Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-06-09 12:02:09 +00:00 committed by GitHub
commit 2721aade99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 3246 additions and 2585 deletions

View File

@ -767,16 +767,16 @@
license = lib.licenses.free;
};
}) {};
consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.17";
version = "0.18";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.17.tar";
sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa";
url = "https://elpa.gnu.org/packages/consult-0.18.tar";
sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2";
};
packageRequires = [ emacs ];
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/consult.html";
license = lib.licenses.free;
@ -801,10 +801,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.23";
version = "0.25";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.23.tar";
sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v";
url = "https://elpa.gnu.org/packages/corfu-0.25.tar";
sha256 = "1ix65l80q8id8vxkvx4wd780cav53lws2z1x3pnj4wmm0n4qwyd9";
};
packageRequires = [ emacs ];
meta = {
@ -861,10 +861,10 @@
elpaBuild {
pname = "cpupower";
ename = "cpupower";
version = "1.0.4";
version = "1.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar";
sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd";
url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar";
sha256 = "1hg5jwdkxl6mx145wwdmnhc8k3z3srvpm757kppj1ybmvjbpxx0y";
};
packageRequires = [];
meta = {
@ -921,10 +921,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.19";
version = "1.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.19.tar";
sha256 = "0sslxlnw10ba6m711p4ps4zsfjz56dsp2945ga5z0y8d860pliqh";
url = "https://elpa.gnu.org/packages/csv-mode-1.20.tar";
sha256 = "08im1llz04s3ckpj3c3j4wxq4g00fyld2m8ylnh878ss5izzs0lg";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1037,6 +1037,21 @@
license = lib.licenses.free;
};
}) {};
detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "detached";
ename = "detached";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/detached-0.7.tar";
sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/detached.html";
license = lib.licenses.free;
};
}) {};
devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "devdocs";
@ -1202,16 +1217,16 @@
license = lib.licenses.free;
};
}) {};
dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
dtache = callPackage ({ detached, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dtache";
ename = "dtache";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dtache-0.6.tar";
sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3";
url = "https://elpa.gnu.org/packages/dtache-0.7.tar";
sha256 = "0cws662f53f2j1viicrwijmniiqxz1n4mh6kwck25pl954xa61gf";
};
packageRequires = [ emacs ];
packageRequires = [ detached emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dtache.html";
license = lib.licenses.free;
@ -1326,10 +1341,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220416";
version = "20220605";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220416.tar";
sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc";
url = "https://elpa.gnu.org/packages/eev-20220605.tar";
sha256 = "1d8bmps72519hv3raqyjx1sbd7vmihckq8qrzd2v0rglx4smikdk";
};
packageRequires = [ emacs ];
meta = {
@ -1444,10 +1459,10 @@
elpaBuild {
pname = "embark";
ename = "embark";
version = "0.16";
version = "0.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/embark-0.16.tar";
sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi";
url = "https://elpa.gnu.org/packages/embark-0.17.tar";
sha256 = "05r5z59sv0j4sawybd4353ziya87q6yzx4l8sjklybcn2mslpp1q";
};
packageRequires = [ emacs ];
meta = {
@ -1464,10 +1479,10 @@
elpaBuild {
pname = "embark-consult";
ename = "embark-consult";
version = "0.5";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar";
sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6";
url = "https://elpa.gnu.org/packages/embark-consult-0.6.tar";
sha256 = "1c8rx9ikazbnap293ab6s26djikdy85i7z330wdwwrgmipkfawaj";
};
packageRequires = [ consult emacs embark ];
meta = {
@ -1714,10 +1729,10 @@
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "0.2.1";
version = "0.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fontaine-0.2.1.tar";
sha256 = "11g03gaiypqf0xi7s3xyjnbi2w154lkd7j0ybmn8scs6pbzdyl95";
url = "https://elpa.gnu.org/packages/fontaine-0.2.2.tar";
sha256 = "14q10r5086pyknpm8kd9f0scwwbgygqjp8b08k6a4f30a3pl3rqi";
};
packageRequires = [ emacs ];
meta = {
@ -2144,6 +2159,21 @@
license = lib.licenses.free;
};
}) {};
inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "inspector";
ename = "inspector";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/inspector-0.5.tar";
sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/inspector.html";
license = lib.licenses.free;
};
}) {};
ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ioccur";
@ -2558,10 +2588,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.3.2";
version = "0.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.3.2.tar";
sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd";
url = "https://elpa.gnu.org/packages/logos-0.4.0.tar";
sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345";
};
packageRequires = [ emacs ];
meta = {
@ -2772,10 +2802,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "2.3.0";
version = "2.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-2.3.0.tar";
sha256 = "028c1z4p1bbgf34fml4i0prihxn44x288iyprz9gxrp7x3gl05n8";
url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar";
sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q";
};
packageRequires = [ emacs ];
meta = {
@ -2821,10 +2851,10 @@
elpaBuild {
pname = "multishell";
ename = "multishell";
version = "1.1.9";
version = "1.1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/multishell-1.1.9.tar";
sha256 = "0gi5qmx27v7kaczr9b3sic69br3l7mcws3sdrs8c14iipcyl5qhb";
url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar";
sha256 = "1ipn9rlh9jg55i04adjy32n8dkjhhw1bcd72w97mlsdk66g8j6l3";
};
packageRequires = [ cl-lib ];
meta = {
@ -2931,10 +2961,10 @@
elpaBuild {
pname = "nano-modeline";
ename = "nano-modeline";
version = "0.7";
version = "0.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.tar";
sha256 = "1fsjzbdawkn4vmk6zs6az1b42mx5ka7a618fgx5zdncr79wl0vjw";
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.1.tar";
sha256 = "18a4mp27z6pj87yhp81x5a79g0kv6mzzd0axq2p31003r675l0hx";
};
packageRequires = [ emacs ];
meta = {
@ -2957,6 +2987,21 @@
license = lib.licenses.free;
};
}) {};
nftables-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "nftables-mode";
ename = "nftables-mode";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar";
sha256 = "0wcd31frnvxzkns4jdfxraai0bfi1184wcn64r8lg73h933p47iz";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
license = lib.licenses.free;
};
}) {};
nhexl-mode = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -3130,10 +3175,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.5.3";
version = "9.5.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.5.3.tar";
sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25";
url = "https://elpa.gnu.org/packages/org-9.5.4.tar";
sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m";
};
packageRequires = [ emacs ];
meta = {
@ -3190,10 +3235,10 @@
elpaBuild {
pname = "org-remark";
ename = "org-remark";
version = "1.0.4";
version = "1.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar";
sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf";
url = "https://elpa.gnu.org/packages/org-remark-1.0.5.tar";
sha256 = "01pgfg9j5wrhggjklkc9nbfiwjd5qnmhcbcccc06jz3hmd0rnxr2";
};
packageRequires = [ emacs org ];
meta = {
@ -3265,10 +3310,10 @@
elpaBuild {
pname = "osm";
ename = "osm";
version = "0.7";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/osm-0.7.tar";
sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4";
url = "https://elpa.gnu.org/packages/osm-0.8.tar";
sha256 = "1vvd149n4pa6jy7xk5dmhi0nfwcjd4rvxn283f1jxp5jvv47m202";
};
packageRequires = [ emacs ];
meta = {
@ -3340,10 +3385,10 @@
elpaBuild {
pname = "parser-generator";
ename = "parser-generator";
version = "0.1.5";
version = "0.1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar";
sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj";
url = "https://elpa.gnu.org/packages/parser-generator-0.1.6.tar";
sha256 = "0qql5klnh8fbnbkb4mhv6axxvw4qv09cy1h556m0qzg30sckxas1";
};
packageRequires = [ emacs ];
meta = {
@ -3400,10 +3445,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.20";
version = "0.4.22";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.20.tar";
sha256 = "0xb4i3s6yira1kfqwrs72ajvpqc6pw7gqlxmfmdhyyvib6p93l6m";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar";
sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c";
};
packageRequires = [ emacs ];
meta = {
@ -3535,10 +3580,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "4.2.0";
version = "4.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar";
sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414";
url = "https://elpa.gnu.org/packages/pyim-4.2.1.tar";
sha256 = "15hsz1ji8xa7zqzzmbi0vk95vgsvl4dsd1rann04vfaz30a1rdzv";
};
packageRequires = [ async emacs xr ];
meta = {
@ -3550,10 +3595,10 @@
elpaBuild {
pname = "pyim-basedict";
ename = "pyim-basedict";
version = "0.5.0";
version = "0.5.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.0.tar";
sha256 = "0h946wsnbbii32kl2kpv0k1kq118ymvpd5q1mphfsf126dz9sv78";
url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.3.tar";
sha256 = "1x3zmcbp5yck5dxfms8d9ym0fdbvwr40fn8wrq0qfl9a58k8i5bx";
};
packageRequires = [];
meta = {
@ -3815,10 +3860,10 @@
elpaBuild {
pname = "rec-mode";
ename = "rec-mode";
version = "1.8.3";
version = "1.8.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rec-mode-1.8.3.tar";
sha256 = "0lkmvvdj4xx3qhxqggizrcdawav0accyrza2wmhfdq88g2zh5575";
url = "https://elpa.gnu.org/packages/rec-mode-1.8.4.tar";
sha256 = "03n0g6inhj0mqqcqimh6nfi6rdzgh4w59vdjicvn880r5n8zwn4d";
};
packageRequires = [ emacs ];
meta = {
@ -4260,10 +4305,10 @@
elpaBuild {
pname = "sql-beeline";
ename = "sql-beeline";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sql-beeline-0.1.tar";
sha256 = "0yvj96aljmyiz8y6xjpypqjfrl1jdcrcc4jx4kbgl6mkv4z2aq1g";
url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar";
sha256 = "1bqzs53x506bzgchvjfr1ljqxbb9y041n7aj9n7ajb2634i7lllr";
};
packageRequires = [];
meta = {
@ -4301,6 +4346,21 @@
license = lib.licenses.free;
};
}) {};
srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
elpaBuild {
pname = "srht";
ename = "srht";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/srht-0.1.tar";
sha256 = "1cdylp2hma83iv062nf7qyz21a3r8562gwx2lk6cf45k2kh3hbv8";
};
packageRequires = [ emacs plz ];
meta = {
homepage = "https://elpa.gnu.org/packages/srht.html";
license = lib.licenses.free;
};
}) {};
ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ssh-deploy";
@ -4553,10 +4613,10 @@
elpaBuild {
pname = "tmr";
ename = "tmr";
version = "0.2.3";
version = "0.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar";
sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb";
url = "https://elpa.gnu.org/packages/tmr-0.3.0.tar";
sha256 = "1cv90hg7hsaffkcxryp9d5cyjvmfpxcmrw5knipad77yxzaf4s6b";
};
packageRequires = [ emacs ];
meta = {
@ -4583,10 +4643,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.2.4";
version = "2.5.2.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar";
sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz";
url = "https://elpa.gnu.org/packages/tramp-2.5.2.5.tar";
sha256 = "05f59x7jl4m187y2cidhnfz7p8q85gav4xpipazfvm5dicxz4j7c";
};
packageRequires = [ emacs ];
meta = {
@ -4802,10 +4862,10 @@
elpaBuild {
pname = "vc-got";
ename = "vc-got";
version = "1.1";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vc-got-1.1.tar";
sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r";
url = "https://elpa.gnu.org/packages/vc-got-1.1.1.tar";
sha256 = "0f8rwd4scvlyn9i9xq7d2sly7r0ddzi8z565jx1h2lkcs5nbihcb";
};
packageRequires = [ emacs ];
meta = {
@ -4894,10 +4954,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.23";
version = "0.24";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.23.tar";
sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2";
url = "https://elpa.gnu.org/packages/vertico-0.24.tar";
sha256 = "17vsx1yijx9clly977lvc6y296kq8g859hqwwq1v8zh4k0wqr9hc";
};
packageRequires = [ emacs ];
meta = {
@ -4947,10 +5007,10 @@
elpaBuild {
pname = "visual-filename-abbrev";
ename = "visual-filename-abbrev";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.1.tar";
sha256 = "1l2wq7q28lcl78flxqvsxc9h96whpynqq8kpmbiy3nzlw2mrgr8g";
url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar";
sha256 = "0sipyqrgf723ii2zd6r8hvihn5kax5qd0dwwrrxqy6f58wnhyq1r";
};
packageRequires = [ emacs ];
meta = {

View File

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.5.4";
version = "1.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar";
sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd";
url = "https://elpa.nongnu.org/nongnu/annotate-1.6.0.tar";
sha256 = "12843875nvrw5cs2pzag9i2k4vgajbs4rr56js7h6mx9w6jmg8hc";
};
packageRequires = [];
meta = {
@ -258,10 +258,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.4.0";
version = "1.4.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar";
sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0";
url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar";
sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj";
};
packageRequires = [
clojure-mode
@ -325,6 +325,26 @@
license = lib.licenses.free;
};
}) {};
corfu-terminal = callPackage ({ corfu
, elpaBuild
, emacs
, fetchurl
, lib
, popon }:
elpaBuild {
pname = "corfu-terminal";
ename = "corfu-terminal";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.4.tar";
sha256 = "1rmfj2lzdab2s49k9ja79i7xcw74r9cr5kv7rgrisqxwgcnvsi95";
};
packageRequires = [ corfu emacs popon ];
meta = {
homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
license = lib.licenses.free;
};
}) {};
crux = callPackage ({ elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "crux";
@ -598,16 +618,16 @@
license = lib.licenses.free;
};
}) {};
evil-matchit = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
evil-matchit = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "evil-matchit";
ename = "evil-matchit";
version = "2.4.4";
version = "3.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar";
sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6";
url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.0.tar";
sha256 = "036zf7l8pkhbyk7gz91r00v4fqi2wfdnqv95xkh7jpm2i9xcgg5p";
};
packageRequires = [ emacs evil ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
license = lib.licenses.free;
@ -673,6 +693,27 @@
license = lib.licenses.free;
};
}) {};
flymake-popon = callPackage ({ elpaBuild
, emacs
, fetchurl
, flymake ? null
, lib
, popon
, posframe }:
elpaBuild {
pname = "flymake-popon";
ename = "flymake-popon";
version = "0.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.2.tar";
sha256 = "08wpfia4q12nhc6l0xmdc54f1s73c0ds6hxwgkk5hjw906rpgn4a";
};
packageRequires = [ emacs flymake popon posframe ];
meta = {
homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
license = lib.licenses.free;
};
}) {};
forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "forth-mode";
@ -1270,10 +1311,10 @@
elpaBuild {
pname = "kotlin-mode";
ename = "kotlin-mode";
version = "1.0.0";
version = "2.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar";
sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj";
url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
sha256 = "0q1pfjcsk6c17hs5xg7wb6f4i29hn3zxgznjcr3v11dm4xmrj9iv";
};
packageRequires = [ emacs ];
meta = {
@ -1524,14 +1565,29 @@
license = lib.licenses.free;
};
}) {};
org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org-auto-tangle";
ename = "org-auto-tangle";
version = "0.4.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.4.1.tar";
sha256 = "169i1agnv66gkpgn5wxxri42610n2dp1gz9bfafk2n2a8b08mhn1";
};
packageRequires = [ async emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
license = lib.licenses.free;
};
}) {};
org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-contrib";
ename = "org-contrib";
version = "0.3";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar";
sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q";
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.tar";
sha256 = "05r7w0h9v1vfhv1dd2vaabq2gm8ra70s1cirlp75s343b0z28ca6";
};
packageRequires = [ emacs org ];
meta = {
@ -1579,10 +1635,10 @@
elpaBuild {
pname = "org-mime";
ename = "org-mime";
version = "0.2.6";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar";
sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf";
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.1.tar";
sha256 = "0dm7addyc98kh1lm4d8x7nvnkh6bwkw300ms2zlwm1ii91jzfkkg";
};
packageRequires = [ emacs ];
meta = {
@ -1745,6 +1801,21 @@
license = lib.licenses.free;
};
}) {};
popon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "popon";
ename = "popon";
version = "0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/popon-0.4.tar";
sha256 = "1c3brjhkdnpawi8jsc20jvhc1vl3l39da12rn3lfx2bfxvjvz76w";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/popon.html";
license = lib.licenses.free;
};
}) {};
popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "popup";
@ -1918,10 +1989,10 @@
elpaBuild {
pname = "shellcop";
ename = "shellcop";
version = "0.0.9";
version = "0.1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar";
sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci";
url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
sha256 = "0z0aml86y1m11lz8a8wdjfad5dzynjsqw69qin0a4vv2b8gy8mhr";
};
packageRequires = [ emacs ];
meta = {
@ -2064,6 +2135,21 @@
license = lib.licenses.free;
};
}) {};
swsw = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "swsw";
ename = "swsw";
version = "2.1.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/swsw-2.1.1.tar";
sha256 = "0k6cysa4pmxv1kmpn0fqvardbdfayj92cq0r3gxrx9pgqxlqwfix";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/swsw.html";
license = lib.licenses.free;
};
}) {};
systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "systemd";
@ -2209,10 +2295,10 @@
elpaBuild {
pname = "vc-fossil";
ename = "vc-fossil";
version = "20210928";
version = "20220707";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar";
sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y";
url = "https://elpa.nongnu.org/nongnu/vc-fossil-20220707.tar";
sha256 = "0l33y8mij6rw4h47ryqpjxr1i2xzis98rbi230izkvsc6w7qf89q";
};
packageRequires = [];
meta = {
@ -2220,14 +2306,29 @@
license = lib.licenses.free;
};
}) {};
vcomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vcomplete";
ename = "vcomplete";
version = "1.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/vcomplete-1.2.1.tar";
sha256 = "1fcchgv4kdmhzgincfy1jm625lwj3qrjskd0cswag5z15by6b5xf";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/vcomplete.html";
license = lib.licenses.free;
};
}) {};
visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "visual-fill-column";
ename = "visual-fill-column";
version = "2.4";
version = "2.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.4.tar";
sha256 = "0100v17s9w9nqjpr7h3zianfy1i4i71idk2qrlzqzcd8qn1m3vjx";
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.tar";
sha256 = "0mqhm7xkxpzjk96n6qybqg2780kbjg1w7ash88zhnbp8kvy0rrwi";
};
packageRequires = [ emacs ];
meta = {
@ -2239,10 +2340,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.2.0";
version = "17.2.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar";
sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.2.tar";
sha256 = "19ajwjcxv7vqysk085jyys77vry8nw7rzc7c43khyxb54qvg36i3";
};
packageRequires = [ emacs ];
meta = {
@ -2337,10 +2438,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "17.7.20220429090059";
version = "17.13.20220526011611";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar";
sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.13.20220526011611.tar";
sha256 = "1lg8805s5y61jr6yrm44zdjm0nad6adc5xr78zm0i0qzigbhhdcq";
};
packageRequires = [ emacs ];
meta = {

View File

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.31.0";
sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d";
manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk";
version = "0.31.1";
sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf";
manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w=";
vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "runc";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0=";
};
vendorSha256 = null;

