Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
eaa6814913
@ -826,6 +826,7 @@
|
||||
};
|
||||
AndersonTorres = {
|
||||
email = "torres.anderson.85@protonmail.com";
|
||||
matrix = "@anderson_torres:matrix.org";
|
||||
github = "AndersonTorres";
|
||||
githubId = 5954806;
|
||||
name = "Anderson Torres";
|
||||
@ -2638,6 +2639,12 @@
|
||||
githubId = 71959829;
|
||||
name = "Cleeyv";
|
||||
};
|
||||
clerie = {
|
||||
email = "nix@clerie.de";
|
||||
github = "clerie";
|
||||
githubId = 9381848;
|
||||
name = "clerie";
|
||||
};
|
||||
cleverca22 = {
|
||||
email = "cleverca22@gmail.com";
|
||||
matrix = "@cleverca22:matrix.org";
|
||||
@ -4616,12 +4623,6 @@
|
||||
githubId = 66178592;
|
||||
name = "Pavel Zolotarevskiy";
|
||||
};
|
||||
flexw = {
|
||||
email = "felix.weilbach@t-online.de";
|
||||
github = "FlexW";
|
||||
githubId = 19961516;
|
||||
name = "Felix Weilbach";
|
||||
};
|
||||
fliegendewurst = {
|
||||
email = "arne.keller@posteo.de";
|
||||
github = "FliegendeWurst";
|
||||
|
||||
@ -130,6 +130,15 @@
|
||||
PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
PHP is now built <literal>NTS</literal> (Non-Thread Safe)
|
||||
style by default, for Apache and <literal>mod_php</literal>
|
||||
usage we still enable <literal>ZTS</literal> (Zend Thread
|
||||
Safe). This has been a common practice for a long time in
|
||||
other distributions.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>protonup</literal> has been aliased to and replaced
|
||||
|
||||
@ -53,6 +53,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- PHP now defaults to PHP 8.1, updated from 8.0.
|
||||
|
||||
- PHP is now built `NTS` (Non-Thread Safe) style by default, for Apache and
|
||||
`mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a
|
||||
common practice for a long time in other distributions.
|
||||
|
||||
- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it.
|
||||
|
||||
- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default.
|
||||
|
||||
@ -34,14 +34,16 @@ let
|
||||
"/share/unimaps"
|
||||
];
|
||||
};
|
||||
|
||||
setVconsole = !config.boot.isContainer;
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options.console = {
|
||||
enable = mkEnableOption (lib.mdDoc "virtual console") // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
font = mkOption {
|
||||
type = with types; either str path;
|
||||
default = "Lat2-Terminus16";
|
||||
@ -125,11 +127,17 @@ in
|
||||
'');
|
||||
}
|
||||
|
||||
(mkIf (!setVconsole) {
|
||||
systemd.services.systemd-vconsole-setup.enable = false;
|
||||
(mkIf (!cfg.enable) {
|
||||
systemd.services = {
|
||||
"serial-getty@ttyS0".enable = false;
|
||||
"serial-getty@hvc0".enable = false;
|
||||
"getty@tty1".enable = false;
|
||||
"autovt@".enable = false;
|
||||
systemd-vconsole-setup.enable = false;
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf setVconsole (mkMerge [
|
||||
(mkIf cfg.enable (mkMerge [
|
||||
{ environment.systemPackages = [ pkgs.kbd ];
|
||||
|
||||
# Let systemd-vconsole-setup.service do the work of setting up the
|
||||
|
||||
@ -774,6 +774,7 @@
|
||||
./services/networking/blockbook-frontend.nix
|
||||
./services/networking/blocky.nix
|
||||
./services/networking/charybdis.nix
|
||||
./services/networking/chisel-server.nix
|
||||
./services/networking/cjdns.nix
|
||||
./services/networking/cloudflare-dyndns.nix
|
||||
./services/networking/cntlm.nix
|
||||
|
||||
@ -28,8 +28,8 @@ let
|
||||
};
|
||||
|
||||
env = {
|
||||
SANE_CONFIG_DIR = config.hardware.sane.configDir;
|
||||
LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
|
||||
SANE_CONFIG_DIR = "/etc/sane.d";
|
||||
LD_LIBRARY_PATH = [ "/etc/sane-libs" ];
|
||||
};
|
||||
|
||||
backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends;
|
||||
@ -158,6 +158,8 @@ in
|
||||
|
||||
environment.systemPackages = backends;
|
||||
environment.sessionVariables = env;
|
||||
environment.etc."sane.d".source = config.hardware.sane.configDir;
|
||||
environment.etc."sane-libs".source = "${saneConfig}/lib/sane";
|
||||
services.udev.packages = backends;
|
||||
|
||||
users.groups.scanner.gid = config.ids.gids.scanner;
|
||||
|
||||
99
nixos/modules/services/networking/chisel-server.nix
Normal file
99
nixos/modules/services/networking/chisel-server.nix
Normal file
@ -0,0 +1,99 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.chisel-server;
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.chisel-server = {
|
||||
enable = mkEnableOption (mdDoc "Chisel Tunnel Server");
|
||||
host = mkOption {
|
||||
description = mdDoc "Address to listen on, falls back to 0.0.0.0";
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
example = "[::1]";
|
||||
};
|
||||
port = mkOption {
|
||||
description = mdDoc "Port to listen on, falls back to 8080";
|
||||
type = with types; nullOr int;
|
||||
default = null;
|
||||
};
|
||||
authfile = mkOption {
|
||||
description = mdDoc "Path to auth.json file";
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
};
|
||||
keepalive = mkOption {
|
||||
description = mdDoc "Keepalive interval, falls back to 25s";
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
example = "5s";
|
||||
};
|
||||
backend = mkOption {
|
||||
description = mdDoc "HTTP server to proxy normal requests to";
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
example = "http://127.0.0.1:8888";
|
||||
};
|
||||
socks5 = mkOption {
|
||||
description = mdDoc "Allow clients access to internal SOCKS5 proxy";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
reverse = mkOption {
|
||||
description = mdDoc "Allow clients reverse port forwarding";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.chisel-server = {
|
||||
description = "Chisel Tunnel Server";
|
||||
wantedBy = [ "network-online.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.chisel}/bin/chisel server " + concatStringsSep " " (
|
||||
optional (cfg.host != null) "--host ${cfg.host}"
|
||||
++ optional (cfg.port != null) "--port ${builtins.toString cfg.port}"
|
||||
++ optional (cfg.authfile != null) "--authfile ${cfg.authfile}"
|
||||
++ optional (cfg.keepalive != null) "--keepalive ${cfg.keepalive}"
|
||||
++ optional (cfg.backend != null) "--backend ${cfg.backend}"
|
||||
++ optional cfg.socks5 "--socks5"
|
||||
++ optional cfg.reverse "--reverse"
|
||||
);
|
||||
|
||||
# Security Hardening
|
||||
# Refer to systemd.exec(5) for option descriptions.
|
||||
CapabilityBoundingSet = "";
|
||||
|
||||
# implies RemoveIPC=, PrivateTmp=, NoNewPrivileges=, RestrictSUIDSGID=,
|
||||
# ProtectSystem=strict, ProtectHome=read-only
|
||||
DynamicUser = true;
|
||||
LockPersonality = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = "~@clock @cpu-emulation @debug @mount @obsolete @reboot @swap @privileged @resources";
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ clerie ];
|
||||
}
|
||||
@ -18,7 +18,7 @@ let
|
||||
sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
|
||||
'';
|
||||
|
||||
php = cfg.phpPackage.override { apacheHttpd = pkg; };
|
||||
php = cfg.phpPackage.override { apxs2Support = true; apacheHttpd = pkg; };
|
||||
|
||||
phpModuleName = let
|
||||
majorVersion = lib.versions.major (lib.getVersion php);
|
||||
@ -660,6 +660,13 @@ in
|
||||
`services.httpd.virtualHosts.<name>.useACMEHost` are mutually exclusive.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.enablePHP -> php.ztsSupport;
|
||||
message = ''
|
||||
The php package provided by `services.httpd.phpPackage` is not built with zts support. Please
|
||||
ensure the php has zts support by settings `services.httpd.phpPackage = php.override { ztsSupport = true; }`
|
||||
'';
|
||||
}
|
||||
] ++ map (name: mkCertOwnershipAssertion {
|
||||
inherit (cfg) group user;
|
||||
cert = config.security.acme.certs.${name};
|
||||
|
||||
@ -7,8 +7,11 @@ with lib;
|
||||
config = mkIf config.boot.isContainer {
|
||||
|
||||
# Disable some features that are not useful in a container.
|
||||
|
||||
boot.kernel.enable = false;
|
||||
|
||||
console.enable = mkDefault false;
|
||||
|
||||
nix.optimise.automatic = mkDefault false; # the store is host managed
|
||||
powerManagement.enable = mkDefault false;
|
||||
documentation.nixos.enable = mkDefault false;
|
||||
|
||||
@ -1,23 +1,25 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, alsa-lib
|
||||
, libjack2
|
||||
, libpulseaudio
|
||||
, fftw
|
||||
, json_c
|
||||
, libjack2
|
||||
, jackSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lingot";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "03x0qqb9iarjapvii3ja522vkxrqv1hwix6b1r53is48p5xwgf3i";
|
||||
sha256 = "sha256-xPl+SWo2ZscHhtE25vLMxeijgT6wjNo1ys1+sNFvTVY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
fftw
|
||||
json_c
|
||||
] ++ lib.optional jackSupport libjack2;
|
||||
|
||||
configureFlags = lib.optional (!jackSupport) "--disable-jack";
|
||||
|
||||
@ -39,10 +39,10 @@
|
||||
elpaBuild {
|
||||
pname = "ada-mode";
|
||||
ename = "ada-mode";
|
||||
version = "7.2.1";
|
||||
version = "7.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.2.1.tar";
|
||||
sha256 = "1x9gkyi23xsq8zn0n8vb1xgkh85maj2cj95ravhkakb2cd9dmbjv";
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-7.3.1.tar";
|
||||
sha256 = "09ji22823w59nnqcjr5524ylxs93c5javsxcvmgbiqlvx9gfrdkk";
|
||||
};
|
||||
packageRequires = [ emacs uniquify-files wisi ];
|
||||
meta = {
|
||||
@ -249,10 +249,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.1.4";
|
||||
version = "13.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.1.4.tar";
|
||||
sha256 = "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.1.5.tar";
|
||||
sha256 = "00g6js6089637w8alch4dvk140chjkyirsa8inh9ai6a6kkfvc3p";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -350,6 +350,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "bind-key";
|
||||
ename = "bind-key";
|
||||
version = "2.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar";
|
||||
sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/bind-key.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
blist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "blist";
|
||||
@ -493,10 +508,10 @@
|
||||
elpaBuild {
|
||||
pname = "cape";
|
||||
ename = "cape";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cape-0.9.tar";
|
||||
sha256 = "0bjzm1jf3554q83mbmyj584v29cgb0s5wpj74y4p9iyy40g739rw";
|
||||
url = "https://elpa.gnu.org/packages/cape-0.10.tar";
|
||||
sha256 = "1ykr01wb0mgs1z181fk9m65lcrv60as5qzbnd0cnndva7p3078lc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -594,21 +609,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cl-print";
|
||||
ename = "cl-print";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cl-print-1.0.el";
|
||||
sha256 = "0ib8j7rv5f4c4xg3kban58jm6cam756i3xz6j8100846g3jn9zcc";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cl-print.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
clipboard-collector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "clipboard-collector";
|
||||
@ -654,21 +654,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "coffee-mode";
|
||||
ename = "coffee-mode";
|
||||
version = "0.4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
|
||||
sha256 = "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "comint-mime";
|
||||
@ -786,10 +771,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-0.19.tar";
|
||||
sha256 = "11dac6cl40xyg05wzxanxsc74f1kgnnkqlgf5gqlkq24gwmlgvyk";
|
||||
url = "https://elpa.gnu.org/packages/consult-0.20.tar";
|
||||
sha256 = "134yyjap69lm3j99q7719b3pgc71y0nl30v9gy0cycf7dp7p1ssx";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -801,10 +786,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult-recoll";
|
||||
ename = "consult-recoll";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-recoll-0.7.tar";
|
||||
sha256 = "12a1qhp7yz6r5pblm68wp1zis0xnvsn2rm12rz9fircq8p3ff3j7";
|
||||
url = "https://elpa.gnu.org/packages/consult-recoll-0.8.tar";
|
||||
sha256 = "02vg1rr2fkcqrrivqgggdjdq0ywvlyzazwq1xd02yah3j4sbv4ag";
|
||||
};
|
||||
packageRequires = [ consult emacs ];
|
||||
meta = {
|
||||
@ -831,10 +816,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.27";
|
||||
version = "0.28";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.27.tar";
|
||||
sha256 = "1i8nl94aaa5p4bp0idsmph3z61lccg9a7plbsnpicy0klsaj69r2";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.28.tar";
|
||||
sha256 = "0gayzzxac42nxj1612isc4f5xishrr0bnvycpcfmkm5pf41kq50f";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -906,10 +891,10 @@
|
||||
elpaBuild {
|
||||
pname = "crdt";
|
||||
ename = "crdt";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.3.3.tar";
|
||||
sha256 = "12xdqdp4zwd163wc19cjakabgjyzm4l4xg4bns6q1p60zgynbkx8";
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.3.4.tar";
|
||||
sha256 = "1wha43mrllnpc2i7p91dns8iwaxf60mp20h234c07m9jcjvcxrmc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1041,10 +1026,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.33";
|
||||
version = "0.34";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.33.tar";
|
||||
sha256 = "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.34.tar";
|
||||
sha256 = "06nxia4myhysiw12vsflgllrp9nyhmjnybrrcl1vyf4pw0fc6yrx";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
@ -1071,10 +1056,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-1.0.0.tar";
|
||||
sha256 = "1gywi22x12p7hkliwy84i7pvyis5ja22fybz5shkdmkcl12mx631";
|
||||
url = "https://elpa.gnu.org/packages/denote-1.1.0.tar";
|
||||
sha256 = "06fmxszw8y8r2sm1j45wx14zb22jg5k5l73k1znhx4gl4v3bl968";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1086,10 +1071,10 @@
|
||||
elpaBuild {
|
||||
pname = "detached";
|
||||
ename = "detached";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/detached-0.9.1.tar";
|
||||
sha256 = "1hzvqb18bpdpmnk469cmkayvddm37knd3mjj7m6zv3qsjw17n6f1";
|
||||
url = "https://elpa.gnu.org/packages/detached-0.9.2.tar";
|
||||
sha256 = "00rbdcl56gqjqrlbmf5mfgakzl086bgs5xb15ic3jlm676j64gqh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1251,10 +1236,10 @@
|
||||
elpaBuild {
|
||||
pname = "doc-toc";
|
||||
ename = "doc-toc";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/doc-toc-1.0.tar";
|
||||
sha256 = "07yan1jmp6q87rhm8bmglswnhzlh5r9j35x5sqm5yfx0pcp16kpj";
|
||||
url = "https://elpa.gnu.org/packages/doc-toc-1.1.tar";
|
||||
sha256 = "145k0w84nda1gq5g8zd9510kxhqqqk72ladi3av6hpydvym6bszz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1277,21 +1262,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dtache = callPackage ({ detached, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dtache";
|
||||
ename = "dtache";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dtache-0.7.tar";
|
||||
sha256 = "0cws662f53f2j1viicrwijmniiqxz1n4mh6kwck25pl954xa61gf";
|
||||
};
|
||||
packageRequires = [ detached emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dtache.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dts-mode";
|
||||
@ -1341,10 +1311,10 @@
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.8.14";
|
||||
version = "0.8.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.14.tar";
|
||||
sha256 = "0h7yva7p4b4lapi7pwcibf75nqmazjf3r67ibnkc8l9salfhml25";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.16.tar";
|
||||
sha256 = "0qldw0a346xbkq289mynvfz38n4yh2rfbvgs5f7ixfc014y3j3gw";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -1386,10 +1356,10 @@
|
||||
elpaBuild {
|
||||
pname = "ediprolog";
|
||||
ename = "ediprolog";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
|
||||
sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar";
|
||||
sha256 = "021jm5zdxrjg7xcja18vgc2v52rk17xi1k7xxw8q802nmixhy0js";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1401,10 +1371,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20220926";
|
||||
version = "20221108";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20220926.tar";
|
||||
sha256 = "0kc30y44wl691jchafljp938kbwilawdfxm0bp6nsniv1bm95rpy";
|
||||
url = "https://elpa.gnu.org/packages/eev-20221108.tar";
|
||||
sha256 = "0va6jb57pyv21zvjaq99yi1275rl2bna7ci5zicqshiq2naxdqzr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1416,10 +1386,10 @@
|
||||
elpaBuild {
|
||||
pname = "ef-themes";
|
||||
ename = "ef-themes";
|
||||
version = "0.6.0";
|
||||
version = "0.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-0.6.0.tar";
|
||||
sha256 = "00xq5ymsq8lq2jc541lw64i9pp0a0757wj3nasmfsa27wfpivzhb";
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-0.9.0.tar";
|
||||
sha256 = "1yhnpnnz3v4v54ha4sibdzp2af6jq5p55jm0g6k0viqv2qpjmh3l";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1435,16 +1405,17 @@
|
||||
, jsonrpc
|
||||
, lib
|
||||
, project
|
||||
, seq
|
||||
, xref }:
|
||||
elpaBuild {
|
||||
pname = "eglot";
|
||||
ename = "eglot";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.8.tar";
|
||||
sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5";
|
||||
url = "https://elpa.gnu.org/packages/eglot-1.9.tar";
|
||||
sha256 = "1v6pyk3c680xmsv6lrq5xcj9x771z87i3b92in87zg841mw3b6as";
|
||||
};
|
||||
packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
|
||||
packageRequires = [ eldoc emacs flymake jsonrpc project seq xref ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/eglot.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1578,10 +1549,10 @@
|
||||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.3";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ement-0.3.tar";
|
||||
sha256 = "08k1qfcymsnaz0mzq33l3i0fj9kjf5y0pdpn7k0skhhlsw90h078";
|
||||
url = "https://elpa.gnu.org/packages/ement-0.4.1.tar";
|
||||
sha256 = "0hf1gdz5kgvy64652h33iph3lrnmiv98lhar421m0grbh326xn95";
|
||||
};
|
||||
packageRequires = [
|
||||
emacs
|
||||
@ -1606,10 +1577,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "11";
|
||||
version = "12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-11.tar";
|
||||
sha256 = "000lqhsafyh1n293ksnlyavxv1pzl5pazds4sgxjcqd45lyn55ii";
|
||||
url = "https://elpa.gnu.org/packages/emms-12.tar";
|
||||
sha256 = "048ijrpw6s4k7zr78fzc3ksjjri6mnyp6c47h5lp5nw5gvm4np7a";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
@ -1746,10 +1717,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.26";
|
||||
version = "0.27";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.26.tar";
|
||||
sha256 = "03pg0r8a5vb1wc5grmjgzql74p47fniv47x39gdll5s3cq0haf6q";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.27.tar";
|
||||
sha256 = "094k33clmxhnab0wniyrs48sdz28kna2g6fmkhsd7n20nmhhc4sn";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -1836,10 +1807,10 @@
|
||||
elpaBuild {
|
||||
pname = "fontaine";
|
||||
ename = "fontaine";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/fontaine-0.4.0.tar";
|
||||
sha256 = "1phbni32zgwml5mwldbqmqmkbhbdj4vf4bs98wj0my6d902x6lbw";
|
||||
url = "https://elpa.gnu.org/packages/fontaine-0.4.1.tar";
|
||||
sha256 = "0szj9ys7bkj6cwg2bmb7sniyzjzdy3f7qm9r90grrgs5iir3k2qa";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2144,6 +2115,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hcel";
|
||||
ename = "hcel";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar";
|
||||
sha256 = "1j6snbyi710qnxr68mbmj1v2i6gqf6znd872fkjkyj85pg3iibia";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hcel.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
heap = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "heap";
|
||||
@ -2163,10 +2149,10 @@
|
||||
elpaBuild {
|
||||
pname = "hiddenquote";
|
||||
ename = "hiddenquote";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hiddenquote-1.1.tar";
|
||||
sha256 = "1j692ka84z6k9c3bhcn28irym5fga4d1wvhmvzvixdbfwn58ivw5";
|
||||
url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar";
|
||||
sha256 = "1ssfy1ha5a1pakihmkifry200k7z1mxcgl4w9pwvp7wmzbkv2zql";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2221,16 +2207,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, lv }:
|
||||
elpaBuild {
|
||||
pname = "hydra";
|
||||
ename = "hydra";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
|
||||
sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
|
||||
url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar";
|
||||
sha256 = "1mppx20920kfq97wd7mkrn4bcmm46k5m8wqm49asd54w701iq3n1";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
packageRequires = [ cl-lib lv ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hydra.html";
|
||||
license = lib.licenses.free;
|
||||
@ -2695,10 +2681,10 @@
|
||||
elpaBuild {
|
||||
pname = "logos";
|
||||
ename = "logos";
|
||||
version = "0.5.1";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/logos-0.5.1.tar";
|
||||
sha256 = "0154fxl20crl0ay064cbhgsjnj70nq5jz778hzjjy3mnkwzsmbh3";
|
||||
url = "https://elpa.gnu.org/packages/logos-1.0.1.tar";
|
||||
sha256 = "1kmfsgapinx6p8zyxd2s81j703iiril9c907r576z5k498pfifb6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2706,14 +2692,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
lv = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "lv";
|
||||
ename = "lv";
|
||||
version = "0.15.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/lv-0.15.0.tar";
|
||||
sha256 = "1xnyk8bvr0bdz68qc1sga3w9lwdga5qpp3m7290z1vyv0mznh4gm";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/lv.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "map";
|
||||
ename = "map";
|
||||
version = "3.2.1";
|
||||
version = "3.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/map-3.2.1.tar";
|
||||
sha256 = "1zj0y3nvkrd2v43za214xr3h9z6wyp7r5s6nf5g1pj272yb871d1";
|
||||
url = "https://elpa.gnu.org/packages/map-3.3.1.tar";
|
||||
sha256 = "1gvywhdfg27nx6pyq7yfwq9x6j96jama59i5s9rp41pvg2dlmvm0";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2725,10 +2726,10 @@
|
||||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.14.tar";
|
||||
sha256 = "0y1mz9688h56knyly7by3gl6v37q437c3lp5bsx6jajysb8v69xw";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-0.15.tar";
|
||||
sha256 = "0sadz4c44pld9aqn49a7l80lqgv2ncv7aw401d740n2ja2grg6vb";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2886,48 +2887,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "mmm-mode";
|
||||
ename = "mmm-mode";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
|
||||
sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
|
||||
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.9.tar";
|
||||
sha256 = "12fss1ccb66xc87m5wpr3vg7bfrzz5m0q6s7pa0avvhsm2f8r2yh";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-operandi-theme = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, modus-themes }:
|
||||
elpaBuild {
|
||||
pname = "modus-operandi-theme";
|
||||
ename = "modus-operandi-theme";
|
||||
version = "0.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.2.tar";
|
||||
sha256 = "1sw18ijp9rhaf8y8x8z5rmxy23pxd3gaicgmp2zndcfmm54gwsic";
|
||||
};
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "2.7.1";
|
||||
version = "3.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.7.1.tar";
|
||||
sha256 = "1ms5nig05z26342723jln50m7xq055knr2570x40lkg2m9s1ikx1";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
|
||||
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2935,25 +2917,6 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
modus-vivendi-theme = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, modus-themes }:
|
||||
elpaBuild {
|
||||
pname = "modus-vivendi-theme";
|
||||
ename = "modus-vivendi-theme";
|
||||
version = "0.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.2.tar";
|
||||
sha256 = "1qn3kzxwf81zc7gprd9wblhb8b8akdkxwajpgk036y8i4cmvmspn";
|
||||
};
|
||||
packageRequires = [ emacs modus-themes ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multi-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "multi-mode";
|
||||
@ -3083,10 +3046,10 @@
|
||||
elpaBuild {
|
||||
pname = "nano-modeline";
|
||||
ename = "nano-modeline";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.1.tar";
|
||||
sha256 = "18a4mp27z6pj87yhp81x5a79g0kv6mzzd0axq2p31003r675l0hx";
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.2.tar";
|
||||
sha256 = "14405gj7fh14incbpsg75fwzxfzazqp9lfk60i4w731kfwhlc727";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3098,10 +3061,10 @@
|
||||
elpaBuild {
|
||||
pname = "nano-theme";
|
||||
ename = "nano-theme";
|
||||
version = "0.3.1";
|
||||
version = "0.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-theme-0.3.1.tar";
|
||||
sha256 = "003jhzh52iqrqlxh1gpv3y2wjlxx4ng3al5zcpm5q42kix8cjpd1";
|
||||
url = "https://elpa.gnu.org/packages/nano-theme-0.3.3.tar";
|
||||
sha256 = "0agdvl85ljiawa06x02zj78crq1y1vg0sr7dqxcl36zx8vhzc08v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3177,10 +3140,10 @@
|
||||
elpaBuild {
|
||||
pname = "notmuch-indicator";
|
||||
ename = "notmuch-indicator";
|
||||
version = "0.1.1";
|
||||
version = "0.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.1.tar";
|
||||
sha256 = "1fdl8xm48id1a85gf3gr8d8m3sz61xrras9f598pvrksm3j162b6";
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.2.2.tar";
|
||||
sha256 = "1jca5zm8vd91ivk5c6n2210ybp1i8rb8cpi1dymbxkcjxc61fzgp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3357,10 +3320,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-modern";
|
||||
ename = "org-modern";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-modern-0.4.tar";
|
||||
sha256 = "0xn2vmlz43p9b1gscijwzhaxa44dsshlw31llhffqpxlw2amm1lf";
|
||||
url = "https://elpa.gnu.org/packages/org-modern-0.5.tar";
|
||||
sha256 = "0fd5inaq094xhlv4cnd7p47hishlxlhjb17srk4cm1jdgaar3pnp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3417,10 +3380,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-transclusion";
|
||||
ename = "org-transclusion";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.3.0.tar";
|
||||
sha256 = "1fgxpx5cikp03xzki55b7davx8m6zmrmrd0jzd69mv9gyw3bywg7";
|
||||
url = "https://elpa.gnu.org/packages/org-transclusion-1.3.1.tar";
|
||||
sha256 = "1v7i2i28500p4gvikcpp931qpks9zmvfpf6lfzrqdqppx2ix295q";
|
||||
};
|
||||
packageRequires = [ emacs org ];
|
||||
meta = {
|
||||
@ -3627,10 +3590,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.25";
|
||||
version = "0.4.30";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.25.tar";
|
||||
sha256 = "1sqwh7lkpgwc8m7vrbzjk8vc2p3b9gq6smyz6zx8pq4pf1rqkzrd";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.30.tar";
|
||||
sha256 = "0gwdcfvp3564zmiaw1p0vfyw46n6kn14nh8qx0jwzwygy22v1jdq";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3687,10 +3650,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar";
|
||||
sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.1.8.tar";
|
||||
sha256 = "0560f05c2rh6jkdba4yq9qbazfz6qbdrymqm5zcihvz7cy019dzm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3702,10 +3665,10 @@
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.8.1.tar";
|
||||
sha256 = "0q2js8qihlhchpx2mx0f992ygslsqri2q4iv8kcl4fx31lpp7c1k";
|
||||
url = "https://elpa.gnu.org/packages/project-0.8.2.tar";
|
||||
sha256 = "1l5yxw6xqml176vskd5fz2y2dbjh8925g3kyimda4gdprz4y7aci";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
@ -3762,10 +3725,10 @@
|
||||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "5.2.5";
|
||||
version = "5.2.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-5.2.5.tar";
|
||||
sha256 = "00f23pl53rdy9iwp4gj2656wik7c6vnmhsglg7z4pz3ippz3f4hq";
|
||||
url = "https://elpa.gnu.org/packages/pyim-5.2.8.tar";
|
||||
sha256 = "1klarzr5lfga09ysq3c7gkgmzl6r08gpl4519x5damxd82x4r3y2";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
@ -3867,10 +3830,10 @@
|
||||
elpaBuild {
|
||||
pname = "rcirc-color";
|
||||
ename = "rcirc-color";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.2.tar";
|
||||
sha256 = "0pa9p018kwsy44cmkli7x6cz1abxkyi26ac7w3vh99qp7x97dia3";
|
||||
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.4.tar";
|
||||
sha256 = "1jwx9fd3m7zl6c7q91v185iy7b8q1bncvif80xi6hbi2srz9rlfg";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4702,10 +4665,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy-magit-section";
|
||||
ename = "taxy-magit-section";
|
||||
version = "0.11";
|
||||
version = "0.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.11.tar";
|
||||
sha256 = "058z95c0z2hxplr5pfgph1cdq68zcrkmwx1wqyd5fy4a5h43yknq";
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
|
||||
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
|
||||
};
|
||||
packageRequires = [ emacs magit-section taxy ];
|
||||
meta = {
|
||||
@ -4732,10 +4695,10 @@
|
||||
elpaBuild {
|
||||
pname = "tempel";
|
||||
ename = "tempel";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tempel-0.4.tar";
|
||||
sha256 = "002ng6x1qlhnk7vvpwjl8wkm869k0ihpbdgbnhqjsnpzln1gib0w";
|
||||
url = "https://elpa.gnu.org/packages/tempel-0.5.tar";
|
||||
sha256 = "0gx48p2kkwizxf30h8jq658ksp00ibf5azjxvcs1nj8hz2g3agjx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4942,6 +4905,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "triples";
|
||||
ename = "triples";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/triples-0.1.tar";
|
||||
sha256 = "1b1qrrg60wx4ikl9nd8gmawj0pc0yysxq901l29336gwpbwj81y7";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/triples.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
|
||||
elpaBuild {
|
||||
pname = "undo-tree";
|
||||
@ -5006,6 +4984,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "url-scgi";
|
||||
ename = "url-scgi";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/url-scgi-0.8.tar";
|
||||
sha256 = "1837vyamwk5mp2nf3k477hyr5pq1xy6p7br7kl6h2k8jmxqy3mlj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/url-scgi.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
validate = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
@ -5152,10 +5145,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "0.27";
|
||||
version = "0.28";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.27.tar";
|
||||
sha256 = "0yf02xwv0zx2pwb7c97k7qbbvmkripb1pb4mn16rvs07a9r217hz";
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.28.tar";
|
||||
sha256 = "0rkvfya674hy8g37hy40knwwppbygmx005cg04136kdlkmywb0l1";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5385,10 +5378,10 @@
|
||||
elpaBuild {
|
||||
pname = "wisi";
|
||||
ename = "wisi";
|
||||
version = "3.1.8";
|
||||
version = "4.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisi-3.1.8.tar";
|
||||
sha256 = "1k4vfxjas79yv5xfnmjygf185zkypx65gpqlmxpvfgcmvl7dgbdy";
|
||||
url = "https://elpa.gnu.org/packages/wisi-4.0.0.tar";
|
||||
sha256 = "1w082nqzvzljm8m8gxja7va88g0lz264d4ir24ydak22rfr688bv";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
||||
@ -69,7 +69,7 @@ self: let
|
||||
then null
|
||||
else super.project;
|
||||
# Compilation instructions for the Ada executables:
|
||||
# https://www.nongnu.org/ada-mode/ada-mode.html#Ada-executables
|
||||
# https://www.nongnu.org/ada-mode/
|
||||
ada-mode = super.ada-mode.overrideAttrs (old: {
|
||||
# actually unpack source of ada-mode and wisi
|
||||
# which are both needed to compile the tools
|
||||
@ -85,15 +85,18 @@ self: let
|
||||
nativeBuildInputs = [
|
||||
buildPackages.gnat
|
||||
buildPackages.gprbuild
|
||||
buildPackages.lzip
|
||||
buildPackages.dos2unix
|
||||
buildPackages.re2c
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pkgs.gnatcoll-xref
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
./build.sh -j$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
|
||||
@ -1,258 +1,95 @@
|
||||
{ lib, pkgs }: self: with self; with lib.licenses; {
|
||||
{ lib, pkgs }:
|
||||
|
||||
elisp-ffi = let
|
||||
rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";
|
||||
in melpaBuild {
|
||||
pname = "elisp-ffi";
|
||||
version = "20170518.0";
|
||||
self: with self; {
|
||||
|
||||
commit = rev;
|
||||
agda-input = callPackage ./manual-packages/agda-input { };
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
inherit rev;
|
||||
sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";
|
||||
};
|
||||
agda2-mode = callPackage ./manual-packages/agda2-mode { };
|
||||
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
bqn-mode = callPackage ./manual-packages/bqn-mode { };
|
||||
|
||||
buildInputs = [ pkgs.libffi ];
|
||||
cask = callPackage ./manual-packages/cask { };
|
||||
|
||||
preBuild = ''
|
||||
mv ffi.el elisp-ffi.el
|
||||
make
|
||||
'';
|
||||
control-lock = callPackage ./manual-packages/control-lock { };
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(elisp-ffi
|
||||
:repo "skeeto/elisp-ffi"
|
||||
:fetcher github)
|
||||
'';
|
||||
ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
|
||||
|
||||
meta = {
|
||||
description = "Emacs Lisp Foreign Function Interface";
|
||||
longDescription = ''
|
||||
This library provides an FFI for Emacs Lisp so that Emacs
|
||||
programs can invoke functions in native libraries. It works by
|
||||
driving a subprocess to do the heavy lifting, passing result
|
||||
values on to Emacs.
|
||||
'';
|
||||
license = publicDomain;
|
||||
};
|
||||
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
emacspeak = callPackage ./manual-packages/emacspeak { };
|
||||
|
||||
ement = callPackage ./manual-packages/ement { };
|
||||
|
||||
ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
|
||||
|
||||
evil-markdown = callPackage ./manual-packages/evil-markdown { };
|
||||
|
||||
font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
|
||||
|
||||
ghc-mod = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
git-undo = callPackage ./manual-packages/git-undo { };
|
||||
|
||||
haskell-unicode-input-method = callPackage ./manual-packages/haskell-unicode-input-method { };
|
||||
|
||||
header-file-mode = callPackage ./manual-packages/header-file-mode { };
|
||||
|
||||
helm-words = callPackage ./manual-packages/helm-words { };
|
||||
|
||||
idris2-mode = callPackage ./manual-packages/idris2-mode { };
|
||||
|
||||
isearch-plus = callPackage ./manual-packages/isearch-plus { };
|
||||
|
||||
isearch-prop = callPackage ./manual-packages/isearch-prop { };
|
||||
|
||||
jam-mode = callPackage ./manual-packages/jam-mode { };
|
||||
|
||||
llvm-mode = callPackage ./manual-packages/llvm-mode { };
|
||||
|
||||
matrix-client = callPackage ./manual-packages/matrix-client {
|
||||
_map = self.map;
|
||||
};
|
||||
|
||||
ghc-mod = melpaBuild {
|
||||
pname = "ghc";
|
||||
version = pkgs.haskellPackages.ghc-mod.version;
|
||||
nano-theme = callPackage ./manual-packages/nano-theme { };
|
||||
|
||||
src = pkgs.haskellPackages.ghc-mod.src;
|
||||
ott-mode = callPackage ./manual-packages/ott-mode { };
|
||||
|
||||
packageRequires = [ haskell-mode ];
|
||||
perl-completion = callPackage ./manual-packages/perl-completion { };
|
||||
|
||||
propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ];
|
||||
pod-mode = callPackage ./manual-packages/pod-mode { };
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
|
||||
'';
|
||||
power-mode = callPackage ./manual-packages/power-mode { };
|
||||
|
||||
fileSpecs = [ "elisp/*.el" ];
|
||||
|
||||
meta = {
|
||||
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
|
||||
license = bsd3;
|
||||
};
|
||||
};
|
||||
|
||||
haskell-unicode-input-method = let
|
||||
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
|
||||
in melpaBuild {
|
||||
pname = "haskell-unicode-input-method";
|
||||
version = "20110905.2307";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "roelvandijk";
|
||||
repo = "emacs-haskell-unicode-input-method";
|
||||
inherit rev;
|
||||
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
|
||||
};
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(haskell-unicode-input-method
|
||||
:repo "roelvandijk/emacs-haskell-unicode-input-method"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
packageRequires = [];
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#haskell-unicode-input-method/";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
};
|
||||
|
||||
matrix-client = let
|
||||
rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
|
||||
in melpaBuild
|
||||
{
|
||||
pname = "matrix-client";
|
||||
version = "0.3.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "alphapapa";
|
||||
repo = "matrix-client.el";
|
||||
inherit rev;
|
||||
sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix: avatar loading when imagemagick support is not available
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
|
||||
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
|
||||
})
|
||||
];
|
||||
|
||||
packageRequires = [
|
||||
anaphora
|
||||
cl-lib
|
||||
self.map
|
||||
dash-functional
|
||||
esxml
|
||||
f
|
||||
ov
|
||||
tracking
|
||||
rainbow-identifiers
|
||||
dash
|
||||
s
|
||||
request
|
||||
frame-purpose
|
||||
a
|
||||
ht
|
||||
];
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(matrix-client
|
||||
:repo "alphapapa/matrix-client.el"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A chat client and API wrapper for Matrix.org";
|
||||
license = gpl3Plus;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
agda2-mode = callPackage ./agda2-mode { };
|
||||
|
||||
agda-input = callPackage ./agda-input{ };
|
||||
|
||||
bqn-mode = callPackage ./bqn-mode { };
|
||||
|
||||
llvm-mode = callPackage ./llvm-mode { };
|
||||
|
||||
ott-mode = callPackage ./ott-mode { };
|
||||
|
||||
urweb-mode = callPackage ./urweb-mode { };
|
||||
|
||||
voicemacs = callPackage ./voicemacs { };
|
||||
|
||||
# Packages made the classical callPackage way
|
||||
|
||||
ebuild-mode = callPackage ./ebuild-mode { };
|
||||
|
||||
evil-markdown = callPackage ./evil-markdown { };
|
||||
|
||||
emacspeak = callPackage ./emacspeak { };
|
||||
|
||||
ement = callPackage ./ement { };
|
||||
|
||||
ess-R-object-popup = callPackage ./ess-R-object-popup { };
|
||||
|
||||
font-lock-plus = callPackage ./font-lock-plus { };
|
||||
|
||||
git-undo = callPackage ./git-undo { };
|
||||
|
||||
header-file-mode = callPackage ./header-file-mode { };
|
||||
|
||||
helm-words = callPackage ./helm-words { };
|
||||
|
||||
idris2-mode = callPackage ./idris2-mode { };
|
||||
|
||||
isearch-plus = callPackage ./isearch-plus { };
|
||||
|
||||
isearch-prop = callPackage ./isearch-prop { };
|
||||
|
||||
jam-mode = callPackage ./jam-mode { };
|
||||
|
||||
nano-theme = callPackage ./nano-theme { };
|
||||
|
||||
perl-completion = callPackage ./perl-completion { };
|
||||
|
||||
control-lock = callPackage ./control-lock { };
|
||||
|
||||
pod-mode = callPackage ./pod-mode { };
|
||||
|
||||
power-mode = callPackage ./power-mode { };
|
||||
|
||||
prisma-mode = let
|
||||
rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4";
|
||||
in melpaBuild {
|
||||
pname = "prisma-mode";
|
||||
version = "20211207.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
packageRequires = [ js2-mode ];
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "pimeys";
|
||||
repo = "emacs-prisma-mode";
|
||||
inherit rev;
|
||||
sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
|
||||
};
|
||||
|
||||
recipe = pkgs.writeText "recipe" ''
|
||||
(prisma-mode
|
||||
:repo "pimeys/emacs-prisma-mode"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Major mode for Prisma Schema Language";
|
||||
license = gpl2Only;
|
||||
};
|
||||
};
|
||||
prisma-mode = callPackage ./manual-packages/prisma-mode { };
|
||||
|
||||
structured-haskell-mode = self.shm;
|
||||
|
||||
sv-kalender = callPackage ./sv-kalender { };
|
||||
sv-kalender = callPackage ./manual-packages/sv-kalender { };
|
||||
|
||||
tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; };
|
||||
tsc = callPackage ./tsc { };
|
||||
tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
|
||||
|
||||
yes-no = callPackage ./yes-no { };
|
||||
tsc = callPackage ./manual-packages/tsc { };
|
||||
|
||||
youtube-dl = callPackage ./youtube-dl { };
|
||||
urweb-mode = callPackage ./manual-packages/urweb-mode { };
|
||||
|
||||
voicemacs = callPackage ./manual-packages/voicemacs { };
|
||||
|
||||
yes-no = callPackage ./manual-packages/yes-no { };
|
||||
|
||||
youtube-dl = callPackage ./manual-packages/youtube-dl { };
|
||||
|
||||
# From old emacsPackages (pre emacsPackagesNg)
|
||||
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
|
||||
color-theme-solarized = callPackage ./color-theme-solarized { };
|
||||
session-management-for-emacs = callPackage ./session-management-for-emacs { };
|
||||
hsc3-mode = callPackage ./hsc3 { };
|
||||
prolog-mode = callPackage ./prolog { };
|
||||
rect-mark = callPackage ./rect-mark { };
|
||||
sunrise-commander = callPackage ./sunrise-commander { };
|
||||
cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };
|
||||
color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { };
|
||||
hsc3-mode = callPackage ./manual-packages/hsc3 { };
|
||||
prolog-mode = callPackage ./manual-packages/prolog { };
|
||||
rect-mark = callPackage ./manual-packages/rect-mark { };
|
||||
session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { };
|
||||
sunrise-commander = callPackage ./manual-packages/sunrise-commander { };
|
||||
|
||||
# camelCase aliases for some of the kebab-case expressions above
|
||||
colorThemeSolarized = color-theme-solarized;
|
||||
emacsSessionManagement = session-management-for-emacs;
|
||||
rectMark = rect-mark;
|
||||
sunriseCommander = sunrise-commander;
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, emacs
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cask";
|
||||
version = "0.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cask";
|
||||
repo = "cask";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [ emacs ];
|
||||
buildInputs = [
|
||||
bash
|
||||
python3
|
||||
]
|
||||
++ (with emacs.pkgs; [
|
||||
ansi
|
||||
dash
|
||||
ecukes
|
||||
el-mock
|
||||
ert-async
|
||||
ert-runner
|
||||
f
|
||||
git
|
||||
noflet
|
||||
package-build
|
||||
s
|
||||
servant
|
||||
shell-split-string
|
||||
]);
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc
|
||||
install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask
|
||||
ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Project management for Emacs";
|
||||
longDescription = ''
|
||||
Cask is a project management tool for Emacs that helps automate the
|
||||
package development cycle; development, dependencies, testing, building,
|
||||
packaging and more.
|
||||
'';
|
||||
homepage = "https://cask.readthedocs.io/en/latest/index.html";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libffi
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";
|
||||
in melpaBuild {
|
||||
pname = "elisp-ffi";
|
||||
version = "20170518.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
inherit rev;
|
||||
sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libffi ];
|
||||
|
||||
preBuild = ''
|
||||
mv ffi.el elisp-ffi.el
|
||||
make
|
||||
'';
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Emacs Lisp Foreign Function Interface";
|
||||
longDescription = ''
|
||||
This library provides an FFI for Emacs Lisp so that Emacs
|
||||
programs can invoke functions in native libraries. It works by
|
||||
driving a subprocess to do the heavy lifting, passing result
|
||||
values on to Emacs.
|
||||
'';
|
||||
license = lib.licenses.publicDomain;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, melpaBuild
|
||||
, haskellPackages
|
||||
, writeText
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
pname = "ghc";
|
||||
|
||||
inherit (haskellPackages.ghc-mod) version src;
|
||||
|
||||
packageRequires = [ haskell-mode ];
|
||||
|
||||
propagatedUserEnvPkgs = [ haskellPackages.ghc-mod ];
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
|
||||
'';
|
||||
|
||||
fileSpecs = [ "elisp/*.el" ];
|
||||
|
||||
meta = {
|
||||
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
|
||||
in melpaBuild {
|
||||
pname = "haskell-unicode-input-method";
|
||||
version = "20110905.2307";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roelvandijk";
|
||||
repo = "emacs-haskell-unicode-input-method";
|
||||
inherit rev;
|
||||
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
|
||||
};
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(haskell-unicode-input-method
|
||||
:repo "roelvandijk/emacs-haskell-unicode-input-method"
|
||||
:fetcher github)
|
||||
'';
|
||||
|
||||
packageRequires = [];
|
||||
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#haskell-unicode-input-method/";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, writeText
|
||||
# Emacs packages
|
||||
, _map
|
||||
, a
|
||||
, anaphora
|
||||
, cl-lib
|
||||
, dash
|
||||
, dash-functional
|
||||
, esxml
|
||||
, f
|
||||
, frame-purpose
|
||||
, ht
|
||||
, ov
|
||||
, rainbow-identifiers
|
||||
, request
|
||||
, s
|
||||
, tracking
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
|
||||
in melpaBuild {
|
||||
pname = "matrix-client";
|
||||
version = "0.3.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alphapapa";
|
||||
repo = "matrix-client.el";
|
||||
inherit rev;
|
||||
sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix: avatar loading when imagemagick support is not available
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
|
||||
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
|
||||
})
|
||||
];
|
||||
|
||||
packageRequires = [
|
||||
_map
|
||||
a
|
||||
anaphora
|
||||
cl-lib
|
||||
dash
|
||||
dash-functional
|
||||
esxml
|
||||
f
|
||||
frame-purpose
|
||||
ht
|
||||
ov
|
||||
rainbow-identifiers
|
||||
request
|
||||
s
|
||||
tracking
|
||||
];
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(matrix-client :repo "alphapapa/matrix-client.el" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A chat client and API wrapper for Matrix.org";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, melpaBuild
|
||||
, js2-mode
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4";
|
||||
in melpaBuild {
|
||||
pname = "prisma-mode";
|
||||
version = "20211207.0";
|
||||
|
||||
commit = rev;
|
||||
|
||||
packageRequires = [ js2-mode ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pimeys";
|
||||
repo = "emacs-prisma-mode";
|
||||
inherit rev;
|
||||
sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
|
||||
};
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(prisma-mode :repo "pimeys/emacs-prisma-mode" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Major mode for Prisma Schema Language";
|
||||
license = lib.licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell ../../../../../../. -i python3 -p python3 -p nix
|
||||
#! nix-shell ../../../../../../../. -i python3 -p python3 -p nix
|
||||
|
||||
from os.path import (
|
||||
dirname,
|
||||
abspath,
|
||||
@ -49,10 +49,10 @@
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.0.tar";
|
||||
sha256 = "169cav480g2fm3z7d5dixrng2h8fv39sa9n066b79cb573p4bbcp";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.1.tar";
|
||||
sha256 = "00rpaki0vf6aiwa4by1v3hba79jmx1g7c283q1gibp4ka7grxzc2";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -214,10 +214,10 @@
|
||||
elpaBuild {
|
||||
pname = "buttercup";
|
||||
ename = "buttercup";
|
||||
version = "1.26";
|
||||
version = "1.28";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.26.tar";
|
||||
sha256 = "1ddzk6h4cxrl7mn8vr2qp4xjj2al3h5s3kwqxpdwd3zn6wqgyqm4";
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.28.tar";
|
||||
sha256 = "0gli1cxqiqg4adln7svplcc6rk718q4gn6idwxbzx8mgcwhmw75f";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -344,10 +344,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu-terminal";
|
||||
ename = "corfu-terminal";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.4.tar";
|
||||
sha256 = "1rmfj2lzdab2s49k9ja79i7xcw74r9cr5kv7rgrisqxwgcnvsi95";
|
||||
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.5.tar";
|
||||
sha256 = "1m53d4vi7cl91d8k550735r3ns4lm9vz3gvb0b7skib8jw3x5xqr";
|
||||
};
|
||||
packageRequires = [ corfu emacs popon ];
|
||||
meta = {
|
||||
@ -533,10 +533,10 @@
|
||||
elpaBuild {
|
||||
pname = "editorconfig";
|
||||
ename = "editorconfig";
|
||||
version = "0.8.2";
|
||||
version = "0.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.8.2.tar";
|
||||
sha256 = "1ff8hwyzb249lf78j023sbibgfmimmk6mxkjmcnqqnk1jafprk02";
|
||||
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.9.1.tar";
|
||||
sha256 = "0i271313bsk3hlkc3bzjv79i20y6ffk7gwn26rnhljwpi828wfsw";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs nadvice ];
|
||||
meta = {
|
||||
@ -711,10 +711,10 @@
|
||||
elpaBuild {
|
||||
pname = "evil-nerd-commenter";
|
||||
ename = "evil-nerd-commenter";
|
||||
version = "3.5.7";
|
||||
version = "3.5.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.7.tar";
|
||||
sha256 = "1lar8hy9n29gv4cijalyy2ba23y0kyh9ycnsi5dzjs68pk3y4hca";
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.8.tar";
|
||||
sha256 = "0hrzwca24dy4g9h7v5csqpwvsfj1ns4gqlnlf1q5i0jqvhvklnj5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -777,10 +777,10 @@
|
||||
elpaBuild {
|
||||
pname = "flymake-popon";
|
||||
ename = "flymake-popon";
|
||||
version = "0.3";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.3.tar";
|
||||
sha256 = "1cmimdkav8cdl7x6qplm4pvj2ifyb3lk8h2q624vh7cxxlh8yq0l";
|
||||
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.tar";
|
||||
sha256 = "1q1adxsrx8sjw6pffwxvk0yrgbz0rbrzi1g7g7zq5952vnz4dnn0";
|
||||
};
|
||||
packageRequires = [ emacs flymake popon posframe ];
|
||||
meta = {
|
||||
@ -792,10 +792,10 @@
|
||||
elpaBuild {
|
||||
pname = "focus";
|
||||
ename = "focus";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/focus-1.0.0.tar";
|
||||
sha256 = "0gicqiw7npcf18rfb99hm1s054m9l4izzcqzij2kpnc544aqgf9y";
|
||||
url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
|
||||
sha256 = "1kiyvbdbjhjfkl5cq6q78lfgbir7iayswwm2qnj4df95nbm8shsz";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -833,21 +833,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
geiser = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, project
|
||||
, transient }:
|
||||
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.26.1";
|
||||
version = "0.28";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.26.1.tar";
|
||||
sha256 = "1fq68gvyyrplxw8i0yma4q0yqmrzp00v1v7izlc5r7h58wryy39a";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.28.tar";
|
||||
sha256 = "0qp732j16cdmkpqv4vjplh9kcdbb1s4gfwff2d7k1sg4wqi8sa95";
|
||||
};
|
||||
packageRequires = [ emacs project transient ];
|
||||
packageRequires = [ emacs project ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/geiser.html";
|
||||
license = lib.licenses.free;
|
||||
@ -928,16 +923,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
geiser-guile = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
|
||||
geiser-guile = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, geiser
|
||||
, lib
|
||||
, transient }:
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.26.1";
|
||||
version = "0.28.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.26.1.tar";
|
||||
sha256 = "1ay7v2qsl0kr9zvf6j1sss3gxniwrqp8xgxhxf7nhlkmkgcfp1wk";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.0.tar";
|
||||
sha256 = "0nw77psyvl9lackyq5l60k84f1dyddn8y2sxm5b1z71gjkp481zi";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
packageRequires = [ emacs geiser transient ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1178,10 +1178,10 @@
|
||||
elpaBuild {
|
||||
pname = "haskell-mode";
|
||||
ename = "haskell-mode";
|
||||
version = "4.7.1";
|
||||
version = "17.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/haskell-mode-4.7.1.tar";
|
||||
sha256 = "07x7440xi8dkv1zpzwi7p96jy3zd6pdv1mhs066l8bp325516wyb";
|
||||
url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.2.tar";
|
||||
sha256 = "1crq9065jy3941z9wh09n82x7bbbmxgcn9ylfj9xgn1rcvgb0cmg";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1208,10 +1208,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.8.8";
|
||||
version = "3.8.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.8.tar";
|
||||
sha256 = "1qsiw8gswjwfp79n7g103db7xsmk36lq6ln558ipn4cw0fpnq1sc";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.9.tar";
|
||||
sha256 = "0hikp6g5g7cy290qxd768vxy91gxj92cwrrzp8kicxy3qck1q39v";
|
||||
};
|
||||
packageRequires = [ helm-core popup ];
|
||||
meta = {
|
||||
@ -1223,10 +1223,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.8.8";
|
||||
version = "3.8.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.8.tar";
|
||||
sha256 = "0wg21425ki8n8d954lkmlyci6awwwv53jg4gn5z495vh27qiv3qn";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.9.tar";
|
||||
sha256 = "03fzcc84gjslgsssbpjhdgnj7dn0pdfb5b2x79ss9vfvxamf2k94";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
@ -1582,16 +1582,17 @@
|
||||
, fetchurl
|
||||
, lib
|
||||
, seq
|
||||
, url-scgi
|
||||
, xml-rpc }:
|
||||
elpaBuild {
|
||||
pname = "mentor";
|
||||
ename = "mentor";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mentor-0.4.tar";
|
||||
sha256 = "1n51yabm4npx62fpfn8rhky09x4y779ismdxa026fycy7va7ynzz";
|
||||
url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar";
|
||||
sha256 = "1kkzm881fxhc5hb83x0j12lv22b72nzw45qrypbl1jf2siispz9l";
|
||||
};
|
||||
packageRequires = [ async emacs seq xml-rpc ];
|
||||
packageRequires = [ async emacs seq url-scgi xml-rpc ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/mentor.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1798,10 +1799,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-mime";
|
||||
ename = "org-mime";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.1.tar";
|
||||
sha256 = "0dm7addyc98kh1lm4d8x7nvnkh6bwkw300ms2zlwm1ii91jzfkkg";
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
|
||||
sha256 = "12crmbrjxac1ml2x1jh3wbpgh0fddhnl3gdmb5r9dlpkay1c5dxs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1929,6 +1930,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pcre2el = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "pcre2el";
|
||||
ename = "pcre2el";
|
||||
version = "1.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/pcre2el-1.11.tar";
|
||||
sha256 = "147da1iqlgsjsnfffk4iwfjsrv98xz5s4wjdys9r98n0j723js7r";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pcre2el.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
pdf-tools = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
@ -1968,10 +1984,10 @@
|
||||
elpaBuild {
|
||||
pname = "popon";
|
||||
ename = "popon";
|
||||
version = "0.9";
|
||||
version = "0.11";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.9.tar";
|
||||
sha256 = "1vnrdjg63fcpgzzc45l9cx67yb2lnk5prfp5js4dpdhz93d14qck";
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.11.tar";
|
||||
sha256 = "03xxh9w215kmlw6vr3cjs9afkj6vrcip7k954sssx77bs1bpnqhz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1998,10 +2014,10 @@
|
||||
elpaBuild {
|
||||
pname = "projectile";
|
||||
ename = "projectile";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/projectile-2.5.0.tar";
|
||||
sha256 = "09gsm6xbqj3357vlshs1w7ygfm004gpgs0pqrvwl6xmccxpqzmi0";
|
||||
url = "https://elpa.nongnu.org/nongnu/projectile-2.6.0.tar";
|
||||
sha256 = "0r0ylllx7vr903sjci1i6yf4xzn7k4azaw9l3azvc3mzrrjagvvj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2099,6 +2115,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rfc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "rfc-mode";
|
||||
ename = "rfc-mode";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.3.0.tar";
|
||||
sha256 = "1wdqp03rrx7ar21nvbnrb7518c3vgf41z00bav00pw8cdx5c4m10";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "rubocop";
|
||||
@ -2257,10 +2288,10 @@
|
||||
elpaBuild {
|
||||
pname = "smartparens";
|
||||
ename = "smartparens";
|
||||
version = "4.7.1";
|
||||
version = "1.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/smartparens-4.7.1.tar";
|
||||
sha256 = "0si9wb7j760c4vdv7p049bgppppw5crrh50038bsh8sghq2gdld8";
|
||||
url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar";
|
||||
sha256 = "1179wicy5nrjk2iq73rxkx6c44k9ybs1vz6llw0qbwc5l10diyvr";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2347,10 +2378,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.0.10";
|
||||
version = "1.0.19";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.10.tar";
|
||||
sha256 = "08vw9sv2g76yj8sfnx53dd28zkj4s0842i7qi92jam993v9s8h0z";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.19.tar";
|
||||
sha256 = "1wgicb0lvnghhr3a1xndkaxhs1c9gc1ac5xwvxcsc9zpgzrlmcda";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2362,10 +2393,10 @@
|
||||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.4.5";
|
||||
version = "0.8.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.4.5.tar";
|
||||
sha256 = "17dbrn2yvc6ib4dig410kbmvpwp4iz6q9hx6g0mk3vxqjrmgwyls";
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.6.tar";
|
||||
sha256 = "108hjh276xgl0xhn2f7h43725xi49zh6j2xrcc17xw2i0phhhswf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2392,10 +2423,10 @@
|
||||
elpaBuild {
|
||||
pname = "swsw";
|
||||
ename = "swsw";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/swsw-2.2.tar";
|
||||
sha256 = "0bxcpk5329g4xdfnx8n70q53v4aansxfcs3fdpzssayyyv4fk72m";
|
||||
url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar";
|
||||
sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2623,10 +2654,10 @@
|
||||
elpaBuild {
|
||||
pname = "vcomplete";
|
||||
ename = "vcomplete";
|
||||
version = "1.2.1";
|
||||
version = "2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/vcomplete-1.2.1.tar";
|
||||
sha256 = "1fcchgv4kdmhzgincfy1jm625lwj3qrjskd0cswag5z15by6b5xf";
|
||||
url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
|
||||
sha256 = "0fh5rfvhjmpfdhp4k4b1y57zlsixiabhzca9329id48p8jm4rqyp";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2653,10 +2684,10 @@
|
||||
elpaBuild {
|
||||
pname = "web-mode";
|
||||
ename = "web-mode";
|
||||
version = "17.3.1";
|
||||
version = "17.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.1.tar";
|
||||
sha256 = "0xlpxk9qscxip93lqyl1l5bzv6nxgq5yb8r05s4jslcipbbfil1d";
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.3.tar";
|
||||
sha256 = "1ci28dfg6k4hwiqz85v9c24n7s52z29ghfyfjg971lq4mfqbx4yy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2751,10 +2782,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "18.1.20220921110635";
|
||||
version = "22.0.20221031102959";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-18.1.20220921110635.tar";
|
||||
sha256 = "0nnd7jq1k62cgjb5y45jg6b76gvzyqh11kha7has4zipd52psvnj";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.0.20221031102959.tar";
|
||||
sha256 = "08i6y3ry0sp597vz0zl7c50lnp04fszydw6m1093sb5nlifbhrb8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2766,10 +2797,10 @@
|
||||
elpaBuild {
|
||||
pname = "xml-rpc";
|
||||
ename = "xml-rpc";
|
||||
version = "1.6.15";
|
||||
version = "1.6.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.15.tar";
|
||||
sha256 = "0z87rn7zbd8335iqfvk16zpvby66l0izzw438pxdr7kf60i5vgwl";
|
||||
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.16.tar";
|
||||
sha256 = "0gglrrnicbsf1lrk4pwmif5658yrhx80ixgi5hm85p8yxarn3ynm";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -23,14 +23,20 @@ commit_change() {
|
||||
git commit -m "${MESSAGE}: updated $(date --iso) (from overlay)" -- "${FILENAME}"
|
||||
}
|
||||
|
||||
test_packageset(){
|
||||
local PKGSET="$1"
|
||||
|
||||
nix-instantiate --show-trace ../../../../../ -A "emacs.pkgs.$PKGSET"
|
||||
}
|
||||
|
||||
download_change "elpa/elpa-generated.nix"
|
||||
download_change "melpa/recipes-archive-melpa.json"
|
||||
download_change "nongnu/nongnu-generated.nix"
|
||||
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.elpaPackages
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
|
||||
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
|
||||
test_packageset "nongnuPackages"
|
||||
test_packageset "elpaPackages"
|
||||
test_packageset "melpaStablePackages"
|
||||
test_packageset "melpaPackages"
|
||||
|
||||
commit_change "elpa-packages" "elpa-generated.nix"
|
||||
commit_change "melpa-packages" "recipes-archive-melpa.json"
|
||||
|
||||
@ -10,10 +10,12 @@
|
||||
, libGL
|
||||
, libXrandr
|
||||
, libusb1
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, openal
|
||||
, udev
|
||||
, libevdev
|
||||
, cubeb
|
||||
, curl
|
||||
, alsa-lib
|
||||
, miniupnpc
|
||||
@ -73,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cubeb
|
||||
curl
|
||||
ffmpeg
|
||||
pugixml
|
||||
@ -83,6 +86,7 @@ stdenv.mkDerivation rec {
|
||||
libusb1
|
||||
libiconv
|
||||
libpng
|
||||
libXdmcp
|
||||
hidapi
|
||||
miniupnpc
|
||||
enet
|
||||
@ -127,7 +131,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}"
|
||||
# https://bugs.dolphin-emu.org/issues/11807
|
||||
# The .desktop file should already set this, but Dolphin may be launched in other ways
|
||||
"--set QT_QPA_PLATFORM xcb"
|
||||
@ -169,7 +173,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://dolphin-emu.org";
|
||||
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
|
||||
mainProgram = "Dolphin";
|
||||
mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
|
||||
branch = "master";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ennEFhnAxsEtZ1LEyr9xeeR4v5IG1Vm2gs4A09IyciE=";
|
||||
sha256 = "sha256-HD6KsPI4ZeJxQ+jbv5bWzTGQBHa9wGzhZBLQedcL5WI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-unSeb8LHgJ0TspbBLhGGU6Pqy1kLMEzgIIblLUyRQWw=";
|
||||
cargoSha256 = "sha256-Q24dyCJBy27B3aI7ZEQnjTgLIB7XhltYeGBpmfy0DwE=";
|
||||
|
||||
checkInputs = [ zoxide ];
|
||||
|
||||
|
||||
@ -1,27 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libX11,
|
||||
procps,
|
||||
python3,
|
||||
libdwarf,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
libglvnd,
|
||||
gtest,
|
||||
brotli,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apitrace";
|
||||
version = "7.1-572-g${builtins.substring 0 8 src.rev}";
|
||||
version = "11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "11bwb0l8cr1bf9bj1s6cbmi77d5fy4qrphj9cgmcd8jpa862anp5";
|
||||
rev = "26966134f15d28f6b4a9a0a560017b3ba36d60bf";
|
||||
repo = "apitrace";
|
||||
owner = "apitrace";
|
||||
repo = "apitrace";
|
||||
rev = version;
|
||||
hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# glibc 2.34 compat
|
||||
# derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb
|
||||
./glibc-2.34-compat.patch
|
||||
];
|
||||
|
||||
# LD_PRELOAD wrappers need to be statically linked to work against all kinds
|
||||
# of games -- so it's fine to use e.g. bundled snappy.
|
||||
buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ];
|
||||
buildInputs = [ libX11 procps python3 libdwarf qtbase gtest brotli ];
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
|
||||
# Don't automatically wrap all binaries, I prefer to explicitly only wrap
|
||||
# `qapitrace`.
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
|
||||
index 2eda082..0c0c8ee 100644
|
||||
--- a/wrappers/dlsym.cpp
|
||||
+++ b/wrappers/dlsym.cpp
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "os.hpp"
|
||||
|
||||
|
||||
-#ifdef __GLIBC__
|
||||
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
|
||||
|
||||
|
||||
#include <dlfcn.h>
|
||||
38
pkgs/applications/misc/meerk40t/camera.nix
Normal file
38
pkgs/applications/misc/meerk40t/camera.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonPackage fetchPypi;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"camera"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, meerk40t-camera
|
||||
, python3
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
@ -7,38 +8,6 @@
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;
|
||||
|
||||
meerk40t-camera = buildPythonPackage rec {
|
||||
pname = "meerk40t-camera";
|
||||
version = "0.1.9";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uGCBHdgWoorVX2XqMCg0YBweb00sQ9ZSbJe8rlGeovs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/meerk40t/d' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
opencv4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"camera"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MeerK40t camera plugin";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/meerk40t/meerk40t-camera";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
|
||||
@ -8,10 +8,12 @@
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libgee
|
||||
, libhandy
|
||||
, libpulseaudio
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
@ -25,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaysettings";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwaySettings";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2bbB+37t6chbdnOSpIolAsy7aD9i1UizWqkcF8Frfsk=";
|
||||
hash = "sha256-dn3n5DOAsw0FeXBkh19A2qB/5O+RyA2/Fj5PVtMOyL0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -52,10 +54,12 @@ stdenv.mkDerivation rec {
|
||||
glib
|
||||
gobject-introspection
|
||||
gsettings-desktop-schemas
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libpulseaudio
|
||||
libxml2
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tofi";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philj56";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wF9gj1VNu+ik/dq5Q0l6rNfqU9kQXyLiAQvbU1OoHdg=";
|
||||
sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
|
||||
|
||||
@ -18,7 +18,8 @@
|
||||
|
||||
let
|
||||
# Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54
|
||||
mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
mesonFeatureFlag = feature: flag:
|
||||
"-D${feature}=${if flag then "enabled" else "disabled"}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -6,20 +6,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "blocky";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xERR0R";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0=";
|
||||
sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk=";
|
||||
};
|
||||
|
||||
# needs network connection and fails at
|
||||
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
|
||||
doCheck = false;
|
||||
|
||||
vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ=";
|
||||
vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ];
|
||||
|
||||
|
||||
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "109.0.5396.2",
|
||||
"sha256": "0a4pd365i8wj608n9d6624mf11491px1x0wv4673m3nkj1k8sqld",
|
||||
"sha256bin64": "1gk7wi20h11bwsfch67xazjk9grxj6ax6vjyz7ihrlajdahdaf0w",
|
||||
"version": "109.0.5410.0",
|
||||
"sha256": "00g8q0qzl8kyc9j60nsvvjkr2x9js2xvbkmwp77p8b6gg0pyymjn",
|
||||
"sha256bin64": "0ljhc5lqdy01apzyj96xzl931d904i37x62257s1h35w0j78mps0",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-10-28",
|
||||
|
||||
@ -1,4 +1,15 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ buildGoModule
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, installShellFiles
|
||||
, kubectl
|
||||
, kubernetes-helm
|
||||
, lib
|
||||
, makeWrapper
|
||||
, yamale
|
||||
, yamllint
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chart-testing";
|
||||
@ -8,10 +19,10 @@ buildGoModule rec {
|
||||
owner = "helm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
|
||||
hash = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
|
||||
vendorHash = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/config/config.go \
|
||||
@ -26,7 +37,7 @@ buildGoModule rec {
|
||||
"-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/etc/ct etc/chart_schema.yaml
|
||||
@ -36,6 +47,15 @@ buildGoModule rec {
|
||||
--bash <($out/bin/ct completion bash) \
|
||||
--zsh <($out/bin/ct completion zsh) \
|
||||
--fish <($out/bin/ct completion fish) \
|
||||
|
||||
wrapProgram $out/bin/ct --prefix PATH : ${lib.makeBinPath [
|
||||
coreutils
|
||||
git
|
||||
kubectl
|
||||
kubernetes-helm
|
||||
yamale
|
||||
yamllint
|
||||
]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8wYrDGykob1YLvtscQdL867vuRv8J83DC7AzvQVXVr8=";
|
||||
sha256 = "sha256-CjT6YKC6DJvs+LeKIzOl2Y6n0/yGv0nz8EfHqiSnIDo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA=";
|
||||
|
||||
@ -85,6 +85,7 @@ let
|
||||
ncloud = removed "ncloud" "2022/08";
|
||||
opc = archived "opc" "2022/05";
|
||||
oraclepaas = archived "oraclepaas" "2022/05";
|
||||
panos = removed "panos" "2022/05";
|
||||
template = archived "template" "2022/05";
|
||||
};
|
||||
|
||||
|
||||
@ -741,13 +741,13 @@
|
||||
"version": "3.3.0"
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-fSZf5lLs3INa742AL3ayuvHr5vsr2/i4yjSvNrCzBT0=",
|
||||
"hash": "sha256-9UZbFTMH6QOcNyBkqnGA3dSDl8Tmhe6oggwJC0yJTAw=",
|
||||
"owner": "aminueza",
|
||||
"provider-source-address": "registry.terraform.io/aminueza/minio",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.8.0",
|
||||
"vendorHash": "sha256-LcU7Pord10j4Eyxx2xIVcQXiZQT9kSTz8iBJCe8/E7s=",
|
||||
"version": "1.8.0"
|
||||
"rev": "v1.9.0",
|
||||
"vendorHash": "sha256-586ekznHNm442LjQ33azbswrOOZ1Z5KNuJEXMrwQ1SM=",
|
||||
"version": "1.9.0"
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=",
|
||||
@ -912,15 +912,6 @@
|
||||
"vendorHash": null,
|
||||
"version": "2.6.4"
|
||||
},
|
||||
"panos": {
|
||||
"hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=",
|
||||
"owner": "PaloAltoNetworks",
|
||||
"provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",
|
||||
"repo": "terraform-provider-panos",
|
||||
"rev": "v1.10.3",
|
||||
"vendorHash": null,
|
||||
"version": "1.10.3"
|
||||
},
|
||||
"pass": {
|
||||
"hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=",
|
||||
"owner": "camptocamp",
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.40.1";
|
||||
version = "0.40.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jTo+CydRpb0Pak8NUwAJbSJDUZnDz4vUZ1577OZQOHg=";
|
||||
sha256 = "sha256-wNedd6C4NPLPw8CA1tyKx2MWsKatFbN4xt3Us2SC/ME=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";
|
||||
vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KANnZLNNDEo8pVWumFRR/Y67F1eS2JeDeX33nQ5YWlk=";
|
||||
hash = "sha256-jyMjcFQXv9wGcvBU+Ki970HAgSQD57Zx3G9gf/mj25A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
|
||||
, gcc, nettools, iproute2, linuxHeaders }:
|
||||
|
||||
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
|
||||
# launch with "iked -f /etc/iked.conf"
|
||||
|
||||
# NOTE: my testings reveal that kernels 3.11.10 and 3.12.6 won't let the traffic through the tunnel,
|
||||
# so I'm sticking with 3.4
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ike";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.shrew.net/download/ike/${pname}-${version}-release.tgz";
|
||||
sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# required for openssl 1.1.x compatibility
|
||||
(fetchpatch {
|
||||
name = "openssl-1.1.0.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/openssl-1.1.0.patch?h=ike&id=3a56735ddc26f750df4720f4baba0728bb4cb458";
|
||||
sha256 = "1hw8q4xy858rivpjkq5288q3mc75d52bg4w3n30y99h05wik0h51";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison makeWrapper ];
|
||||
buildInputs = [ openssl libedit qt4 nettools iproute2 ];
|
||||
|
||||
postPatch = ''
|
||||
# fix build with bison3
|
||||
sed -i 's/define "parser_class_name"/define parser_class_name/' source/iked/conf.parse.yy
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
mkdir -p $out/{bin,sbin,lib}
|
||||
cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin \
|
||||
-DKRNINC="${linuxHeaders}/include/" -DTESTS=YES \
|
||||
-DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install
|
||||
for file in "$out"/bin/* "$out"/sbin/*; do
|
||||
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
homepage = "https://www.shrew.net/software";
|
||||
description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems";
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ ];
|
||||
license = licenses.sleepycat;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "senpai";
|
||||
version = "unstable-2022-10-19";
|
||||
version = "unstable-2022-11-04";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~taiite";
|
||||
repo = "senpai";
|
||||
rev = "b3377c58ffb0bc07d222258ea578bdab723b2ec8";
|
||||
sha256 = "sha256-QPqnfGdQJh+XDXTcOCwx5KK85vEQuAv386a+qk68zDU=";
|
||||
rev = "3be87831281af1c91a6e406986f317936a0b98bc";
|
||||
sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+cdGRk/96Xu4IgtmZ8GbqWiKAxxwpAnuAkAnKX0CbmU=";
|
||||
vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/senpai"
|
||||
|
||||
@ -7,16 +7,17 @@
|
||||
makeDesktopItem,
|
||||
gtk3,
|
||||
openssl,
|
||||
xdg-user-dirs
|
||||
xdg-user-dirs,
|
||||
keybinder3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appflowy";
|
||||
version = "0.0.4";
|
||||
version = "0.0.6.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz";
|
||||
sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso=";
|
||||
sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
openssl
|
||||
keybinder3
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2022-10-20";
|
||||
version = "unstable-2022-11-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "12580ce39ee89f0ae6b9bdb304f7bc68a74ecdf7";
|
||||
sha256 = "Z1BAYRcoeYOWomfwgBS/CQbejARs6sqsyZorhbJ/RdI=";
|
||||
rev = "94881402b4730f598a536d8cddb3314eaf16defc";
|
||||
sha256 = "+fv05KqfhpFeufUduOikXJuQmZfOq+i97B8kP//hsk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,9 +17,27 @@
|
||||
, llvmPackages
|
||||
, z3
|
||||
, fmt_8
|
||||
, suitesparse
|
||||
}:
|
||||
|
||||
let
|
||||
igraph' = igraph.overrideAttrs (old: rec {
|
||||
version = "0.9.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "igraph";
|
||||
repo = "igraph";
|
||||
rev = version;
|
||||
hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk=";
|
||||
};
|
||||
postPatch = old.postPatch + lib.optionalString stdenv.isAarch64 ''
|
||||
# https://github.com/igraph/igraph/issues/1694
|
||||
substituteInPlace tests/CMakeLists.txt \
|
||||
--replace "igraph_scg_grouping3" "" \
|
||||
--replace "igraph_scg_semiprojectors2" ""
|
||||
'';
|
||||
buildInputs = old.buildInputs ++ [ suitesparse ];
|
||||
cmakeFlags = old.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ];
|
||||
});
|
||||
# no stable hal release yet with recent spdlog/fmt support, remove
|
||||
# once 4.0.0 is released - see https://github.com/emsec/hal/issues/452
|
||||
spdlog' = spdlog.override {
|
||||
@ -64,7 +82,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog' graphviz wrapQtAppsHook z3 ]
|
||||
buildInputs = [ qtbase qtsvg boost rapidjson igraph' spdlog' graphviz wrapQtAppsHook z3 ]
|
||||
++ (with python3Packages; [ python pybind11 ])
|
||||
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ assert withMPI -> trilinos.withMPI;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xyce";
|
||||
version = "7.4.0";
|
||||
version = "7.6.0";
|
||||
|
||||
srcs = [
|
||||
# useing fetchurl or fetchFromGitHub doesn't include the manuals
|
||||
@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
|
||||
(fetchgit {
|
||||
url = "https://github.com/Xyce/Xyce.git";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-sOHjQEo4FqlDseTtxFVdLa0SI/VAf2OkwQV7QSL7SNM=";
|
||||
sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
owner = "Xyce";
|
||||
repo = "Xyce_Regression";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "sha256-kSGUaFarOHDNJ8kA/TAGkmzicm9O7cfJ7mGFZcbqCZM=";
|
||||
sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lean";
|
||||
version = "3.48.0";
|
||||
version = "3.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover-community";
|
||||
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
# from. this is then used to check whether an olean file should be
|
||||
# rebuilt. don't use a tag as rev because this will get replaced into
|
||||
# src/githash.h.in in preConfigure.
|
||||
rev = "283f6ed8083ab4dd7c36300f31816c5cb793f2f7";
|
||||
sha256 = "sha256-0Ogv/24KNp1ZBDqiYTsGv5vDKD4fJBtoX7LWLu4QZe0=";
|
||||
rev = "acf633e01a8783a12060b0a1b7b5b5e15fd73e77";
|
||||
sha256 = "sha256-KF13DlGEl6aICSp/haczo54gjLZaOxyzFRdzvyyiu5M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "st";
|
||||
version = "0.8.5";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc=";
|
||||
url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
configFile = lib.optionalString (conf != null)
|
||||
(writeText "config.def.h" conf);
|
||||
|
||||
postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h"
|
||||
postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h"
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace config.mk --replace "-lrt" ""
|
||||
'';
|
||||
@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ andsild ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which }:
|
||||
{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-subrepo";
|
||||
version = "0.4.1";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ingydotnet";
|
||||
repo = "git-subrepo";
|
||||
rev = version;
|
||||
sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp";
|
||||
sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
which
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -26,21 +27,9 @@ stdenv.mkDerivation rec {
|
||||
"INSTALL_MAN=${placeholder "out"}/share/man/man1"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Allow zsh completion to work even though we aren't installing from a git
|
||||
# clone. Also submitted upstream as
|
||||
# https://github.com/ingydotnet/git-subrepo/pull/420
|
||||
./zsh-completion.patch
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ZSH_COMP_DIR="$out/share/zsh/vendor-completions"
|
||||
mkdir -p "$ZSH_COMP_DIR"
|
||||
cp share/zsh-completion/_git-subrepo "$ZSH_COMP_DIR/"
|
||||
|
||||
BASH_COMP_DIR="$out/share/bash-completion/completions"
|
||||
mkdir -p "$BASH_COMP_DIR"
|
||||
cp share/completion.bash "$BASH_COMP_DIR/git-subrepo"
|
||||
installShellCompletion --bash --name git-subrepo.bash share/completion.bash
|
||||
installShellCompletion --zsh share/zsh-completion/_git-subrepo
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
@ -52,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/ingydotnet/git-subrepo";
|
||||
description = "Git submodule alternative";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix ++ platforms.darwin;
|
||||
maintainers = [ maintainers.ryantrinkle ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ryantrinkle ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/pkg/bin/generate-completion.pl b/pkg/bin/generate-completion.pl
|
||||
index 85ae3b8..d3e423c 100644
|
||||
--- a/pkg/bin/generate-completion.pl
|
||||
+++ b/pkg/bin/generate-completion.pl
|
||||
@@ -82,11 +82,6 @@ sub generate_zsh {
|
||||
|
||||
# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
|
||||
|
||||
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
|
||||
- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
|
||||
- return 3
|
||||
-fi
|
||||
-
|
||||
_git-subrepo() {
|
||||
typeset -A opt_args
|
||||
local curcontext="$curcontext" state line context
|
||||
diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo
|
||||
index fc82be2..a8069d9 100644
|
||||
--- a/share/zsh-completion/_git-subrepo
|
||||
+++ b/share/zsh-completion/_git-subrepo
|
||||
@@ -3,11 +3,6 @@
|
||||
|
||||
# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
|
||||
|
||||
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
|
||||
- echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
|
||||
- return 3
|
||||
-fi
|
||||
-
|
||||
_git-subrepo() {
|
||||
typeset -A opt_args
|
||||
local curcontext="$curcontext" state line context
|
||||
@ -19,21 +19,21 @@
|
||||
, unzip
|
||||
}:
|
||||
let
|
||||
version = "0.58.18";
|
||||
version = "0.61.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "meta.sr.ht";
|
||||
rev = version;
|
||||
sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o=";
|
||||
hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU=";
|
||||
};
|
||||
|
||||
metasrht-api = buildGoModule ({
|
||||
inherit src version;
|
||||
pname = "metasrht-api";
|
||||
modRoot = "api";
|
||||
vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; });
|
||||
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
# - Add plugin to it's own directory (because of future patches).
|
||||
|
||||
{
|
||||
input-overlay = qt6Packages.callPackage ./input-overlay.nix { };
|
||||
|
||||
looking-glass-obs = callPackage ./looking-glass-obs.nix { };
|
||||
|
||||
obs-backgroundremoval = callPackage ./obs-backgroundremoval { };
|
||||
|
||||
47
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
Normal file
47
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ stdenv, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, obs-studio
|
||||
, libuiohook
|
||||
, qtbase
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, libxkbfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kpVAvQpBU8TxHAFcx/ok67++4MHh5saoRHJc5XpY4YQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
obs-studio libuiohook qtbase
|
||||
xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXtst xorg.libXext
|
||||
xorg.libXi xorg.libXt xorg.libXinerama libxkbcommon libxkbfile
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
rm -rf $out/obs-plugins
|
||||
mv $out/data $out/share/obs
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Show keyboard, gamepad and mouse input on stream ";
|
||||
homepage = "https://github.com/univrsal/input-overlay";
|
||||
maintainers = with maintainers; [ glittershark ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,41 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, btrfs-progs
|
||||
, gpgme
|
||||
, libassuan
|
||||
, lvm2
|
||||
, testers
|
||||
, podman-tui
|
||||
}:
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, testers, podman-tui }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9ZFyrRf4yMik4+TQYN+75fWuKHuI8hkaKJ6o5qWYb7E=";
|
||||
hash = "sha256-UhlhNmVPTOXVWpL4pxF5c6ZQj//pXrzZWlRUaKGSTSA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
buildInputs = [ gpgme libassuan ]
|
||||
++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ];
|
||||
tags = [ "containers_image_openpgp" "remote" ]
|
||||
++ lib.optional stdenv.isDarwin "darwin";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
preCheck =
|
||||
let skippedTests = [
|
||||
"TestNetdialogs"
|
||||
]; in
|
||||
let
|
||||
skippedTests = [
|
||||
"TestDialogs"
|
||||
"TestNetdialogs"
|
||||
];
|
||||
in
|
||||
''
|
||||
export HOME=/home/$(whoami)
|
||||
export USER=$(whoami)
|
||||
export HOME=/home/$USER
|
||||
|
||||
# Disable flaky tests
|
||||
buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]")
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tabbed";
|
||||
version = "unstable-2018-03-10";
|
||||
version = "0.7";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.suckless.org/tabbed";
|
||||
rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3";
|
||||
sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Y1MgPwqMUoa2Rr4HmqjtPaQegUmQJWYkcbyFcJHAOBI=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
@ -29,4 +29,4 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -7,25 +7,25 @@
|
||||
let
|
||||
# make install will use dconf to find desktop background file uri.
|
||||
# consider adding an args to allow specify pictures manually.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L38
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L38
|
||||
fake-dconf = writeScriptBin "dconf" "echo -n";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20220622";
|
||||
version = "20221107";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-fm1YOKI6TLkCnkkPZkp8I0xWkNrZt4sVktYZyD5foKU=";
|
||||
hash = "sha256-5V3ECbQe3/5bhHnMR1pzvehs1eh0u9U7E1voDiqo9cY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib fake-dconf ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20220510/Makefile#L56
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20221107/Makefile#L56
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "xfce4-settings";
|
||||
version = "4.16.3";
|
||||
version = "4.16.4";
|
||||
|
||||
sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY=";
|
||||
sha256 = "sha256-w/wnLa3NuOV/2LlDPMCEG3z+k3pW+MPHtqx5L5NdOJs=";
|
||||
|
||||
postPatch = ''
|
||||
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user