mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
615ca4335f
@ -9796,6 +9796,12 @@
|
||||
githubId = 25278;
|
||||
name = "Otavio Salvador";
|
||||
};
|
||||
otini = {
|
||||
name = "Olivier Nicole";
|
||||
email = "olivier@chnik.fr";
|
||||
github = "OlivierNicole";
|
||||
githubId = 14031333;
|
||||
};
|
||||
otwieracz = {
|
||||
email = "slawek@otwiera.cz";
|
||||
github = "otwieracz";
|
||||
|
||||
@ -256,12 +256,8 @@ with lib.maintainers; {
|
||||
golang = {
|
||||
members = [
|
||||
c00w
|
||||
cstrahan
|
||||
Frostman
|
||||
kalbasit
|
||||
mic92
|
||||
orivej
|
||||
rvolosatovs
|
||||
zowoq
|
||||
];
|
||||
scope = "Maintain Golang compilers.";
|
||||
|
||||
@ -216,6 +216,7 @@ in
|
||||
# we can't be part of a system service, and the agent should
|
||||
# be okay with the main service coming and going
|
||||
wantedBy = [ "default.target" ];
|
||||
after = lib.optionals cfg.enableWifi [ "network-online.target" ];
|
||||
unitConfig.ConditionUser = "!@system";
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
|
||||
@ -335,16 +335,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }:
|
||||
beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "beacon";
|
||||
ename = "beacon";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/beacon-1.3.3.el";
|
||||
sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02";
|
||||
url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar";
|
||||
sha256 = "1fy76c2x0xpnx7wfpsxfawdlrspan4dbj2157k9sa62i6a1c8f21";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/beacon.html";
|
||||
license = lib.licenses.free;
|
||||
@ -399,10 +399,10 @@
|
||||
elpaBuild {
|
||||
pname = "boxy";
|
||||
ename = "boxy";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar";
|
||||
sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns";
|
||||
url = "https://elpa.gnu.org/packages/boxy-1.1.1.tar";
|
||||
sha256 = "08jb5v93l3y9cx48qhpv20i7kdxvl5dinxj3z0pxkx0ckvml7cvd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -440,16 +440,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
buffer-env = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "buffer-env";
|
||||
ename = "buffer-env";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.3.tar";
|
||||
sha256 = "0h92pia258fndihnwmnak10ix00dmfanadnsnzbdah3q64416qhz";
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.4.tar";
|
||||
sha256 = "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/buffer-env.html";
|
||||
license = lib.licenses.free;
|
||||
@ -771,10 +771,10 @@
|
||||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "28.1.1.3";
|
||||
version = "28.1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/compat-28.1.1.3.tar";
|
||||
sha256 = "11g27n0103j1xmj1s3m49jcqxn4n4wd9pm69i2g3ikijxs1qw18n";
|
||||
url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar";
|
||||
sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr";
|
||||
};
|
||||
packageRequires = [ emacs nadvice ];
|
||||
meta = {
|
||||
@ -797,6 +797,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "consult-recoll";
|
||||
ename = "consult-recoll";
|
||||
version = "0.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar";
|
||||
sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp";
|
||||
};
|
||||
packageRequires = [ consult emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "context-coloring";
|
||||
@ -1056,10 +1071,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-0.3.1.tar";
|
||||
sha256 = "0zdxflmm62gkg6nbrpaxinwb60ghr19pvr3jbgnvbca3bd5yg5wk";
|
||||
url = "https://elpa.gnu.org/packages/denote-0.4.0.tar";
|
||||
sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1086,10 +1101,10 @@
|
||||
elpaBuild {
|
||||
pname = "devdocs";
|
||||
ename = "devdocs";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.4.tar";
|
||||
sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm";
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.5.tar";
|
||||
sha256 = "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1429,10 +1444,10 @@
|
||||
elpaBuild {
|
||||
pname = "eldoc";
|
||||
ename = "eldoc";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar";
|
||||
sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk";
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.13.0.tar";
|
||||
sha256 = "0c05dzrs7vrhibj46jpz625482ah6xywji7way6wcvwc711y74fz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2333,10 +2348,10 @@
|
||||
elpaBuild {
|
||||
pname = "javaimp";
|
||||
ename = "javaimp";
|
||||
version = "0.8";
|
||||
version = "0.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.8.tar";
|
||||
sha256 = "1i6k0yz6r7v774qgnkzinia783fwx73y3brxr31sbip3b5dbpmsn";
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar";
|
||||
sha256 = "106wn53z39fcna3sv4p0idmjg9lg5lijm5hyb4lbibp4s5yh2y3b";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2764,6 +2779,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
minibuffer-header = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "minibuffer-header";
|
||||
ename = "minibuffer-header";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar";
|
||||
sha256 = "1nw53h34izm0z8njsf6jacc40fhg4x5l8r403ysmw2ps89i80p36";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "minibuffer-line";
|
||||
@ -2832,10 +2862,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar";
|
||||
sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar";
|
||||
sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3100,10 +3130,10 @@
|
||||
elpaBuild {
|
||||
pname = "num3-mode";
|
||||
ename = "num3-mode";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.3.el";
|
||||
sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w";
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar";
|
||||
sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3246,6 +3276,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-notify = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-notify";
|
||||
ename = "org-notify";
|
||||
version = "0.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-notify-0.1.0.tar";
|
||||
sha256 = "1ijwlv8493g19cascv7fl23sjljvdcak6pg4y1wbs595mmsmh409";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-notify.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-real";
|
||||
@ -3370,10 +3415,10 @@
|
||||
elpaBuild {
|
||||
pname = "pabbrev";
|
||||
ename = "pabbrev";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el";
|
||||
sha256 = "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh";
|
||||
url = "https://elpa.gnu.org/packages/pabbrev-4.2.2.tar";
|
||||
sha256 = "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3456,6 +3501,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "perl-doc";
|
||||
ename = "perl-doc";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/perl-doc-0.2.tar";
|
||||
sha256 = "1p5bbkwllh91a0vg5aisqa9kbms7l9vxk14lm09bav952xxn6gdl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/perl-doc.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
persist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "persist";
|
||||
@ -3475,10 +3535,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.22";
|
||||
version = "0.4.25";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar";
|
||||
sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.25.tar";
|
||||
sha256 = "1sqwh7lkpgwc8m7vrbzjk8vc2p3b9gq6smyz6zx8pq4pf1rqkzrd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3505,10 +3565,10 @@
|
||||
elpaBuild {
|
||||
pname = "plz";
|
||||
ename = "plz";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/plz-0.1.tar";
|
||||
sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc";
|
||||
url = "https://elpa.gnu.org/packages/plz-0.2.tar";
|
||||
sha256 = "1b45m9b9gzx5ylpxcppkiikk5lfya7ngiqsap4a7m1b2cr8rqxcj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3595,10 +3655,10 @@
|
||||
elpaBuild {
|
||||
pname = "pulsar";
|
||||
ename = "pulsar";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar";
|
||||
sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx";
|
||||
url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar";
|
||||
sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4530,10 +4590,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy";
|
||||
ename = "taxy";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.9.tar";
|
||||
sha256 = "1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh";
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.10.tar";
|
||||
sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4545,16 +4605,17 @@
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, magit-section }:
|
||||
, magit-section
|
||||
, taxy }:
|
||||
elpaBuild {
|
||||
pname = "taxy-magit-section";
|
||||
ename = "taxy-magit-section";
|
||||
version = "0.9.1";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.9.1.tar";
|
||||
sha256 = "0ybkz5nqjdrg2z9bfd07xg4k49hrl26vsrwz2vqpfbsqqg5vr4pr";
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.10.tar";
|
||||
sha256 = "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw";
|
||||
};
|
||||
packageRequires = [ emacs magit-section ];
|
||||
packageRequires = [ emacs magit-section taxy ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
|
||||
license = lib.licenses.free;
|
||||
@ -4673,10 +4734,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.3";
|
||||
version = "2.5.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.3.tar";
|
||||
sha256 = "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar";
|
||||
sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4892,10 +4953,10 @@
|
||||
elpaBuild {
|
||||
pname = "vc-got";
|
||||
ename = "vc-got";
|
||||
version = "1.1.2";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.1.2.tar";
|
||||
sha256 = "1824d5c217qimsg4aw8adjvv06gkhv5f3918fi0lkhya1jsvfrx9";
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.2.tar";
|
||||
sha256 = "074di4bchhnpfixkjdis8dwxx6r32j1qypxk647q1z7lvd92j39s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5327,10 +5388,10 @@
|
||||
elpaBuild {
|
||||
pname = "xref";
|
||||
ename = "xref";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xref-1.4.1.tar";
|
||||
sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf";
|
||||
url = "https://elpa.gnu.org/packages/xref-1.5.0.tar";
|
||||
sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
@ -49,10 +49,10 @@
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.0.tar";
|
||||
sha256 = "0bpicd0m9h1n56ywinfa0wykhx86sxn8i1f2j5vwhwcidap42qaa";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar";
|
||||
sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -144,10 +144,10 @@
|
||||
elpaBuild {
|
||||
pname = "autothemer";
|
||||
ename = "autothemer";
|
||||
version = "0.2.3";
|
||||
version = "0.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.3.tar";
|
||||
sha256 = "10r4lf3nl7mk6yzfcyld5k0njslw8ly2sd0iz1zkzywnv31lsxnd";
|
||||
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar";
|
||||
sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d";
|
||||
};
|
||||
packageRequires = [ cl-lib dash emacs ];
|
||||
meta = {
|
||||
@ -296,10 +296,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
ename = "clojure-mode";
|
||||
version = "5.14.0";
|
||||
version = "5.15.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar";
|
||||
sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar";
|
||||
sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -473,10 +473,10 @@
|
||||
elpaBuild {
|
||||
pname = "dockerfile-mode";
|
||||
ename = "dockerfile-mode";
|
||||
version = "1.5";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar";
|
||||
sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3";
|
||||
url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
|
||||
sha256 = "1kb768kv48ypw7fm5xcvkw4pq9mfkvv0bg1inlhfifkb4i9kmz3l";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1123,10 +1123,10 @@
|
||||
elpaBuild {
|
||||
pname = "gruvbox-theme";
|
||||
ename = "gruvbox-theme";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.26.0.tar";
|
||||
sha256 = "19q5i0jz01hdn09wwg929yva6278fhyvk68id5p9dyi8h2n73djn";
|
||||
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar";
|
||||
sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8";
|
||||
};
|
||||
packageRequires = [ autothemer ];
|
||||
meta = {
|
||||
@ -1198,10 +1198,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.6.tar";
|
||||
sha256 = "0h0l36wmzxi03viy0jd3zri84big0syiilvjm639nqhzsr1lbvy2";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.7.tar";
|
||||
sha256 = "1n0m061amrzm0xpgqy2mp9vrk2960gqhl5hi6c1smcmm7nxqwz12";
|
||||
};
|
||||
packageRequires = [ helm-core popup ];
|
||||
meta = {
|
||||
@ -1213,10 +1213,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.6.tar";
|
||||
sha256 = "0yzzwdggd37m7kv0gh4amc7l5x0r5x2pxi3lfs36hq2hfsqlfkza";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.7.tar";
|
||||
sha256 = "1sak74v3gg34zzlbbgvlzvg7gw32fhcbxp5kigigmwvvbj5imgs7";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
@ -1330,10 +1330,10 @@
|
||||
elpaBuild {
|
||||
pname = "inf-clojure";
|
||||
ename = "inf-clojure";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.0.tar";
|
||||
sha256 = "1a9hr28l8cxf5j9b5z0mwds4jd36bhdqz9r86c85rylgaibx5ky7";
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
|
||||
sha256 = "0p1q51wn67abwhn6qa01f190czaq33nmy4ir1jrcxsny4vnbxvx4";
|
||||
};
|
||||
packageRequires = [ clojure-mode emacs ];
|
||||
meta = {
|
||||
@ -1959,10 +1959,10 @@
|
||||
elpaBuild {
|
||||
pname = "popon";
|
||||
ename = "popon";
|
||||
version = "0.7";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.7.tar";
|
||||
sha256 = "0sr0cv9jlaj83sgk1cb7wd6r12g6gmzdjzm077gxa6jy9p4qrv0q";
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.9.tar";
|
||||
sha256 = "1vnrdjg63fcpgzzc45l9cx67yb2lnk5prfp5js4dpdhz93d14qck";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2338,10 +2338,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar";
|
||||
sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar";
|
||||
sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2712,10 +2712,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "17.17.20220709145456";
|
||||
version = "17.19.20220806194323";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.17.20220709145456.tar";
|
||||
sha256 = "1npgdc9f1vj1d9nyfh30vskybqs2lwhd31b2a7i79ifrxs48kqr4";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar";
|
||||
sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1959,8 +1959,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "adwaita-theme";
|
||||
publisher = "piousdeer";
|
||||
version = "1.0.7";
|
||||
sha256 = "zfG9ktxOCUOJaNrWtblq+ktSMppwp1SaB/39F1qfQew=";
|
||||
version = "1.0.8";
|
||||
sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Theme for the GNOME desktop";
|
||||
|
||||
@ -22,20 +22,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4=";
|
||||
hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI=";
|
||||
hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,10 +32,6 @@ let
|
||||
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
|
||||
};
|
||||
});
|
||||
electronExec = if stdenv.isDarwin then
|
||||
"${electron_18}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else
|
||||
"${electron_18}/bin/electron";
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.12.29";
|
||||
@ -102,7 +98,7 @@ in nodePackages.deltachat-desktop.override rec {
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
|
||||
done
|
||||
|
||||
makeWrapper ${electronExec} $out/bin/deltachat \
|
||||
makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
--add-flags $out/lib/node_modules/deltachat-desktop
|
||||
'';
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
executableName = "element-desktop";
|
||||
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
|
||||
keytar = callPackage ./keytar { inherit Security AppKit; };
|
||||
seshat = callPackage ./seshat { inherit CoreServices; };
|
||||
in
|
||||
@ -83,7 +82,7 @@ mkYarnPackage rec {
|
||||
|
||||
# executable wrapper
|
||||
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
executableName = "schildichat-desktop";
|
||||
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schildichat-desktop";
|
||||
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.53.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.54.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-31IIjeaziXyH+RFEDTutghj8iq8ogANbxvssJUj9HpM=";
|
||||
sha256 = "sha256-dGxbsSNvBT0KFukSNXyii69hMN246IYFbb0CzrDh7IU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,10 +11,6 @@
|
||||
}:
|
||||
let
|
||||
executableName = "micropad";
|
||||
electron_exec =
|
||||
if stdenv.isDarwin
|
||||
then "${electron}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else "${electron}/bin/electron";
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "micropad";
|
||||
@ -64,7 +60,7 @@ in
|
||||
done
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/micropad" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "metis-prover";
|
||||
version = "2.3.20160713";
|
||||
version = "2.4.20200713";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilith";
|
||||
repo = "metis";
|
||||
rev = "f0b1a17cd57eb098077e963ab092477aee9fb340";
|
||||
sha256 = "1i7paax7b4byk8110f5zk4071mh5603r82bq7hbprqzljvsiipk7";
|
||||
rev = "d17c3a8cf6537212c5c4bfdadcf865bd25723132";
|
||||
sha256 = "phu1x0yahK/B2bSOCvlze7UJw8smX9zw6dJTpDD9chM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-branchless";
|
||||
version = "0.3.12";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arxanas";
|
||||
repo = "git-branchless";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1bUHltONLfJumkxPnzGJFMMyS02LVqjpDL+KgiewyoQ=";
|
||||
sha256 = "sha256-WFrN5TRFr9xHBUawTfvri0qlTiWCfAeC5SL+T6mwlU0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3+ULHqtKAhf4AdoLPK/3IqnfOcskoh6ctlQnY1oTHJ8=";
|
||||
cargoSha256 = "sha256-AGW1jUKPc5iiuDlgIDHG1sOn1flAB3UdxJJNKPH5+f8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -48,15 +48,6 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_next_ambiguous_interactive"
|
||||
];
|
||||
|
||||
# Fixed in next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch";
|
||||
sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w=";
|
||||
name = "fix-tests-for-latest-git";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
|
||||
homepage = "https://github.com/arxanas/git-branchless";
|
||||
|
||||
@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pkexec detection on NixOS.
|
||||
./fix-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp
|
||||
index 868969ba..51eb93b5 100644
|
||||
--- a/src/gsm_pkexec.cpp
|
||||
+++ b/src/gsm_pkexec.cpp
|
||||
@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command)
|
||||
gboolean
|
||||
procman_has_pkexec(void)
|
||||
{
|
||||
- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
+ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS)
|
||||
+ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
}
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, cmake }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lunatic";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunatic-solutions";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gHG8jk23qTANbLNPH4Q+YusEkDZ/G33SARAsLVLrVPs=";
|
||||
sha256 = "sha256-MfN4NZIkzQji+bIfpgDdVyGXiD291ULGT2JslSevr/w=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-keu9lNYuOruU58YBPyqtDqBS/jjruK9GcYrKv7dGmlQ=";
|
||||
cargoSha256 = "sha256-Qpu6FKIrDZyEbcv/uRjInz6lmMeTSZvY/JGLJe+My+U=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Erlang inspired runtime for WebAssembly";
|
||||
homepage = "https://lunatic.solutions";
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, zlib
|
||||
@ -28,6 +30,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/libproxy/libproxy/pull/189
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch";
|
||||
sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "py3" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,8 +5,7 @@ buildDunePackage rec {
|
||||
|
||||
inherit (tls) src meta version;
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.11";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "1.2.6";
|
||||
version = "1.2.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-69Lg+sw/USNrqtjk8VlsyFydu8Rz9duaoZ1d7KJ2Dfk=";
|
||||
hash = "sha256-h3I/BsFnluPnGSHDbkq04oFGJo74QnxY56X3kCokFwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyotgw";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvn23";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2mO8/qBG01zR0LHS4ajaNHrPsM//4i4gKnviy2aGeRs=";
|
||||
hash = "sha256-lmhFQ1HhRuiS++NsELA53YafrJ9uX2UDBQ9Kgyq0N0o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
|
||||
{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
|
||||
, addOpenGLRunpath, fetchpatch, patchelfUnstable
|
||||
# Python deps
|
||||
, buildPythonPackage, pythonOlder, python
|
||||
@ -76,7 +76,7 @@ let
|
||||
|
||||
tfFeature = x: if x then "1" else "0";
|
||||
|
||||
version = "2.9.1";
|
||||
version = "2.10.0-rc0";
|
||||
variant = if cudaSupport then "-gpu" else "";
|
||||
pname = "tensorflow${variant}";
|
||||
|
||||
@ -184,13 +184,13 @@ let
|
||||
stdenv = llvmPackages_11.stdenv;
|
||||
})) {
|
||||
name = "${pname}-${version}";
|
||||
bazel = bazel_4;
|
||||
bazel = bazel_5;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "tensorflow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kILNvwHi29F8BClYsZw+7RT2t6x57AsAHURVTfs5uOE=";
|
||||
hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8=";
|
||||
};
|
||||
|
||||
# On update, it can be useful to steal the changes from gentoo
|
||||
@ -369,12 +369,13 @@ let
|
||||
fetchAttrs = {
|
||||
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
|
||||
sha256 = if cudaSupport then
|
||||
"sha256-mcK60pLz70tOAu1+THUXweiO2SCSFUdFdT91HaUokzA="
|
||||
"sha256-KtVReqHL3zxE8TPrqIerSOt59Mgke/ftoFZKMzgX/u8="
|
||||
else
|
||||
if stdenv.isDarwin then
|
||||
"sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjrk="
|
||||
# FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin
|
||||
"sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0="
|
||||
else
|
||||
"sha256-teW6o9Fb4hUxmaHpQU2F+5ihE/DA+MIY8QaMEKMnFiE=";
|
||||
"sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
||||
@ -104,14 +104,17 @@ let
|
||||
};
|
||||
|
||||
darwin = {
|
||||
nativeBuildInputs = [ unzip ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/Applications
|
||||
unzip $src
|
||||
mv Electron.app $out/Applications
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
|
||||
makeWrapper $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
@ -11,19 +11,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-w64fdjKXiCaM+U28Hte+I0LPqmGKxbCVRUyhNWcVyTc=";
|
||||
sha256 = "sha256-2NfM1Gd+I9+XGuTyKXxoxH63mqR/G4YcvAjMU2Evhb0=";
|
||||
};
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-K9Ab4L/wnpUqe+gLKhtHX4fOgWXv6ZL9faa58hzdq/0=";
|
||||
cargoSha256 = "sha256-6k35fv0HwHuu2k7V2GBjvdAajLVuXuFzVSpVSFF8y+s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.8.2";
|
||||
version = "2022.8.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
|
||||
@ -307,7 +307,7 @@ let
|
||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.8.2";
|
||||
hassVersion = "2022.8.3";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -325,7 +325,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-82UPZmaSJVO0kmlGuY08vS3y5ai0NtSQ7ntkiOcNc2A=";
|
||||
hash = "sha256-Wx5l51+vcByOqdwqcnOn1+yYgp98kXggRmgO/wtiI+U=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -15,16 +15,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-07-26T00-53-03Z";
|
||||
version = "2022-07-30T05-21-40Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-/2oCivEZttYo4f06KvTked4jR7DIV4cGgejMzElYVaY=";
|
||||
sha256 = "sha256-yPysciKr8sn+TykQ+rupxAF3LLj8g4HOzjUaUTatjBk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eohF8pfW9wiUvSbukpy1zAnaB/grN0RzvtDwJ/JV07E=";
|
||||
vendorSha256 = "sha256-xNxAR6cAvIhOZZ+dnIgEqkmtE70endU80TDWMFDBWo8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -16,11 +16,11 @@ let
|
||||
in
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "04.00.01";
|
||||
version = "04.00.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
|
||||
sha256 = "sha256-NhXS7WpFbKuRFiAWDSy+g9PoYVQcpugLppQEF/S5WeI=";
|
||||
sha256 = "sha256-8Yrdu3IMN1yD+zlAAlEW688EVqNYZQhkKzxtsAKtd3Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = tclLibraries;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2022-07-24T02-25-13Z";
|
||||
version = "2022-07-29T19-17-16Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-wBAZD2qX/EoAgUVPdBJrPJe4Na6yPgjoJeKGBqwYJzs=";
|
||||
sha256 = "sha256-yl8+lmhEdcFB8EASnmi9g9B+0vFKDX5wULMgj9oj4kQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-F/BNi8DA2NbAE0lUn63DzNeFDXY9hBeIgSv6XBb4cCc=";
|
||||
vendorSha256 = "sha256-I0JVLaNTxWq0hqM0ureyZHZE64DgfYR6sjj2q9xcsV8=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oha";
|
||||
version = "0.5.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hatoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wCoBlbi4/EiTAA1xiZ/taVrokE0ECf8STAlA1sk/pm0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-P21rANxgreXu8vA1vsFCSkh1Irs67r3s33XT1dMFD7I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tcORdyxGViUhKbtxVJaZ1G3uUpyr1pRLu5j8v52lMg8=";
|
||||
cargoSha256 = "sha256-l6xQbZVrWF8Uw27datqvv9B3LoPtoaCnumo0gIjKdaA=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
|
||||
@ -24,6 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "HTTP load generator inspired by rakyll/hey with tui animation";
|
||||
homepage = "https://github.com/hatoo/oha";
|
||||
changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
||||
@ -5,6 +5,8 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, Foundation
|
||||
, Security
|
||||
, stdenv
|
||||
@ -12,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "termscp";
|
||||
version = "0.8.2";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "veeso";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7T3VmcI9CWrKROQ0U2du2d8e0A6XnOxpd8Zl0T4w+KQ=";
|
||||
sha256 = "sha256-iazp3Qx2AivuL+S1Ma/64BLJtE46tc33dq5qsgw+a6Q=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-WuoN7b9Fw2Op8tck4ek8gyufInlbPkDHHtLAsbG1NLE=";
|
||||
cargoSha256 = "sha256-FBW3Hl67Efnc/sNGM1LQw6msWHCYRj3KwfmSD2lpbUc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -32,10 +34,16 @@ rustPlatform.buildRustPackage rec {
|
||||
libssh
|
||||
openssl
|
||||
] ++ lib.optional stdenv.isDarwin [
|
||||
AppKit
|
||||
Cocoa
|
||||
Foundation
|
||||
Security
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
|
||||
"-framework" "AppKit"
|
||||
];
|
||||
|
||||
# Requires network access
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
let
|
||||
pname = "cryptomator";
|
||||
version = "1.6.10";
|
||||
version = "1.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cryptomator";
|
||||
repo = "cryptomator";
|
||||
rev = version;
|
||||
sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s=";
|
||||
sha256 = "sha256-+iNXQpzvZ51LJ3WsePVQXaLmUhvaw52Fp7bkUDdVijw=";
|
||||
};
|
||||
|
||||
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
|
||||
@ -37,7 +37,7 @@ let
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak=";
|
||||
outputHash = "sha256-SFiYHUH1Et7/SgciIvLcQGh54Z3fDVp22jSvDavXPjE=";
|
||||
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tidy-viewer";
|
||||
version = "1.4.6";
|
||||
version = "1.4.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexhallam";
|
||||
repo = "tv";
|
||||
rev = version;
|
||||
sha256 = "sha256-aCso4+EdHKeYVFyOrVwE967//9VkfNHvvnumtkORVmw=";
|
||||
sha256 = "sha256-z1H27D0DYQieU91FBZreN6XQCFvwxBJBIWBZRO50cnw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bEwfdjvBbvlMyuqdH0xprCVrOV5Wm2E1uwDsg2M66dY=";
|
||||
cargoSha256 = "sha256-rLRyzQkwbjIMhLLHSuDKQznBIDV9iAqCUVg6q5gRhsA=";
|
||||
|
||||
# this test parses command line arguments
|
||||
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
|
||||
|
||||
@ -51,7 +51,7 @@ with localPython.pkgs; buildPythonApplication rec {
|
||||
--replace "six>=1.11.0,<1.15.0" "six==1.16.0" \
|
||||
--replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \
|
||||
--replace "jmespath>=0.7.1,<1.0.0" "jmespath==1.0.1" \
|
||||
--replace "botocore>1.23.41,<1.24.0" "botocore==1.27.31"
|
||||
--replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.49"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -8489,7 +8489,9 @@ with pkgs;
|
||||
|
||||
lshw = callPackage ../tools/system/lshw { };
|
||||
|
||||
lunatic = callPackage ../development/interpreters/lunatic { };
|
||||
lunatic = callPackage ../development/interpreters/lunatic {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
lv = callPackage ../tools/text/lv { };
|
||||
|
||||
@ -11208,7 +11210,7 @@ with pkgs;
|
||||
termcolor = callPackage ../development/libraries/termcolor { };
|
||||
|
||||
termscp = callPackage ../tools/networking/termscp {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation Security;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security;
|
||||
};
|
||||
|
||||
termius = callPackage ../applications/networking/termius { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user