View File

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "0.8.2";
version = "0.8.156";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8=";
sha256 = "sha256-vexJg/RGdc3TZTOhjY0oe9GJ1sgobNWaISyBG3EF12g=";
};
executable = "bb";

View File

@ -0,0 +1,20 @@
{ lib, buildDunePackage, fetchFromGitHub }:
buildDunePackage rec {
pname = "cry";
version = "0.6.5";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-cry";
rev = version;
sha256 = "1g4smccj27sv8pb9az5hbzxi99swg3d55mp7j25lz30xyabvksc3";
};
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-cry";
description = "OCaml client for the various icecast & shoutcast source protocols";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,24 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, faad2, pkg-config }:
buildDunePackage rec {
pname = "faad";
version = "0.5.1";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-faad";
rev = "v${version}";
sha256 = "sha256-3ayKZhgJAgsoOqn0InSrM5f3TImRHOQMtWETICo4t3o=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ faad2 ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-faad";
description = "Bindings for the faad library which provides functions for decoding AAC audio files";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,24 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, frei0r }:
buildDunePackage rec {
pname = "frei0r";
version = "0.1.2";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-frei0r";
rev = "v${version}";
sha256 = "sha256-eh/ymZO/3a1z6uvZdnXgma/7AU2NBVs2lddA+R/kuQA=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ frei0r ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-frei0r";
description = "Bindings for the frei0r API which provides video effects";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,26 @@
{ lib, buildDunePackage, fetchFromGitHub, pkg-config, dune-configurator, lame }:
buildDunePackage rec {
pname = "lame";
version = "0.3.6";
minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-lame";
rev = "v${version}";
sha256 = "sha256-oRxP1OM0pGdz8CB+ou7kbbrNaB1x9z9KTfciLsivFnI=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ lame ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-lame";
description = "Bindings for the lame library which provides functions for encoding mp3 files";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, lilv }:
buildDunePackage rec {
pname = "lilv";
version = "0.1.0";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-lilv";
rev = "v${version}";
sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c";
};
minimalOCamlVersion = "4.03.0";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ ctypes lilv ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-lilv";
description = "OCaml bindings for lilv";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -1,21 +1,18 @@
{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
if lib.versionOlder ocaml.version "4.02"
{ lib, stdenv, fetchurl, pkg-config, ocaml, findlib, curl, lwt, lwt_ppx }:
if lib.versionOlder ocaml.version "4.04"
then throw "ocurl is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
pname = "ocurl";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "http://ygrek.org.ua/p/release/ocurl/ocurl-${version}.tar.gz";
sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
};
nativeBuildInputs = [ pkg-config ocaml findlib ];
buildInputs = [ ncurses ];
propagatedBuildInputs = [ curl lwt ];
propagatedBuildInputs = [ curl lwt lwt_ppx ];
strictDeps = true;
@ -24,7 +21,7 @@ stdenv.mkDerivation rec {
description = "OCaml bindings to libcurl";
license = lib.licenses.mit;
homepage = "http://ygrek.org.ua/p/ocurl/";
maintainers = with lib.maintainers; [ bennofs ];
maintainers = with lib.maintainers; [ dandellion bennofs ];
platforms = ocaml.meta.platforms or [ ];
};
}

View File

@ -0,0 +1,23 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, soundtouch }:
buildDunePackage rec {
pname = "soundtouch";
version = "0.1.9";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-soundtouch";
rev = "v${version}";
sha256 = "sha256-81Mhk4PZx4jGrVIevzMslvVbKzipzDzHWnbtOjeZCI8=";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ soundtouch ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-soundtouch";
description = "Bindings for the soundtouch library which provides functions for changing pitch and timestretching audio data";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,26 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, taglib, zlib }:
buildDunePackage rec {
pname = "taglib";
version = "0.3.9";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-taglib";
rev = "v${version}";
sha256 = "sha256-n8Vv8Vepvhx7anZdWIdBfw+HSQShKWjNe6l0gqRRsSs=";
};
minimalOCamlVersion = "4.05.0"; # Documented version 4.02.0. 4.05.0 actually required.
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ taglib zlib ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-taglib";
description = "Bindings for the taglib library which provides functions for reading tags in headers of audio files";
license = with licenses; [ lgpl21Plus "link-exception" ]; # GNU Library Public License 2 Linking Exception
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
version = "0.31.0";
version = "0.31.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
sha256 = "sha256-jxipSHSsipnKJF+d7tez9M6bBlwV4r8XGQ2elI0jsVc=";
sha256 = "sha256-edoP4YvMp9ImfeS9bUwNBdx6eAUj5/J1tLymkOc6jwQ=";
};
propagatedBuildInputs = [

View File

@ -60,10 +60,9 @@ buildPythonPackage rec {
# Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785
"test_bpo_2142_workaround"
"test_skip_magic_trailing_comma"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
# exceeds max open files on hydra builders
"test_blackd_supported_version"
];
# multiple tests exceed max open files on hydra builders
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
propagatedBuildInputs = [
aiohttp

View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
version = "2.3.0";
version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-9Muw3l4XIo6cCc3Il9geqnDiw5b1hRP3neDoJFhMj1s=";
hash = "sha256-X+JvE4GzDjzDKPRuE1McqFJUWPhwweMDxha963t/XGY=";
};
propagatedBuildInputs = [

View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "hidapi";
version = "0.11.2";
version = "0.12.0.post2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-yYS37C/C6ph81EzwaUflVXJJjtLUPGSJC0q1iymvcrw=";
sha256 = "8ebb2117be8b27af5c780936030148e1971b6b7fda06e0581ff0bfb15e94ed76";
};
nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ];

View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "huum";
version = "0.5.0";
version = "0.6.0";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ldhAg9zGCEYvya01s6AHzALI4dS+d0R73c62YZyk19M=";
sha256 = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ=";
};
nativeBuildInputs = [

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "0.2.0";
version = "0.3.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4=";
hash = "sha256-s2OPHA3uBoWFnEz51itif3icErYkXhayvQ3+0b6jyjE=";
};
postPatch = ''

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pywemo";
version = "0.9.0";
version = "0.9.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-x4wIn+X70z5cCIhOfpQCj7qy0kEagnMcscxUls1697o=";
hash = "sha256-RgG2bKA7ifuOPX0ZDKv92S4Gpp9zaansKiEpYrYfPt4=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "regenmaschine";
version = "2022.06.0";
version = "2022.06.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-fmoq0mOhD8Y3P9IgghxiTuS9b3gMUUyCCXmYnqN9ue0=";
sha256 = "sha256-Q29e2f/6r0QFN5EPL8Gs1Z4CcvKXrZaYcEMgCJ9uuW8=";
};
nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "rollbar";
version = "0.16.2";
version = "0.16.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87";
sha256 = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI=";
};
propagatedBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "3.2.0";
version = "3.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2aR959ljz2mogPPQSWG3ksQPRWx04Jh4VRVV3jwiYfA=";
hash = "sha256-2sYMEC+2eorJqhZWmwr9DWO5bGK+BkCIUZ4cZhs/Ofo=";
};
propagatedBuildInputs = [

View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "vertica-python";
version = "1.0.5";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo=";
hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY=";
};
propagatedBuildInputs = [

View File

@ -32,14 +32,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.1204";
version = "2.0.1206";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-qqTqEn11DM1W48ZYoiCacsSCA4xPLxPil43xiByEy5g=";
hash = "sha256-5pnT9JcE1BY4kgqycfNLm3PiTqZdw2V9ksz2E+jfFkY=";
};
nativeBuildInputs = with py.pkgs; [

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "circup";
version = "1.0.4";
version = "1.1.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "adafruit";
repo = pname;
rev = version;
hash = "sha256-qX3kSlqA2qP8+XiLYx/hKYfyeB6p3tnXEhESox0c/lY=";
rev = "refs/tags/${version}";
hash = "sha256-6UzMAKrK2fp4XKoi42Uo6dfPQB17p/w+b3nXa3JVdV4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -8,8 +8,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.15.1";
sha256 = "sha256-1OmdPB9pcREJpnUlVxBY5gCc3bwijn1yO4+0pFQWm30=";
version = "16.15.0"; # Do not upgrade until #176127 is solved
sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.6.3";
version = "2022.6.4";
components = {
"abode" = ps: with ps; [
abodepy

View File

@ -176,7 +176,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.6.3";
hassVersion = "2022.6.4";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM=";
hash = "sha256-ec6f8H9nU2edsailp1OCPwTFXnPm+NRqNha6Gk3xN44=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -1,108 +1,99 @@
{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config
, fetchFromGitLab
, fetchFromGitHub
, libjpeg
, ocamlPackages
, libao, portaudio, alsa-lib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, zlib
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
, awscli2, curl, ffmpeg, youtube-dl
, runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ]
}:
let
pname = "liquidsoap";
version = "1.4.2";
ocaml-ffmpeg = fetchurl {
url = "https://github.com/savonet/ocaml-ffmpeg/releases/download/v0.4.2/ocaml-ffmpeg-0.4.2.tar.gz";
sha256 = "1lx5s1avds9fsh77828ifn71r2g89rxakhs8pp995a675phm9viw";
};
packageFilters = map (p: "-e '/ocaml-${p}/d'" )
[ "gstreamer" "shine" "aacplus" "schroedinger"
"voaacenc" "soundtouch" "gavl" "lo"
];
version = "2.0.5";
in
# Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210
# Locally override menhir to an earlier version
let
menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
version = "20211128";
src = fetchFromGitLab {
domain = "gitlab.inria.fr";
owner = "fpottier";
repo = "menhir";
rev = version;
sha256 = "sha256-L/zfjPZfn9L7qqqqJGk3Ge52rvujOVPiL8jxfH5R60g=";
};
});
menhirSdk = ocamlPackages.menhirSdk.override { inherit menhirLib; };
menhir = ocamlPackages.menhir.override {
inherit menhirLib menhirSdk;
};
srt = ocamlPackages.srt.overrideAttrs (old: rec {
version = "0.1.1";
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-srt";
rev = "v${version}";
sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
};
});
in
stdenv.mkDerivation {
name = "${pname}-full-${version}";
inherit pname version;
src = fetchurl {
url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}-full.tar.gz";
sha256 = "0wkwnzj1a0vizv7sr1blwk5gzm2qi0n02ndijnq1i50cwrgxs1a4";
url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-+BHRAnO2sKK504EhXc6LPabnOzcOAAHmtmqVNQ8OeZU=";
};
# Use ocaml-srt and ocaml-fdkaac from nixpkgs
# Use ocaml-ffmpeg at 0.4.2 for compatibility with ffmpeg 4.3
prePatch = ''
rm -rf ocaml-srt*/ ocaml-fdkaac*/ ocaml-ffmpeg*/
tar xzf ${ocaml-ffmpeg}
'';
preConfigure = /* we prefer system-wide libs */ ''
sed -i "s|gsed|sed|" Makefile
make bootstrap
# autoreconf -vi # use system libraries
sed ${toString packageFilters} PACKAGES.default > PACKAGES
'';
postFixup = ''
wrapProgram $out/bin/liquidsoap --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa
wrapProgram $out/bin/liquidsoap \
--set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \
--prefix PATH : ${lib.makeBinPath runtimePackages}
'';
configureFlags = [ "--localstatedir=/var" ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs =
[ which ocamlPackages.ocaml ocamlPackages.findlib
libao portaudio alsa-lib libpulseaudio libjack2
libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus zlib
faad2 flac ladspaH ffmpeg frei0r dssi
ocamlPackages.xmlm ocamlPackages.ocaml_pcre
ocamlPackages.camomile
ocamlPackages.fdkaac
srt ocamlPackages.sedlex menhir menhirLib
];
buildInputs = [
libjpeg
which
ocamlPackages.ocaml ocamlPackages.findlib
hardeningDisable = [ "format" "fortify" ];
# Mandatory dependencies
ocamlPackages.dtools
ocamlPackages.duppy
ocamlPackages.mm
ocamlPackages.ocaml_pcre
ocamlPackages.menhir ocamlPackages.menhirLib
ocamlPackages.sedlex
# Recommended dependencies
ocamlPackages.camomile
ocamlPackages.samplerate
# Optional dependencies
ocamlPackages.camlimages
ocamlPackages.gd4o
ocamlPackages.alsa
ocamlPackages.ao
ocamlPackages.bjack
ocamlPackages.cry
ocamlPackages.dssi
ocamlPackages.faad
ocamlPackages.fdkaac
ocamlPackages.srt
ocamlPackages.ffmpeg
ocamlPackages.flac
ocamlPackages.frei0r
ocamlPackages.gstreamer
ocamlPackages.inotify
ocamlPackages.ladspa
ocamlPackages.lame
ocamlPackages.lastfm
ocamlPackages.lo
ocamlPackages.mad
ocamlPackages.magic
ocamlPackages.ogg
ocamlPackages.opus
ocamlPackages.portaudio
ocamlPackages.pulseaudio
ocamlPackages.shine
ocamlPackages.soundtouch
ocamlPackages.speex
ocamlPackages.srt
ocamlPackages.ssl
ocamlPackages.taglib
ocamlPackages.theora
ocamlPackages.vorbis
ocamlPackages.xmlplaylist
ocamlPackages.posix-time2
ocamlPackages.tsdl
ocamlPackages.tsdl-image
ocamlPackages.tsdl-ttf
# Undocumented dependencies
ocamlPackages.ocurl
ocamlPackages.lilv
ocamlPackages.graphics
ocamlPackages.yojson
ocamlPackages.cohttp-lwt-unix
];
meta = with lib; {
description = "Swiss-army knife for multimedia streaming";
homepage = "https://www.liquidsoap.info/";
maintainers = with maintainers; [ ehmry ];
license = licenses.gpl2;
maintainers = with maintainers; [ dandellion ehmry ];
license = licenses.gpl2Plus;
platforms = ocamlPackages.ocaml.meta.platforms or [];
};
}

View File

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, pkg-config, libGL, glfw, soil, lib }:
stdenv.mkDerivation {
pname = "esshader";
version = "unstable-2020-08-09";
src = fetchFromGitHub {
owner = "cmcsun";
repo = "esshader";
rev = "506eb02f3de52d3d1f4d81ac9ee145655216dee5";
sha256 = "sha256-euxJw7CqOwi6Ndzalps37kDr5oOIL3tZICCfmxsujfk=";
};
postPatch = ''
substituteInPlace config.mk \
--replace "-lGLESv2" "-lGL -lGLESv2"
'';
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libGL glfw soil
];
installPhase = ''
mkdir -p $out/bin
cp -a esshader $out/bin/
'';
meta = with lib; {
description = "Offline ShaderToy-compatible GLSL shader viewer using OpenGL ES 2.0";
homepage = "https://github.com/cmcsun/esshader";
license = licenses.mit;
maintainers = with maintainers; [ astro ];
platforms = lib.platforms.unix;
};
}

View File

@ -5670,6 +5670,8 @@ with pkgs;
escrotum = callPackage ../tools/graphics/escrotum { };
esshader = callPackage ../tools/graphics/esshader { };
etcher = callPackage ../tools/misc/etcher {
electron = electron_12;
};
@ -17170,6 +17172,10 @@ with pkgs;
VideoDecodeAcceleration;
};
ffmpeg_5-full = ffmpeg-full.override {
ffmpeg = ffmpeg_5;
};
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { };

View File

@ -239,6 +239,8 @@ let
crunch = callPackage ../development/tools/ocaml/crunch { };
cry = callPackage ../development/ocaml-modules/cry { };
cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
csexp = callPackage ../development/ocaml-modules/csexp { };
@ -397,6 +399,8 @@ let
ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
faad = callPackage ../development/ocaml-modules/faad { };
facile = callPackage ../development/ocaml-modules/facile { };
faraday = callPackage ../development/ocaml-modules/faraday { };
@ -460,6 +464,10 @@ let
fpath = callPackage ../development/ocaml-modules/fpath { };
frei0r = callPackage ../development/ocaml-modules/frei0r {
inherit (pkgs) frei0r;
};
functoria = callPackage ../development/ocaml-modules/functoria { };
functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { };
@ -684,6 +692,10 @@ let
lambda-term = callPackage ../development/ocaml-modules/lambda-term { };
lame = callPackage ../development/ocaml-modules/lame {
inherit (pkgs) lame;
};
lastfm = callPackage ../development/ocaml-modules/lastfm { };
lens = callPackage ../development/ocaml-modules/lens { };
@ -694,6 +706,10 @@ let
letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { };
lilv = callPackage ../development/ocaml-modules/lilv {
inherit (pkgs) lilv;
};
linenoise = callPackage ../development/ocaml-modules/linenoise { };
llvm = callPackage ../development/ocaml-modules/llvm {
@ -1179,6 +1195,10 @@ let
sosa = callPackage ../development/ocaml-modules/sosa { };
soundtouch = callPackage ../development/ocaml-modules/soundtouch {
inherit (pkgs) soundtouch;
};
spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
speex = callPackage ../development/ocaml-modules/speex {
@ -1377,6 +1397,10 @@ let
stringext = callPackage ../development/ocaml-modules/stringext { };
taglib = callPackage ../development/ocaml-modules/taglib {
inherit (pkgs) taglib;
};
tcslib = callPackage ../development/ocaml-modules/tcslib { };
telegraml = callPackage ../development/ocaml-modules/telegraml { };