diff options
Diffstat (limited to 'pkgs')
91 files changed, 3098 insertions, 3216 deletions
diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index cc0f801efd6..b2d28ed8942 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "0l4h3fdvln03ycbg3xngh8vkhgrz4ad864yyn4gmdjp0ypi69qa1"; + sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 4bb5f1f7a6b..8d2da4c3665 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.6.1"; + version = "21.7.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; - x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; + aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A=="; + x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix index 1e4036b4c27..f3adf4b9ea7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -5,7 +5,7 @@ trivialBuild rec { version = "1.52"; src = fetchurl { - url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz"; + url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8a87889e702..10a4a2cab5e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -125,20 +125,16 @@ license = lib.licenses.free; }; }) {}; - aggressive-indent = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: + aggressive-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "aggressive-indent"; ename = "aggressive-indent"; - version = "1.8.3"; + version = "1.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el"; - sha256 = "0jnzccl50x0wapprgwxinp99pwwa6j43q6msn4gv437j7swy8wnj"; + url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar"; + sha256 = "166jk1z0vw481lfi3gbg7f9vsgwfv8fiyxpkfphgvgcmf5phv4q1"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/aggressive-indent.html"; license = lib.licenses.free; @@ -670,10 +666,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.9"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.9.tar"; - sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf"; + url = "https://elpa.gnu.org/packages/corfu-0.10.tar"; + sha256 = "0sqr4cld84vgfnf0fjgvbbix1p23s0n2xsszfap6d8a2xzzpp044"; }; packageRequires = [ emacs ]; meta = { @@ -775,10 +771,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.18.1"; + version = "2.19.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.18.1.tar"; - sha256 = "17mrvmrfh5c3kri4r3gf1c3gz4i5vl9ac60grpx4103b56y4cgra"; + url = "https://elpa.gnu.org/packages/dash-2.19.0.tar"; + sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx"; }; packageRequires = [ emacs ]; meta = { @@ -1015,10 +1011,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.24"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar"; - sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r"; + url = "https://elpa.gnu.org/packages/ebdb-0.7.tar"; + sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1075,10 +1071,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210618"; + version = "20210710"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210618.tar"; - sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf"; + url = "https://elpa.gnu.org/packages/eev-20210710.tar"; + sha256 = "19k5yncyjg7afvkx54k9mplm86jyr3svjjyprrj1frdi219i5piw"; }; packageRequires = [ emacs ]; meta = { @@ -2321,10 +2317,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-1.4.0.tar"; - sha256 = "0ssckl06jk08vaq4g7sxpzvc3ybm339fzbn9qw21w82v1l60rzpm"; + url = "https://elpa.gnu.org/packages/modus-themes-1.5.0.tar"; + sha256 = "0y5a7g66iiai20fvc6qff3ki792bzca87zxbmxl8hpks4a6znc80"; }; packageRequires = [ emacs ]; meta = { @@ -2889,10 +2885,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.8.2"; + version = "3.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar"; - sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw"; + url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar"; + sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3430,10 +3426,10 @@ elpaBuild { pname = "slime-volleyball"; ename = "slime-volleyball"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/slime-volleyball-1.1.7.tar"; - sha256 = "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy"; + url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar"; + sha256 = "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2"; }; packageRequires = [ cl-lib ]; meta = { @@ -3561,16 +3557,16 @@ license = lib.licenses.free; }; }) {}; - spinner = callPackage ({ elpaBuild, fetchurl, lib }: + spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "spinner"; ename = "spinner"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spinner-1.7.3.el"; - sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd"; + url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar"; + sha256 = "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/spinner.html"; license = lib.licenses.free; @@ -3824,10 +3820,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.5.tar"; - sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68"; + url = "https://elpa.gnu.org/packages/transient-0.3.6.tar"; + sha256 = "11n2551kvfjrqyk0x78bz6pirnfs126cbchiv1pchqwyk8z8c9ks"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index e5f6f1aa7c9..5d043f9de9a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210628"; + version = "20210712"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210628.tar"; - sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl"; + url = "https://orgmode.org/elpa/org-20210712.tar"; + sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210628"; + version = "20210712"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar"; - sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar"; + sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 86d117b8956..5581a52fed4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -25,17 +25,17 @@ }, { "ename": "0x0", - "commit": "982788433004ba644a372c50130613e3c56bba10", - "sha256": "0447s6jq57g0p5myb295930wyqk7q5qj00r8qi3l39670xsgbqdl", - "fetcher": "git", - "url": "https://git.sr.ht/~pkal/nullpointer-emacs", + "commit": "f725830dd12dcf466b7b1efe54b9eb3b55e5f959", + "sha256": "0s8q6wzzbqlpxsf9757r44lf8i8h72x4j020wmv4hvbxdvprqxq4", + "fetcher": "gitlab", + "repo": "willvaughn/emacs-0x0", "unstable": { "version": [ - 20210628, - 1207 + 20210701, + 839 ], - "commit": "a613afa08271a75551a4d2165b4ab872b131edc0", - "sha256": "1ngaq8ldyv9h0g5c83y4g5z1a19z4k90dha5y4g7v3lpzmqx4jgn" + "commit": "63cd5eccc85e527f28e1acc89502a53245000428", + "sha256": "1cd0drlhi0lf1vmarcfl3vc7ldkymaj50dhqb1ajm7r0s5ps3asb" }, "stable": { "version": [ @@ -122,6 +122,21 @@ } }, { + "ename": "750words", + "commit": "bee7108d3b0f4861ec23ab7a87ddd5fbf17952c7", + "sha256": "0j63ry8x617xdrffiwkwdngp6y3rik0nq2w61yf6sa097fmzpl2p", + "fetcher": "github", + "repo": "zzamboni/750words-client", + "unstable": { + "version": [ + 20210701, + 1950 + ], + "commit": "0fed7621c04debad64ea6455455494d4e6eb03fa", + "sha256": "1qglbfdc6526aqsba93ngw1a6hp19lqx1wlxzzy9yvggbb02mii2" + } + }, + { "ename": "@", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z", @@ -1585,8 +1600,8 @@ "repo": "chumpage/ack-menu", "unstable": { "version": [ - 20150504, - 2022 + 20130107, + 640 ], "deps": [ "mag-menu" @@ -1936,8 +1951,8 @@ "annotation", "eri" ], - "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", - "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" + "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", + "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" }, "stable": { "version": [ @@ -1979,23 +1994,20 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20200824, - 2352 + 20210701, + 2224 ], - "commit": "b0ec0047aaae071ad1647159613166a253410a63", - "sha256": "0rz010ypy1rg8v6na05zs942ikzqg1l32inzpzqg2q2rnfa3wkx1" + "commit": "cb416faf61c46977c06cf9d99525b04dc109a33c", + "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja" }, "stable": { "version": [ 1, - 9, + 10, 0 ], - "deps": [ - "cl-lib" - ], - "commit": "d6778ae89cd2d40949aa076a43e327f7acff59c3", - "sha256": "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w" + "commit": "cb416faf61c46977c06cf9d99525b04dc109a33c", + "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja" } }, { @@ -2268,11 +2280,11 @@ "repo": "jgkamat/alda-mode", "unstable": { "version": [ - 20180608, - 605 + 20210705, + 654 ], - "commit": "1692b9003d2c3de403251ec452c6ce43ec819c84", - "sha256": "0kz0b2c1np088wbmnlvznizsv8nwiidgs67cn4dz46k66g9yg3g5" + "commit": "4de011d572e958a377fb16daae05a1b411f0c8ad", + "sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx" }, "stable": { "version": [ @@ -2321,16 +2333,20 @@ "deps": [ "flycheck" ], - "commit": "bf859fdb80a46c6d0d9fd8f8540a8ae96d5c1016", - "sha256": "1bp3q84alqwkglifhwc5kcrb2dc22kjd3l0h9r0bh1klz70sjss4" + "commit": "3fad996473200fa07b0381cd66179089d10fcc6f", + "sha256": "0qj4cjra1kyiw8h2qm024wgy9fy3xjwik7sr1mfkhk1gbndl8m3w" }, "stable": { "version": [ 1, - 0 + 2, + 1 + ], + "deps": [ + "flycheck" ], - "commit": "55fc849cdb7a05bbaab6f9359386d8830bdcfb87", - "sha256": "0v5jfmqcvridh8z7y8i5hklybfxicgmbnambi21ml34px3p9fldc" + "commit": "7b7041fd58c2b1893e4b65b18045880ecc7a1c73", + "sha256": "1lvhzi6fxnmpcr7xac6ri3904cqbp016ivziih3nfchdzznmzljj" } }, { @@ -2425,11 +2441,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210603, - 1604 + 20210703, + 2203 ], - "commit": "facbde4a7be292bf9490932cbe403b443273f45d", - "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" + "commit": "9d97c074b08000eacefc03ebc5dadbdc33888cc2", + "sha256": "06ya21isl47cfs4fsl8k3qzh7d27gss0snxv7mmv8a0c7rgjyx7j" }, "stable": { "version": [ @@ -2503,8 +2519,8 @@ "deps": [ "all-the-icons" ], - "commit": "5a984b4d7f811e2ad08fdc461a1e89205804b7bd", - "sha256": "05bglgqc4q5p9zr6ylllg16crpxcnb6p51xkk5v1nljgi3n9786l" + "commit": "f304d283cbb815cd28b86c1cbe74b706c0678e25", + "sha256": "1afjcv94p8za3ri9c324j1wdg4klpcaippby3r1avwnjy5l9qpav" }, "stable": { "version": [ @@ -2566,8 +2582,8 @@ "all-the-icons", "ivy-rich" ], - "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", - "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" + "commit": "78ee2fb4eb43c970e12a91949f7efd26ca1834d5", + "sha256": "04pgr5xjk84kksck7f1y9gpvxxnsy803zq252hg1pzg1pl6bx3ga" }, "stable": { "version": [ @@ -2633,8 +2649,8 @@ 20200723, 1037 ], - "commit": "b36c2b2bccc628da1579016381d5c3195c9e12b2", - "sha256": "19nqpg91in65gj59zndhncx6c1005k0wh05rprv1z6465j5gd40g" + "commit": "4aba676d49b0705cb4431b7e7c733ef8eac7d5aa", + "sha256": "1z5b5ivn81hmvndd7ari07kj1bsp9ziyxcrgf7xq21g1dfsbq8cs" }, "stable": { "version": [ @@ -3201,8 +3217,8 @@ 20200914, 644 ], - "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", - "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" + "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", + "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" }, "stable": { "version": [ @@ -3655,8 +3671,8 @@ 20210223, 1539 ], - "commit": "a45c426b7e4a450faea004ef5b842fd37e17a7c6", - "sha256": "1f7bvcv4qqqa5bsfrcs69yc1phgnyrh5mbnb2hhgq72z8ymmrn7q" + "commit": "267a1453f58a6a6577a1d5752c876fdaa2896a6d", + "sha256": "0l5nfj5wz9cjpl9906w8q3p6ciwr6imf4nqh8i2s4dzip4n9w6nl" }, "stable": { "version": [ @@ -4086,7 +4102,7 @@ "unstable": { "version": [ 20210501, - 1527 + 1536 ], "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" @@ -4175,8 +4191,8 @@ 20201026, 339 ], - "commit": "449596a61f551ba5f8f3ff731984316e3b99faba", - "sha256": "0r21mxadvx4scnmx76kqnqmnvw9mx1394dvs34i5mr02nal3vhsg" + "commit": "375488bed4f279cf56a5c60ff236b320d3bfa169", + "sha256": "1kms5dkxz5ppf2iw95p4mvnkssp2iwp483mn4x0xvv53lglnjlxw" }, "stable": { "version": [ @@ -4199,8 +4215,8 @@ 20200810, 845 ], - "commit": "79adac0149bb6083ad3a327c6bbdf56537282ee9", - "sha256": "1kd9fk1f3aaw0ikkbf9n6w5b2sy7v0xzsch688h8ac9rp6s2yws8" + "commit": "67b67de68f3d878f98c96ea7e340344aed6e6e46", + "sha256": "0qg04bn50s2chnwk7krdfkhq6y944fbgbwxs507qgmg4n0iyzkln" }, "stable": { "version": [ @@ -4482,8 +4498,8 @@ "keytar", "s" ], - "commit": "9ecdd6226b50a1a04675b65589e6cc36fd3aea2c", - "sha256": "04vr0i4y9i96vm1pliac8snnvlwqzafy7xrq39wpvhvd99qr4845" + "commit": "ab6f89a412ae47d257352b26f9667c3c062a7328", + "sha256": "1ha0v6np9qwg7lqcj0srq0qljs6yx2rgdj0dzwk74mqlk1xb5lzv" }, "stable": { "version": [ @@ -4947,22 +4963,25 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20210629, - 1535 + 20210715, + 1416 ], "deps": [ "ht" ], - "commit": "45c472cf72df1d477550dcc07e556047b2fc5852", - "sha256": "1xbkcpidmzlbv3qs8r9i880pbkf7w78xagh85nvcrv965ra66k6c" + "commit": "3425ee2eac724d1d64170a8b9d23afc18f8951a9", + "sha256": "08m6wyfvy6i99q25nk6b7d1bvlfalvdlafh7ajglj6fnpdjmnk0h" }, "stable": { "version": [ 1, - 60 + 61 + ], + "deps": [ + "ht" ], - "commit": "d5125800b038d1275aabd14008ede75a3a858587", - "sha256": "1mi4mayfavkfm9fkg1j1wcv6kvb2cfgf5nr5kk15jhy7x1ajwphp" + "commit": "ca285d84e4a22514adaff2f0ba39657e296f4fff", + "sha256": "0lkdx247isrjsn8v51dqmxv6xcg4shqbnz5jxmw05isvhvm9k3xb" } }, { @@ -5100,8 +5119,8 @@ 20210629, 1537 ], - "commit": "ac7b7183c5e84da110e2f4850c5d8bc5325d058a", - "sha256": "1hzh6ajccmkc2p5kcbl7vjh16rdh4nw3kmncw8ca32ij3l01rmb1" + "commit": "9511446c4359100d0b6433579e663852bf8f36ef", + "sha256": "0gkkgkqvs7sq5s43srzzi8s5xm4pj53x9lifg79cad15a6i9a8sc" }, "stable": { "version": [ @@ -5305,14 +5324,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20210412, - 1127 - ], - "deps": [ - "cl-generic" + 20210709, + 1230 ], - "commit": "1dc4e5983382093fc74c81d84a45cd2b53adfd90", - "sha256": "0r99h100v43i7wr2c1jqgyzixlc1y973swwfa9cfmnaxck3ibk93" + "commit": "32786dc552569c7cc9970628f580b0b7b8e0b03d", + "sha256": "0vs8kwgxvmbr1yy1f8jvxpixy4jfxpdk17mq0gfvlcmnqb560gdr" } }, { @@ -5727,11 +5743,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20210312, - 2248 + 20210714, + 1912 ], - "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", - "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" + "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", + "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" } }, { @@ -6078,11 +6094,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210506, - 1530 + 20210710, + 1645 ], - "commit": "59692942f34b9be0447a7766ad03115d04e79874", - "sha256": "1la7671sz666in8zx35j517sbj2y4jyasnj0x9yxh5n4g5qdrnbp" + "commit": "7f1db3df9bb6f4a3c9f4d3c10b9a6cf231752547", + "sha256": "0ycxj4lmmkbpmb8yizys25rdh0zrmw4sbgj19wb6zp2d30xk32qf" }, "stable": { "version": [ @@ -6296,11 +6312,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20210605, - 906 + 20210715, + 2325 ], - "commit": "667554f76696a3cbb50c4c01b121c1aef882195a", - "sha256": "169x8d52hkb30w2c4ww7lpipdin5406nm2i95fbbxs1sz1068b8r" + "commit": "3b0a3a2200cd93497563812d4026c4d67b13e91a", + "sha256": "0pgn1j6fpj2qjns2zvzaswk5l65mkd6sxs08l6z0q2926gb7dpx9" } }, { @@ -6760,11 +6776,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20210110, - 1317 + 20210713, + 1426 ], - "commit": "411ecdf6e7a3e1b4ced7605070d2309e5fc46556", - "sha256": "03jgfrpjlvn7fkv9grcqayphz2bjjkfh4rd6k1s7vmdpd3hm0xpb" + "commit": "7f328a886ba4dd01993d269eee01c8ee3d0ddf52", + "sha256": "1xfap2db1ncfdnv8d3vdn8gxgkzamz8vz9jsyn0jiminhy0hb2na" } }, { @@ -6775,11 +6791,11 @@ "repo": "jcs-elpa/better-scroll", "unstable": { "version": [ - 20201013, - 1355 + 20210715, + 1004 ], - "commit": "eaa8dae6f048fcff773f3cca2e3113c52ad0463f", - "sha256": "0r8g5gc454mnk6jbmdx56dfjkw57003c677csb30pf15fxnxp2r4" + "commit": "eb389204f9dadd8a040a78e79a17732daca7e253", + "sha256": "1m3v51hnhrfxpqqalkx26d1x6v109w83w7h5mwfa64hmgpax9r7i" }, "stable": { "version": [ @@ -7022,14 +7038,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210625, - 1718 + 20210714, + 1030 ], "deps": [ "bibtex-completion" ], - "commit": "ee09acded11c160001e60c47de700e5fee6e9426", - "sha256": "0i4476gydsyandyb3r53hk8izx9jpmg03ny8f4glxcvlsm1ysvzf" + "commit": "f5b73bce4fcc31d55044d17949569b35dc50283b", + "sha256": "06wv37ck15i4m90lwksyc4zq9pwx4ljr90g8yqjmmracpgbm967y" }, "stable": { "version": [ @@ -7869,8 +7885,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20210323, - 1836 + 20210703, + 238 ], "deps": [ "cl-lib", @@ -7879,8 +7895,8 @@ "flycheck", "yasnippet" ], - "commit": "bc5572f796bc3ecafadadcbd93de73052304c856", - "sha256": "0x1lw3cx9vx0l9xr9683p2385msny8dkp2w5l6kfa8imbyclpkp2" + "commit": "1e3b6a8aee9fa7c113468838c5b647080caf3703", + "sha256": "1h3j7a1y5p90dd1vj4kyngj5xvbr2z4dkzkq74s85bqf61j66yw2" } }, { @@ -8556,16 +8572,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210624, - 1642 + 20210707, + 1745 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "4a226bc410ec7b5b0323879b03aad73be1b69728", - "sha256": "02l4wh4qykbk58cda8l3cyg4lpf5zjr0ss4927ac48nlxnawcrsa" + "commit": "25c44a39742b21122e1e2adf1f6c5828148cd3ee", + "sha256": "130304bmlz46z6g56bsr745zfb8mxw5kzkslb8vdz7hvcp75wfc4" }, "stable": { "version": [ @@ -8664,8 +8680,8 @@ 20200924, 345 ], - "commit": "2b12ed29cbcd733ad21d91475d1fcbd4092c604e", - "sha256": "1x9vayhq5cpqglkz4bzd9iaa1p0j0qsvh5pr6vkqi2z1nrjcwi8g" + "commit": "a14568210e212a4dfb93898218c4df58ff204089", + "sha256": "0b7lc14sn88r3wf8yqnx41wr704fm8kd6nxbd4874jaw01yp8x63" }, "stable": { "version": [ @@ -8685,18 +8701,17 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20201226, - 2149 + 20210716, + 1006 ], "deps": [ "dash", - "dash-functional", "f", "magit-section", "pretty-hydra" ], - "commit": "097f4349920215bdd829fceabc1afdbba172c32a", - "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" + "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b", + "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24" }, "stable": { "version": [ @@ -8911,14 +8926,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20210621, - 845 + 20210709, + 415 ], "deps": [ "map" ], - "commit": "c6d6aaeded0ef892af307652503de21db2a2a5b3", - "sha256": "1ic6qgmcj4l7a4775wwz45qwadj4ha4z3v2qlr4s54hzzldwc9w7" + "commit": "a67a026db0937b26c0b7a2fcf81bf44498ad2dd1", + "sha256": "0xck02i9l0yw7yzy6sgzg17k2hyqaj9lvafp7r229xzw8rdzl8cr" }, "stable": { "version": [ @@ -9601,7 +9616,7 @@ "unstable": { "version": [ 20210311, - 831 + 830 ], "deps": [ "anaconda-mode", @@ -10154,8 +10169,8 @@ 20210621, 654 ], - "commit": "720f9145d88b3e54b5388742c8a1a2b963d74581", - "sha256": "1mgjw93b5mag1ivvxsm416nkvappi4rkddpjlpjcvqw7lwzgps3d" + "commit": "614a8d94f67cdc1eeef8371f7b6b90aef8a78158", + "sha256": "1i9la8rh1sgvnk1kwd180x3daaglh3xzlbbfirnjsiqn3yyl9flk" }, "stable": { "version": [ @@ -10409,8 +10424,8 @@ 20171115, 2108 ], - "commit": "3a5929f70b2b258e4786f86383edee6db76bd5a7", - "sha256": "05a004z6lxafi9x16br3hhflv7dr1ndlgqrfsb88rjm17w6afpc3" + "commit": "d87317f360d64b5f68809a564d03436d2b07e96a", + "sha256": "1g2q4fg95wpg1d77zrk80923553w2sgsby3ylrrq92y11ks4yiq5" }, "stable": { "version": [ @@ -10860,6 +10875,21 @@ } }, { + "ename": "chemtable", + "commit": "5ffceb52fe572dec4203b6cb8f48da23a698cc06", + "sha256": "1s1fscgp6b8haq30fxvbxrczgzzs2sh3ggq6ib3ydyxa1vp6aggp", + "fetcher": "github", + "repo": "sergiruiztrepat/chemtable", + "unstable": { + "version": [ + 20210713, + 1551 + ], + "commit": "05fc1449db497e715b33b8e08359fa17c3148c7b", + "sha256": "16sdhias8ws93lhfhbf5hm05gff1r3imphk7gdziy51xfgyml619" + } + }, + { "ename": "cherry-blossom-theme", "commit": "401ae22f11f7ee808eb696a4c1f869cd824702c0", "sha256": "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w", @@ -11041,30 +11071,30 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210622, - 44 + 20210707, + 2147 ], "deps": [ "dash", "seq", "ts" ], - "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", - "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" + "commit": "524ba9592fc7095209e380392915b376f75bec00", + "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" }, "stable": { "version": [ 0, - 8, - 1 + 9, + 0 ], "deps": [ "dash", "seq", "ts" ], - "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", - "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" + "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", + "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" } }, { @@ -11113,20 +11143,20 @@ "deps": [ "chronometrist" ], - "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", - "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" + "commit": "524ba9592fc7095209e380392915b376f75bec00", + "sha256": "07fclq7dllz4nsrx51j4vrds1ciylxhkp9g945vc7xk6bi8syl4d" }, "stable": { "version": [ 0, - 8, - 1 + 9, + 0 ], "deps": [ "chronometrist" ], - "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", - "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" + "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", + "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" } }, { @@ -11185,8 +11215,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210625, - 1100 + 20210706, + 1151 ], "deps": [ "clojure-mode", @@ -11197,8 +11227,8 @@ "sesman", "spinner" ], - "commit": "af140ced2286ff646471b067b94c2b18d42616df", - "sha256": "0nwh1pi31jrhxjxy7q92hpis5lf1k6f6l6k5vdb0y2lfsd7acqii" + "commit": "fe8cf244fd3426261f9f630c981a6296afd433a4", + "sha256": "02xj7g6jnwd9vjr8jipqvwy89zadkzsak08pq8418hz2af26bvaf" }, "stable": { "version": [ @@ -11383,20 +11413,20 @@ }, { "ename": "circe", - "commit": "a2b295656d53fddc76cacc86b239e5648e49e3a4", - "sha256": "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07", + "commit": "8229522ba39b4b542421664ad3fef76439fbbfc9", + "sha256": "0wzpx6qpl89zixbsqyfgmda35qbjpqyq60xm61qjzi36hf9f9wcb", "fetcher": "github", - "repo": "jorgenschaefer/circe", + "repo": "emacs-circe/circe", "unstable": { "version": [ - 20210614, - 912 + 20210713, + 1609 ], "deps": [ "cl-lib" ], - "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", - "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" + "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2", + "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp" }, "stable": { "version": [ @@ -11467,8 +11497,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20201031, - 1642 + 20210709, + 602 ], "deps": [ "dash", @@ -11478,8 +11508,8 @@ "s", "string-inflection" ], - "commit": "0857973409e3ef2ef0238714f2ef7ff724230d1c", - "sha256": "1vi62fzl3bcn24j7pvb39jdf1njrdvdvwz88qlz6l0ijaxhrv0vp" + "commit": "dc118772ad4585c0511f4f8f25c81faf69952038", + "sha256": "0v8z6fhrsi9kszqcbrm1ggvin0jff744byaiw06d3id1hc428iq5" }, "stable": { "version": [ @@ -11545,11 +11575,20 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210701, - 1448 + 20210716, + 403 + ], + "commit": "813e8c32a41f84ff099feddb5a4d5a51c5c200b5", + "sha256": "02482ln1458hb6z1x89b7294q4bwwdqi08h6m0mmvgd3vz2nwmqs" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], - "commit": "01ed8539e8068f1e1ff658ab4b1931d9b7907809", - "sha256": "1ihxy871wqdpy3ri77kl1wwd21bnl484x343z9xvggl9z6dz8pw4" + "commit": "dcb5ec12d077c9a8f1c165a0868f98098494f78c", + "sha256": "1mf0d9avyhz83kb5fz2flwwn1knrbgrs0245q0layda9bya5i5yk" } }, { @@ -11576,36 +11615,6 @@ } }, { - "ename": "cl-lib-highlight", - "commit": "696c79669478b0d1c9769cc6f0fe581ee056cf32", - "sha256": "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8", - "fetcher": "github", - "repo": "skeeto/cl-lib-highlight", - "unstable": { - "version": [ - 20200210, - 1951 - ], - "deps": [ - "cl-lib" - ], - "commit": "72afc4dd0107c357543244d09903767f49651c5c", - "sha256": "1ndjjdada219fgs68np4r7vg50s2h6060wd6wf0x3pnj8b0ca5wm" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "deps": [ - "cl-lib" - ], - "commit": "c117451df8455769701af6c8e92a8fb29c05e1fa", - "sha256": "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw" - } - }, - { "ename": "cl-libify", "commit": "22088f8779652072871d5c472c67f34bd0470129", "sha256": "0p3b57vfzhk348hb7bcnkq4ihi4qzsy4hcdvwa1h85i84vwyzk5d", @@ -11636,11 +11645,11 @@ "url": "https://git.sr.ht/~pkal/clang-capf", "unstable": { "version": [ - 20210625, - 1107 + 20210707, + 1127 ], - "commit": "e422f339395aac6d023954880d19bc76a0d1072d", - "sha256": "1gdd674m1vbl8acwsgx6qfmx1gr7h8a6yadzp1jjaandpmc9jlrf" + "commit": "258863d5cd77d2c9d07cc5dfa41b20db22a178f7", + "sha256": "1zg192hy2mf6r6fiy2ahkprxjnb79lh9n6wv6nvxqnc5cq0969i4" }, "stable": { "version": [ @@ -12188,11 +12197,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210505, - 712 + 20210706, + 1318 ], - "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", - "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" + "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1", + "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak" }, "stable": { "version": [ @@ -12218,8 +12227,8 @@ "deps": [ "clojure-mode" ], - "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", - "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" + "commit": "3e426b3a479f479963f2c7d1147cc826ed1a0ee1", + "sha256": "16smnr1hlbv347wnzhncasz5ihy0sb4fcpx5dw9v8az5r3q8xpak" }, "stable": { "version": [ @@ -12521,19 +12530,17 @@ 20210104, 1831 ], - "commit": "bf6c9567920965f7b3aba37079cc1b51f31d969d", - "sha256": "1hk1qmvw9hmq8xarcnc3pspgsa2fkr8cra8g43i12b8011dz6hpb" + "commit": "4e17e90988e9f23dece4c04f574d456309d7a50c", + "sha256": "1gqbgs8zxn9dcpxmbykz0mrqy6p229b0pdz3hnk0kncqkk004lx1" }, "stable": { "version": [ 3, 21, - 0, - -1, - 2 + 0 ], - "commit": "e610e99ad34a545ac67f1977e78ea59a52fdcf79", - "sha256": "1jss6aavq89kmhdbjml6qamv9jm92xf74g1wz4dsr36wh0mypgfk" + "commit": "ff7a2e37bfff23ce1751a93b3eba179fbf32a9b6", + "sha256": "061cjj5mni91p6b0mpp6a2zrkrmw1hc3l4cci6lcqbx733y192fq" } }, { @@ -13157,8 +13164,8 @@ "deps": [ "s" ], - "commit": "61244e12594f117ffac047454311212604399d52", - "sha256": "104iq411nwnv3dnm5x9myn4vf36yg3v46jcag9ln0cj0kypmjdrv" + "commit": "e91006ba4a77b8ea8c4fe4085ba5676c97cf0315", + "sha256": "0icjcmfmwdwas59425baf2s3zw2iblidx6v3jy6k53y1ac5qn7iy" }, "stable": { "version": [ @@ -13390,20 +13397,20 @@ "repo": "pzel/commentary-theme", "unstable": { "version": [ - 20181213, - 1045 + 20210714, + 1757 ], - "commit": "dede0f8ecb72156fa6ae81198ea570ead02997ff", - "sha256": "1ykicd6yp495s7795mlfwd54lp0427j8mw6ajbqsw2c2w0f7jcjr" + "commit": "a73e1256f667065933e96bd6032c463cb115201d", + "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "9a825ae98166c9dbbf106e7be62ee69dd9f0342f", - "sha256": "1x30iyvvxggbh7xvp8lwpirvpqijchqf2fdaw4xrlbw5vajlaxcx" + "commit": "a73e1256f667065933e96bd6032c463cb115201d", + "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98" } }, { @@ -13492,11 +13499,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210618, - 2105 + 20210709, + 1110 ], - "commit": "1fd1b363eee68e4cdcf0e610005c0bdbf9940604", - "sha256": "00502ffyfx9zc6bs2pzn3zj3rj2zz8sdm1g046ijkgbya8wszkcm" + "commit": "d77184094b9a45b204813d824918e1ec2aac8504", + "sha256": "09f59ipp6c2b1xpnmk82ygxcfkfhh36h4g1c07dmxf7m3z1hwlgi" }, "stable": { "version": [ @@ -13634,8 +13641,8 @@ "axiom-environment", "company" ], - "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", - "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" + "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", + "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" } }, { @@ -13666,8 +13673,8 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20210330, - 1155 + 20210712, + 843 ], "deps": [ "company", @@ -13675,8 +13682,8 @@ "dash-functional", "frame-local" ], - "commit": "aa5f09a5492344e3cc831f0f169a6a8345dec358", - "sha256": "15wbhf04qj8wplf03hbwixhwbrw3r3vb2ih2lvxjhgpg0lq1gjz5" + "commit": "156f65cfbf690ed84e0e84f90277d665d873ff24", + "sha256": "1lafm8kpn0i688gk53711mazksy96c7fmr8qhjmdxpxwdk56jcy2" } }, { @@ -13737,8 +13744,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210420, - 215 + 20210708, + 2357 ], "deps": [ "cl-lib", @@ -13747,8 +13754,8 @@ "dash", "yasnippet" ], - "commit": "6a23da61e4008f54cf1b713f8b8bffd37887e172", - "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4" + "commit": "382db93374380e5db56f02934ee32bbe39159019", + "sha256": "1vlbw54a02qy77ad2qgd6sy7y3b6x1y1nm3bjxcd7f67hnncjg0p" }, "stable": { "version": [ @@ -14013,16 +14020,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210608, - 1454 + 20210716, + 926 ], "deps": [ "company", "ht", "s" ], - "commit": "b35c6fd89ad111c662916751cf8b3facc8acb1c0", - "sha256": "0h9ly6jpbkbcraxs8l0245vqld61jap1vw3cfrbp885jyyzpfb0v" + "commit": "b4fd1c8d128ae345176f713dad2c04944a9cf27c", + "sha256": "1fhkc49xp4yfqry6a0w7bsz80c7v5kc60jzd3ran0yjr9q9yzx8i" }, "stable": { "version": [ @@ -14809,15 +14816,15 @@ "repo": "jcs-elpa/company-quickhelp-terminal", "unstable": { "version": [ - 20200904, - 305 + 20210715, + 1010 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "c2e077e8d32610f80a506c410ab51a4ba747a47f", - "sha256": "014gk5ara9xh218wm2ygh2nilyp3s1rbg6y5y2z2ki460biwi166" + "commit": "2e82273e206f78f015e67f799f51e3f3458d6d94", + "sha256": "0miylw8lhs4jgfa47mis6k68jm69jwbmpgms0dl9rnjgpmyvr133" }, "stable": { "version": [ @@ -15706,11 +15713,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210629, - 1951 + 20210716, + 1219 ], - "commit": "6ce9aa58e74da92e391cfe938bc3da4f47ab591e", - "sha256": "1ji5ilakwahipp23avzjpi5vfp5f17pm6m1prygk065zqdianrv9" + "commit": "5fb6248c8e12630ce1247985c67ea28ae4077e4f", + "sha256": "1cgk144alm3pbig9acm62q3r7479x69ig76q3z6agamdvf91ay29" }, "stable": { "version": [ @@ -15838,14 +15845,14 @@ "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "consult", "notmuch" ], - "commit": "5cc6684f6e9cbeb23a06280a1cc9332658d37514", - "sha256": "1s1imciy8yb3kkgbdsqsvlv0j40sm94lvv9z5kq58w6n9c2dmb48" + "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", + "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" } }, { @@ -16205,8 +16212,8 @@ "ivy", "swiper" ], - "commit": "040d458bce4a88f37359192061bcea5ebe87007c", - "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" + "commit": "56139df678d9886d0612c0a192cce2cf6f156628", + "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" }, "stable": { "version": [ @@ -17226,11 +17233,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20200330, - 920 + 20210715, + 133 ], - "commit": "9625228cbfce29ac3b443c6eff893ff828268f7d", - "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31" + "commit": "7412f3df0958812bfcacd5875a409fa795fa8ecc", + "sha256": "0jfdak85r9j0qlbzc53mkbfqqgqs9ghg0x6fhlv8i22873y650gm" } }, { @@ -18053,17 +18060,17 @@ 20190111, 2150 ], - "commit": "e7e5d1dc652755bd0ac0a45e4f970b1a2b137308", - "sha256": "0900w9ddx0i942spji7jg6ssv9d898isggzy9yjhirwn8fs0a2jb" + "commit": "5bf5aa63d6b6742144071a2af896067c21b3752a", + "sha256": "1nnyca4bagdbpmzy64pqy95vxbj3dx7lfbapvs120zbpxj193p7a" }, "stable": { "version": [ 0, 29, - 23 + 24 ], - "commit": "17670781083e3ccfedb1af4adcec614d4599eef9", - "sha256": "1yri0ay0p3p80h9ypq692470y1b99y4hk468zqlmfzb87yv8vv7j" + "commit": "3a34c5fb48ee86be9d0a819fee1ff3cb3efd1a1e", + "sha256": "0jsbmgqxhyjsrjc2h6lw4yqjjqaiqmgz4yjg580j76q8zk9vkjyb" } }, { @@ -18261,8 +18268,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210519, - 1554 + 20210711, + 1427 ], "deps": [ "bui", @@ -18274,8 +18281,8 @@ "posframe", "s" ], - "commit": "cc395e066755c7513d4862f5639f3d162b3bd30f", - "sha256": "0nmpldvkhgi668zpn5wym6rfvsdnib9ny2snzwsrrfgqa70lmky6" + "commit": "685168efc72e61bca2a248155bace7ec633269a5", + "sha256": "1mwy92rj9jj4ziflhzpy774vrp5m7zwzy2x1iyj33mn2rmykwl2w" }, "stable": { "version": [ @@ -18528,20 +18535,20 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210609, - 1330 + 20210708, + 2009 ], - "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", - "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" + "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", + "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" }, "stable": { "version": [ 2, - 18, - 1 + 19, + 0 ], - "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", - "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" + "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", + "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" } }, { @@ -18607,20 +18614,20 @@ "deps": [ "dash" ], - "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", - "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" + "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", + "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" }, "stable": { "version": [ 2, - 18, - 1 + 19, + 0 ], "deps": [ "dash" ], - "commit": "1a53e13d7964c84cf756ead353eb6dc094b65fd5", - "sha256": "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva" + "commit": "2675596b9ac1c4b9d47b93e227f06f8ec6755ec6", + "sha256": "0wycrcl79mv253vzf2y92qz9i52mi5xa82f9i4rgnqa02f2m633h" } }, { @@ -18631,14 +18638,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210427, - 705 - ], - "deps": [ - "page-break-lines" + 20210714, + 305 ], - "commit": "9983aa0838ce5a2219ef4b674e6b37de41b5b585", - "sha256": "1mi1jn5gknvs7xjgj2v4dcq7z1a7xknksgfqi66bby7cl6cr3hqd" + "commit": "09932ef488b47c6b645a081fee4a82be437f98d8", + "sha256": "1kfsc5f37i4k4j8rqmi70cd6yvwxhhq2q513gby8qj2bqsgiwkhb" }, "stable": { "version": [ @@ -18688,8 +18692,8 @@ "f", "s" ], - "commit": "91b3c79aa3af3842f1477825f967370414dc77b2", - "sha256": "0q456m64wkbwxc99bwr8b3n7z2f2qkrbcdij0kji35rg89rxbgph" + "commit": "947c8c99e9abb38852d895f8792258783e3c4e1d", + "sha256": "1iwm1kzjbvfamdzz79bkyq848z3wgr3cf2692dmfah58gy5wkb0z" }, "stable": { "version": [ @@ -19275,8 +19279,8 @@ "s", "wiki-summary" ], - "commit": "8df0505babf930bafe3fd28d472cc325637f886b", - "sha256": "1czdnvwf2z0za296sn392w52hb2akw2sh27f3b7nw0987iz9qa0s" + "commit": "1861c57e67315bcb1ff88f37184cf7e2d6167642", + "sha256": "104dfryn6ql2a4l7nd9x0984qpyxhn6kv0432h1lha5adb8g1h10" }, "stable": { "version": [ @@ -19361,11 +19365,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20210101, - 1519 + 20210707, + 1633 ], - "commit": "c4af44827f4257e7619e63abfd22094a29a9ab52", - "sha256": "0xphl5r8q884ml6clrfrzaiqznfrrpsvysakigjqpgazic5d60g2" + "commit": "28be94d89bff2e1c7edef7244d7c5ba0636b1296", + "sha256": "074d8apvfp9na14q080w14i9ixbswvp7akjyv8gmxmy5im4gm0y3" }, "stable": { "version": [ @@ -19653,11 +19657,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20210629, - 1601 + 20210703, + 306 ], - "commit": "23e62096b98b9b509efc453d7fee0810acea4bf8", - "sha256": "0f6ld4m1x419677snbpd3qyx782zpj61rahphgc5nfj6aanvll0w" + "commit": "f8572f208d58b2122df63ffef87fdd5112d83233", + "sha256": "10ywfkkczi6hzcz4hnjqxr77708hi22hgrvrykmwrh4lsfxl0iyq" } }, { @@ -19876,8 +19880,8 @@ "deps": [ "cl-lib" ], - "commit": "1077c734b3b6de02c80456035a4939b028cb4179", - "sha256": "18vk7rhysavm8j02kd4lw6j6zr2l13gyvrjxq7psy1flhvmkxknc" + "commit": "d225def4a473a16ac994124e063695ef9cef3308", + "sha256": "1wizqf5qj0bxx9b5d0j726in1alqv0wy508y5ivaw7hcyggkg9i7" }, "stable": { "version": [ @@ -20135,6 +20139,18 @@ ], "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dylan" + ], + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -20168,11 +20184,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20201206, - 1238 + 20210715, + 1026 ], - "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f", - "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8" + "commit": "fcc43f38431d4b16b2fd8d15e799488a7fb60966", + "sha256": "1r5a98viw7j2nfmhgf5v9whkya3h9s392drz764a9ivj2znc0qg5" }, "stable": { "version": [ @@ -20289,20 +20305,20 @@ "repo": "HKey/dired-atool", "unstable": { "version": [ - 20181228, - 1422 + 20210706, + 1456 ], - "commit": "52ce4ac88fa39a0ebdf732435fd831ea9a8d0764", - "sha256": "00br8f8rw0rrzmi3nvacwn14d122jw243z1izlsm8h8q95hh8f6l" + "commit": "c01e0a79c952a29db17c262c9ce8a90632b04b3a", + "sha256": "1r44s3f29p70li6k6646xcby3ypz1ljgd4j1fhdd0x4d7a09zl0v" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "09dbb769fe02f546da470369a12468ab4a0cceb2", - "sha256": "0j2dz4vy4i22185hhlwg2kprpis97xb12qvfdhvdcnz2vwy61sxa" + "commit": "c01e0a79c952a29db17c262c9ce8a90632b04b3a", + "sha256": "1r44s3f29p70li6k6646xcby3ypz1ljgd4j1fhdd0x4d7a09zl0v" } }, { @@ -22079,8 +22095,8 @@ "deps": [ "s" ], - "commit": "32196031f60627e88a67b676d643ab51c251711f", - "sha256": "19bm4fr38hkh6mrbf0vgafwq2hfldkcn2b5flllvizq2qh86hq81" + "commit": "5b80126a71662a4bcd3dff7cfbcf70954610092e", + "sha256": "0ywm29gfqfb8dhv3mwwb8fx1vl363gkhba9vdkx0w3r2wvh17l80" }, "stable": { "version": [ @@ -22222,16 +22238,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210627, - 1731 + 20210706, + 604 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "07d03c4626eaaf2cc9c346308add3700ad4a3a06", - "sha256": "0c9g5i9cyqcc934rz778zia24bls99i9hfl0s61354ncgw4qndfy" + "commit": "06606e0b8b3c19fbe56e25702e2a664deec593c3", + "sha256": "0akyzih955j2ijnrvfnajwpml5xb3v9pg9wbn4z8nkcw33hvxgk9" }, "stable": { "version": [ @@ -22275,14 +22291,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210701, - 707 + 20210714, + 1511 ], "deps": [ "cl-lib" ], - "commit": "bd5b9065dea54472519da67ccfcc3185bf5e35c3", - "sha256": "0g12rlkfg9ijgd2csrcmcqf6yrs33x9gfkw3g7azp74pvx3cvcmi" + "commit": "b7995ac041f8dadb021cd2445e85d29c9bf718ae", + "sha256": "09hhplhb0832ja9nnsq3d4p6g0fdw2sp9kl2y4n2kk6zq909ar54" }, "stable": { "version": [ @@ -22936,11 +22952,11 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20210213, - 757 + 20210715, + 548 ], - "commit": "846b38c1efab4757240d131d2c45102930fc305c", - "sha256": "1vw500g9jfa4za1f0r90bzzb6ra9jyn52z1g4nwvqcnha1sixj7m" + "commit": "48bd29decb847bd9357aceeca9ad1c916f199913", + "sha256": "02fy271d8s77l2g4rykgpnqvy4sq2ri88xz97ink00r1r12cdvk9" }, "stable": { "version": [ @@ -23066,6 +23082,15 @@ ], "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -23188,14 +23213,14 @@ "repo": "ahyatt/emacs-dyncloze", "unstable": { "version": [ - 20210613, - 1956 + 20210712, + 145 ], "deps": [ "dash" ], - "commit": "fe5baf6d324800779f80f5c6298a56e2dcb87598", - "sha256": "0c7bh3swwmfc1z834f79jakg1n6li5prd33r5k92id8kl18hb8fj" + "commit": "aafc5adc25c7f714b619109bccf92e475d6c84ef", + "sha256": "0l3y8xvjy0f2wacnh03i8ny06apcgyzvippsm8k80qhzjc8dxs2i" } }, { @@ -24869,8 +24894,8 @@ 20210613, 1418 ], - "commit": "ec135b5353867ce3564a675e99024944b834395d", - "sha256": "1mpc4gnrpvqvhfvjvp4hqb4x6nzn1kfzgsqi4sdjgbfjqll2jzv0" + "commit": "463f5e985fc53300f87ab7eb054d1738fc6ac93b", + "sha256": "122xbfag9ykvcwq549r3aglrdip1nk68abgqlzhm5mqfpqi0l8a8" }, "stable": { "version": [ @@ -25219,20 +25244,20 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210530, - 1641 + 20210711, + 1204 ], - "commit": "d51ce6152519b5cf32d0dcc40cad6787eb605997", - "sha256": "1nkc9fwg7fn8gvj4zg515320p7m2h3b1nyd6zzbp2v60qj7277jq" + "commit": "f9d034ff330d657fa3cbbb1df3a582cd417da78a", + "sha256": "13pd4kwak8fvzbmj8lcasxpi6m8i1cffrs6hg1wnd1j6w68jl4yg" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "70167056fd81e8477b0a5508cf7e28d7a48a2367", - "sha256": "1jfj4f5w20qd12k6ygv0jazn2x9pxjrmqmlmibppc4ybrhhgmg0s" + "commit": "2b6513ac12bfc73dd954effc68734bc84607b31c", + "sha256": "1agg69ji032k9a1r23cdcgb0ihmcxxlbjgsqx647igv3mw7r6ff0" } }, { @@ -26172,15 +26197,15 @@ "repo": "Silex/elmacro", "unstable": { "version": [ - 20200905, - 2130 + 20210716, + 639 ], "deps": [ "dash", "s" ], - "commit": "4888d1baa8b943adf0bab94419357c55b7e6e697", - "sha256": "0g1iavy7f0n14c34b808kv5sf3imvc9aqv5814r231i6qjck5vj4" + "commit": "d2e05012cee4f54fab6d8d8d6aced6e5eeef4f31", + "sha256": "1mmhgl85880bhhwibf9ksifghdc7w22vrhpg8y8rvpjh91fdg0lz" }, "stable": { "version": [ @@ -26254,21 +26279,11 @@ "repo": "jcaw/elnode", "unstable": { "version": [ - 20190702, - 1509 - ], - "deps": [ - "creole", - "dash", - "db", - "fakir", - "kv", - "noflet", - "s", - "web" + 20190608, + 1623 ], - "commit": "29ef0f51a65a24fca7fdcdb4140d2e4556e4bb29", - "sha256": "1bks7aakhvdab56gbsa44ca9kbilajisdd9bns485d9wr62d2lgj" + "commit": "305c532b6e59f58c4afcfb76466dbfbdc4e58b9c", + "sha256": "1214216wrdhfw3lbf59vnddk28hi4g3s1ksdi5walksihd3gh7my" } }, { @@ -26426,11 +26441,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20200919, - 1025 + 20210716, + 1445 ], - "commit": "3561c2815bc6bc896fc7a6da8f094edca48c55b8", - "sha256": "0vy1ak5gphnih90c1n7js91p0fdyccdqqbagdjqdfbpbir41gba5" + "commit": "7e0919bd74952fb229862f1280e01817721b7fc2", + "sha256": "13fjp20hf4jv3325ipnjrzqvxa122sfhs44dgsr52g9mkhhc6kbm" }, "stable": { "version": [ @@ -27590,8 +27605,8 @@ "emojify", "request" ], - "commit": "d512c2babb412820945444c6daf309b470e2eb12", - "sha256": "1llqn6ik0dnrpmvdxcgiyadbffjlbxqv6i7bxh2rnqiy4fhk9s1n" + "commit": "f05ab06436e13b3578f3d4d183fcb1bc3a4eeab1", + "sha256": "01dnab8mqz03rdd3xcb48csx56cv2ik07sykyqscbiib5vcw5k5k" }, "stable": { "version": [ @@ -27739,8 +27754,8 @@ "repo": "rejeep/enclose.el", "unstable": { "version": [ - 20121008, - 1614 + 20120618, + 2019 ], "commit": "2747653e84af39017f503064bc66ed1812a77259", "sha256": "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim" @@ -27880,7 +27895,7 @@ "unstable": { "version": [ 20130407, - 1348 + 1236 ], "commit": "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80", "sha256": "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd" @@ -28684,8 +28699,8 @@ 20200914, 644 ], - "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", - "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" + "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", + "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" }, "stable": { "version": [ @@ -28708,8 +28723,8 @@ 20210315, 1640 ], - "commit": "3517ac9f6b48641b949e19971a1a2d022b7494a0", - "sha256": "1r9adb0x370c3cj93lgaag2ifkgi954gh5hnshkr3wz8bpqirvk1" + "commit": "81c6d94625a04f6550e77a068489ca6378cabfee", + "sha256": "1kkjyradh316xcqsh9pn4l1nvz1krn8cm3zch0vfp47dkkg54w1y" }, "stable": { "version": [ @@ -28929,8 +28944,8 @@ "repo": "dakrone/es-mode", "unstable": { "version": [ - 20201125, - 2059 + 20201112, + 2317 ], "deps": [ "cl-lib", @@ -29570,11 +29585,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210616, - 1806 + 20210707, + 917 ], - "commit": "a5df6aa81351385e9813b722afcacdba1648226d", - "sha256": "0di7s1k9lizvbr4n59qhn6ipc67klcyimlkdqw4if7nkfjif5bsn" + "commit": "4fefd0feaae688e28d6a0c36c9eaa219c448903f", + "sha256": "0m9w0l6x67s5mx76ixgh42abblzi8jbp9xpps4flv08jhz1lkc5i" }, "stable": { "version": [ @@ -30165,15 +30180,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210628, - 1913 + 20210715, + 1839 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", - "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" + "commit": "070abb16620653fb343980fb85a13c4d55e1070b", + "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9" }, "stable": { "version": [ @@ -30367,28 +30382,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210701, - 1024 + 20210715, + 1552 ], "deps": [ "annalist", "evil" ], - "commit": "a24168ffe3711890b5dcd41041a51146bbd67497", - "sha256": "1pz046fw06lgc7gjrfr0a895j867mm96k8h5dw3k0p64rh1xh1sa" + "commit": "3bd5e90accbb3a12d924bb7b4220221493675591", + "sha256": "1nikhz4l01zi884dwyjfsaralc1pd6y70fvd36i4qn477xinsvk4" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "annalist", "evil" ], - "commit": "a615e4a7f642e0c3acd8628111624355380aa18f", - "sha256": "0dxrwcf5dnww0a9mvwjkcgm8ry3y282v9l85jh0645zk71nz1in3" + "commit": "d97e0ff4afa67bd19443245d4f663de29b043a6b", + "sha256": "0ssb3n1i67b6zp2j8djaalkr33x4c7zalw6vl6p5kqxkh8vy8cdf" } }, { @@ -31502,15 +31517,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20210609, - 509 + 20210713, + 1456 ], "deps": [ "cl-lib", "evil" ], - "commit": "a9b9b39a7915e66b7d5da9cecfaf002c72d08196", - "sha256": "01ikzxvm878k0xwj10h3ww02459g3jiz4fjsm481jw1jjvnxg5b2" + "commit": "1a28d718c835a21591a170af78a03a366cd60c0d", + "sha256": "1dm73xmlhznh9yc22ifb238yyad09011nryc91n6glla347896p0" }, "stable": { "version": [ @@ -31693,8 +31708,8 @@ "deps": [ "evil" ], - "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", - "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" + "commit": "070abb16620653fb343980fb85a13c4d55e1070b", + "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9" }, "stable": { "version": [ @@ -32398,11 +32413,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20210624, - 1015 + 20210708, + 1952 ], - "commit": "519e92eabc470fe1792d8d4a37c98e76cf195840", - "sha256": "0rh5li9i6nz81mbji87dnv5ly58rl5lphlvjx4m0hb7dlqpw0db2" + "commit": "95a773bd8f557cbd43d3b2dab2fa4417ec5927ab", + "sha256": "05zdh71zkp2n740dcixanw9cziw93rkix2bb24vw9phkj271m0d7" }, "stable": { "version": [ @@ -32916,14 +32931,14 @@ "url": "https://git.sr.ht/~pkal/face-shift", "unstable": { "version": [ - 20190818, - 1551 + 20210707, + 1127 ], "deps": [ "cl-lib" ], - "commit": "8c62d7a27a0e3092942742362ed73e17e254e904", - "sha256": "028b3j7rp4z78285r8w4db8dx9j6zlqp8aw4y0pvd4ifqbs5wh05" + "commit": "0170ab2993211eb0f514f7d1ce14e8194a11f6b2", + "sha256": "0zj9h3nmswpc7q02a76rrzw3ypjwn1lwq5mkm6s28q0xrdpmrgq3" }, "stable": { "version": [ @@ -33463,11 +33478,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210624, - 1431 + 20210713, + 2129 ], - "commit": "f37a3de72c6cbf37f82d4b2f37d9009af5058099", - "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" + "commit": "0f83112e70c1cd13a8b98e9e75b2291fcdf3d57f", + "sha256": "1n1f9bn8447aq3666q9lj7idzj9nwkmknfzybk3is98m03cjki3z" }, "stable": { "version": [ @@ -33509,8 +33524,8 @@ "f", "s" ], - "commit": "164fb15d70adbc186eb2d987f5c5143aa7336659", - "sha256": "0i6r2mlpahrnszr9vk476iqvc1c8cpp6wn6fhlnz6vw4dybpw5p5" + "commit": "142a7a5ecd79b4a3db7ce3dfdd0d87ceeedab468", + "sha256": "1lmfnc5nljghqapciaqrvmj177v3m1ybndf7mjj74d6n41gphwcj" }, "stable": { "version": [ @@ -33678,11 +33693,11 @@ "repo": "jcs-elpa/fill-page", "unstable": { "version": [ - 20201105, - 452 + 20210707, + 354 ], - "commit": "95f82f93848ca608d4c4d9ec7386d94745cbc691", - "sha256": "10kgaq1da5zgz2dzagw2fc5hlh4ik5z6vyfw0lqd7bqpjfg62kgr" + "commit": "cad66696f334f70adf2b8bdf9910852c017dbdd0", + "sha256": "0jg7gppjf39qzwb44n1q7bikhqvxs5hr4yd403v7apf75z0hpc3m" }, "stable": { "version": [ @@ -33957,11 +33972,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20210621, - 1933 + 20210702, + 1631 ], - "commit": "85e0eba018bca70040faea19996b43ce8e543cad", - "sha256": "1mv0gphbp976ncfif2jbfrmkayh0lp5cjqmiimhw1inw7ps18k5r" + "commit": "eaff81f867d9c84e25891368f3d0cac7513984e8", + "sha256": "0gc77fkc6jczb52f5hil3h0hv74f7cxbijc8mjprh7zzgb09b6za" } }, { @@ -34178,19 +34193,19 @@ "repo": "jonnay/fix-muscle-memory", "unstable": { "version": [ - 20160823, - 439 + 20210702, + 1755 ], - "commit": "a123e04f8a1d2982cbf930efb909cad9522ac884", - "sha256": "0mm6dl7017x5l43jf89w4nn5hcyi4fm160d2rcqx5w6dwb6f0v27" + "commit": "b8d4b8025d758762f4459c70c3a7a209ead865ed", + "sha256": "0g3rg7bg256ymkby33nd5yhaf24216ghhkwvcz1vl54yzyfv8w2x" }, "stable": { "version": [ 0, - 93 + 94 ], - "commit": "df687aea23c6eac4b751f993893c2fd56e5a8a3b", - "sha256": "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc" + "commit": "b8d4b8025d758762f4459c70c3a7a209ead865ed", + "sha256": "0g3rg7bg256ymkby33nd5yhaf24216ghhkwvcz1vl54yzyfv8w2x" } }, { @@ -34331,19 +34346,19 @@ "repo": "Asalle/flatbuffers-mode", "unstable": { "version": [ - 20200822, - 957 + 20210710, + 1004 ], - "commit": "c0e9dc220db5f08410f40becf03531938484cb6c", - "sha256": "0dahs0q004pgalxrll1f8995q1ws358fk87a1jkm3fazl97p7gx4" + "commit": "8e7783db45a64c9456130fd0c108ac12d45a7789", + "sha256": "1g446s8xhgcrkqhl08d6l68gga6n3c3hdk4z3bazglfwycynhpp9" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "1b563b450e5353797083bcb03ab02f456e9a7361", - "sha256": "17g7y2nzhdwzck63miks4kn2w1nlari0qkc5v6lc4ksiaacispfb" + "commit": "8e7783db45a64c9456130fd0c108ac12d45a7789", + "sha256": "1g446s8xhgcrkqhl08d6l68gga6n3c3hdk4z3bazglfwycynhpp9" } }, { @@ -34701,14 +34716,14 @@ "repo": "defaultxr/fluxus-mode", "unstable": { "version": [ - 20191001, - 1716 + 20210715, + 58 ], "deps": [ "osc" ], - "commit": "3d05fa15f141ac3e936f908097bb7eb6295cc367", - "sha256": "0axjlvhv3xwg16zkpskqp9kvb1x513jl329pmrjzazn5mdh2m8cw" + "commit": "a14578640c578a4fd09cb7e25da1e87d637719ae", + "sha256": "1k7jiagsbydr3vqb2r47dh3hp3g94vpfwpc3ds9lv6shv3h669d5" } }, { @@ -34800,8 +34815,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210321, - 852 + 20210708, + 1337 ], "deps": [ "dash", @@ -34809,8 +34824,8 @@ "pkg-info", "seq" ], - "commit": "f8c679fff349850c80541a31de50009c3c15d4c9", - "sha256": "0v0zyq7zn89j036sp8ijxwpb0n435sf444ki618y7mv77k2qflxx" + "commit": "21d52264aa80bfa4ede94c59e37a20fb6d033b0c", + "sha256": "1k2fqiy0aw30za8d8bhia996ab168j61m8h1s9zi7d5y32q1csnh" }, "stable": { "version": [ @@ -35768,14 +35783,14 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210627, - 1018 + 20210705, + 1656 ], "deps": [ "flycheck" ], - "commit": "8f13de89134e9708b2a24a040a0335a7302632f9", - "sha256": "1acwvndq604gl5n3985mj5v70vcl3d12vh6bzs5nz5xyr8c848z7" + "commit": "061ce63d217b7cd165c487d81331843dea5bc11c", + "sha256": "088g4vi01xanjm5dyzlw483h8w3dyijjccla37zfa55cg0nksdd3" }, "stable": { "version": [ @@ -35804,8 +35819,8 @@ "flycheck", "grammarly" ], - "commit": "8321fc98a0809cad17e37ca924d364423c37b8c0", - "sha256": "1pga651wnvw3czqshn731nx0cdaf157v7v1c5n7kh95lc2r3jmn3" + "commit": "abab9e6fadccd6e239f3f7efd91b155c9d5cd716", + "sha256": "1y6v3d4xnlfqcvl5hc4b0y6san1mnf2mx6hcvlbxdphhf12hp560" }, "stable": { "version": [ @@ -36224,14 +36239,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20210629, - 536 + 20210715, + 946 ], "deps": [ "flycheck" ], - "commit": "6ade9d7f294cee7e41d0bce9dddb139c49985501", - "sha256": "1yq2n7bknw7by1cn53xn7kz8a3qj1w7szsjysaj93mhxb154g9qz" + "commit": "c4a1dd0b23b8b25ba706eed48ae7d3e97bf4f349", + "sha256": "1zcp9brh9cygga0yflw4saf7bf503ll1l4nmhf79h039xm7p3rcz" }, "stable": { "version": [ @@ -36583,28 +36598,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20210617, - 2237 + 20210714, + 1805 ], "deps": [ "flycheck", "phpstan" ], - "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", - "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "flycheck", "phpstan" ], - "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", - "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" } }, { @@ -37728,8 +37743,8 @@ "deps": [ "grammarly" ], - "commit": "bc7c7e74013816ea06463ff85627bdc08ad60d9a", - "sha256": "0yj0mqyg0c87kvxz21y0wmfx97lwvym6qm3sdppgkff5fwppyj91" + "commit": "06ba82495614f1dfaffb8894f57789156586448c", + "sha256": "1lc3nv7km5m19l673agh9rxv9afllf7sz4sv0brgp1sbmks1il3b" }, "stable": { "version": [ @@ -37981,8 +37996,8 @@ "deps": [ "s" ], - "commit": "5e44d7ba7153d20a01428bff98c1949a7a0eb753", - "sha256": "19149wr4plng3n1bpfd49ja1phd3sbyrxa6vk47qh8xc7x1ra309" + "commit": "5c93f538978f2d272e5210b27f5255ee87b6b61f", + "sha256": "1awd69ns238ia27k2njlx65gkyscxzayyyx777rbmy6g259bndzq" }, "stable": { "version": [ @@ -38186,26 +38201,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20210617, - 2223 + 20210714, + 1805 ], "deps": [ "phpstan" ], - "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", - "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "phpstan" ], - "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", - "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" } }, { @@ -39121,8 +39136,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210628, - 736 + 20210716, + 1447 ], "deps": [ "closql", @@ -39135,8 +39150,8 @@ "transient", "yaml" ], - "commit": "84ef3a7bad5879a2dd179a94655ac0da28be3898", - "sha256": "0mp1jwc0ms6d15l3vw0zg35l68q58bk5bj8w5znjvwjh3akybfpm" + "commit": "49da45ac4515d7442ebd606f4ad4922a3e1439ff", + "sha256": "1vqhxckmkfbkvpnsigdb1625b5n0fpry2hxkympqnxspcccnijks" }, "stable": { "version": [ @@ -39190,15 +39205,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210619, - 533 + 20210708, + 1728 ], "deps": [ "inheritenv", "language-id" ], - "commit": "6a3463a723e08a37bae85a7585700ab314ae86ea", - "sha256": "10aa5jh4ba4bhghwb8mi6my1dazbvxlylk3gcxji47qj0z78fajh" + "commit": "d60a763eaf716d17bf6b8dbff1cc8f54337bfeab", + "sha256": "12gvyr73ab6x4p5iadxdi61d3hwwfbxd9wm6vkja92glyqs2vvbf" }, "stable": { "version": [ @@ -39341,8 +39356,8 @@ "deps": [ "seq" ], - "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", - "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" + "commit": "ede8a254fe1bfb125b52ea71252b863cf80eee18", + "sha256": "0s2qlnx5lq5ni53r0i4fja6qfxxbg6apq5madgkiyz5d1bay551g" }, "stable": { "version": [ @@ -39959,8 +39974,8 @@ "deps": [ "cl-lib" ], - "commit": "b989a860d1d6191bb9c5911ac77ed0931424eaeb", - "sha256": "1w0hyfspi3kahj2lk1bzj3ny3r8bb0cj4yfjizzbfc1pz9dlkpkp" + "commit": "5b1c814d84714b0c94c5a7b4aeb3f44d2a4d5998", + "sha256": "1sw7abwli4hjwbyqmkc8vfg4sgil59gkygvk3f4p6gdihnfqynwp" }, "stable": { "version": [ @@ -40698,8 +40713,8 @@ "repo": "emacs-geiser/gauche", "unstable": { "version": [ - 20200802, - 1300 + 20200801, + 2337 ], "deps": [ "geiser" @@ -41652,30 +41667,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210701, - 1554 + 20210702, + 822 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", - "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" + "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", + "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 1 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", - "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" + "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", + "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" } }, { @@ -41755,11 +41770,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210511, - 427 + 20210703, + 1007 ], - "commit": "d050abdd7f5a46c9cfbec2953d2fca90095e2857", - "sha256": "1bx44spbhags7d2jjfcvanian36vkw1cw186zy7vl2nqwf9hfa95" + "commit": "35aa068bc2bd6ad8b0070d9f3948d30b76c2e939", + "sha256": "020hnz41hwwr7kr2d1cs8vhlzn2i8p1hvd8v9z79v7a54f7573b9" }, "stable": { "version": [ @@ -42833,16 +42848,16 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20210225, - 1553 + 20210707, + 1954 ], "deps": [ "async", "ht", "project" ], - "commit": "344d084ec5ff6c99b31c5ea57e5352c85b57ae26", - "sha256": "0x8m3srxhy0bdl6wqvi7m3q9jai73m5bavij1jwqhr3pc2caxzxm" + "commit": "06db25d91cc8bfb5e24e02adc04de1226c7e742d", + "sha256": "1q30cbqq0h1gfwlcbnx9s930li7w7a0y8sx2ivbvvyyc2j5gsk4j" }, "stable": { "version": [ @@ -43979,8 +43994,8 @@ 20210102, 515 ], - "commit": "fcbd45f78b85500f66f323bd19994941832c28d1", - "sha256": "1akrm884nbqjf4l5667cfdxn8xawb2fkri40hv7k8w0pl9cjbamx" + "commit": "1d7d647bb53a49fce03486eba90e97ccf35cf85a", + "sha256": "14ysgyg1cqn83ly6fkwpq7ysibz9pgwcmn9x6lzk38ynkwdwjyz2" }, "stable": { "version": [ @@ -44161,20 +44176,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210613, - 206 + 20210712, + 1206 ], - "commit": "26a1b958bbf2c45d86f033e58b74edd196302f23", - "sha256": "0g4fzji614aqy3kw9iivlmw5v8igql0lkrzvgffrd01jn57dzlwp" + "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", + "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" }, "stable": { "version": [ - 1, - 1, - 4 + 2, + 0, + 0 ], - "commit": "4ca86e18c8f64fd7a2d088a591ac11773d6b06a7", - "sha256": "0bq229nnwp8cy33gizp75wi3x11wn46p73v1581srm2f1zmkapsj" + "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", + "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" } }, { @@ -44203,8 +44218,8 @@ 20180130, 1736 ], - "commit": "9c8784ded344f6a35d1e1550385002f613a0c788", - "sha256": "1n1pk876yicv9hvwmja3hs6i7s25nv626p3gxsp9278yb933ml2m" + "commit": "4044bbd5ca4434b8cecd23a4da8ae173c1e0d58e", + "sha256": "0nym4c4j0awxzpj2qkds1fxppc7jzzazwj0j8qx6vr5yfp7iry51" } }, { @@ -44446,8 +44461,8 @@ 20210323, 332 ], - "commit": "6ab5128c028aac3ae070ba8df041b8039487253a", - "sha256": "0d8dihhl7cn3afwhn09drymm7c5hsf8v2m6rvpq5z7nkskkjw80v" + "commit": "1ed2df72f495784a2eccbe61de5f1b01b854fbea", + "sha256": "0hr6yhsr2x745i1q9sywvgr8xwvnpc05lr3zi84gci0frlab92d9" }, "stable": { "version": [ @@ -44533,8 +44548,8 @@ 20210323, 422 ], - "commit": "c83688ea95b4308145555fea50e953a26d67b1b2", - "sha256": "0hi4jikr5hk4v28790mw1rj1myvr1pwldy7wh3n8bajhqdhbr59v" + "commit": "4cef6cab89eab5906330412efee6a3d9564f6e14", + "sha256": "02hywgvy9d0mhan595jgc2x6vqy428hi9ha9zybiz1hl2394xila" }, "stable": { "version": [ @@ -44563,8 +44578,8 @@ "magit-popup", "s" ], - "commit": "93851bd6e14df055d86661de494119e6bacb2192", - "sha256": "0bb5zbyr0xsf4p3440n5x2f3h10ya76vwr3jq10j0ff0x4fxs6iy" + "commit": "7822b34eb5d359ddae2f93d356c78c5ea05784d5", + "sha256": "0qkznd0a6cc32mwnmsa28lr8zji2nsi87kzcn467hq542zr61nz6" }, "stable": { "version": [ @@ -44798,8 +44813,8 @@ "s", "websocket" ], - "commit": "175e68d7ce9fd4c44d1eb808954cf0ba66b59599", - "sha256": "1ylynb295p5c26ayb8kdxqfbj9z61vinnd6bdlwsynr1wncbwyy4" + "commit": "46e802631a136cf356f5563005c9f9f5dedd09ed", + "sha256": "01vw411ngj325q1irhkx3fmf7g0mh99yrc72cxz3275mnc0dpdpj" }, "stable": { "version": [ @@ -45211,8 +45226,8 @@ 20210609, 1305 ], - "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", - "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" + "commit": "c0ca78990395245e5f742166047b04eeff63cf6a", + "sha256": "1pyi6l08j19d30dk66ign0gpjh9wv1l42jnbsapb5migghas558z" }, "stable": { "version": [ @@ -46475,8 +46490,8 @@ 20210108, 1835 ], - "commit": "fb3f3c9514e652f8955a67baeae13de264996860", - "sha256": "05kaxcazbr51chcmlx0fscwk32blj3lzndkr0qpbwfrn8n6mcmrg" + "commit": "6057c05154464bfb88d2ba119cdc8d4c7e767541", + "sha256": "0z1lpsvmkcxs3gcxkmi1vjgfa7wdfa42cp2i9rl2i17jq34j37yb" }, "stable": { "version": [ @@ -46615,16 +46630,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210701, - 637 + 20210714, + 1600 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", - "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" + "commit": "60db46905443c87f324440202bd0735d57c5c201", + "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp" }, "stable": { "version": [ @@ -46718,14 +46733,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20210305, - 334 + 20210702, + 845 ], "deps": [ "helm" ], - "commit": "51e164b4bb1a9826fe8b39c0d02b4064c9352b9f", - "sha256": "0371s2y06pipjn0ka8c1a0r6g8migz5sbm8hqqilng1cr1dm3x7a" + "commit": "7cfed5d3e861717466ae6d3f76c759548a9fad04", + "sha256": "0j1l9ifssd2xmdiif0c922dsdii143kjp8ifygqigb9m4wbsz8ax" }, "stable": { "version": [ @@ -47079,15 +47094,15 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20201216, - 826 + 20210708, + 2217 ], "deps": [ "bufler", "helm" ], - "commit": "097f4349920215bdd829fceabc1afdbba172c32a", - "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" + "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b", + "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24" }, "stable": { "version": [ @@ -47523,14 +47538,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210701, - 608 + 20210714, + 1600 ], "deps": [ "async" ], - "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", - "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" + "commit": "60db46905443c87f324440202bd0735d57c5c201", + "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp" }, "stable": { "version": [ @@ -48068,8 +48083,8 @@ "deps": [ "helm" ], - "commit": "59adbf2d3c67b174a354f0dd64f647b4391ab8d0", - "sha256": "1x2ds29k4wwv406j49nzjkh43scahmrshx4lssqrkc9cay7210nx" + "commit": "5d6366adc14c51570374320fa827b0772833a61e", + "sha256": "0nrkghnsn83ah0jqbv7fx2i90p1z37lfmh6kwgjkr2aq4ggrcklj" }, "stable": { "version": [ @@ -48333,8 +48348,8 @@ "flx", "helm" ], - "commit": "72d618f95d6531854a60322d88b242825016f8e6", - "sha256": "0bpnspq7c3akny8blsp75br11g6fh425v9hxfpwyk8iqs5zwvlb7" + "commit": "9d57e4802aacfc50efe4804e45ace16f6931635c", + "sha256": "1l2vjksmgp7djxfwp6lyg9vqbsx2snc8h3wnf9pf020p3h4ccy9v" }, "stable": { "version": [ @@ -49115,8 +49130,8 @@ "repo": "julienXX/helm-lobste.rs", "unstable": { "version": [ - 20150213, - 1546 + 20150211, + 2214 ], "deps": [ "cl-lib", @@ -49612,8 +49627,8 @@ "org-ql", "s" ], - "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", - "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" + "commit": "94f9e6f3031b32cf5e2149beca7074807235dcb0", + "sha256": "022arhyyn8hbb1hzjkv4gl3dr8lz1gv0x4h70x0970bsbqlsa27w" }, "stable": { "version": [ @@ -50500,8 +50515,8 @@ "s", "searcher" ], - "commit": "181f60cb8505aec05393a9dbf414733d19f76d2a", - "sha256": "06bnnbay56ngiddkvvwmy3fv4v2gjss8gm7gjcp2064m9njgw5mx" + "commit": "76a8de11e39da5c7a94066bcf3d515cdd23c6f63", + "sha256": "1698j6x0vbxfdpdknrzwihr4pwpl1914i3azarmngkh8wnhma26s" }, "stable": { "version": [ @@ -50798,14 +50813,14 @@ "repo": "jamesnvc/helm-switch-shell", "unstable": { "version": [ - 20210106, - 1810 + 20210713, + 1440 ], "deps": [ "helm" ], - "commit": "9de26ca41e94c095c978ed920009de0280f5c4ec", - "sha256": "190bmn04g4nlcrpnsm465vyp0zcd2ryh13bc14f7w1vrmnw6ll1j" + "commit": "8d7ba1d99ff12a8f1d6ce3b9684ae8aebf494cf3", + "sha256": "04d7hz7gpbcy4vnmwi605n51angn4xbx6kqqqdb8nqvzh4f0y5g1" } }, { @@ -52117,8 +52132,8 @@ 20200203, 1927 ], - "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4", - "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp" + "commit": "852cb4e72c0f78c8dbb2c972bdcb4e7b0108ff4c", + "sha256": "031624grhvv5ix3gvnd8lzpws80lb5r272yggl1k57rsayyv55ix" } }, { @@ -52346,16 +52361,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20201212, - 2121 + 20210706, + 1225 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "f1deebb0cbe9ca040856d3cc99942335250d9566", - "sha256": "0hnmia3c052php3i2g1sbsp402fgi17yv6as044ck617p7avz971" + "commit": "9ac07ff0adbce6a402c17e789b1750f9da0d22f4", + "sha256": "0x3dgws8nh7q8x7zzjwbm5k9n7gi7qqd3ww7y51fbx6p6ii3jpp4" } }, { @@ -52740,16 +52755,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210217, - 1723 + 20210707, + 1513 ], "deps": [ "org", "promise", "request" ], - "commit": "27e9e015b930175896c07536c25e379a4e1997af", - "sha256": "14f3fqz8sjmjh7si5gk31fh7bnvc9p1rfd9p2l39zvasvk1sxki0" + "commit": "4943a4ef8d242952ade64903a05c13094de2fbf0", + "sha256": "1fgg1jcnihx3akp7r0fvwdx71ldl2apbw6xa591f6r5slvh179gn" } }, { @@ -52942,8 +52957,8 @@ 20200929, 559 ], - "commit": "8cb33f9513d79e44a602927f35d5a3bb0dccbb92", - "sha256": "0x72qh6pmaw3dfnx296flbvbm1sxgljz4997jkjwiss2pr7qsgx0" + "commit": "97f885a550bed05f2fbdd933718313e6645a6ea1", + "sha256": "0b8wz43k64c2ca4kqjlp9zx97hafwmnjc38pa7lyip9yhhnhkkf5" }, "stable": { "version": [ @@ -53059,6 +53074,30 @@ } }, { + "ename": "huecycle", + "commit": "0c73a3a204ffe41f7370ef5d72a02a9e1844ce24", + "sha256": "0h4hfy9bw30sij5r3wgpz4sqwh343bwhd207p85kp0v10vnlk62x", + "fetcher": "github", + "repo": "pnor/huecycle", + "unstable": { + "version": [ + 20210706, + 205 + ], + "commit": "c343b2085dea11b820d4da6c6183e1102ec08698", + "sha256": "1bdhm9j2dammw5dzr8gh4wg5pkl7c706jqdwd43my7zsn2ipar24" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "c343b2085dea11b820d4da6c6183e1102ec08698", + "sha256": "1bdhm9j2dammw5dzr8gh4wg5pkl7c706jqdwd43my7zsn2ipar24" + } + }, + { "ename": "hugsql-ghosts", "commit": "969fd5e51bf93b5eff6919956c43c041a3b24d1e", "sha256": "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz", @@ -54775,8 +54814,8 @@ "deps": [ "impatient-mode" ], - "commit": "60ae30d07b857c074e2918680805cb37249de0ad", - "sha256": "0brj34ijgsgkbawp097wjwiaka2b082aypl5pal0298mpk97zxq0" + "commit": "bcb636dbef4630c5ae654642c6a637cceb588cac", + "sha256": "1nnmx7f256cll04wxwip3a1pll3rayiqx4ynirrm1ld97q8hdc3v" }, "stable": { "version": [ @@ -54892,8 +54931,8 @@ 20210508, 309 ], - "commit": "044291cf063a86927dae50dffdb2b0e2e3f9199b", - "sha256": "0hiwq5nzh42f5ynjlhq9vlcgq8pmgcgbi9w5c5gczdl0s7cxv6l7" + "commit": "bfacd60a4be68a89d150f0bf2a9fb8714591f6f5", + "sha256": "1dxdzvg6bpz0wgj2amqy7q9xl8xi7clsw10d9c86gbq87b9js681" }, "stable": { "version": [ @@ -55452,11 +55491,14 @@ "repo": "emacs-jp/init-loader", "unstable": { "version": [ - 20200520, - 2345 + 20210703, + 902 ], - "commit": "10b8d7b12acbd1036e68dfb59f460714baedaa33", - "sha256": "1w7sq9famd4xbh5jk974zzpn6cf1nh2vmbvjvd4fwpjhmnnibqsm" + "deps": [ + "cl-lib" + ], + "commit": "ecab5a66b40227c4173992adfa5cfeae09f1657e", + "sha256": "0fkxv7i7jdlj0z5n4hfm8897pfy6jxmk8znpfr9564ay90cp445h" }, "stable": { "version": [ @@ -55546,11 +55588,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20210427, - 1337 + 20210716, + 58 ], - "commit": "7c3a0a76fa00db41a4d3d990cc98a1c6b088df3d", - "sha256": "17x0afwfcr4k0nmliqajswmvaiglk1xl33r3j215w214xp6dqrp2" + "commit": "c3683aa99c738eb46cf310ba23162dbb315a5ac5", + "sha256": "14k3n5kn9z2lqdhm00qy0hz8synnv28i17gn518ps4cyk298dmby" } }, { @@ -55665,11 +55707,11 @@ "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20210618, - 2249 + 20210707, + 1126 ], - "commit": "25b74d527cef00f6a49985161a8caaf62faa887c", - "sha256": "1qqxw67fbpix290jjrfai6z33fsyzb3zy1nwzk6mjss151586f5n" + "commit": "e818845a99d418e04c1685f06fe25116916f6168", + "sha256": "0acyzysz04sd3rahymw6x3a8zy57sy84d36zp6prd62y4w0sw361" }, "stable": { "version": [ @@ -55854,8 +55896,8 @@ "repo": "dcjohnson/inverse-acme-theme", "unstable": { "version": [ - 20210204, - 1640 + 20170615, + 1337 ], "deps": [ "autothemer", @@ -56136,14 +56178,14 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20200907, - 1453 + 20210715, + 1041 ], "deps": [ "f" ], - "commit": "1077b395e1c34a734120faf1f3a7feae6dc4d9c5", - "sha256": "1zdlk6s0j0825wy2blpxhsg5pxaybk5adxxpjvm6jj9r612xyn73" + "commit": "796e4e9a2508120ae430f522115c7d174d912276", + "sha256": "0wlh2ph87qa3i3n7j2mvih428ih65gqj0bzqwqw123cfflcz6xy2" }, "stable": { "version": [ @@ -56378,8 +56420,8 @@ 20210602, 1349 ], - "commit": "040d458bce4a88f37359192061bcea5ebe87007c", - "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" + "commit": "56139df678d9886d0612c0a192cce2cf6f156628", + "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" }, "stable": { "version": [ @@ -56406,8 +56448,8 @@ "avy", "ivy" ], - "commit": "040d458bce4a88f37359192061bcea5ebe87007c", - "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" + "commit": "56139df678d9886d0612c0a192cce2cf6f156628", + "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" }, "stable": { "version": [ @@ -56509,16 +56551,16 @@ "repo": "jixiuf/ivy-dired-history", "unstable": { "version": [ - 20210418, - 1444 + 20210715, + 48 ], "deps": [ "cl-lib", "counsel", "ivy" ], - "commit": "1ffa9b705c52a9d5b03c97150addb4f746c08380", - "sha256": "1li8vh94w1mkwqbh1f0i1mmv5advrbh1183vpjc2zbmmk02pynkf" + "commit": "dba848929cb063a5536cb442c70be1099e2f5baa", + "sha256": "1fkw82am49j49s0s3ql22hl9i2imypb0xkrmsgc7sr2hfsim56sd" }, "stable": { "version": [ @@ -56653,8 +56695,8 @@ "ivy", "s" ], - "commit": "b237ee8e9fd2fd1b52254ef84cd06a0bb6c10a24", - "sha256": "0bimn8j3md579sg7bypsynmjnq1mlmmslci1k98sc8kfnky8260c" + "commit": "3ad203f6166f82c7a09ab4ad065fd40136915fb8", + "sha256": "07mdv0cnrjys0lcxamwpg5xl0g7wb0mgnzbkqyaik559avp5kq5a" }, "stable": { "version": [ @@ -56747,16 +56789,16 @@ "repo": "PythonNut/historian.el", "unstable": { "version": [ - 20190111, - 313 + 20210714, + 56 ], "deps": [ "flx", "historian", "ivy" ], - "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4", - "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp" + "commit": "852cb4e72c0f78c8dbb2c972bdcb4e7b0108ff4c", + "sha256": "031624grhvv5ix3gvnd8lzpws80lb5r272yggl1k57rsayyv55ix" } }, { @@ -56774,8 +56816,8 @@ "hydra", "ivy" ], - "commit": "040d458bce4a88f37359192061bcea5ebe87007c", - "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" + "commit": "56139df678d9886d0612c0a192cce2cf6f156628", + "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" }, "stable": { "version": [ @@ -57107,8 +57149,8 @@ "s", "searcher" ], - "commit": "3a2f5073a0d5842a6b3c386e70cc484e3c4ea77b", - "sha256": "1bk8kaxqq1m76x1i4hy3jqcy05pr6dlzjd4dbyi8lrx9sxnfrnkk" + "commit": "84faba3cd87374f54d5e27344d4812737375fbaa", + "sha256": "1lxiamv0960j1sfs9afqbdkp7mjkdbi1nw1nh5w8q3m9a44c1h89" }, "stable": { "version": [ @@ -58493,14 +58535,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210622, - 102 + 20210712, + 202 ], "deps": [ "cl-lib" ], - "commit": "4eaf98e3cc3789381a37a05cd70a248db9ac8c1b", - "sha256": "0mlp1pbph3790lvg5j6cdaffhb9ly8jdl00lmffs14840b8prkf3" + "commit": "6f313c9566d9c8453a91c5ccaa25760978cb9f6d", + "sha256": "09fxg0ljv2g9rv7n67km7q64w49fcl0gngm68m252nyvk2x28b08" }, "stable": { "version": [ @@ -59014,8 +59056,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210624, - 547 + 20210715, + 1359 ], "deps": [ "dash", @@ -59024,8 +59066,8 @@ "spinner", "vterm" ], - "commit": "47f1b125f8364a0aa8c072fdc7b4007aad5c0724", - "sha256": "12lqc5yysjzf0vypjcs2mnsv6frhwyfm950rcsbwkwz3lvfnrajn" + "commit": "a71a536fc1f194bc329e2c33eed5eab542c00cab", + "sha256": "0cnhv37m8hcl3lfbiivy3yk338x60q8fglm5nibhfr55ln52jjc4" }, "stable": { "version": [ @@ -59714,11 +59756,11 @@ "repo": "ifosch/keepass-mode", "unstable": { "version": [ - 20210110, - 630 + 20210628, + 729 ], - "commit": "515343a7667b2bf4253309449f65a6eb94933df7", - "sha256": "0hrq521swki0l3m81wk9p7pkc5j99li441fb75h7107v6z0p102c" + "commit": "fd7d380b762c888f25435d0c241012cdabf6e288", + "sha256": "1623hqlyk7qlvb5kigkyiji98a2vp39y0v6smag2mnqa3r89jq7l" }, "stable": { "version": [ @@ -60165,8 +60207,8 @@ 20210523, 403 ], - "commit": "8d2a5ec4a7fe766a62037b05f26a8f36fff45c06", - "sha256": "1rszkzpr22dy9yr54k2pz6p2j6lbgvy189f6ki8gmlsqzdyxmssk" + "commit": "075b05b6ed7fe1b9f4f22544bc26749243de6808", + "sha256": "01qwcr65qzz0ilzj9318hnz9hs3gdd722xpajmp8sa1520w9vhzm" }, "stable": { "version": [ @@ -60748,16 +60790,16 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210630, - 612 + 20210714, + 1307 ], "deps": [ "dash", - "magit", - "magit-popup" + "magit-popup", + "magit-section" ], - "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", - "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" + "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", + "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" }, "stable": { "version": [ @@ -60789,8 +60831,8 @@ "evil", "kubernetes" ], - "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", - "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" + "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", + "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" }, "stable": { "version": [ @@ -60910,14 +60952,14 @@ "url": "https://git.sr.ht/~tarsius/l", "unstable": { "version": [ - 20210214, - 1130 + 20210705, + 2113 ], "deps": [ "seq" ], - "commit": "518203abc6cee13c73c2d91282354ed59f00f15e", - "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" + "commit": "02b1afad2c5649221abada2d938ef3736e020a96", + "sha256": "0idzyx6pxn8s78my9b4qjxz6561w6bzjvbp3yv267piyjgvwnzpc" }, "stable": { "version": [ @@ -61050,8 +61092,8 @@ "highlight", "math-symbol-lists" ], - "commit": "56f808edfd0983c0df2ed1c957c50c02af5faad3", - "sha256": "05fyx88wmyc4c6lcy5qphg6zhbfmlnpy7y23l00qfi5k9hmv99hm" + "commit": "138e6794122f8601e58731a365930bd7cf5791ea", + "sha256": "0zj3i612h0sih7lyy4zvzldcrgqmsqcvr4y42zv75r81s0l6gddz" } }, { @@ -61176,25 +61218,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210618, - 1532 + 20210708, + 1719 ], "deps": [ "cl-lib" ], - "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", - "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" + "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", + "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "cl-lib" ], - "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", - "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" + "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", + "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" } }, { @@ -61620,14 +61662,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20210222, - 1243 + 20210711, + 156 ], "deps": [ "leaf" ], - "commit": "4146621f4ae80ef0c30160337119441c1f6334b6", - "sha256": "16iv1cvlky2gij1ndx2d6q8l35axm72bx52n6v5y3h21aibj197n" + "commit": "f46311f8e7e5ce0d5af928fea99111b3c86de7ce", + "sha256": "1qlg6n5yaagq97x3c2r58pcblk0gz4bysg3cgm5iq3sq9lpf3h2n" }, "stable": { "version": [ @@ -61866,8 +61908,8 @@ "log4e", "spinner" ], - "commit": "aeba19919e6d8f1c0529330572240143a2af38e0", - "sha256": "0yfghps19832w4sdjaglnbb9xn40fc5a6072lxbsw8gan9c2bjh7" + "commit": "7ef1dffd44be9bba6450953d25ff787e122afc69", + "sha256": "15gfyx53m02andalyicnvs7b3v59zq64r0jmmgkg6gy5za6c0hsd" }, "stable": { "version": [ @@ -62211,8 +62253,8 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20210526, - 623 + 20200915, + 542 ], "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" @@ -62336,8 +62378,8 @@ "deps": [ "request" ], - "commit": "ef80eff8b7be117f9c48bdc6d9a62e56b0a93554", - "sha256": "1z6qd4bcpwdpvi6w9yrkrnk2ypllhm6k4zjl8v1p8k0j93dbn3ny" + "commit": "bfd5ef11f26ba46c8e0894ea08ffec74cca72288", + "sha256": "1x02lwplyd41qaxy27np2fza818p0h62np6kd9sqqxkng4ahy97z" }, "stable": { "version": [ @@ -62378,17 +62420,17 @@ 20210303, 1751 ], - "commit": "95538837d93c9d05e35ea85d6c25527fac715df7", - "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" + "commit": "4a785dbbf4f906584716bb14c92230beda5081ed", + "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd" }, "stable": { "version": [ 0, - 19, + 20, 0 ], - "commit": "0169d3ef40403c1bb41b5ce81c7ae2ec01a6ba1d", - "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" + "commit": "89c2f0ad779b8d15581a3607beb55855b0da8737", + "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd" } }, { @@ -62399,15 +62441,15 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210627, - 2121 + 20210715, + 839 ], "deps": [ "fringe-helper", "indicators" ], - "commit": "355cdcb6888fe6668e85a96dfe694d4bd050372e", - "sha256": "0hs5js38djfid0aqz0ygswqj26j3dpqjbaidghlfhdhcvifixsvw" + "commit": "38ca45f01b31d5de07a4a5e43ec54c4644718dcf", + "sha256": "12qcrsjb9j9w7nqr28ff1gnk4icl134pgjvm9ph5psf6a6qd9d78" }, "stable": { "version": [ @@ -62539,14 +62581,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210410, - 1506 + 20150922, + 451 ], "deps": [ "avy" ], - "commit": "ae73db6a5948c8d109fc1d570760bcafa3f07175", - "sha256": "1rlbxlh9a0hnlaxpgfjvjjvmhnzwc84p9xiqi740xv82cd27wcnl" + "commit": "9fbf196d155016d9b8471a99318ed67a086cf257", + "sha256": "0v2g9gzf2v88ag59q1pf5vhd4qjnz3g4i6gzl27k6fi7pvlxdn39" } }, { @@ -62743,8 +62785,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210121, - 926 + 20210702, + 1206 ], "deps": [ "ace-window", @@ -62753,8 +62795,8 @@ "iedit", "zoutline" ], - "commit": "38a7df4cbb16cfe3d62dc8ea98b50e2d9a572e58", - "sha256": "1q3sgk8ffwajmh8l7c4p4fz36xw4fqds8yqblbi5kardaa8bs8cs" + "commit": "e9731aa95581951ab2cbfaed28f0ac7d71124ac0", + "sha256": "12vvh1z72bhvh4yhm0r7c3wl3iplf45qkdqk92xc0mp3zf9w6c5g" }, "stable": { "version": [ @@ -62781,16 +62823,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20200808, - 2240 + 20210702, + 2031 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "89316f01822b2135e52ca27fd308d207ef618052", - "sha256": "10k3hxxpx2v2k4dyad7j1bzmr1q7rzvv4y6c67pa9zcqyaw8m91v" + "commit": "9c14bed0359f659e246d345c706f895737c3d172", + "sha256": "1jlxcr9vikczhryw3xslfy6hzs2ikcf9khbwaw53ymwdxrmphcci" } }, { @@ -63165,10 +63207,10 @@ "unstable": { "version": [ 20210701, - 1735 + 1955 ], - "commit": "96ca0e9058d8c1e533ce9aa1396e49f086362b06", - "sha256": "0bcilb7mcf9al3qs8i63idw97025b193sslrwkd7w8pphk2g9cqi" + "commit": "db1f98cc470972f92d72f40b78db4baff5768edd", + "sha256": "1wgqcb4m5nzkbxkvdx801h9d1wqswlqmqbar4282wabgnw78zwwy" }, "stable": { "version": [ @@ -63740,14 +63782,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210701, - 216 + 20210710, + 228 ], "deps": [ "map" ], - "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", - "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" + "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311", + "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n" } }, { @@ -63758,15 +63800,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210701, - 216 + 20210705, + 2006 ], "deps": [ "dash", "loopy" ], - "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", - "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" + "commit": "f3f81affc88e6cb9efbc5440b26e081cffddd311", + "sha256": "0ibag71yz92abhbxsry3sby7g5361n4y7qac5myav2rj4bcjsl0n" } }, { @@ -63833,8 +63875,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210608, - 2101 + 20210715, + 1659 ], "deps": [ "dap-mode", @@ -63845,14 +63887,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "01d89d43f17a15c7ccad5a458250d5d6b0f70b09", - "sha256": "0vnzzfap7ndr26016n1c1q21ga2lgw9vb555mn4dql6ny191ri0r" + "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea", + "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n" }, "stable": { "version": [ 1, 19, - 0 + 1 ], "deps": [ "dap-mode", @@ -63863,8 +63905,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "49bb4d597e30c95d66a96739ea10c1c4f74ac649", - "sha256": "0kwzi6f3ig6lq95h2y9nddwkisml1fig290vn1sm7wkl3r9ci8bd" + "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea", + "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n" } }, { @@ -63926,8 +63968,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210616, - 1021 + 20210715, + 918 ], "deps": [ "grammarly", @@ -63936,8 +63978,8 @@ "request", "s" ], - "commit": "57a698e69c0dacbcad30398c262cdc5711efba71", - "sha256": "17jhfzy7bk645402yi65dsw19rvyjqm5wfd8y73hcfniihdrnqzp" + "commit": "bb7fe5d70a3d21813858d93f70fe807beba99688", + "sha256": "143afkkfm7dvhlpl77j98hbm5fk2jsrrkxkx1dpn17mj74ijq0ix" }, "stable": { "version": [ @@ -64034,8 +64076,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210701, - 725 + 20210710, + 1757 ], "deps": [ "dap-mode", @@ -64047,8 +64089,8 @@ "request", "treemacs" ], - "commit": "28c56ec59a8c1b197727f4d56cec724445661fd9", - "sha256": "0g544mxv362ypwg79kyvjmnr63ss5psp89dmmzbx0bfpk8z4ib0j" + "commit": "b66a075bcb1edf57b09a0e1c73c3a399596d4760", + "sha256": "1s47y8hd9mnvz858h3sbdbdgrv3d1kdxag8flm44jla4yhgish7g" }, "stable": { "version": [ @@ -64165,8 +64207,8 @@ "deps": [ "lsp-mode" ], - "commit": "0e4c96a625bd83930cac338eb7a998c024a15f38", - "sha256": "11gvqbp9j585g86ir610lb3fq87nbwr44j3xzifh4rga6cwdb6yj" + "commit": "d1da153dbc762c5262f6e2a10264cc9075ebb6fc", + "sha256": "06vb7dxmjdc86zmv1i4qckx1isv0kvp5h0av2b4cnaci76bjh3s3" }, "stable": { "version": [ @@ -64189,14 +64231,15 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210616, - 1021 + 20210715, + 942 ], "deps": [ + "f", "lsp-mode" ], - "commit": "cd6fa0b32118792e9f7bcbf4a26032bfff05d603", - "sha256": "16hn5wbfa4f958pyl47l4nvqx092ws16l99dcwijzk9xs4wrkipn" + "commit": "b9a930757c71f7eb30a0828a502a237bfd882b43", + "sha256": "1hsq4jjz79bb1wl8m65n2zmx10mr8zc7dmg5sp6z6sprgyb3vndh" }, "stable": { "version": [ @@ -64263,8 +64306,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210630, - 2003 + 20210715, + 1320 ], "deps": [ "dash", @@ -64274,8 +64317,8 @@ "markdown-mode", "spinner" ], - "commit": "7b183d397f8bc17eceb4d156e24575a47a1d807f", - "sha256": "15br2gf55436jm5a3iygr8cp3vriiar85kmgmap88ws8z83qg17x" + "commit": "cd47168035c98c6ebf9177705b9b7da53fcc9f5f", + "sha256": "1q1isn2g09pdczqdvbk5hjirym6106ip1z6klg1m2d5b9d8vx0l2" }, "stable": { "version": [ @@ -64600,16 +64643,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210619, - 905 + 20210708, + 134 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "240a7de26400cf8b13312c3f9acf7ce653bdaa8a", - "sha256": "1zscdjlnkx43i4kw2qmlvji23xfpw7n5y4v99ld33205dg905fsy" + "commit": "1ee371765612b7aaa6046aabdc2f65bcfcb93b11", + "sha256": "051hc6310zzn9qpvd9k8cj7ibzsk1k19l2485c5wra0fvm2lfa6x" }, "stable": { "version": [ @@ -65087,8 +65130,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210701, - 1554 + 20210716, + 1440 ], "deps": [ "dash", @@ -65097,14 +65140,14 @@ "transient", "with-editor" ], - "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", - "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" + "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", + "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 1 ], "deps": [ "dash", @@ -65113,8 +65156,8 @@ "transient", "with-editor" ], - "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", - "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" + "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", + "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" } }, { @@ -65184,8 +65227,8 @@ "magit", "xterm-color" ], - "commit": "1164a6c3e501e944f1a6a2e91f15374a193bb8d3", - "sha256": "1a24qpqdk00prprm5s4gwfi1hvdljp2808rg33qaaa1087zdavqj" + "commit": "56cdffd377279589aa0cb1df99455c098f1848cf", + "sha256": "19q04y61hkzxkqw2xi1g7m4bwaxpfwza7if6cm41g72kdb8r68vb" } }, { @@ -65437,28 +65480,28 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210701, - 1551 + 20210702, + 819 ], "deps": [ "libgit", "magit" ], - "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", - "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" + "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", + "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 1 ], "deps": [ "libgit", "magit" ], - "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", - "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" + "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", + "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" } }, { @@ -65606,26 +65649,26 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210701, - 1554 + 20210702, + 822 ], "deps": [ "dash" ], - "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", - "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" + "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", + "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 1 ], "deps": [ "dash" ], - "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", - "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" + "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", + "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" } }, { @@ -65903,8 +65946,8 @@ "repo": "p3r7/magrant", "unstable": { "version": [ - 20210514, - 1322 + 20210706, + 1438 ], "deps": [ "dash", @@ -65913,8 +65956,8 @@ "tablist", "transient" ], - "commit": "79661be21cc8e9faf1ac93adb1f86f9b7a8b110d", - "sha256": "00hl22bl9cbivwdilzqrz9kf3qcixbc15x263cv1nn9ppba4arhw" + "commit": "6309c001355126e3ade79493479b517925943d17", + "sha256": "0fg4hi65qdix0lpfw29ymy2naskn2af661pzg695f47xhknsir1r" } }, { @@ -66230,8 +66273,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "d377094c4ff5e93321e12f53892113083148bdaf", - "sha256": "0dpljs8qmpvpb0y2cvcr71ashzrm2ypb8p6anay4sjmiphkb60p5" + "commit": "ae46a80e27dc42913620ad78d7a84ece12643bd7", + "sha256": "16ygsxk5raa6p767jp6g5hmgsghq0dpk102g526d770iim5s8nlb" }, "stable": { "version": [ @@ -66407,11 +66450,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210620, - 1943 + 20210716, + 1252 ], - "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", - "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" + "commit": "b5893884abeb6a355233edf54e0f63d04bc32ce2", + "sha256": "0cjabw0ia9rnb3idmv9s6i4izgklxkiax8zn5xw1c6n8ls5iwbqj" }, "stable": { "version": [ @@ -66527,11 +66570,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210616, - 122 + 20210710, + 1646 ], - "commit": "1c7d29d52986b2cb153b5f643167ea49417de469", - "sha256": "0jgfxvhx5z3hjzpdxikx75ikgc0w7ap442svqpyigf78rb32wsjl" + "commit": "359347b2bb15f8d7ef819692ac79759ccfe2c85d", + "sha256": "1naqcg0a5shzcg0rlqs6w5mlr7sn0b8b2hmhs07qawvpxln8j628" }, "stable": { "version": [ @@ -66742,8 +66785,8 @@ 20200720, 1034 ], - "commit": "d8e83b837bacdd45d274be42fe2d172fd1cbbba2", - "sha256": "1iy8vg2wlrzb01nc6sx21ijg62ak94k2x2w6gy56krp7frakacrv" + "commit": "67d19ed3d74c335a6a0e4798c98841c940ec911f", + "sha256": "04dyb3nn5rdgic1m74sv9wzxkfxvszk3sj2fnixp41dj3pvwwdwb" }, "stable": { "version": [ @@ -66927,11 +66970,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210504, - 1439 + 20210716, + 1247 ], - "commit": "c5824936cc7c2d24aeaac40010669f4eec89a239", - "sha256": "0rccwkglyw9hnab5mzhrzfrldlvi9c8ivygdh54jzfjlzcgwddv9" + "commit": "3fbc97b3f29c72b01812739536ed416e3e07e3c1", + "sha256": "0fhsp1g8mlh4ias1xgx0yjvh0g1khdy91pl474b2g0ffrml5ab73" } }, { @@ -67468,11 +67511,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210623, - 1512 + 20210707, + 901 ], - "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", - "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" + "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", + "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" }, "stable": { "version": [ @@ -67500,8 +67543,8 @@ "auto-complete", "merlin" ], - "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", - "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" + "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", + "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" }, "stable": { "version": [ @@ -67533,8 +67576,8 @@ "company", "merlin" ], - "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", - "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" + "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", + "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" }, "stable": { "version": [ @@ -67595,8 +67638,8 @@ "iedit", "merlin" ], - "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", - "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" + "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", + "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" }, "stable": { "version": [ @@ -67692,11 +67735,11 @@ "repo": "myTerminal/meta-presenter", "unstable": { "version": [ - 20190414, - 1720 + 20210714, + 1658 ], - "commit": "704a2e0f2a3e6bb72578e00eccb772dfcf0670fc", - "sha256": "1hka4c87zdgqjawlmsfd7wi6rbc03qfp996ydrj84kz8saq7gf89" + "commit": "4ab48dacea245b223a0ffd2723ece746bd61c0af", + "sha256": "0na573lsgvzpfyam7bsc63lnsrd2acp9djbg3kpng999f2mlrx1r" }, "stable": { "version": [ @@ -67931,11 +67974,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20210131, - 2152 + 20190324, + 1908 ], - "commit": "48fa796ab1669dc275b8c99238fff6c83ad2fcc6", - "sha256": "0rn7ahpj2kjkmy7gq4fj0n99af70xxxykyjqsza1nnizxfgmrpwj" + "commit": "6a7d904fae5014aabae8c91add220485108d485b", + "sha256": "0r0msrnbz9177cv1mlacsyd35k945nk2qaqm1f8ymgxa99zy124i" }, "stable": { "version": [ @@ -68138,11 +68181,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20210212, - 2041 + 20210710, + 1941 ], - "commit": "41afb3d79cd269726e955ef0896dc077562de0f5", - "sha256": "0yghz9pdjsm9v6lbjckm6c5h9ak7iylx8sqgyjwl6nihkpvv4jyp" + "commit": "b07faabfec1b5ba545dc1cb961545cc1e9d78db0", + "sha256": "0b7znsgvycfx2brk782mi0n8i779n1r7pqwfq7s256rgi4fcyzap" } }, { @@ -68523,8 +68566,8 @@ 20210601, 2158 ], - "commit": "d912fec98698c4f72a5f408d5a3f80e95327817d", - "sha256": "0gby38fd5vvfbm3pl2cvp6jsfjqi17xgh1m8vv9z9s6zang4knsy" + "commit": "5ad0fd71634ac9dc6f97f653bc748f9fb58d80e4", + "sha256": "0fxk860dv8xqd5rfp4bw1pspm58c71mhac2xp2cxi1i2jrg272dn" }, "stable": { "version": [ @@ -68928,15 +68971,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20200904, - 1838 + 20210716, + 148 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "05430398a5070245c4358e6a1b7e49a154da174e", - "sha256": "05k5ak09rw8zrn5k7zjc54ckv4jrp9fs3s3r3ja5cil45irgcmhv" + "commit": "8b11b67ac738cfd95babbcc7543467fd9190fc7e", + "sha256": "1y0y2fwyi1qi5k3nypdv51rfyf06f2q2c6ki5yz6bl82lhd0vb1l" } }, { @@ -68986,20 +69029,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210630, - 1252 + 20210716, + 431 ], - "commit": "9b1d1594efa5d7389300b93c78f1b1dd389f9c27", - "sha256": "1m4wmcjhd7hck3rdg9anynlxzr9lnswkdzwypgwfwmabnvsyqvrm" + "commit": "9521dcec6c012d3776e3d05692720dd24922218b", + "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k" }, "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "15c973f716378084a937e777f86182741fd9b697", - "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" + "commit": "b6fb7cda01a665f9369f2c6a29f3bf26c8cc8019", + "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k" } }, { @@ -69692,8 +69735,8 @@ 20210306, 1053 ], - "commit": "171aebaf3a1fb76d1a460d12c7199bc6fbcec473", - "sha256": "06dw5blx8r6wzkwwwbi7p3fxs4flgsf2vlkz8vv9gar4cg9w7wy7" + "commit": "515b4f47c7f43816fce82cdf555107614e9e7edd", + "sha256": "1q39iy7g4f11nzhlsa1j8shrvhmg3ip2h43rxawhmypfwd95vzk1" }, "stable": { "version": [ @@ -69819,8 +69862,8 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20210107, - 1303 + 20201026, + 1123 ], "deps": [ "libmpdel", @@ -70244,16 +70287,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20210601, - 1402 + 20210709, + 150 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "c7f2398612218407e72b174f02b26cf2916eba22", - "sha256": "0irvzwfrrqzk8pcq1m3w9s21v2y0h6f5jrvsv88knz0ki1bdkbai" + "commit": "9fbe402dc5931ba9cafec581ac3e6d86e9a9f2da", + "sha256": "0a73izknp2nkzklkhf9wyxy38fnw4f1jyimdcnh14m1v5bcw2wal" }, "stable": { "version": [ @@ -70419,8 +70462,8 @@ "repo": "sagarjha/multi-run", "unstable": { "version": [ - 20210108, - 336 + 20190507, + 2349 ], "deps": [ "window-layout" @@ -70477,8 +70520,8 @@ "project", "vterm" ], - "commit": "8f385a0aa1ad7a279acc9276913955ef165e7ac7", - "sha256": "0anipknf7bfzygjkynq81ndspnfsqwx7l1i7chkfgfygqyq5486y" + "commit": "934397efd2e78a6b83d2b06ef4e4c281c0ae3c65", + "sha256": "0cz3zs9xd2zbyb9g9r4r893kl9nqk8i9l0zy66s500iy5522vcnh" } }, { @@ -70591,26 +70634,26 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20200201, - 55 + 20210701, + 2153 ], "deps": [ "cl-lib" ], - "commit": "475e2a92795dbed1aa3b1c5eba2c6c779cac4508", - "sha256": "0nl4cm1nx7lmb2gd76jw8v0hqdfjjcwy0xskpi0brd8z6dp1m5n3" + "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", + "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" }, "stable": { "version": [ 0, 4, - 10 + 11 ], "deps": [ "cl-lib" ], - "commit": "258b1232af6680396b6c0912597ed52e583326f4", - "sha256": "08b9a0pb38swgvg2v97pm4g2zda0xagdgq42znwhkmhzjiskh2g1" + "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", + "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" } }, { @@ -71351,11 +71394,11 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20210510, - 2035 + 20210711, + 217 ], - "commit": "d76314802273153c2c38156250d75f95ca352482", - "sha256": "006ghb4xrpp82wlshqmpsj0yh5vq8il6wl5v8f1cyy1vd21yl285" + "commit": "55786c9582410a5637b5635fea022aae564205cd", + "sha256": "0pj92h241k17hvlx7x0nx2hnjg6vyz65sa4ghyqhwa7mdn0c12pi" }, "stable": { "version": [ @@ -72114,11 +72157,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210629, - 2024 + 20210706, + 2217 ], - "commit": "d27820b0408b3e9067c264e25c009bd5cd9dfcd1", - "sha256": "0hrhzm703k86a4wlx0hwnivklniziy2xbrs1q0mvijmsvks60f57" + "deps": [ + "f" + ], + "commit": "3cca5b6527a69c4701394f424726282a1462ede3", + "sha256": "1cf88v8hbcn2kcyh4bv74yhpp7jf4r80zf3pzfw6cqvrgx19px2k" }, "stable": { "version": [ @@ -72349,18 +72395,19 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20201130, - 39 + 20210708, + 43 ], "deps": [ "anaphora", "dash", "json-rpc", "request", + "s", "virtualenvwrapper" ], - "commit": "cf6bc58bff8bb8e2e3c4d681d2657b561573b2dc", - "sha256": "1cgw4vmffp08csf48gghfsm73h8yaai4k2kpgf213d6zqbxz9w5z" + "commit": "60bf11fdba8ff56b6b4b21f5f0c04953834d8a14", + "sha256": "1b6i4kwjb81s7x56g7xmkynryw8xzrpbbkfy03597ka0v0n8i717" } }, { @@ -72604,8 +72651,8 @@ "repo": "esessoms/nofrils-theme", "unstable": { "version": [ - 20180620, - 1248 + 20180227, + 2153 ], "commit": "98ad7bfaff1d85b33dc162645670285b067c6f92", "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs" @@ -72711,11 +72758,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210627, - 1741 + 20210713, + 1255 ], - "commit": "1768b0c416ce1034a5726ff0037e5a605cb45ab6", - "sha256": "0cynllvnhiibxa9a06xg9qzybvsl802l7lcc2jwzhja05l2wrdps" + "commit": "d8a5fba4fe1efd7d0d652ead6d55371bc4078a9d", + "sha256": "138wxhawdp8nllpvmrgll4nvn5by3hsp0zy4gywf6nalr0d1wdld" }, "stable": { "version": [ @@ -72895,8 +72942,8 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20210601, - 1122 + 20200812, + 1850 ], "deps": [ "jest", @@ -73459,8 +73506,8 @@ "deps": [ "axiom-environment" ], - "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", - "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" + "commit": "7d72e6319b98b334f74b78f3d4151e92fb7dcbad", + "sha256": "1hwcndb1x3i51l0kvzk4mj6sil8h10mxmazic9zvwjhia9qz9hz3" } }, { @@ -74532,17 +74579,17 @@ 20210617, 1726 ], - "commit": "a54914c8f4bc5e2d57aac5ed15f1192c2f53abbc", - "sha256": "0625kwk1k8c4j92w4v5160zxcqxa2bf7kdmkii26m25fzw1az1d1" + "commit": "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591", + "sha256": "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z" }, "stable": { "version": [ 0, - 18, + 19, 0 ], - "commit": "3697f0f92854a681fd1156fe4f6fb97d060da1d8", - "sha256": "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1" + "commit": "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591", + "sha256": "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z" } }, { @@ -75666,14 +75713,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210627, - 612 + 20210709, + 949 ], "deps": [ "org" ], - "commit": "12056f697fce51958e7baf837d250341bd86194e", - "sha256": "0p3h2inqqf9ighr9sig1spbni9mq0k4iy8w10w5bpjd3xm37qx80" + "commit": "148aa124901ae598f69320e3dcada6325cdc2cf0", + "sha256": "0scj53w5kk62k294s7pfr15wqiiwvlprxhnmkrjmfx2gwyb1yh9i" } }, { @@ -75898,14 +75945,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20210515, - 1814 + 20210706, + 1519 ], "deps": [ "org" ], - "commit": "a9ca42cb8d1325a4e928716384a0bdb53ea2ad41", - "sha256": "0gp00wbp56g58fz6x4w70lhhwyy3ffxj8hhf5qfrz1wg264n23jy" + "commit": "46ca9f766322cff31279ecdf02251ff24a0e9431", + "sha256": "0bj08f5mg9v0xm2awbv1fxv98jj9scvqss6fmw0lzix6s3112z25" } }, { @@ -76454,8 +76501,8 @@ "deps": [ "web-server" ], - "commit": "b4f97edf4150870b84d7ee8508088c0d375eaa83", - "sha256": "124fq9k7qmjvn5hp9i2b4xmrm9z18zhbc9j1rv68wpdqf0kqxkcd" + "commit": "6e4d328afac1195fa7f831c6d41ae966b5d75a16", + "sha256": "0igx916wk9xc74h6zm8dz3h5007izrp2jdm4pdm2r4bcp1ybnk05" } }, { @@ -76587,26 +76634,20 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20210514, - 1608 - ], - "deps": [ - "org" + 20210713, + 551 ], - "commit": "bed49744ed27ff205539a14fd51e2977852c49e5", - "sha256": "0cw8903nw0mrn9kppwlypsb6h9m54zrb6y969yj0gnkza6gqy36c" + "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", + "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" }, "stable": { "version": [ 0, 3, - 2 - ], - "deps": [ - "org" + 3 ], - "commit": "bed49744ed27ff205539a14fd51e2977852c49e5", - "sha256": "0cw8903nw0mrn9kppwlypsb6h9m54zrb6y969yj0gnkza6gqy36c" + "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", + "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" } }, { @@ -76786,15 +76827,15 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210326, - 1711 + 20210714, + 1604 ], "deps": [ "dash", "org" ], - "commit": "2cb87624238281b438cda67ed375c56403524489", - "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" + "commit": "416c95fc9ad8551f1d9544f2504c866daac5477e", + "sha256": "189zzfi5a1qsjm8ayq5v58s5iagibv2vk6rb6zda4p0hrmnfz2ky" }, "stable": { "version": [ @@ -76842,30 +76883,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210630, - 1503 + 20210709, + 1801 ], "deps": [ "dash", "org", "s" ], - "commit": "ddb1b95ac139676e4aa8a0b787e57feba34cc7cb", - "sha256": "0l563j9m8zcmsn8vqv3qchk4yqrfbigk5k4iqcw8p7cbix57sjah" + "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", + "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" }, "stable": { "version": [ 7, - 2, - 1 + 3, + 0 ], "deps": [ "dash", "org", "s" ], - "commit": "1ee39e4f8616199ad8e5cb6b2d6b410e75857ecd", - "sha256": "06mf8s68mw6fcdpvdddcvy2x8z6zyisfvgh4sdrpz2z5j03v7qd7" + "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", + "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" } }, { @@ -76959,14 +77000,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20210326, - 1207 + 20210714, + 911 ], "deps": [ "org" ], - "commit": "5f253a880e1919ef4b98f0d91f271a8b522eaae5", - "sha256": "1cirbb5x29qnf59qkcfsjw467xx02vl4f17iqd4qqxwaarwkyq30" + "commit": "6c3a2fdb6c85253a32992a29edb976407bad4d77", + "sha256": "0rxrsqj3a8qchjhm9kb37zd9h1h1lcqfg2gwsgab74rfyfgf9ryd" }, "stable": { "version": [ @@ -77078,14 +77119,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210628, - 1124 + 20210704, + 2214 ], "deps": [ "all-the-icons" ], - "commit": "f78924c06c9f3902bab8e390d91402516d2bb502", - "sha256": "1v847kpc3fh4sxi1rw8pp6xlb89r6z224831xkd82gys74ya0724" + "commit": "40d40c1e6187ec9c13292beb3f7f319f189264d8", + "sha256": "0253i9hvq9yki97jmdrvbv82xbgdrq76l73frq6xbbzzhw6615m6" } }, { @@ -77156,14 +77197,14 @@ "repo": "dfeich/org-listcruncher", "unstable": { "version": [ - 20210503, - 802 + 20210706, + 1741 ], "deps": [ "seq" ], - "commit": "50c06445a837c6677da035f72dbe0f973d9e10a7", - "sha256": "1nw5wd781a5nh5csvsr6ycjpji66k8vkvw8z1sfa0p8xsbln9rk9" + "commit": "075e0e6d36eb50406a608bc8a2f0dd359ec63938", + "sha256": "133smvw9iaxg0p3y5wl0rc4fwwgbxgw6hxngpmar8qf4grwy4w27" } }, { @@ -77686,16 +77727,16 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20210701, - 342 + 20210705, + 408 ], "deps": [ "a", "dash", "request" ], - "commit": "f55b9773b2f4a502e636688bc1caa21ee0396abe", - "sha256": "1ipxr8s384pljlz9rzpdhmrsa7q7jzk27dblrrapgbgi52h3n5np" + "commit": "6403cefb8440567fc593a8d267536138cd6165e2", + "sha256": "0a95gnvgfvj3f9xy5hl4d7367j8sfysf5ghnz6hxiz6ilhngfnz7" } }, { @@ -77911,8 +77952,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210624, - 1314 + 20210713, + 233 ], "deps": [ "dash", @@ -77926,8 +77967,8 @@ "transient", "ts" ], - "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", - "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" + "commit": "94f9e6f3031b32cf5e2149beca7074807235dcb0", + "sha256": "022arhyyn8hbb1hzjkv4gl3dr8lz1gv0x4h70x0970bsbqlsa27w" }, "stable": { "version": [ @@ -78846,8 +78887,8 @@ "repo": "arbox/org-sync", "unstable": { "version": [ - 20181204, - 23 + 20181203, + 2242 ], "deps": [ "cl-lib", @@ -79693,8 +79734,8 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20210121, - 606 + 20210715, + 1155 ], "deps": [ "dash", @@ -79702,8 +79743,8 @@ "ht", "s" ], - "commit": "50c11af264505b026aed77d6b67a132f7d4f7e6b", - "sha256": "0q5qz7bm8k17v9mzixb4fbdcn9czcskkrrlnk38sgj390d2pyc7c" + "commit": "cd931a01adb23dd473ca1abd22f45ac0a5661cac", + "sha256": "0cmr4dq90kvmscsm2jvvpdijbmqh0skra79cybcj4pdzafx79c8c" }, "stable": { "version": [ @@ -79903,8 +79944,8 @@ 20201129, 604 ], - "commit": "649fd0cdcb831dcd840c66ee324005165ce970ca", - "sha256": "1iarfqdxryj5p43hsch2jgqslrpyfkza9x9fpshmbpwjkbf1548x" + "commit": "5bd7ee9d9e23ce37fd004054071026ff51445654", + "sha256": "1qblj2m7bhykm58i63r5ywvpz6hr0vyzx7fa0s6rwlkjzbdn77g6" }, "stable": { "version": [ @@ -80174,14 +80215,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20210309, - 115 + 20210703, + 1152 ], "deps": [ "cl-lib" ], - "commit": "4d4cc19fdd4ac8408bd5acc7694e7a7096b1e3b3", - "sha256": "1zmng3qx7i4wkz1vrxw0vw3kyirnb8a0pn46zq6zhzj33ybn9582" + "commit": "1a4479d9f44ef1e6e5f7643c172c32f6fe6cce21", + "sha256": "1714bh7gx1limy8zs1sbxyr9an7gj7viq8sf4cr6wnxz44v237fb" }, "stable": { "version": [ @@ -80648,6 +80689,24 @@ } }, { + "ename": "ox-750words", + "commit": "d05562f905715abfc139c224fa2fbbb796208318", + "sha256": "1cnzzfxvmg7d24lzp5n8i20c4yh2z1vpqhpciqy13qx9c3lqd4ri", + "fetcher": "github", + "repo": "zzamboni/750words-client", + "unstable": { + "version": [ + 20210701, + 1950 + ], + "deps": [ + "750words" + ], + "commit": "0fed7621c04debad64ea6455455494d4e6eb03fa", + "sha256": "1qglbfdc6526aqsba93ngw1a6hp19lqx1wlxzzy9yvggbb02mii2" + } + }, + { "ename": "ox-asciidoc", "commit": "3b268064f09ae5c3d15064b7d197c7af767fb278", "sha256": "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr", @@ -81214,14 +81273,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210515, - 1007 + 20210705, + 2321 ], "deps": [ "org" ], - "commit": "826b01beb434d38e415d3001908baf5994c6d669", - "sha256": "0q8ygsd2r2yg1k5z9j7bbq2hl43hjjdpws0k4rsx19l786ssg7yq" + "commit": "014561540bdc5dc6fe68671cadcc3793a65f6b54", + "sha256": "1hha8f9vb6pmszpz0xx4lj2imm2nh81mgrvsblvbm92k4qvmk6z4" } }, { @@ -81472,6 +81531,39 @@ } }, { + "ename": "ox-yaow", + "commit": "cf9aa32de6b3daaa1f209fad6412cf057c43e4fd", + "sha256": "16ajjq2if5jlc58a19nh8q9vgnp1d9zsqgzadkphc8g7g0ca3yaf", + "fetcher": "github", + "repo": "LaurenceWarne/ox-yaow.el", + "unstable": { + "version": [ + 20210706, + 1059 + ], + "deps": [ + "dash", + "f", + "s" + ], + "commit": "c7eca0130c35b3a8adcade637a35d1474368f4e9", + "sha256": "1k8vr1z9h6qywl037fh5p7ji0k78zm18r4qg996jghdk9sfxasfx" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "dash", + "f", + "s" + ], + "commit": "83f9e903f2853e9dc6367fa0a49015428d061dea", + "sha256": "1ab8n6k5pwsy54mm9fnfv64007fi884vjfxhbl5yvvg16a2pm7qa" + } + }, + { "ename": "ox-zenn", "commit": "30a54915cf91b47230ddf66ad2e5e17c36fb5e7d", "sha256": "1lsvq5av234dbm88bw4jlj1vxmm3jd8hnzf8vv7q675qcxgpnz5j", @@ -81618,14 +81710,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210616, - 2110 + 20210707, + 1424 ], "deps": [ "cl-lib" ], - "commit": "95e021756ee5c5255a63cce8351178e298c68363", - "sha256": "05qm6a0dy2iszrlwkiw5x2v0h5whk7d4qn7qjlf5qpns5fl0fwg2" + "commit": "eea82edcbcc95e9cd35e33243d77adeb88ec7edc", + "sha256": "018pihaz1msmizhfjqwsp4d1aa9idiri4nrf6ifkpp6v6j8k7mva" }, "stable": { "version": [ @@ -82442,8 +82534,8 @@ "deps": [ "s" ], - "commit": "f910af3b1d98b88a0f41794bbe7fd57411e9b909", - "sha256": "02miw5sf4bbwmz58ya98ijjhqx92vamyzw8c5v2k6id3pxaypng4" + "commit": "0c4c92283baa951469e75f632fdd08f0cb9fe6af", + "sha256": "1g34wkb3ca6wgjkgmzbhaak95bpdh1k49p5m00ajhg1rqicxwdzw" }, "stable": { "version": [ @@ -83640,14 +83732,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210610, - 548 + 20210709, + 2353 ], "deps": [ "cl-lib" ], - "commit": "68b13cef8435cae581850415cdda17e245dd0eae", - "sha256": "1iwqg1y47lp54qn9cjr3w9pca294mn92qlil3a4lr8xi57jbi3iz" + "commit": "b55aec612db791a1720232df0e2df0d3597d850b", + "sha256": "01bh8cs54mnikzrbhxc03588mrx8wsn2vqgb12j47g4lmg93759w" }, "stable": { "version": [ @@ -84099,11 +84191,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210519, - 1728 + 20210714, + 1700 ], - "commit": "cbf27232649c39e3749eefd23f962750bd249a49", - "sha256": "0r20y2hrgy1gmnx6izzvmvjh4axwb4x4pgcxn4bjmpzypand5xfp" + "commit": "4b0e9f84d063c476b211ec89b2a17bddac138911", + "sha256": "0jw2c8fmj0m39xms301diid7l1wkhcpxh6mw2mrdla8as31vgygv" }, "stable": { "version": [ @@ -84196,15 +84288,15 @@ "repo": "mallt/php-scratch", "unstable": { "version": [ - 20201108, - 750 + 20210706, + 459 ], "deps": [ "php-mode", "s" ], - "commit": "a9db3986144fff424c93228a613f54734ef993a8", - "sha256": "01fkpcxmv98wklzf8vbs6l3kljdmwzclv5m73czzbgk5s3rwc8vb" + "commit": "b6bfd279da8a8ac7fc30459485956f3fd5d02573", + "sha256": "084ms50pw90jaqyll0rd3if1kb0i8hfrdrg72vss44cg83rq58vj" } }, { @@ -84249,26 +84341,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20210617, - 2234 + 20210714, + 1805 ], "deps": [ "php-mode" ], - "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", - "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "php-mode" ], - "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", - "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + "commit": "0869b152f82a76138daa53e953285936b9d558bd", + "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" } }, { @@ -86711,14 +86803,14 @@ "unstable": { "version": [ 20210606, - 1152 + 1150 ], "deps": [ "iter2", "nvm" ], - "commit": "e38d21a885e234af9ea6b03f499c487175570571", - "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8" + "commit": "85c9349de2730b71c5796e342d67efee34faa9ed", + "sha256": "06gcqnd6wwcxqij4gx06y16kcqsh5znhs7hi5kwhzrbvqvqvrki8" }, "stable": { "version": [ @@ -87122,11 +87214,11 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20200724, - 901 + 20210715, + 1213 ], - "commit": "7b5749eae33eda576da3293dc386794c1248bb48", - "sha256": "0fvfp5hy93ggqspbnishzp0x0j1652ayismb8bpzkf6vra8vjrdw" + "commit": "e8c22beb14aff6d5661337feb6cebd7af3a3d454", + "sha256": "09zp7896ndmksk7mywdwhrh4bq951vj5lqjls7ncihifwlgcxa7w" }, "stable": { "version": [ @@ -87810,8 +87902,8 @@ 20200619, 1742 ], - "commit": "4b77b733699f9c39b517a124da737c018b1164e2", - "sha256": "1mfvmpwxayrzp07vl72djv162vlf0xg29mxh030lqf7jc9h11gxq" + "commit": "b90ec9c242b303e90811deebaa2e3e684b63de91", + "sha256": "11n9ybjxfc8x58fwp2f67nc6mg4qkj8m9c7ldjlp77m01k0qrij1" }, "stable": { "version": [ @@ -88657,6 +88749,40 @@ } }, { + "ename": "pygn-mode", + "commit": "a6a83906ba07f4a0cd906e8345de036a7cdcc6e5", + "sha256": "0w7rrq02rjkm4bbk08fz0r5yaxzbgxrgglhbg2qz7arzvgq4l715", + "fetcher": "github", + "repo": "dwcoates/pygn-mode", + "unstable": { + "version": [ + 20210714, + 1304 + ], + "deps": [ + "ivy", + "nav-flash", + "uci-mode" + ], + "commit": "321c14c195cd2f8a31b9bf99dd318a552fbbcd6d", + "sha256": "1sz8riry4c4lf5n0nsd3msw5kch3ifwg5psrf4y866b0wlya7yk2" + }, + "stable": { + "version": [ + 0, + 5, + 1 + ], + "deps": [ + "ivy", + "nav-flash", + "uci-mode" + ], + "commit": "cd06faecb40774fafa69d91085206810d686367a", + "sha256": "15hs87ly3gr8qcdfpsyyf8wadyhhij72kkj33hdqbbq9b74yr6qq" + } + }, + { "ename": "pyim", "commit": "151a0af91a58e27f724854d85d5dd9668229fe8d", "sha256": "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j", @@ -88664,15 +88790,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210623, - 415 + 20210714, + 231 ], "deps": [ "async", "xr" ], - "commit": "70d488f9233a578f0c7f8906aa83a1a690ec10fa", - "sha256": "14zczmikgsxqf3klx17n1imgpqhj3gjmz4hs95lkxs3a50qbqh7z" + "commit": "ebd3175c4c5e7845c52dddf71a806826a80df89d", + "sha256": "0p52a4bp4gmgwfpai8cwq3frp0fyhp9ma5a0idxdiamr8xjiwjz0" }, "stable": { "version": [ @@ -88834,8 +88960,8 @@ 20210411, 1931 ], - "commit": "6f066733e23a61d83580cd1898e6b8afab8fafea", - "sha256": "1m7365k7a624mp33v5x23knkcahpa9gvb3sbr8idqlk8n8k3f6mk" + "commit": "6c29598ce446dc441a8095b83c82390249df3693", + "sha256": "0l5dg9snp4p6x3nlyl0civ50kdl1q6zr0hmx9hcp2c72hm22dqi5" }, "stable": { "version": [ @@ -89759,15 +89885,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210629, - 2000 + 20210715, + 2107 ], "deps": [ "faceup", "pos-tip" ], - "commit": "4f8eafe2a016e2e78872e4006939ee82397e57a0", - "sha256": "0fa9kipg1ihfr16ljsfgxd6z8a5fj31npfxhqv7q9ysi4nq479c0" + "commit": "c7aca6f1b4c34a48314bc7812c2d7edc849e3dba", + "sha256": "1pcxicz7kg6s9j9gsdb8pba3j3n5522gclc5qq95ch2q3i5phg91" } }, { @@ -89832,11 +89958,11 @@ "repo": "istib/rainbow-blocks", "unstable": { "version": [ - 20210412, - 1937 + 20210715, + 1518 ], - "commit": "ae5c11cd3dc64039c5e65c9f1804aceba5b3b209", - "sha256": "17ar9k2352h6cnvcknq945lna3illln87r1vf4ll1aa798azizpb" + "commit": "83c4d6e77a1e25d3d2d124a4e90d5b084f3e15a5", + "sha256": "1v583d6mh69cz1adl295pd7axlqk3m1qs94558n84d1sh7syxcdg" }, "stable": { "version": [ @@ -90716,7 +90842,7 @@ "unstable": { "version": [ 20210513, - 2237 + 1453 ], "deps": [ "load-relative", @@ -92013,8 +92139,8 @@ "f", "s" ], - "commit": "f62be2d11c8a9182cf84f0efe7ed054cc304262d", - "sha256": "0ksw9s96mmb1qlypz9mc9br9139ha5jmahi42x4i8qppcn6zs5ja" + "commit": "eaf177324482d0eadf0e97a892a156c2d503f245", + "sha256": "18krcfbjvm9g67846dn3q7a2y4z3figirk3pvdsdb0fv425j11zr" }, "stable": { "version": [ @@ -93400,8 +93526,8 @@ "spinner", "xterm-color" ], - "commit": "bbf129cd128105de51b6c242b2551094b8d8987d", - "sha256": "09dnlvi8kf683n6q3yp4gy9d4idiyg4x6rcij8d90cvygh8i30wd" + "commit": "6ca73bb3cce4d1db3c4f91efb83b63227eb712d1", + "sha256": "12arrvvp3idq11a4ham77zxqp2d1026qz89ywgd3i9k1cbj852wi" } }, { @@ -93708,8 +93834,8 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20201015, - 836 + 20201011, + 905 ], "commit": "5daade4836da5b1b2ab26d84128d6c38328a5d52", "sha256": "0fkq8knq023zm538ls4zxghlkn9zf4rfccpmmgfcpad6bdm00cpc" @@ -93871,8 +93997,8 @@ 20200830, 301 ], - "commit": "32c5c18e1cac173b79fc37b85dca51f4e8d57e45", - "sha256": "1vzg370393yfw1msgdyq2bwv3rc765z30vsrxssm0zifjqimkab6" + "commit": "cff035686cc9505d114115646e4d98edac307512", + "sha256": "0w5bzlsbs5zdk3h8ij019yj7861ggg0a4wcqwq7dm7rwf1bshsl2" } }, { @@ -94371,8 +94497,8 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210530, - 624 + 20210524, + 354 ], "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" @@ -94452,8 +94578,8 @@ "dash", "f" ], - "commit": "447b6f0c3b4429e70a474a325151913100bc6417", - "sha256": "1w0l0r4n0w99523klia1pfyh0y3jvskhk2wrwzdx09mad0bdfj1b" + "commit": "46eefd5b3f4a6f24b2f88c8aa18cce0abb32edb1", + "sha256": "0fi04v84gp74xr84sh7blbc5s93xxb6apsrdh8zlc9dvwkkh5gza" }, "stable": { "version": [ @@ -94690,11 +94816,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210530, - 245 + 20210707, + 1827 ], - "commit": "a19bbe94de492bf504399c093cfc5695eb630fa8", - "sha256": "0jhc0qn3q7npsixj1b1cmplxdvpy30745h32y0ybyydahqc3yc30" + "commit": "48ea51aa5b6959ea2a134e36cd21f727047b0677", + "sha256": "0lini8hdih1qakf3hg981diw9gmzxjkd6rnjq3lddyqg6dvj9hhw" }, "stable": { "version": [ @@ -95732,11 +95858,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210621, - 534 + 20210714, + 111 ], - "commit": "70b985b1d00c8703acb1ebf16875616903470f45", - "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" + "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b", + "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3" } }, { @@ -95808,11 +95934,11 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20200921, - 1201 + 20210715, + 1227 ], - "commit": "02fdb5b2832889afd6cad5c517da9b1e4611c766", - "sha256": "0yy97yzc8v1h0vjpm6zbrdwy8sd931mscrbrq1svvv2y227s4ffl" + "commit": "28dc1d6faf21efbc49436b4458821a2d46e38ffe", + "sha256": "002vyik2nyqcvrf6d0qfbxc9bs95bc74crmyn9havlr50bw52wlc" }, "stable": { "version": [ @@ -96161,11 +96287,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20210502, - 935 + 20210709, + 1403 ], - "commit": "ca73cec33880322c5bbab407825d502d87f4cf0f", - "sha256": "1qnrk8kib4rndgbljqxq7cmskgxwcc9d8wdbdr3mgkgbg08xv5gq" + "commit": "41fe8544661a772f764a0924e04080f258053955", + "sha256": "14xm2a465mgdbp47hwb1dpxw4w5vl0rdlc4m5bxd5z1l4s06nc32" }, "stable": { "version": [ @@ -96736,8 +96862,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200830, - 1021 + 20210712, + 628 ], "deps": [ "alert", @@ -96747,8 +96873,8 @@ "request", "websocket" ], - "commit": "1f6a40faec0d8d9c9de51c444508d05a3e995ccd", - "sha256": "19lan9nd8qfw2ws7mx814vrin04c892yn5c8g3nad7lpnzszgr1r" + "commit": "ae1d742a0193fba38698931055708a28cc382bcf", + "sha256": "0292z0pzvwg85pr1g3xsglp9rkna6k7b0frbm5r43yr91sr0vv3f" } }, { @@ -96809,15 +96935,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210614, - 1523 + 20210709, + 2051 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "98a656d96b177edce57b552a2fa9d139cdce8c9a", - "sha256": "133p6yj5vdw6i4j2v8ac2g9ayrwxlvvimh2qs5fmxi8vklvn7h3a" + "commit": "68f5623f13c9a0d3d47ce70cf56928e00483d9d6", + "sha256": "1hybxng81ra3zqj07xp5vpzd5mx15sfvqa4wydg1kxi9ics6m9i6" }, "stable": { "version": [ @@ -97052,8 +97178,8 @@ 20210629, 2009 ], - "commit": "954e5dad72fb5712dfa968222e2b46dfdf9a476c", - "sha256": "06m2vwxga1rys98z97abajqq89k2dlfrrab21hhgqwc0zmdmb9fv" + "commit": "41f4d650485217aa1f2afa7c159418f103a09231", + "sha256": "0cq1a19d1przjizp7d4vjl8khp09j6jcwavhrpja1saqhwavhv7c" }, "stable": { "version": [ @@ -98069,15 +98195,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210605, - 1242 + 20210708, + 1128 ], "deps": [ "dash", "s" ], - "commit": "54005eb19dfab02f38074e696fa8d247b59a2ad8", - "sha256": "18ynqkf98rjyzl48l5399g49x9gdmsj0wyc4jp7mly7xrv51zblx" + "commit": "1b3071974b55c7f2046bd20a052b8fc795d2c940", + "sha256": "16k64k4mzjaiyq264crcpnmccj7aza2zlr9jg6l7ggjssly3fw5c" } }, { @@ -98253,26 +98379,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210601, - 1921 + 20210711, + 2145 ], "deps": [ "cl-lib" ], - "commit": "2298fd806d28daf511eb7836b23775e7df1f65e2", - "sha256": "1jfl0nhnv3ljagdlpsi2d7mhcrm8rww8crnhzad5zimzwc48nlcq" + "commit": "030964f7c62696c8cfb29125df6e7649d2bf9aeb", + "sha256": "01c1lkr21y0cd6gixzd38mql89k70jn049jr0xhazgz16cnw1g7j" }, "stable": { "version": [ 2, 0, - 0 + 2 ], "deps": [ "cl-lib" ], - "commit": "59efa9c52ec407161f741e67071813c3c1901680", - "sha256": "0aigavrqfi2dy4q5vrfs48n5k7839gqnafq7mp14cmcbrzcwadrd" + "commit": "030964f7c62696c8cfb29125df6e7649d2bf9aeb", + "sha256": "01c1lkr21y0cd6gixzd38mql89k70jn049jr0xhazgz16cnw1g7j" } }, { @@ -98283,14 +98409,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210519, - 925 + 20210112, + 1050 ], "deps": [ "dash" ], - "commit": "e626b1889d8c945806e959e451f08633d948f8a7", - "sha256": "1nz04q681slnzcqzc6lcckmv72h017616l1j7q4aalf2dqkn529z" + "commit": "8271679a627148c96ad894f960cec9b1abfb1e6c", + "sha256": "1xrya65z54si9cf64whllq7vhw5dnafal9q2m4jf62jvxmbjdfsi" }, "stable": { "version": [ @@ -98847,11 +98973,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20210618, - 2001 + 20210706, + 1210 ], - "commit": "f98150e8e254e6bf94dee2de3e8baaf02e2aae80", - "sha256": "02jm3v3bnbc45rd4fl9kkln0pn49ix2igm254yz33cg0ykgkj2nf" + "commit": "dfe06629f8211ccd9933fc0d457019401ecbe594", + "sha256": "1apa6bp3lxs6jia37k079yd3qx79wclzh02bf66xpsqkwc2xg5fr" } }, { @@ -99009,11 +99135,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20210619, - 1753 + 20210702, + 1954 ], - "commit": "bd21335668ac7ea4d8c992490b4a710053434e74", - "sha256": "1jlb1mfigcqxvm1aibf803xypmbj3x1145nmf2q0v2aaipd6s912" + "commit": "7f3d3d3545078df2f4a37094c618993145c731d2", + "sha256": "126chadfvsfpwa196811s2i8zr4cs1g413ssy52apn2fpzrb3vmp" } }, { @@ -99803,11 +99929,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210517, - 1925 + 20210714, + 951 ], - "commit": "ff9a15ec150baef21d7d8c6f79c5602e56825391", - "sha256": "1nvsxj616lgciysmvzpwfpq7dv0alkv2ma4gi9b4j3vjwm0rzbry" + "commit": "1c8f8779f20479e55f9d3d1151f1f68c1dff56f2", + "sha256": "0vcs6bz3qzw06c7bs253m9q2l43k8nppzdv7hqbybcdh4fakp8xw" } }, { @@ -100114,8 +100240,8 @@ 20200606, 1308 ], - "commit": "097c527a40797e1b3f3a954cfc5e04987fbb61a9", - "sha256": "0yidmzdkrw66hga7nna337jk8rkml6plhr1mzfsyfazpb9da0zsj" + "commit": "ba12f620074b5a6e6615e2963bdc79fbba6060eb", + "sha256": "1gjmzm8lx8fas9phkbvy3rz9dyzqgdjs2ddd3l9biqqggwka0pa0" }, "stable": { "version": [ @@ -100279,20 +100405,20 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20200927, - 747 + 20210712, + 755 ], - "commit": "c4a519be102cb99dd86be3ee8c387f008d097635", - "sha256": "0f3nkfdpngax4zfw75jca2wywwh31ha6ywddh4125lbxi3y6m7s9" + "commit": "bf60b0c943cc0934aa188ada7c1c16053517df07", + "sha256": "077qxldhya397ka96786w0876bwa77x0il3zwixa9pcbqmqsg8qd" }, "stable": { "version": [ 1, 0, - 12 + 13 ], - "commit": "c4a519be102cb99dd86be3ee8c387f008d097635", - "sha256": "0f3nkfdpngax4zfw75jca2wywwh31ha6ywddh4125lbxi3y6m7s9" + "commit": "96a9baf4936df43b9f46804629384b79238691c3", + "sha256": "1v8h05m7iwxqp7lypdngib2620z0x23zc715vxqpqys79djwh9yh" } }, { @@ -100604,14 +100730,14 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20210108, - 420 + 20210706, + 534 ], "deps": [ "cl-lib" ], - "commit": "a7ae1713bb659988bb1465a13b837fbc2d699504", - "sha256": "1hncxbg5lvywzkwvdmzvrz71midy4samjq2vvxxhz90z1y5l8l29" + "commit": "23b78a39053088839f281bc0c3134203d7e04e50", + "sha256": "1c8rrrxq8i287a7r1qwrqhfyrl84jfcpnjxiqczwjmc95r510yyz" }, "stable": { "version": [ @@ -101227,8 +101353,8 @@ "deps": [ "ivy" ], - "commit": "040d458bce4a88f37359192061bcea5ebe87007c", - "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" + "commit": "56139df678d9886d0612c0a192cce2cf6f156628", + "sha256": "0xjjdq3vmpm3fpvmd3g57m4ldixx8j73in0nmdx4vvnzvh0n904g" }, "stable": { "version": [ @@ -101438,14 +101564,14 @@ "url": "https://tildegit.org/contrapunctus/sxiv", "unstable": { "version": [ - 20210514, - 918 + 20210713, + 1845 ], "deps": [ "dash" ], - "commit": "a531a7596e307a218beb8ff77893eeae61284f6e", - "sha256": "0gimq172pp143jckfhhyw319n3vpjvlkadm0vhypycas9i89mcg0" + "commit": "14057b156dd57610edf101403e653be874a342bb", + "sha256": "14wh7fw45w5cfdqibrcfzahsf4cwbi97xp16jd773ynkcf049cjs" }, "stable": { "version": [ @@ -101805,15 +101931,15 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20190913, - 2040 + 20210714, + 1932 ], "deps": [ "hide-lines", "ov" ], - "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", - "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + "commit": "ff1ab94c0f65e9891656d78d84f71614e0b9a597", + "sha256": "1x0xlbiisq8wngxhznkhxavhrhbc1w5p5w1qgfxib16fr09aqyc5" }, "stable": { "version": [ @@ -102434,15 +102560,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210701, - 1035 + 20210711, + 1323 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "a4054e9517d68109212f9d69342a49d4d65dd56f", - "sha256": "010b2rkpr8cib1c6s1ysg5wllrsg4rxc7h7cxqrjq1978bi499cw" + "commit": "377531fc19063b490b842e779df9b07195e8c496", + "sha256": "0gmjfw6kz5cflvj3zmyhw9qad850ckvq14k5vys62603yvm53qgw" }, "stable": { "version": [ @@ -103382,14 +103508,14 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20201107, - 4 + 20210714, + 1807 ], "deps": [ "cl-lib" ], - "commit": "6bc170097f1dfb7ea4db91544c5ab653279e15cd", - "sha256": "0amm2jw86nyjzrga93n7jhz7p603mid46y41dsw2x8wz2rbh06r2" + "commit": "bb711c4bb992d7a129dd434a41a356cdaf8c387d", + "sha256": "09i7w2s594ksyi7a9bwpcycn4j7is19jh9kznrk39ar2kc3m118h" }, "stable": { "version": [ @@ -103525,18 +103651,18 @@ 20200212, 1903 ], - "commit": "6c2a7567772f3954006c77a8bdc041df83802a00", - "sha256": "0g1j346s8jhw830byzjvgsjg6a03kza19xsghza1bzncwqjbv1n5" + "commit": "b157feff61c3bdefb138753af7636dae5a7b3c08", + "sha256": "1dnspcmni98xhcz21604238lskdqn6b4kpv2zllvq58si59q32mw" }, "stable": { "version": [ 2021, - 6, - 28, + 7, + 12, 0 ], - "commit": "32036a5505970a5a8c905543ebc6de1b20a662d8", - "sha256": "0nc9d88ydm5x4nynyxq4rqbp63ypjd1mwf18vancwigv7jxc62an" + "commit": "faeb22efa9ed948e6096e37e65e6d121c83e329a", + "sha256": "1adaqcdzzrrff0186276pdmlqixkv47qfgyxap3by9zdiqwysd50" } }, { @@ -103592,20 +103718,20 @@ "deps": [ "haskell-mode" ], - "commit": "60a1c271b39dac22783a4f892446f08d3faeb025", - "sha256": "18spz3lvb3df0rr2cqxkqa6rfzrpwwryh4gkzp68znbbfl655l8d" + "commit": "95c065a410c20cbeefeaabc3084b2b09d09564c2", + "sha256": "02xbzwj1bf0n4lvg1rycmxsbvwi0p0h9a5fqx755kshwx5hngkx3" }, "stable": { "version": [ 1, 7, - 7 + 8 ], "deps": [ "haskell-mode" ], - "commit": "b7399a878622173bf9fdc076ec72a8353e1b924c", - "sha256": "1qbywv182gzbdk27bzah273mb8brmqrpxcgv1pmdy10fc7fv2z0f" + "commit": "95c065a410c20cbeefeaabc3084b2b09d09564c2", + "sha256": "02xbzwj1bf0n4lvg1rycmxsbvwi0p0h9a5fqx755kshwx5hngkx3" } }, { @@ -103841,11 +103967,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210621, - 1857 + 20210710, + 1950 ], - "commit": "80d29c0f29925775fb00e90669a153d94eae01db", - "sha256": "1hdxis28ngrl0d1gafckah7srad4rnpmn4dh5dxd0a5vph63cxhw" + "commit": "e0629d59adc92112f51b5f9300e06e714349488d", + "sha256": "104zffdf0jlfqh6rlzl7a7ji5gs11pacy63ab4rjs2kx08p3z0y9" } }, { @@ -104004,11 +104130,11 @@ "repo": "dalanicolai/toc-mode", "unstable": { "version": [ - 20201028, - 1141 + 20210714, + 725 ], - "commit": "36fe728f387ab2087e4096cb4734a8642dd7f880", - "sha256": "1v3h1aw8p98rhy3mx8nngwl0v0pzk6pabr9mmah20cdgz1j8ax0s" + "commit": "977bec00d8d448ad2a5e2e4c17b9c9ba3e194ec2", + "sha256": "1yshkvsa5g6gxn9agf4z5ks5bd43l4akdcblxfgqkpshp25y5plv" } }, { @@ -104483,11 +104609,11 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210528, - 754 + 20210713, + 1609 ], - "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", - "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" + "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2", + "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp" }, "stable": { "version": [ @@ -104590,20 +104716,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210701, - 1116 + 20210712, + 1626 ], - "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", - "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" + "commit": "e90481000f071e9a26a1cc0f40d347f7d3e2201e", + "sha256": "1sw9248cxr3x2hy2rhyzbwik08nvlkglxgig3rbqshc8spnid5h3" }, "stable": { "version": [ 0, 3, - 5 + 6 ], - "commit": "b711543401dafc159943d8a703cf30fabdc78e1f", - "sha256": "0wzfnzv2304a737zwp163aajjhm8i3ix9v7palgg1r3jskvbghmw" + "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", + "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" } }, { @@ -104651,14 +104777,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20210218, - 2015 + 20210705, + 2152 ], "deps": [ "let-alist" ], - "commit": "b5c1d391b4be469a07536e901e54a8680387025f", - "sha256": "1z3gzax6i9cwipmi64hg3h98haimlb0xsz4zm1ggqwwq1zd5csvp" + "commit": "a03a6f5c7b133e0a37896b6d993dd6d6d4532cc2", + "sha256": "1znpl4ps0ah6lmrlyha6wbkbvnx90qkvksp5xp87apfb61zqzqwz" }, "stable": { "version": [ @@ -104723,8 +104849,8 @@ 20200910, 1636 ], - "commit": "20694aae145edd6ad496a395ef1a53ab37a59521", - "sha256": "01afsgkzn5y4ld5m1gmvai8pgdy73kmllivmz18a2q9fdrgaa6xb" + "commit": "d2651b913a6ec615e6285712833566a79dca7247", + "sha256": "0pw401npbahlii6x37c6mi66ghd16mv04d6y0d1nirflvg4nfl8a" }, "stable": { "version": [ @@ -104964,8 +105090,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210606, - 1918 + 20210713, + 2032 ], "deps": [ "ace-window", @@ -104977,8 +105103,8 @@ "pfuture", "s" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105014,8 +105140,8 @@ "all-the-icons", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0", + "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg" } }, { @@ -105033,8 +105159,8 @@ "evil", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105063,8 +105189,8 @@ "deps": [ "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105095,8 +105221,8 @@ "pfuture", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105128,8 +105254,8 @@ "persp-mode", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105161,8 +105287,8 @@ "perspective", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "a6f9e9f1cea3502b3ead082fd208c4011a55add0", + "sha256": "1g004yj613x6qr06gaffb6rp2n47ximb1w8776l0s6w8d40msyyg" } }, { @@ -105180,8 +105306,8 @@ "projectile", "treemacs" ], - "commit": "2655a8976d56719add893cec45a18e018626842d", - "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" + "commit": "e4a85e3266581b8a8f526dbf4142c26d6e76d294", + "sha256": "1bjjz504a6nyh8ymqj4zbakp7b2006r0ayid5akc6yzpmyrsb4rl" }, "stable": { "version": [ @@ -105389,15 +105515,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20201212, - 1041 + 20210705, + 341 ], "deps": [ "dash", "s" ], - "commit": "b7ca357a0ed57694e0b25ec1b1ca12e24a4ce541", - "sha256": "12p4k8x1p0h94xcdis7m0vkzf41k5k3ijkaj838ywb7i74myfdxb" + "commit": "b6814e7e688781a586a775ef3504b9252af65b93", + "sha256": "1bf39qx8k7nn1dj1fp6j47zr1lp28ccrj6ciz7z3dk040rlxnv11" }, "stable": { "version": [ @@ -105518,14 +105644,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210628, - 1257 + 20210709, + 321 ], "deps": [ "caml" ], - "commit": "2e8482e23f45f0e6246a8d075a3b8696c5f49070", - "sha256": "04wblkb0jqzq67p1d96i284wfqv3ddffrwz3i3wf537wyi8bmn4k" + "commit": "b59c422759506402f990b089dbaa91c0578e2c2e", + "sha256": "1maqyhy82ayfiv95ng4bpgxrvjkkz331pw4ld1x99jpwqljpwqzc" }, "stable": { "version": [ @@ -106159,8 +106285,8 @@ 20200719, 618 ], - "commit": "d4edb2cc110f1679ebc82cb52a4242cbc74636db", - "sha256": "0agn2j0qd516kxqx1bh6ajpandi8vz7zas966nw88yhv8m8hlzb2" + "commit": "741ab716ada8e71a94a9dae3daa4236298d29bd7", + "sha256": "1ibjwmvx4p7kchxlnfpqxj4p3k99nwxwhzk4m2b1yyswpiad2k0z" }, "stable": { "version": [ @@ -107033,8 +107159,8 @@ "deps": [ "exec-path-from-shell" ], - "commit": "43499194224483b27628fdf99f6f9ff6e731d844", - "sha256": "1j6vkg0z7m8yzrgy0innq7r2d5pchbqs3y5gf51qdzsfqdmff3ys" + "commit": "31d8bbec16eff342bd4c02b0cb12ea31dd31bf19", + "sha256": "0388kwc65hpbimd53br2x9z9dvxw20wnny09kldw5nnlvzvzrba1" }, "stable": { "version": [ @@ -107063,8 +107189,8 @@ "deps": [ "s" ], - "commit": "408c01423d7036463891d83e4a21227250ed2a14", - "sha256": "1jz7x93c14f2nm8iqc30kzfjbn5bcdvxxnfljvwj77mwgir2ali8" + "commit": "aa6e271e8efc3a93caaaa740245d126d24e778ab", + "sha256": "0a8qb7wyi5pkg7g0x7imzzxryz55dr8msiila9j9skq6jlmn84hl" }, "stable": { "version": [ @@ -107823,8 +107949,8 @@ "repo": "koral/veri-kompass", "unstable": { "version": [ - 20200213, - 934 + 20181103, + 1246 ], "deps": [ "cl-lib", @@ -108504,8 +108630,8 @@ 20210627, 2121 ], - "commit": "bda27d3a7f11fee0550055b0552c2633c167dd96", - "sha256": "1y8ycsm4d72v86prg87dffis5q853k2w0fvx5vz732jryzp18lda" + "commit": "28398f1059f88e7e242f39cfa0ff8213cdaefc42", + "sha256": "0ln5idsmj7x0b769g7bj9wk0bjr826kq4bryw206dxxnz06s3wcs" }, "stable": { "version": [ @@ -108527,8 +108653,8 @@ 20210627, 2121 ], - "commit": "a8bff6913f603a30bd98bef882ace01476c440bf", - "sha256": "1rshwvfggjb7amgxcl31xhll28kfbgh14aw33khlp32gq6p3vqyh" + "commit": "500d35f051fca07459abd163d5692c853a49329f", + "sha256": "1k5akiim0c0qiv10np5yzdndz8p499qhzhhrp1i8dz36gbp5x8ll" }, "stable": { "version": [ @@ -108707,8 +108833,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20210323, - 911 + 20210715, + 907 ], "deps": [ "bind-key", @@ -108717,8 +108843,8 @@ "s", "versuri" ], - "commit": "43b9364042922950f612ac57d8c526921a01b291", - "sha256": "14432mnm5lvccb9x3fymzi53kxfh2if92c5q14llz6pbbif8x3vh" + "commit": "b327a5224ab45f6689ce635878301e54ca753b3b", + "sha256": "1sq2nmmw8ga4jhkgb3a0mkps7v8ma1jrrz8c1vbypfn1b3amvj3b" }, "stable": { "version": [ @@ -108840,8 +108966,8 @@ 20210615, 103 ], - "commit": "70b985b1d00c8703acb1ebf16875616903470f45", - "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" + "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b", + "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3" } }, { @@ -109401,14 +109527,14 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20210209, - 58 + 20210708, + 2242 ], "deps": [ "cl-lib" ], - "commit": "3aa5084bcb733aa77997b9210b4437903f6f29ce", - "sha256": "1cg27byi1g0s3yfzdkji4xzc15ci5kqb2j0mj5dfdms4db12dir4" + "commit": "6357a1c2d1718778503f7ee0909585094117525b", + "sha256": "1dp4ajfd4ikqdr2lkmjijw431d3hi07izaw54fn5zw8mp9dk225y" } }, { @@ -109845,11 +109971,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210630, - 1217 + 20210712, + 1852 ], - "commit": "27d9fec33abb989b030f7677ccf5f799287d6472", - "sha256": "1vdvp3iavh57mwhmgxwalrha7h7hgxsfnkxbrspl9x9cx7fx98f3" + "commit": "55fcce0c6143044535bc6825a68f42ca83f58f00", + "sha256": "0bap1k6rzaqvqp7njzikw8clhky1fj78mdcx4zah1y57vhszavcw" }, "stable": { "version": [ @@ -110178,15 +110304,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20210615, - 2334 + 20210711, + 302 ], "deps": [ "org", "wikinfo" ], - "commit": "7df42a260fb93cb743a08e67ea92d77f62dec72b", - "sha256": "05qqs4b0gmnwjl6d29xns93p2lyh1x2xzl0qpydbnxjirwp2bamx" + "commit": "31cf4a52990caa3f928b847ec25a5412836552bd", + "sha256": "0l13yi9iwi68n95wmxkjrf0zsmvxadpmxc7zm8x7v8kk5p7scnil" } }, { @@ -110894,11 +111020,11 @@ "repo": "istib/wordsmith-mode", "unstable": { "version": [ - 20171025, - 1430 + 20210715, + 1517 ], - "commit": "589a97412138145bea70e0450eeddeb7f138d538", - "sha256": "1zm4grysjpynibldvic75awhcmmnjmlkkvslw8bvirmi58qwvwzj" + "commit": "5d40ceaa2b8d41ab3634ca377ceb6a74deeb2287", + "sha256": "132l0i94nwrm676bpxw0wnr1drqwmapwv92mf4iyb209fr4hc2w2" }, "stable": { "version": [ @@ -110918,8 +111044,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210504, - 1132 + 20210702, + 1200 ], "deps": [ "ace-link", @@ -110927,8 +111053,8 @@ "swiper", "zoutline" ], - "commit": "c99ef5478183d0ab56b0abe943206491c802e003", - "sha256": "1qbs5dvqcip7y77f8sdyr7zw64vgxlybj4isi7x841j4z7kh5m11" + "commit": "28d381e2603a79340a94a410acbbb8a6b3e237d8", + "sha256": "15567bns5kag47d58xapr4z0gfj5py3a8lwfpjlhmzccmarjr7x8" }, "stable": { "version": [ @@ -111392,11 +111518,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210701, - 145 + 20210715, + 2014 ], - "commit": "6465e77d57a30a0a82ca4f4756593207b2ada510", - "sha256": "1bzlpwxkjmzgypagdp9qj4jf6crm3yhjnr98ipr1f49dl8178j6s" + "commit": "95c54a896c1e4af797f0af7cf9de85426c8e11eb", + "sha256": "137xv47cij7a0zws8xdw140cwlsnywapyb9y51dqpmn08s1ff2l2" } }, { @@ -111422,11 +111548,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20200420, - 1528 + 20210708, + 2203 ], - "commit": "c97a43dc0cebbfc519d0cce5b547dcc5e22b2085", - "sha256": "1qkazkisgw5c9xzxqm6xzm124r1v4d4dcyazvw66nz5j2zl1i5qd" + "commit": "53044a43db3c803fb3e32003c3106403ecfb8e4b", + "sha256": "09x8lrx4sdnx2sr0nkkn19hi7x6hi3gs0ad31xmjx1qgd7bw7as9" } }, { @@ -112453,8 +112579,8 @@ 20210625, 803 ], - "commit": "0ddf70ec214e2b1fade0594ec44c55adb48c06da", - "sha256": "1mkk07j3bayzprimiq95blbyj7idl01p6jv43hh226r427c89bcs" + "commit": "0d7556d0936e0223003208003470a2fa28f72150", + "sha256": "12lz73grpvnjgki93q9aywa5p6ddw67a73dcaryv186j3maq442w" }, "stable": { "version": [ @@ -112813,11 +112939,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210623, - 544 + 20210713, + 455 ], - "commit": "4aa2a0d0c3e3b7c408d680df8cc5ede53c18e923", - "sha256": "0psb3ff0f0wia7vmxqhframl8vnyzk6xx3dmv1g1j7b0njk259ij" + "commit": "06a6bcfc58d1f1cd8815c674c9fcbbf193bba0a9", + "sha256": "0mp68h924hfj86rya0kvk16w82lvllmiryz8ry70ngcfmwdh930v" }, "stable": { "version": [ @@ -113221,15 +113347,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210602, - 841 + 20210713, + 1855 ], "deps": [ "ace-window", "deft" ], - "commit": "b71f24d382887aeefde9c47fb6aa521d0ebeb806", - "sha256": "09wy2gllacry2n0cp52fakaa36lnd1mnbb26zysdjxh0429siy4a" + "commit": "7dbf608d17786a69019867fd6b2b7d6c6edf849f", + "sha256": "1lq80ck08bydl98ka6j4qd6m5iqd1l8cx0y8pa2wq94vj71l65vl" }, "stable": { "version": [ @@ -113662,8 +113788,8 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20210222, - 347 + 20210129, + 413 ], "deps": [ "deferred", @@ -113711,6 +113837,30 @@ } }, { + "ename": "zoxide", + "commit": "77de3ff55aa7feffef7e389b4dc9a0844f82da55", + "sha256": "055f229a9kck8bbfwxksdi2b5v2aawjz2p8f6dar247ii1ix0jd6", + "fetcher": "gitlab", + "repo": "Vonfry/zoxide.el", + "unstable": { + "version": [ + 20210705, + 448 + ], + "commit": "f68d7cf9c8c813bdc1ec75f880e0dd1b64112f7c", + "sha256": "030vyh9v89ij1db1riqpzxxfgs50x0lx3isnhzbfj2dy3acmmc7s" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "f68d7cf9c8c813bdc1ec75f880e0dd1b64112f7c", + "sha256": "030vyh9v89ij1db1riqpzxxfgs50x0lx3isnhzbfj2dy3acmmc7s" + } + }, + { "ename": "zpl-mode", "commit": "0bf11cd6ceb2633f968134d80f37d32f91c48227", "sha256": "0wqhwzanvc1gpnykfqzi02p9zx0c1n6gnavg5dv1mlmc8x0hr67s", diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e9dc88376bc..dc22a92238e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "06as63444m2036vk4180dfpavmp9l07qc1jfc4gg86j0apdxr6sh"; - x86_64-darwin = "0dxchqwk3flv2cr542y1l7c06lak9zzj09f2kljsan6gs6zbls2b"; - aarch64-linux = "0pdbganyc59mll3232b26cc6fi8a8kpvjm5qky4qr4pk4jsj2r6q"; - aarch64-darwin = "00pax1hakj5l21j7fm1b05s8kkfnbvgfs9h7f27ad379n6482gxl"; - armv7l-linux = "1g63xh3k1nm8kls674qavmyl7csb3m4d7ywc0512far76lw39rvr"; + x86_64-linux = "049spg4c1arkw97mg0h046kiirmcrjj97sy4ldiblwldjn510acw"; + x86_64-darwin = "0g6b1891ag4a6p7rlkfka5v4nbmpr4ckkmibhw8l3wa9zdzs77x6"; + aarch64-linux = "1qvk6cn5v9bz4vl5ifpdgrba94v6a54xx8s3fxdkj3lqvq27kpd1"; + aarch64-darwin = "1whgjkxy70ifx1vaddxr8f1xcg651fhca4x7rzidzbyyf3baghy0"; + armv7l-linux = "1k45s81s4ispc0vz7i17a7gss05d82vpymxgangg6f1yxwz944r4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.58.0"; + version = "1.58.2"; pname = "vscode"; sourceExecutableName = "code"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index c9da010505e..000c12bc72c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16hzhmsh9nv2brpzx8wnz08sanf0v6f3ln5hqgzxck0pafbzqyl5"; - x86_64-darwin = "1a44fm5fx0zqlfr344mvc0m9hbd0vxd6s489pmh8x7m7q3sadi7j"; - aarch64-linux = "082gjmnlvk12vkcxbpsd4xfgs38qbxkfawq9kyl3p7i8y6anrd4i"; - armv7l-linux = "0zs66qmlq65166s34qjr6gppxvl5hyz1mjwxc97mki2c6y61fp28"; + x86_64-linux = "11h4c5ghgn3qrg66jh2par3cl3fqzn9xb7gdniww4badnyajnij8"; + x86_64-darwin = "0hd3qdxg4cknk3fxv509jlblwmfx65bm2a4arsg255224dpg64n2"; + aarch64-linux = "0waakj413kqf68sawajd3n24qdbx6b2svyb4lgbn0sy1apc96s3c"; + armv7l-linux = "1ij2bmsk601f1vjljj6gvxsxrcjqf2m74s9kc006hmcz7czjgk8f"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.58.1"; + version = "1.58.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e7544258acf..aab30c24e20 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.74"; + version = "0.75"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"; + sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"; }; # glib-2.62 deprecations diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 4fe5272bc07..d9bc78bb2fe 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.6"; + version = "3.4.7"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0a26kcj3n1a2kw1f3fc6s1x3rw3f3bj2cq6rp7k0kc4ciwh7i9hj"; + sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c"; }; cmakeFlags = [ diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 2b099e7664a..611bbbe979f 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -52,5 +52,10 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ marsam mpickering ]; platforms = platforms.unix; + + # Broken due to Agda update. See + # https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881107449. + broken = true; + hydraPlatforms = platforms.none; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 54e26cd2ee8..138c97d73be 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , flint @@ -11,57 +10,16 @@ }: stdenv.mkDerivation rec { - version = "0.7.27"; + version = "0.7.29"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "sha256-1HHCIeaNE2UsJNX92UlDGLJS8I4nC/8FnwX7Y4F9HpU="; + sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; }; - patches = [ - # the five patches below are included with sage 9.3. since pynac - # is a self-described "Sage Math support library", we include them - # here. - - # https://trac.sagemath.org/ticket/30688 - (fetchpatch { - name = "power_inf_loop.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3"; - sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs="; - }) - - # https://trac.sagemath.org/ticket/31479 - (fetchpatch { - name = "disable_poly_mul_expand.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3"; - sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo="; - }) - - # https://trac.sagemath.org/ticket/31530 - (fetchpatch { - name = "too_much_sub.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3"; - sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis="; - }) - - # https://trac.sagemath.org/ticket/31554 - (fetchpatch { - name = "handle_factor.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3"; - sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; - }) - - # https://trac.sagemath.org/ticket/31645 - (fetchpatch { - name = "seriesbug.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3"; - sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts="; - }) - ]; - buildInputs = [ flint gmp @@ -84,7 +42,7 @@ stdenv.mkDerivation rec { of the full GiNaC, and it is *only* meant to be used as a Python library. ''; homepage = "http://pynac.org"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5ab696ed1d5..227439713ed 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -64,11 +64,9 @@ buildGoModule rec { installShellCompletion --fish completions/fish/* installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild - '' + lib.optionalString stdenv.isLinux '' install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system - '' + '' runHook postInstall ''; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593df..820e8ad18bc 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -13,12 +14,14 @@ , cni-plugins # not added to path , iptables , iproute2 +, qemu +, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ + binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -27,6 +30,9 @@ let util-linux iptables iproute2 + ] ++ lib.optionals stdenv.isDarwin [ + qemu + xz ] ++ extraPackages); in runCommand podman.name { diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 8f7a88a2182..2e024c20f41 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-slNVSlyJLaqIFF4uJP/7u4M0AkJLQjqkHO5TeKFYgSA="; + sha256 = "sha256-xd46HlZenTNCzmnCGN3x7Ah8pPLwbG9LSMGmiPIPyv0="; }; vendorSha256 = null; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 661e0d674c5..8110d670e41 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -140,7 +140,7 @@ url_to_name(){ fi } -# Fetch everything and checkout the right sha1 +# Fetch and checkout the right sha1 checkout_hash(){ local hash="$1" local ref="$2" @@ -149,6 +149,7 @@ checkout_hash(){ hash=$(hash_from_ref "$ref") fi + clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \ clean_git fetch -t ${builder:+--progress} origin || return 1 local object_type=$(git cat-file -t "$hash") diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d0824b17bd1..00cad9a96b5 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -193,7 +193,7 @@ let ''; in runCommand "test-writers" { - passthru = { inherit writeTest bin simple; }; + passthru = { inherit writeTest bin simple path; }; meta.platforms = lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 4cd602c620d..c15f3a011a2 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz", - "sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62", - "msg": "Update from Hackage at 2021-07-02T10:49:03Z" + "commit": "360e4a3b93ab9fc49673c9d91eebd963ddd7e132", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/360e4a3b93ab9fc49673c9d91eebd963ddd7e132.tar.gz", + "sha256": "0pzi0kjlma36s0z5wfcghn6h6lwx61vvq8f7322nz80fs4drpn64", + "msg": "Update from Hackage at 2021-07-07T20:16:30Z" } diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index e8b10227eaa..50a32420de0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,11 +11,12 @@ , gtk3 , granite , libgee +, libhandy , elementary-icon-theme , appstream , libpeas , editorconfig-core-c -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libsoup , vte @@ -25,11 +25,12 @@ , ctags , libgit2-glib , wrapGAppsHook +, polkit }: stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.4.1"; + version = "6.0.0"; repoName = "code"; @@ -37,17 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; + sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; - sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -60,6 +53,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + + # polkit is needed for ITS rules + polkit + python3 vala wrapGAppsHook @@ -71,10 +68,11 @@ stdenv.mkDerivation rec { elementary-icon-theme granite gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libgee libgit2-glib + libhandy libpeas libsoup vte diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 46f279dd795..6e6beba50ce 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -12,6 +12,7 @@ , gtk3 , libxml2 , granite +, libhandy , libnotify , vte , libgee @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "5.5.2"; + version = "6.0.0"; repoName = "terminal"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-giVmL0zYEVYJ40ZBQ9dDb4hOx4HaYRt7tUTOu37lMYU="; + sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc"; }; passthru = { @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libnotify pcre2 vte diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index ad1a47e5cc9..3ef4ebb9b98 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl, perl, gcc -, ncurses6, gmp, glibc, libiconv, numactl +, ncurses5 +, ncurses6, gmp, libiconv, numactl , llvmPackages # minimal = true; will remove files that aren't strictly necessary for @@ -14,68 +15,191 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let + downloadsUrl = "https://downloads.haskell.org/ghc"; + + version = "8.10.2"; + + # Information about available bindists that we use in the build. + # + # # Bindist library checking + # + # The field `archSpecificLibraries` also provides a way for us get notified + # early when the upstream bindist changes its dependencies (e.g. because a + # newer Debian version is used that uses a new `ncurses` version). + # + # Usage: + # + # * You can find the `fileToCheckFor` of libraries by running `readelf -d` + # on the compiler binary (`exePathForLibraryCheck`). + # * To skip library checking for an architecture, + # set `exePathForLibraryCheck = null`. + # * To skip file checking for a specific arch specfic library, + # set `fileToCheckFor = null`. + ghcBinDists = { + # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) + # nixpkgs uses for the respective system. + defaultLibc = { + i686-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, + # which link it against `libtinfo.so.5` (ncurses 5). + # Other bindists are linked `libtinfo.so.6` (ncurses 6). + { nixPackage = ncurses5; fileToCheckFor = "libtinfo.so.5"; } + ]; + }; + x86_64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + armv7l-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + aarch64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + { nixPackage = numactl; fileToCheckFor = null; } + ]; + }; + x86_64-darwin = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + }; + # Binary distributions for the musl libc for the respective system. + musl = { + x86_64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; + sha256 = "0xpcbyaxqyhbl6f0i3s4rp2jm67nqpkfh2qlbj3i2fiaix89ml0l"; + }; + exePathForLibraryCheck = "bin/ghc"; + archSpecificLibraries = [ + # In contrast to glibc builds, the musl-bindist uses `libncursesw.so.*` + # instead of `libtinfo.so.*.` + { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } + ]; + }; + }; + }; + + distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; + + binDistUsed = ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); + useLLVM = !stdenv.targetPlatform.isx86; - libPath = lib.makeLibraryPath ([ - ncurses6 gmp - ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv - ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl); + libPath = + lib.makeLibraryPath ( + [ + gmp + ] + # Add arch-specific libraries. + ++ map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + ); libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; - if stdenv.hostPlatform.libc == "glibc" then - # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. - ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' - else - "${lib.getLib glibc}/lib/ld-linux*"; - - downloadsUrl = "https://downloads.haskell.org/ghc"; - in stdenv.mkDerivation rec { - version = "8.10.2"; + inherit version; name = "ghc-${version}-binary"; - # https://downloads.haskell.org/~ghc/8.10.2/ - src = fetchurl ({ - i686-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; - }; - x86_64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; - sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; - }; - armv7l-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; - sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; - }; - aarch64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; - }; - x86_64-darwin = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); + src = fetchurl binDistUsed.src; nativeBuildInputs = [ perl ]; - propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; + propagatedBuildInputs = + lib.optionals useLLVM [ llvmPackages.llvm ] + # Because musl bindists currently provide no way to tell where + # libgmp is (see not [musl bindists have no .buildinfo]), we need + # to propagate `gmp`, otherwise programs built by this ghc will + # fail linking with `cannot find -lgmp` errors. + # Also, as of writing, the release pages of musl bindists claim + # that they use `integer-simple` and do not require `gmp`; however + # that is incorrect, so `gmp` is required until a release has been + # made that includes https://gitlab.haskell.org/ghc/ghc/-/issues/20059. + # (Note that for packaging the `-binary` compiler, nixpkgs does not care + # about whether or not `gmp` is used; this comment is just here to explain + # why the `gmp` dependency exists despite what the release page says.) + ++ lib.optionals stdenv.hostPlatform.isMusl [ gmp ]; # musl bindist needs this + # Set LD_LIBRARY_PATH or equivalent so that the programs running as part + # of the bindist installer can find the libraries they expect. # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location/ + # the final install location. ${libEnvVar} = libPath; postUnpack = + # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, + # so that we know when ghc bindists upgrade that and we need to update the + # version used in `libPath`. + lib.optionalString + (binDistUsed.exePathForLibraryCheck != null) + # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. + # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. + # As a result, don't shell-quote this glob when splicing the string. + (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in + lib.concatStringsSep "\n" [ + ('' + echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" + if ! test -e ${buildExeGlob}; then + echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '') + (lib.concatMapStringsSep + "\n" + ({ fileToCheckFor, nixPackage }: + lib.optionalString (fileToCheckFor != null) '' + echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" + if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then + echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + + echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" + if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then + echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '' + ) + binDistUsed.archSpecificLibraries + ) + ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -91,6 +215,9 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/configure '' + # We have to patch the GMP paths for the integer-gmp package. + # Note [musl bindists have no .buildinfo] + # Note that musl bindists do not contain them; unclear if that's intended; + # see: https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231 '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; @@ -106,21 +233,8 @@ stdenv.mkDerivation rec { '' + # Rename needed libraries and binaries, fix interpreter lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ - --interpreter ${glibcDynLinker} {} \; - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - '' + - # We're kludging a glibc bindist into working with non-glibc... - # Here we patch up the use of `__strdup` (part of glibc binary ABI) - # to instead use `strdup` since musl doesn't provide __strdup - # (`__strdup` is defined to be an alias of `strdup` anyway[1]). - # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html - # Use objcopy magic to make the change: - lib.optionalString stdenv.hostPlatform.isMusl '' - find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; + find . -type f -executable -exec patchelf \ + --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; # fix for `configure: error: Your linker is affected by binutils #16177` @@ -130,15 +244,33 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically # calls install-strip ... dontBuild = true; + # Apparently necessary for the ghc Alpine (musl) bindist: + # When we strip, and then run the + # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + # below, running ghc (e.g. during `installCheckPhase)` gives some apparently + # corrupted rpath or whatever makes the loader work on nonsensical strings: + # running install tests + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # This is extremely bogus and should be investigated. + dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness + # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. postFixup = lib.optionalString stdenv.isLinux @@ -186,13 +318,23 @@ stdenv.mkDerivation rec { find $out -type f -name '*.p_o' -delete find $out -type f -name '*.p_hi' -delete find $out -type f -name '*_p.a' -delete - rm $out/lib/ghc-*/bin/ghc-iserv-prof + # `-f` because e.g. musl bindist does not have this file. + rm -f $out/lib/ghc-*/bin/ghc-iserv-prof # Hydra will redistribute this derivation, so we have to keep the docs for # legal reasons (retaining the legal notices etc) # As a last resort we could unpack the docs separately and symlink them in. # They're in $out/share/{doc,man}. ''; + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + doInstallCheck = true; installCheckPhase = '' unset ${libEnvVar} @@ -221,7 +363,16 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; license = lib.licenses.bsd3; - platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + # HACK: since we can't encode the libc / abi in platforms, we need + # to make the platform list dependent on the evaluation platform + # in order to avoid eval errors with musl which supports less + # platforms than the default libcs (i. e. glibc / libSystem). + # This is done for the benefit of Hydra, so `packagePlatforms` + # won't return any platforms that would cause an evaluation + # failure for `pkgsMusl.haskell.compiler.ghc8102Binary`, as + # long as the evaluator runs on a platform that supports + # `pkgsMusl`. + platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; maintainers = with lib.maintainers; [ lostnet ]; }; diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index f007dcf7898..10ca2f6662c 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -38,6 +38,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -45,6 +59,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -60,14 +78,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + lib.optionalString enableRelocatedStaticLibs '' @@ -217,8 +247,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -238,7 +270,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 8a0994b8b6a..ea4542a38b2 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -121,8 +121,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -152,6 +153,15 @@ stdenv.mkDerivation rec { done ''; + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + doInstallCheck = true; installCheckPhase = '' unset ${libEnvVar} @@ -180,5 +190,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; + # build segfaults, use ghc8102Binary which has proper musl support instead + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 544b96f5e4f..23826614716 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -38,6 +38,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -45,6 +59,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -60,6 +78,21 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' @@ -72,9 +105,6 @@ let + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString dontStrip '' STRIP_CMD = : '' + lib.optionalString (!enableProfiledLibs) '' @@ -142,11 +172,14 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. - preConfigure = lib.optionalString stdenv.isAarch64 '' + preConfigure = # Aarch64 allow backward bootstrapping since earlier versions are unstable. - find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ - -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; - '' + '' + # Same for musl, as earlier versions do not provide a musl bindist for bootstrapping. + lib.optionalString (stdenv.isAarch64 || stdenv.hostPlatform.isMusl) '' + find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ + -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; + '' + + '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done @@ -224,8 +257,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -245,7 +280,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index f5a6b5f32fa..d2ae51c66de 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -39,6 +39,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -46,6 +60,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -61,14 +79,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + lib.optionalString enableRelocatedStaticLibs '' @@ -143,7 +173,7 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -204,8 +234,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -225,7 +257,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ec236731afd..2ea14b78cc4 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -46,6 +46,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -53,6 +67,10 @@ assert !enableNativeBignum -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -68,14 +86,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString dontStrip '' STRIP_CMD = : '' + lib.optionalString (!enableProfiledLibs) '' @@ -221,8 +251,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf autoreconfHook automake m4 python3 sphinx + perl autoconf autoreconfHook automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -242,7 +274,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index c5bd1098c0b..e61019b91c6 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -4,8 +4,10 @@ with lib; mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null; + defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "8.13.0" else + if versions.range "8.6" "8.10" coq.coq-version then "8.12.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; + release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; extraBuildInputs = [ bignums ]; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8b058b2dc05..6a769a47ef8 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-06-12"; + version = "unstable-2021-07-08"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz"; - sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9"; + url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz"; + sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e22f86a009..9594c0788c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1828,22 +1828,30 @@ EOT # 2021-05-09: compilation requires patches from master, # remove at next release (current is 0.1.0.4). - large-hashable = appendPatches super.large-hashable [ - # Fix compilation of TH code for GHC >= 8.8 - (pkgs.fetchpatch { - url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; - sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; - excludes = [ - ".travis.yml" - "stack**" - ]; - }) - # Fix cpp invocation - (pkgs.fetchpatch { - url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; - sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; - }) - ]; + large-hashable = overrideCabal super.large-hashable (drv: { + # fix line endings which are an issue all of a sudden for an unknown reason + prePatch = '' + find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix + '' + (drv.prePatch or ""); + # allow newer template haskell + jailbreak = true; + patches = [ + # Fix compilation of TH code for GHC >= 8.8 + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; + sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; + excludes = [ + ".travis.yml" + "stack**" + ]; + }) + # Fix cpp invocation + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; + sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; + }) + ]; + }); # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 @@ -1938,6 +1946,14 @@ EOT # Flakey tests # upstream https://github.com/circuithub/rel8/issues/86 - rel8 = dontCheck super.rel8; + rel8 = dontCheck (super.rel8.override { + opaleye = dontCheck super.opaleye_0_7_2_0; + }); + + # Release 1.0.0.0 added version bounds (was unrestricted before), + # but with too strict lower bounds for our lts-18. + graphql = assert pkgs.lib.versionOlder self.parser-combinators.version "1.3.0"; + assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; + doJailbreak super.graphql; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7731c73f0f6..20c64dbbccf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -106,7 +106,7 @@ self: super: { retry = dontCheck super.retry; # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_0.overrideScope (self: super: { + hlint = super.hlint_3_3_1.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { doHaddock = false; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 13bd569a443..302c2722ee0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -91,6 +91,7 @@ broken-packages: - Agata - agda-language-server - agda-snippets + - agda-unused - AGI - ag-pictgen - AhoCorasick @@ -661,6 +662,7 @@ broken-packages: - clock-extras - clogparse - clone-all + - closed-intervals - closure - cloudfront-signer - clr-inline @@ -1090,6 +1092,7 @@ broken-packages: - doctest-prop - docusign-example - docvim + - dominion - domplate - do-spaces - dotfs @@ -1778,6 +1781,7 @@ broken-packages: - hakismet - hakka - hako + - hakyll-agda - hakyll-blaze-templates - hakyll-contrib - hakyll-contrib-csv @@ -2205,6 +2209,7 @@ broken-packages: - Hricket - hs2bf - hs2ps + - hsakamai - hsaml2 - hsay - hsbc @@ -2382,6 +2387,7 @@ broken-packages: - hw-json-simd - hw-mquery - hworker + - hw-prim-bits - hw-simd - hwsl2 - hx @@ -3108,6 +3114,7 @@ broken-packages: - MuCheck - mud - muesli + - mu-graphql - mulang - multext-east-msd - multiaddr @@ -3266,6 +3273,8 @@ broken-packages: - np-extras - np-linear - nptools + - nri-kafka + - nri-postgresql - ntp-control - ntrip-client - n-tuple @@ -4508,6 +4517,7 @@ broken-packages: - streamdeck - streamed - stream-fusion + - streaming-benchmarks - streaming-conduit - streaming-events - streaming-lzma @@ -4535,6 +4545,7 @@ broken-packages: - stripe-http-streams - stripe-signature - stripe-tests + - strong-path - strongswan-sql - structural-traversal - structures @@ -4749,6 +4760,7 @@ broken-packages: - thrift - Thrift - throttled-io-loop + - throwable-exceptions - th-sccs - th-tc - th-to-exp @@ -4793,6 +4805,7 @@ broken-packages: - Titim - tkhs - tkyprof + - tmp-postgres - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 45d0bdcd0cb..c63942afe1a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,6 +115,7 @@ extra-packages: - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 + - opaleye < 0.7.3.0 # 2021-07-11: for rel8 <= 1.0.0.1, see https://github.com/circuithub/rel8/issues/95#issuecomment-877616118 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 69f518322c2..2098609cd69 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.0 +# Stackage LTS 18.1 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -33,7 +33,7 @@ default-package-overrides: - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 - - Agda ==2.6.1.3 + - Agda ==2.6.2 - agda2lagda ==0.2021.6.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 @@ -202,8 +202,8 @@ default-package-overrides: - auto-update ==0.1.6 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.8 - - aws-xray-client ==0.1.0.0 - - aws-xray-client-wai ==0.1.0.0 + - aws-xray-client ==0.1.0.1 + - aws-xray-client-wai ==0.1.0.1 - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 @@ -211,7 +211,7 @@ default-package-overrides: - base16 ==0.3.0.1 - base16-bytestring ==1.0.1.0 - base16-lens ==0.1.3.2 - - base32 ==0.2.0.0 + - base32 ==0.2.1.0 - base32-lens ==0.1.1.1 - base32string ==0.9.1 - base58-bytestring ==0.1.0 @@ -233,7 +233,7 @@ default-package-overrides: - bcp47 ==0.2.0.4 - bcp47-orphans ==0.1.0.4 - bcrypt ==0.0.11 - - bech32 ==1.1.0 + - bech32 ==1.1.1 - bech32-th ==1.0.2 - bench ==1.0.12 - benchpress ==0.2.2.17 @@ -304,7 +304,7 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.4 - - bugzilla-redhat ==0.3.1 + - bugzilla-redhat ==0.3.2 - burrito ==1.2.0.2 - butcher ==1.3.3.2 - buttplug-hs-core ==0.1.0.0 @@ -420,13 +420,13 @@ default-package-overrides: - Color ==0.3.2 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - - colour ==2.3.5 + - colour ==2.3.6 - combinatorial ==0.1.0.1 - comfort-array ==0.4.1 - comfort-graph ==0.0.3.1 - - commonmark ==0.2 + - commonmark ==0.2.1 - commonmark-extensions ==0.2.1.2 - - commonmark-pandoc ==0.2.1 + - commonmark-pandoc ==0.2.1.1 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -490,7 +490,7 @@ default-package-overrides: - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.9.0 - - criterion-measurement ==0.1.2.0 + - criterion-measurement ==0.1.3.0 - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 @@ -555,7 +555,7 @@ default-package-overrides: - data-hash ==0.2.0.1 - data-interval ==2.1.0 - data-inttrie ==0.1.4 - - data-lens-light ==0.1.2.2 + - data-lens-light ==0.1.2.3 - data-memocombinators ==0.5.1 - data-msgpack ==0.0.13 - data-msgpack-types ==0.0.3 @@ -680,7 +680,7 @@ default-package-overrides: - elynx-seq ==0.5.1.1 - elynx-tools ==0.5.1.1 - elynx-tree ==0.5.1.1 - - email-validate ==2.3.2.13 + - email-validate ==2.3.2.15 - emd ==0.2.0.0 - emojis ==0.1 - enclosed-exceptions ==1.0.3 @@ -703,7 +703,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.0.0 + - esqueleto ==3.5.2.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -729,7 +729,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.14 + - express ==0.1.16 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -803,7 +803,7 @@ default-package-overrides: - forkable-monad ==0.2.0.3 - forma ==1.1.3 - format-numbers ==0.1.0.1 - - formatting ==7.1.2 + - formatting ==7.1.3 - foundation ==0.0.26.1 - fourmolu ==0.3.0.0 - free ==5.1.7 @@ -850,8 +850,8 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-sop ==0.5.1.1 - generics-sop-lens ==0.2.0.1 - - geniplate-mirror ==0.7.7 - - genvalidity ==0.11.0.0 + - geniplate-mirror ==0.7.8 + - genvalidity ==0.11.0.2 - genvalidity-aeson ==0.3.0.0 - genvalidity-bytestring ==0.6.0.0 - genvalidity-containers ==0.9.0.0 @@ -898,11 +898,11 @@ default-package-overrides: - ghc-prof ==1.4.1.8 - ghc-source-gen ==0.4.0.0 - ghc-syntax-highlighter ==0.0.6.0 - - ghc-tcplugins-extra ==0.4.1 - - ghc-trace-events ==0.1.2.2 - - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.5 - - ghc-typelits-natnormalise ==0.7.4 + - ghc-tcplugins-extra ==0.4.2 + - ghc-trace-events ==0.1.2.3 + - ghc-typelits-extra ==0.4.3 + - ghc-typelits-knownnat ==0.7.6 + - ghc-typelits-natnormalise ==0.7.6 - ghc-typelits-presburger ==0.6.0.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.23 @@ -923,7 +923,7 @@ default-package-overrides: - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.24 - - githash ==0.1.6.0 + - githash ==0.1.6.1 - github-release ==1.3.7 - github-rest ==1.0.3 - github-types ==0.2.1 @@ -974,7 +974,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.2.0 - - happstack-server ==7.7.1 + - happstack-server ==7.7.1.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1006,7 +1006,7 @@ default-package-overrides: - hasql-optparse-applicative ==0.3.0.6 - hasql-pool ==0.5.2 - hasql-queue ==1.2.0.2 - - hasql-transaction ==1.0.0.2 + - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - HaXml ==1.25.5 @@ -1015,7 +1015,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.4.1.0 + - headroom ==0.4.2.0 - heap ==1.0.4 - heaps ==0.4 - hebrew-time ==0.1.2 @@ -1025,7 +1025,7 @@ default-package-overrides: - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.14.4 - - hedn ==0.3.0.2 + - hedn ==0.3.0.3 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.4 @@ -1163,7 +1163,7 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.0.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.7.2 + - http-streams ==0.8.8.1 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1212,7 +1212,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyper ==0.2.1.1 - hyperloglog ==0.4.4 - - hyphenation ==0.8.1 + - hyphenation ==0.8.2 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1240,7 +1240,7 @@ default-package-overrides: - influxdb ==1.9.1.2 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.4 + - inline-c ==0.9.1.5 - inline-c-cpp ==0.4.0.3 - inline-r ==0.10.4 - inliterate ==0.1.0 @@ -1394,7 +1394,7 @@ default-package-overrides: - lift-generics ==0.2 - lift-type ==0.1.0.1 - line ==4.0.1 - - linear ==1.21.5 + - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 @@ -1606,7 +1606,7 @@ default-package-overrides: - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - net-mqtt ==0.7.1.1 - - net-mqtt-lens ==0.1.0.0 + - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1646,7 +1646,7 @@ default-package-overrides: - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.0.3 + - nri-observability ==0.1.1.1 - nri-prelude ==0.6.0.2 - nsis ==0.3.3 - numbers ==3000.2.0.2 @@ -1673,7 +1673,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.7.1.0 + - opaleye ==0.7.3.0 - OpenAL ==1.7.0.5 - openapi3 ==3.1.0 - open-browser ==0.2.1.0 @@ -1698,7 +1698,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.16.1.0 - optparse-generic ==1.4.4 - - optparse-simple ==0.1.1.3 + - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - ormolu ==0.1.4.1 @@ -1708,12 +1708,12 @@ default-package-overrides: - pager ==0.1.1.0 - pagination ==0.2.2 - pagure-cli ==0.2 - - pandoc ==2.14.0.2 + - pandoc ==2.14.0.3 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-plot ==1.2.3 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - - pantry ==0.5.2.2 + - pantry ==0.5.2.3 - parallel ==3.2.2.0 - parameterized ==0.5.0.0 - paripari ==0.7.0.0 @@ -1758,11 +1758,11 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.13.0.2 + - persistent ==2.13.1.1 - persistent-mtl ==0.2.2.0 - persistent-mysql ==2.13.0.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.0.2 + - persistent-postgresql ==2.13.0.3 - persistent-qq ==2.12.0.1 - persistent-sqlite ==2.13.0.3 - persistent-template ==2.12.0.0 @@ -1770,7 +1770,7 @@ default-package-overrides: - persistent-typed-db ==0.1.0.4 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.3.1.1 + - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -2083,7 +2083,7 @@ default-package-overrides: - sequenceTools ==1.5.0 - serf ==0.1.1.0 - serialise ==0.2.3.0 - - servant ==0.18.2 + - servant ==0.18.3 - servant-auth ==0.4.0.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 @@ -2091,23 +2091,23 @@ default-package-overrides: - servant-auth-swagger ==0.2.10.1 - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 - - servant-client ==0.18.2 - - servant-client-core ==0.18.2 + - servant-client ==0.18.3 + - servant-client-core ==0.18.3 - servant-conduit ==0.15.1 - - servant-docs ==0.11.8 + - servant-docs ==0.11.9 - servant-elm ==0.7.2 - servant-errors ==0.1.6.0 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - - servant-foreign ==0.15.3 - - servant-http-streams ==0.18.2 + - servant-foreign ==0.15.4 + - servant-http-streams ==0.18.3 - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-openapi3 ==2.0.1.2 - - servant-pipes ==0.15.2 + - servant-pipes ==0.15.3 - servant-rawm ==1.0.0.0 - - servant-server ==0.18.2 + - servant-server ==0.18.3 - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.5.3.47.1 - servant-swagger-ui-core ==0.3.5 @@ -2118,9 +2118,9 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.0 + - sexp-grammar ==2.3.1 - SHA ==1.6.4.4 - - shake ==0.19.4 + - shake ==0.19.5 - shake-language-c ==0.12.0 - shake-plus ==0.3.3.1 - shake-plus-extended ==0.4.1.0 @@ -2143,7 +2143,7 @@ default-package-overrides: - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - simple-cmd ==0.2.3 - - simple-cmd-args ==0.1.6 + - simple-cmd-args ==0.1.7 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 @@ -2161,8 +2161,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.5.1 - - skylighting-core ==0.10.5.1 + - skylighting ==0.10.5.2 + - skylighting-core ==0.10.5.2 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slick ==1.1.1.0 @@ -2244,7 +2244,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.3.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.0 + - streaming-bytestring ==0.2.1 - streaming-commons ==0.2.2.1 - streamly ==0.7.3 - streams ==3.3 @@ -2264,7 +2264,7 @@ default-package-overrides: - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.8 + - stripe-concepts ==1.0.3 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 @@ -2329,7 +2329,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 - - tasty-silver ==3.2.1 + - tasty-silver ==3.2.2 - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 @@ -2338,7 +2338,7 @@ default-package-overrides: - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1.1 - - template-haskell-compat-v0208 ==0.1.5 + - template-haskell-compat-v0208 ==0.1.6 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2408,7 +2408,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.5 + - tidal ==1.7.7 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2443,7 +2443,7 @@ default-package-overrides: - transformers-bifunctors ==0.1 - transformers-compat ==0.6.6 - transformers-fix ==1.0 - - traverse-with-class ==1.0.1.0 + - traverse-with-class ==1.0.1.1 - tree-diff ==0.2 - tree-fun ==0.8.1.0 - tree-view ==0.5.1 @@ -2451,7 +2451,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.0.0 + - ttc ==1.1.0.1 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 @@ -2502,7 +2502,7 @@ default-package-overrides: - unipatterns ==0.0.0.0 - uniplate ==1.6.13 - uniprot-kb ==0.1.2.0 - - uniq-deep ==1.2.0 + - uniq-deep ==1.2.1 - unique ==0.0.1 - unique-logic ==0.4 - unique-logic-tf ==0.5.1 @@ -2527,7 +2527,7 @@ default-package-overrides: - unordered-containers ==0.2.14.0 - unsafe ==0.0 - urbit-hob ==0.3.3 - - uri-bytestring ==0.3.3.0 + - uri-bytestring ==0.3.3.1 - uri-bytestring-aeson ==0.1.0.8 - uri-encode ==1.5.0.7 - url ==2.1.3 @@ -2541,7 +2541,7 @@ default-package-overrides: - uuid-types ==1.0.5 - validation ==1.1.1 - validation-selective ==0.1.0.1 - - validity ==0.11.0.0 + - validity ==0.11.0.1 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - validity-containers ==0.5.0.4 @@ -2568,7 +2568,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.3.1 + - vector-sized ==1.4.4 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.9 @@ -2604,7 +2604,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.16 + - warp ==3.3.17 - warp-tls ==3.3.1 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2658,7 +2658,7 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - xeno ==0.4.2 - - xlsx ==0.8.3 + - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 @@ -2681,12 +2681,12 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.2.0.0 - - yesod ==1.6.1.1 + - yesod ==1.6.1.2 - yesod-auth ==1.6.10.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.20.1 + - yesod-core ==1.6.20.2 - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 6ecf31c7da7..e8e415695cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -480,6 +480,7 @@ dont-distribute-packages: - avers-api - avers-api-docs - avers-server + - aviation-navigation - avro-piper - awesomium - awesomium-glut @@ -808,7 +809,6 @@ dont-distribute-packages: - convertible-text - coordinate - copilot - - copilot-c99 - copilot-cbmc - copilot-language - copilot-libraries @@ -1444,6 +1444,7 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options + - hasql-queue - hasql-th - hastache-aeson - haste-app @@ -1833,6 +1834,11 @@ dont-distribute-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-posture + - keid-core + - keid-geometry + - keid-render-basic + - keid-resource-gltf + - keid-ui-dearimgui - kevin - keysafe - keyvaluehash @@ -2334,6 +2340,7 @@ dont-distribute-packages: - polysemy-fs - polysemy-fskvstore - polysemy-http + - polysemy-keyed-state - polysemy-kvstore-jsonfile - polysemy-log - polysemy-log-co @@ -2886,6 +2893,7 @@ dont-distribute-packages: - swearjure - sweet-egison - switch + - sydtest-persistent-postgresql - sylvia - sym-plot - symantic-atom diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index facd3ec5a3d..ef0bd0656ff 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -914,4 +914,9 @@ self: super: builtins.intersectAttrs super { cachix = generateOptparseApplicativeCompletion "cachix" super.cachix; + # Enable extra optimisations which increase build time, but also + # later compiler performance, so we should do this for user's benefit. + # Flag added in Agda 2.6.2 + Agda = appendConfigureFlag super.Agda "-foptimise-heavily"; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 807d8a9bf0e..c895053704b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -784,40 +784,6 @@ self: { "Agda" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, containers, data-hash - , deepseq, directory, edit-distance, emacs, equivalence, exceptions - , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable - , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process - , regex-tdfa, split, stm, strict, template-haskell, text, time - , transformers, unordered-containers, uri-encode, zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.6.1.3"; - sha256 = "1rx1r21kpgz27g2qn6fqgdpkl5b07c2fl86j3clylpp9rr0ch6xv"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory filepath process ]; - libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - containers data-hash deepseq directory edit-distance equivalence - exceptions filepath geniplate-mirror ghc-compact gitrev hashable - hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time transformers - unordered-containers uri-encode zlib - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base directory filepath process ]; - executableToolDepends = [ emacs ]; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ abbradar turion ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_6_2" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, edit-distance, emacs , equivalence, exceptions, filepath, ghc-compact, gitrev, happy @@ -11889,8 +11855,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "Kawaii-Parser"; - version = "0.0.0"; - sha256 = "163rh1vciljl35wc5wrcr1ky2vb536pv6hhnl3r97mfjc9c9k2wm"; + version = "1.0.1"; + sha256 = "032kglqc4pfhig7wqqsps0g490ajp1yffl4h4lr3qs98vi7vl4x6"; libraryHaskellDepends = [ base containers mtl ]; description = "A simple parsing library"; license = lib.licenses.bsd3; @@ -25543,6 +25509,8 @@ self: { testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "agda2lagda" = callPackage @@ -35998,6 +35966,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "aviation-navigation" = callPackage + ({ mkDerivation, base, lens, mtl, optparse-applicative, radian }: + mkDerivation { + pname = "aviation-navigation"; + version = "0.1.0.0"; + sha256 = "17nb2ryrxdy3sv68cnbv7saw5k9wh9nyas74bpsyn0p8grw71sd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens mtl optparse-applicative radian + ]; + executableHaskellDepends = [ + base lens mtl optparse-applicative radian + ]; + description = "Aviation Navigation functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aviation-units" = callPackage ({ mkDerivation, base, lens }: mkDerivation { @@ -36956,28 +36943,6 @@ self: { }: mkDerivation { pname = "aws-xray-client"; - version = "0.1.0.0"; - sha256 = "0rb46hz2y9mz0prgyb5m2v31j05cx18j6yl01pawhrb6v8pb7z00"; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-types lens network random text - time - ]; - testHaskellDepends = [ - aeson aeson-qq base generic-arbitrary hspec lens QuickCheck random - text - ]; - benchmarkHaskellDepends = [ async base criterion random time ]; - description = "A client for AWS X-Ray"; - license = lib.licenses.mit; - }) {}; - - "aws-xray-client_0_1_0_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, async, base, bytestring - , criterion, deepseq, generic-arbitrary, hspec, http-types, lens - , network, QuickCheck, random, text, time - }: - mkDerivation { - pname = "aws-xray-client"; version = "0.1.0.1"; sha256 = "1b179i32aw3xi72vnxmgvgczq14ay159cji9mmk345shdiac6crj"; libraryHaskellDepends = [ @@ -36991,7 +36956,6 @@ self: { benchmarkHaskellDepends = [ async base criterion random time ]; description = "A client for AWS X-Ray"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "aws-xray-client-persistent" = callPackage @@ -37019,23 +36983,6 @@ self: { }: mkDerivation { pname = "aws-xray-client-wai"; - version = "0.1.0.0"; - sha256 = "1vrgx2l3f08bd73z0an15zh3fla0d5sxqvwbsk1jxkrjfy2c43rd"; - libraryHaskellDepends = [ - aws-xray-client base bytestring containers http-types lens random - text time unliftio unliftio-core vault wai - ]; - description = "A client for AWS X-Ray integration with WAI"; - license = lib.licenses.mit; - }) {}; - - "aws-xray-client-wai_0_1_0_1" = callPackage - ({ mkDerivation, aws-xray-client, base, bytestring, containers - , http-types, lens, random, text, time, unliftio, unliftio-core - , vault, wai - }: - mkDerivation { - pname = "aws-xray-client-wai"; version = "0.1.0.1"; sha256 = "0b2rnls3qk7qzn9swfqmslxrw466gs6lhh7zi677k5b0dzh237vp"; libraryHaskellDepends = [ @@ -37044,7 +36991,6 @@ self: { ]; description = "A client for AWS X-Ray integration with WAI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "axel" = callPackage @@ -38263,31 +38209,6 @@ self: { }: mkDerivation { pname = "base32"; - version = "0.2.0.0"; - sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; - revision = "2"; - editedCabalFile = "0chbgkq65mh6nc48a3hywcv7idfqgb3acv4b7gmz8m6szqq4mx95"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-byteorder text text-short - ]; - testHaskellDepends = [ - base bytestring memory QuickCheck random-bytestring tasty - tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq memory random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base32 encoding"; - license = lib.licenses.bsd3; - }) {}; - - "base32_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq - , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; revision = "1"; @@ -38304,7 +38225,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base32 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base32-bytestring" = callPackage @@ -39328,8 +39248,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.9.0.0"; - sha256 = "0ixaxjmgg162ff7srvwmkv5lp1kfb0b6wmrpaz97rsmlpa5vf6ji"; + version = "0.9.1.0"; + sha256 = "1rw3db9qmf08wi5gcd0cbsz5cpndf8cwkbzkh74gbwwpcpa7lg39"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -39352,8 +39272,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.0.0"; - sha256 = "0xrmb5nmn5ffzgcpsjilagz5ppm283kfjvvbnsvpvnh6p6i0xc99"; + version = "0.5.1.0"; + sha256 = "0wvbs7lda7pxsrymm2dv2km1w3snd8mjwijagn06ylrc2pjn6sjz"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -39405,17 +39325,18 @@ self: { , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific , tagged, tasty, tasty-hunit, text, time, tmp-postgres - , unordered-containers, uuid, uuid-types, vector + , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.0.0"; - sha256 = "03dd9qzw3b2rqva2pn4iaq5lswn8gb7lrlsa6nmc0bfn1w9i4a7k"; + version = "0.5.1.0"; + sha256 = "17npmh5agnxy12n93hrpi83al80csmvigbm3mlsvx92l4mcif2ml"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control mtl network-uri postgresql-libpq postgresql-simple - scientific tagged text time unordered-containers uuid-types vector + scientific tagged text time transformers-base unordered-containers + uuid-types vector ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog @@ -39428,17 +39349,19 @@ self: { "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate - , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, tasty, tasty-expected-failure, tasty-hunit, text - , time, unix + , bytestring, dlist, free, hashable, monad-control, mtl + , network-uri, scientific, sqlite-simple, tasty + , tasty-expected-failure, tasty-hunit, text, time + , transformers-base, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.5.0.0"; - sha256 = "1ng67jspdwp4prfzp9lzhl1g26q9bfpmxpwv0q392y8wwrq6zxrj"; + version = "0.5.1.0"; + sha256 = "1vfrma27rchq3p4h0p21m3lhz46yxyagbrb39r9jb8w20whja2gr"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free - hashable mtl network-uri scientific sqlite-simple text time unix + hashable monad-control mtl network-uri scientific sqlite-simple + text time transformers-base unix ]; testHaskellDepends = [ base beam-core beam-migrate sqlite-simple tasty @@ -39533,35 +39456,6 @@ self: { }: mkDerivation { pname = "bech32"; - version = "1.1.0"; - sha256 = "0s7kqy128k71rnpv22awf643djhsyd8ipihx38lvslsxk8klr8i0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers extra text - ]; - executableHaskellDepends = [ - base base58-bytestring bytestring extra memory optparse-applicative - text - ]; - testHaskellDepends = [ - base base58-bytestring bytestring containers deepseq extra hspec - memory process QuickCheck text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "bech32_1_1_1" = callPackage - ({ mkDerivation, array, base, base58-bytestring, bytestring - , containers, deepseq, extra, hspec, hspec-discover, memory - , optparse-applicative, process, QuickCheck, text, vector - }: - mkDerivation { - pname = "bech32"; version = "1.1.1"; sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; isLibrary = true; @@ -46766,26 +46660,6 @@ self: { "bugzilla-redhat" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, http-conduit, http-types, iso8601-time, resourcet - , text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bugzilla-redhat"; - version = "0.3.1"; - sha256 = "088ya35lwxnvg0x996agy2ky8kp4r3j2i1ja15fy3afcqfpvbqiv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring connection containers - http-conduit http-types iso8601-time resourcet text time - transformers unordered-containers vector - ]; - description = "A Haskell interface to the Bugzilla native REST API"; - license = lib.licenses.bsd3; - }) {}; - - "bugzilla-redhat_0_3_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, hspec, http-conduit, http-types, iso8601-time , resourcet, text, time, transformers, unordered-containers, vector }: @@ -46803,7 +46677,6 @@ self: { testHaskellDepends = [ aeson base hspec time ]; description = "A Haskell interface to the Bugzilla native REST API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "build" = callPackage @@ -50557,8 +50430,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.0.1"; - sha256 = "1jwlkrf4aja71sbxxlxsd7syh6sb4vgv2pb18mvj5ppm6al2ykp3"; + version = "1.1.0"; + sha256 = "0y6ds8lhhs0r4ns35y6zrph3bjkq9kdx4zp7kb8knsn0cpd3haz1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54040,39 +53913,40 @@ self: { "chessIO" = callPackage ({ mkDerivation, attoparsec, base, binary, brick, bytestring , containers, deepseq, directory, extra, file-embed, filepath - , hashable, haskeline, lens, megaparsec, MonadRandom + , hashable, haskeline, HUnit, lens, megaparsec, MonadRandom , mono-traversable, mtl, o-clock, optparse-applicative, parallel , prettyprinter, process, random, rosezipper, stm, template-haskell - , text, th-lift-instances, time, unordered-containers, vector - , vector-binary-instances, vector-instances, vty + , text, th-compat, th-lift-instances, time, unordered-containers + , vector, vector-binary-instances, vector-instances, vty }: mkDerivation { pname = "chessIO"; - version = "0.7.0.0"; - sha256 = "1jb1c702c58g0pkk43g1mp7clm0wbkq993j880v3p7cxbyj5n9bh"; + version = "0.8.0.0"; + sha256 = "16xgq8xvfvk6rsjzaimd29b867ffml2h9nldsy5d5sninbmbq0k8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers deepseq extra file-embed hashable lens megaparsec MonadRandom mono-traversable o-clock prettyprinter process random stm template-haskell text - th-lift-instances unordered-containers vector + th-compat th-lift-instances unordered-containers vector vector-binary-instances vector-instances ]; executableHaskellDepends = [ attoparsec base binary brick bytestring containers deepseq extra file-embed filepath hashable haskeline lens megaparsec MonadRandom mono-traversable mtl o-clock optparse-applicative prettyprinter - process random rosezipper stm template-haskell text + process random rosezipper stm template-haskell text th-compat th-lift-instances time unordered-containers vector vector-binary-instances vector-instances vty ]; testHaskellDepends = [ attoparsec base binary bytestring containers deepseq directory - extra file-embed hashable lens megaparsec MonadRandom + extra file-embed hashable HUnit lens megaparsec MonadRandom mono-traversable o-clock parallel prettyprinter process random stm - template-haskell text th-lift-instances time unordered-containers - vector vector-binary-instances vector-instances + template-haskell text th-compat th-lift-instances time + unordered-containers vector vector-binary-instances + vector-instances ]; description = "Basic chess library"; license = lib.licenses.bsd3; @@ -56820,8 +56694,8 @@ self: { }: mkDerivation { pname = "closed-intervals"; - version = "0.1.0.1"; - sha256 = "19vmiwwzv9g4nl1mzkqc7r9bw67n9y7kk3v0jc2vc8yjzrmqgy7v"; + version = "0.1.1.0"; + sha256 = "0wmxacb9msr7bip5pz9qwgvg9kgvpyylps6xhsg85blhd2bplmbi"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest-exitcode-stdio doctest-lib QuickCheck time @@ -56829,6 +56703,8 @@ self: { ]; description = "Closed intervals of totally ordered types"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "closure" = callPackage @@ -58781,23 +58657,6 @@ self: { }: mkDerivation { pname = "colour"; - version = "2.3.5"; - sha256 = "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck random test-framework test-framework-quickcheck2 - ]; - description = "A model for human colour/color perception"; - license = lib.licenses.mit; - }) {}; - - "colour_2_3_6" = callPackage - ({ mkDerivation, base, QuickCheck, random, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "colour"; version = "2.3.6"; sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; enableSeparateDataOutput = true; @@ -58807,7 +58666,6 @@ self: { ]; description = "A model for human colour/color perception"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "colour-accelerate" = callPackage @@ -59323,28 +59181,6 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2"; - sha256 = "083xrmyxsgn6ivrxqgmjbqvv4k64n7a330pbf1n7xbsjqh78cg28"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-transforms - }: - mkDerivation { - pname = "commonmark"; version = "0.2.1"; sha256 = "1vba7v1zaqh811v3j4x42g7mhwvxwgzm997kq1kzd0njby14fq5b"; libraryHaskellDepends = [ @@ -59358,7 +59194,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -59410,21 +59245,6 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1"; - sha256 = "0i5qavci8j63d15i2c6cbm0b53kcjh7s4vxadfgf4vkp2sy1ybvw"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_1_1" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; version = "0.2.1.1"; sha256 = "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp"; libraryHaskellDepends = [ @@ -59432,7 +59252,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commsec" = callPackage @@ -63968,8 +63787,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.3"; - sha256 = "166nin0861i2ak06gdhj6sv6zv7cc60wmqgv4mly9hjf0qp3w6j1"; + version = "3.4"; + sha256 = "1cl7w9z08rnzsig09q65i6j4644zj469isd1mjjiwp23yiqs5gfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63982,26 +63801,20 @@ self: { }) {}; "copilot-c99" = callPackage - ({ mkDerivation, base, containers, copilot-core, copilot-language - , csv, directory, filepath, hspec, language-c99 - , language-c99-simple, language-c99-util, mtl, pretty, process - , QuickCheck + ({ mkDerivation, base, containers, copilot-core, directory + , filepath, language-c99, language-c99-simple, language-c99-util + , mtl, pretty }: mkDerivation { pname = "copilot-c99"; - version = "3.3"; - sha256 = "09qjfhf0dkccbi4kycwqavv7bxdpfj2j50vkljmzrxh59xq00jnz"; + version = "3.4"; + sha256 = "14ajk29p4da777r9klfqhcyi5qkrz16qn5f6h22kgw1vqj9vm4ja"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty ]; - testHaskellDepends = [ - base copilot-core copilot-language csv hspec language-c99 - language-c99-simple pretty process QuickCheck - ]; description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -64025,8 +63838,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.3"; - sha256 = "19k206hsqd3lw2k40cjpjhnwfjsfraagw622bxn97rk4195jqhy6"; + version = "3.4"; + sha256 = "01bxajyxd9na6msjnh6klnhc71xryc7nxz96pylyqn39978by7p0"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; @@ -64038,8 +63851,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.3"; - sha256 = "1x39jyn82j9mydsbi8n24a2nx8j00gcxw2rsxqagjpwqx10igyr2"; + version = "3.4"; + sha256 = "0i3ha9mpjizqalhnv2vvcgzs75r3ld7c4qhaknip3jw1d0j76fx6"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -64055,8 +63868,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.3"; - sha256 = "0f8g67j26g1k5xph6zg5crypj0ys8mf0i5pazn04sy02lslsdmd9"; + version = "3.4"; + sha256 = "13ypvpqr0g3xrvdria35c83yxpk3727wm6n8jdsihq7ilkhl00mf"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -64090,8 +63903,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.3"; - sha256 = "1js4j9alfnlxi6zsvcdj8zf2r04lm9rp22r6zq6qkhams6pmmxly"; + version = "3.4"; + sha256 = "1mrw6i4dwg8cx56821vcy0bnzyhxcch0k9byrkazg3jgplvalfbr"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65745,8 +65558,8 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.1.2.0"; - sha256 = "03p71mfnnfjx9dnf0yhrhdcr30zc2nwn5f8lql48cabccpd3793l"; + version = "0.1.3.0"; + sha256 = "1ffmjcpmdx2sx0sr3g5n2s8dhrbmh7606zfnymv2v9h1rf36xf3x"; libraryHaskellDepends = [ aeson base base-compat binary containers deepseq vector ]; @@ -67130,23 +66943,24 @@ self: { ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , conduit, conduit-extra, containers, data-default, directory , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl - , primitive, resourcet, semigroups, test-framework - , test-framework-hunit, text, transformers, unordered-containers - , vector + , ordered-containers, primitive, resourcet, semigroups + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.7.2.0"; - sha256 = "1bclavsan00mv0n0dy0ap6byk4w5fwnhpvxhdhx94r7bxfqi2r0q"; + version = "0.7.3.0"; + sha256 = "1xh11h4qibjcv8b0rk5mwdzww183kpjqzl3x22rbfryjvrp0n07w"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ghc-prim mmorph - monad-control mtl primitive resourcet semigroups text transformers - unordered-containers vector + monad-control mtl ordered-containers primitive resourcet semigroups + text transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers directory HUnit mtl primitive - test-framework test-framework-hunit text transformers vector + base bytestring conduit containers directory HUnit mtl + ordered-containers primitive test-framework test-framework-hunit + text transformers vector ]; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = lib.licenses.bsd3; @@ -67444,8 +67258,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.10.2.0"; - sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l"; + version = "0.11.0.0"; + sha256 = "0j35p4i611jkxa3i59gvc7vgbkzx7ckri1fd1n0ryv8akn4gl9m8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68187,6 +68001,19 @@ self: { license = lib.licenses.mit; }) {}; + "d10_0_3_0_1" = callPackage + ({ mkDerivation, base, hedgehog, template-haskell }: + mkDerivation { + pname = "d10"; + version = "0.3.0.1"; + sha256 = "0fw6hl0ikfxgqhns18f0h3hs2ihi2d09jpjvmgrzddf3d8lrrlnh"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hedgehog template-haskell ]; + description = "Digits 0-9"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "d3d11binding" = callPackage ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler , d3dx11, d3dxof, dxgi, dxguid, vect, Win32 @@ -69872,23 +69699,11 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "data-lens-light"; - version = "0.1.2.2"; - sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj"; - libraryHaskellDepends = [ base mtl template-haskell ]; - description = "Simple lenses, minimum dependencies"; - license = lib.licenses.mit; - }) {}; - - "data-lens-light_0_1_2_3" = callPackage - ({ mkDerivation, base, mtl, template-haskell }: - mkDerivation { - pname = "data-lens-light"; version = "0.1.2.3"; sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple lenses, minimum dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "data-lens-template" = callPackage @@ -78984,6 +78799,8 @@ self: { testHaskellDepends = [ base containers hspec lens mtl random ]; description = "A simulator for the board game Dominion"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "domplate" = callPackage @@ -83723,8 +83540,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.13"; - sha256 = "0wh955b9wwqwl8jbkzyxxaf8q9y80dbh0f6vaxxzh2cc7zqc31im"; + version = "2.3.2.15"; + sha256 = "0n67wss6k8lhwfkybkhsa04bbdfdv541sacbxlylkx2hqpj5r5gh"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -83733,23 +83550,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "email-validate_2_3_2_14" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.14"; - sha256 = "1jl93c5xm20gpngqxgzbcaqhkjl9nxsph17qgzyd2whmkz5yxhk7"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -85654,34 +85454,6 @@ self: { "esqueleto" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, postgresql-libpq, postgresql-simple, resourcet - , tagged, text, time, transformers, unliftio, unordered-containers - , vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.0.0"; - sha256 = "00mamdsm4yc8gdvb5zfnhnp7iqkg7h9fd5jgzrbdh9q7isyc6kiy"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - postgresql-libpq postgresql-simple resourcet tagged text time - transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql , persistent-postgresql, persistent-sqlite, postgresql-simple @@ -85706,7 +85478,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ess" = callPackage @@ -88007,13 +87778,27 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.14"; - sha256 = "19sjh12sjpxhk7wg2b3abga7bpk6ckry19zi58imqmy8xbh6ds39"; + version = "0.1.16"; + sha256 = "04a1iv3dzyni7b0yvzqf1s8l0wg07hk9sg6d59hdbsl4f3kw8ki4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving function application and variables"; + license = lib.licenses.bsd3; + }) {}; + + "express_1_0_0" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "1.0.0"; + sha256 = "1aymnlq1nkw7qvrydmy0447ls5lnnjkhvpgicr56p2v65xrd37qx"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; - description = "Dynamically-typed expressions involving applications and variables"; + description = "Dynamically-typed expressions involving function application and variables"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "expression-parser" = callPackage @@ -93979,6 +93764,29 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "foldl_1_4_12" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, primitive + , profunctors, random, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.12"; + sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable primitive + profunctors random semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, doctest, foldl, safe-exceptions }: mkDerivation { @@ -94640,27 +94448,6 @@ self: { }: mkDerivation { pname = "formatting"; - version = "7.1.2"; - sha256 = "13sdc3wc8ahf18g5yld9bqi5yhbbg1w1r69rims93c5bxhiw3f9f"; - libraryHaskellDepends = [ - base clock double-conversion ghc-prim old-locale scientific text - time transformers - ]; - testHaskellDepends = [ base ghc-prim hspec scientific text ]; - benchmarkHaskellDepends = [ - base criterion ghc-prim QuickCheck text - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = lib.licenses.bsd3; - }) {}; - - "formatting_7_1_3" = callPackage - ({ mkDerivation, base, clock, criterion, double-conversion - , ghc-prim, hspec, old-locale, QuickCheck, scientific, text, time - , transformers - }: - mkDerivation { - pname = "formatting"; version = "7.1.3"; sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0"; libraryHaskellDepends = [ @@ -94673,7 +94460,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "forml" = callPackage @@ -97582,30 +97368,30 @@ self: { ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed - , filepath, free, gitrev, happy, hashable, haskeline - , language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , filepath, free, futhark-data, futhark-server, gitrev, happy + , hashable, haskeline, language-c-quote, mainland-pretty + , megaparsec, mtl, neat-interpolation, parallel, parser-combinators + , pcg-random, process, process-extras, QuickCheck, regex-tdfa + , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, terminal-size, text, time, transformers + , unordered-containers, utf8-string, vector + , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.19.6"; - sha256 = "1wpg2ad2xv60xsdvnq3246nps3ldc00n58k7jxmh8lrx5bjzg263"; + version = "0.19.7"; + sha256 = "1c3la98gsw3xxvakg4zsknwn3z3whn75r5vr9rf6w6f48jl0829k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bmp bytestring bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free gitrev hashable haskeline - language-c-quote mainland-pretty megaparsec mtl neat-interpolation - parallel pcg-random process process-extras regex-tdfa srcloc - template-haskell temporary terminal-size text time transformers - unordered-containers utf8-string vector vector-binary-instances - versions zip-archive zlib + dlist file-embed filepath free futhark-data futhark-server gitrev + hashable haskeline language-c-quote mainland-pretty megaparsec mtl + neat-interpolation parallel pcg-random process process-extras + regex-tdfa srcloc template-haskell temporary terminal-size text + time transformers unordered-containers utf8-string vector + vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -99154,6 +98940,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.12"; sha256 = "17br2dl9gd2hyflgp0fzqs5ghp4my4l234pjfvvnhk9n4szxzcr3"; + revision = "1"; + editedCabalFile = "0nd40p8iqr6bk7py9rblpis2s8i4p5wgg6kfp607mpp4y17xq1dr"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -99173,6 +98961,18 @@ self: { license = lib.licenses.mit; }) {}; + "generic-arbitrary_0_2_0" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.2.0"; + sha256 = "1wlrsj9l57vqdkaablb8ypq2g1i4mishjag00fyf2imr2cvzkamg"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -99919,23 +99719,11 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.7"; - sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b"; - libraryHaskellDepends = [ base mtl template-haskell ]; - description = "Use Template Haskell to generate Uniplate-like functions"; - license = lib.licenses.bsd3; - }) {}; - - "geniplate-mirror_0_7_8" = callPackage - ({ mkDerivation, base, mtl, template-haskell }: - mkDerivation { - pname = "geniplate-mirror"; version = "0.7.8"; sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "geniserver" = callPackage @@ -99993,27 +99781,12 @@ self: { }: mkDerivation { pname = "genvalidity"; - version = "0.11.0.0"; - sha256 = "0kqhmgq7p94980br47jd6k9m2vjb62idx8x5hrcmybf0dakyscbl"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = lib.licenses.mit; - }) {}; - - "genvalidity_0_11_0_2" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; version = "0.11.0.2"; sha256 = "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j"; libraryHaskellDepends = [ base QuickCheck random validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -102300,23 +102073,11 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.1"; - sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67"; - libraryHaskellDepends = [ base ghc ]; - description = "Utilities for writing GHC type-checker plugins"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-tcplugins-extra_0_4_2" = callPackage - ({ mkDerivation, base, ghc }: - mkDerivation { - pname = "ghc-tcplugins-extra"; version = "0.4.2"; sha256 = "1gddqcczb8ixmrlfbfb06dc470jsjhvsxx3q2nsd4mcx2x6jdk08"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-time-alloc-prof" = callPackage @@ -102355,25 +102116,12 @@ self: { ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.2.2"; - sha256 = "18vhv99lrfjx6bxww77qxg7gwqmvpylvlrq1bji0hd6mcxxdjn69"; - libraryHaskellDepends = [ base bytestring text ]; - benchmarkHaskellDepends = [ base bytestring tasty-bench ]; - description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-trace-events_0_1_2_3" = callPackage - ({ mkDerivation, base, bytestring, tasty-bench, text }: - mkDerivation { - pname = "ghc-trace-events"; version = "0.1.2.3"; sha256 = "11m2ihzlncvxp8x2zgbnzbyybz2lbpdl5flk4gzmq0qz0957j7qd"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage @@ -102384,29 +102132,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.2"; - sha256 = "0xpy52rib25iz5h89nqlj27isjk57pjbhlvlfam5q0g3x92572h4"; - libraryHaskellDepends = [ - base containers ghc ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp - transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_4_3" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-prim - , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; version = "0.4.3"; sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; libraryHaskellDepends = [ @@ -102420,7 +102145,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -102430,26 +102154,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.5"; - sha256 = "1xraiil3nq02jdb4blkmsrdp36qhykv2xvwg3kaiyw5bgfl15gl3"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_7_6" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; version = "0.7.6"; sha256 = "10m4y0hf25w2i40464pz85lqs5dr8cznl191icnibc5fjynyzd9v"; libraryHaskellDepends = [ @@ -102461,7 +102165,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -102470,22 +102173,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.4"; - sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_7_6" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.7.6"; sha256 = "09d70iw58m5g6yi8k2b52f1g0pfdqm5fzhs8rd7fgrgmi70np9bx"; libraryHaskellDepends = [ @@ -102494,7 +102181,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -103136,6 +102822,8 @@ self: { pname = "ghcup"; version = "0.1.14.2"; sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; + revision = "1"; + editedCabalFile = "1vy71ly44jibq8bil0ns80m2zn9gcpnz8f9w2mn4j404gajpqagk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105162,25 +104850,6 @@ self: { "githash" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; - version = "0.1.6.0"; - sha256 = "1mcfzgvqiirlz8vc02wlvvfyf6742f3901ks8rphhabl4b4v1djl"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = lib.licenses.bsd3; - }) {}; - - "githash_0_1_6_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec , process, template-haskell, temporary, th-compat, unliftio }: mkDerivation { @@ -105197,7 +104866,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "github" = callPackage @@ -106237,8 +105905,8 @@ self: { pname = "glirc"; version = "2.38"; sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; - revision = "1"; - editedCabalFile = "04f35w57jq6gpi6d3d83c9bswwl724rbd0dbl835ilhl18kpfscj"; + revision = "2"; + editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -110954,21 +110622,20 @@ self: { ({ mkDerivation, aeson, base, conduit, containers, exceptions , hspec, hspec-expectations, hspec-megaparsec, megaparsec , parser-combinators, QuickCheck, raw-strings-qq, scientific, text - , transformers, unordered-containers + , transformers, unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "0.11.1.0"; - sha256 = "093gk2w2qrvarcv7xn0d0saa1j35cy0isw5vz04h08gy37s2nspc"; + version = "1.0.0.0"; + sha256 = "09r2a444l18pzy0952hkpl98vkmldi8j94hr6qf16xg5y9nic3nd"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ - aeson base conduit containers exceptions hspec hspec-expectations - hspec-megaparsec megaparsec parser-combinators QuickCheck - raw-strings-qq scientific text transformers unordered-containers + aeson base conduit exceptions hspec hspec-megaparsec megaparsec + QuickCheck raw-strings-qq scientific text unordered-containers ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; @@ -115375,6 +115042,8 @@ self: { ]; description = "Wrapper to integrate literate Agda files with Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-alectryon" = callPackage @@ -117124,34 +116793,6 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-bsd, network-uri, old-locale, parsec, process, semigroups - , sendfile, syb, system-filepath, text, threads, time, transformers - , transformers-base, transformers-compat, unix, utf8-string, xhtml - , zlib - }: - mkDerivation { - pname = "happstack-server"; - version = "7.7.1"; - sha256 = "1zxdv7nihw3kjq2fvw5cl3s27pwm5gkli3sl15iqxfm7mdxz8rm0"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-bsd network-uri old-locale parsec - process semigroups sendfile syb system-filepath text threads time - transformers transformers-base transformers-compat unix utf8-string - xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - description = "Web related tools and services"; - license = lib.licenses.bsd3; - }) {}; - - "happstack-server_7_7_1_1" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , syb, system-filepath, text, threads, time, transformers , transformers-base, transformers-compat, unix, utf8-string, xhtml @@ -117174,7 +116815,6 @@ self: { ]; description = "Web related tools and services"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-server-tls" = callPackage @@ -117742,6 +117382,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasbolt_0_1_6_1" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , connection, containers, criterion, data-binary-ieee754 + , data-default, deepseq, deepseq-generics, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.6.1"; + sha256 = "1skniw27z4p3103anh2jc546h0jkvsacsnwnf32zz7a4paw6z280"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default deepseq deepseq-generics mtl network text + ]; + testHaskellDepends = [ + base binary bytestring containers hspec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base base64-bytestring binary bytestring criterion data-default + hspec + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -122780,6 +122446,7 @@ self: { ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-simple" = callPackage @@ -122807,8 +122474,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.8"; - sha256 = "14h71s7dha1g0zfi3vsg5y6lsn09x8c9nqv1nqiqmw2m19adx7gi"; + version = "0.4.0.9"; + sha256 = "0z3falhkyyqpzqh116xwzvjj0xb391bwahh64sasnw4vf2i0drb9"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -122826,8 +122493,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "1.0.0.2"; - sha256 = "1ig6fny9c90cmfsh6kcdhj9ps2arn1y80ic2w7ps6mn8wgl0cr82"; + version = "1.0.1"; + sha256 = "1a83x2jrv9bhjrxfgvqfwrqv5cx1f401rmvz0k44yww5p816jk9s"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -124625,8 +124292,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.2"; - sha256 = "1s2alhwmkk5czilm1m2dp72xpbdjhn7yhghrs1aca2js71x5j7qj"; + version = "0.2.0.1"; + sha256 = "1bkjk5bzlzsigqdcb3vyqmjxddf4hm7b5a4ppb0iwh5n78whxpjc"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -124656,33 +124323,6 @@ self: { }) {}; "headroom" = callPackage - ({ mkDerivation, aeson, base, doctest, either, file-embed - , generic-data, hspec, hspec-discover, microlens, microlens-th, mtl - , mustache, optparse-applicative, pcre-heavy, pcre-light - , QuickCheck, rio, string-interpolate, template-haskell, time, yaml - }: - mkDerivation { - pname = "headroom"; - version = "0.4.1.0"; - sha256 = "1f98x1qm567wsa58nyavj7lfi2fmm6zrmjc0cwg0dyhvi63n9qp0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base either file-embed generic-data microlens microlens-th - mtl mustache optparse-applicative pcre-heavy pcre-light rio - string-interpolate template-haskell time yaml - ]; - executableHaskellDepends = [ base optparse-applicative rio ]; - testHaskellDepends = [ - aeson base doctest hspec mtl optparse-applicative pcre-light - QuickCheck rio string-interpolate time - ]; - testToolDepends = [ hspec-discover ]; - description = "License Header Manager"; - license = lib.licenses.bsd3; - }) {}; - - "headroom_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, doctest, either, extra, file-embed , generic-data, hspec, hspec-discover, http-client, http-types , microlens, microlens-th, modern-uri, mtl, mustache @@ -124709,7 +124349,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "License Header Manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "heap" = callPackage @@ -125409,27 +125048,6 @@ self: { }: mkDerivation { pname = "hedn"; - version = "0.3.0.2"; - sha256 = "1w9p9h06rgz80153b2q59bblpn124nicn1sscyyjc1cfwda2h0b4"; - libraryHaskellDepends = [ - base containers deepseq deriving-compat megaparsec - parser-combinators prettyprinter scientific template-haskell text - time uuid-types vector - ]; - testHaskellDepends = [ - base containers hedgehog megaparsec text time uuid-types vector - ]; - description = "EDN parsing and encoding"; - license = lib.licenses.bsd3; - }) {}; - - "hedn_0_3_0_3" = callPackage - ({ mkDerivation, base, containers, deepseq, deriving-compat - , hedgehog, megaparsec, parser-combinators, prettyprinter - , scientific, template-haskell, text, time, uuid-types, vector - }: - mkDerivation { - pname = "hedn"; version = "0.3.0.3"; sha256 = "0amfsmnly9yxzv1j34ya8kq9fqd067kgklx7rswy5g7aflj3bpwl"; libraryHaskellDepends = [ @@ -125442,7 +125060,6 @@ self: { ]; description = "EDN parsing and encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedn-functor" = callPackage @@ -129943,6 +129560,51 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger_1_22" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries + , bytestring, cmdargs, containers, data-default, Decimal, Diff + , directory, extra, filepath, githash, hashable, haskeline + , hledger-lib, lucid, math-functions, megaparsec, mtl, old-time + , process, regex-tdfa, safe, shakespeare, split, tabular, tasty + , temporary, terminfo, text, time, timeit, transformers + , unordered-containers, utf8-string, utility-ht, wizards + }: + mkDerivation { + pname = "hledger"; + version = "1.22"; + sha256 = "1w7akdl9pn77s3fnb5wq3f7k2xpxnf91ann8qy5gpq66nszm6pqc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal Diff directory extra filepath + githash hashable haskeline hledger-lib lucid math-functions + megaparsec mtl old-time process regex-tdfa safe shakespeare split + tabular tasty temporary terminfo text time timeit transformers + unordered-containers utf8-string utility-ht wizards + ]; + executableHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal directory extra filepath githash + haskeline hledger-lib math-functions megaparsec mtl old-time + process regex-tdfa safe shakespeare split tabular tasty temporary + terminfo text time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + testHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal directory extra filepath githash + haskeline hledger-lib math-functions megaparsec mtl old-time + process regex-tdfa safe shakespeare split tabular tasty temporary + terminfo text time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + description = "Command-line interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hledger-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , Decimal, docopt, either, hledger, hledger-lib, microlens @@ -130134,6 +129796,43 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hledger-lib_1_22" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base + , base-compat-batteries, blaze-markup, bytestring, call-stack + , cassava, cassava-megaparsec, cmdargs, containers, data-default + , Decimal, directory, doctest, extra, file-embed, filepath, Glob + , hashtables, megaparsec, mtl, old-time, parser-combinators + , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, text, time, timeit, transformers, uglymemo + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.22"; + sha256 = "06qddk2nhjq3g02in3hcxz4hfwq9fcb3356shzbljx7ssmzjakzm"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal directory extra file-embed + filepath Glob hashtables megaparsec mtl old-time parser-combinators + pretty-simple regex-tdfa safe tabular tasty tasty-hunit + template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal directory doctest extra + file-embed filepath Glob hashtables megaparsec mtl old-time + parser-combinators pretty-simple regex-tdfa safe tabular tasty + tasty-hunit template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string + ]; + description = "A reusable library providing the core functionality of hledger"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hledger-makeitso" = callPackage ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time , turtle @@ -130206,6 +129905,31 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger-ui_1_22" = callPackage + ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries + , brick, cmdargs, containers, data-default, directory, extra + , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens + , microlens-platform, process, safe, split, text, text-zipper, time + , transformers, unix, vector, vty + }: + mkDerivation { + pname = "hledger-ui"; + version = "1.22"; + sha256 = "1izidpxwygghq0c3z7pygf9c9qlsydw89gs6475hsd4qiqc06gjr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base base-compat-batteries brick cmdargs + containers data-default directory extra filepath fsnotify hledger + hledger-lib megaparsec microlens microlens-platform process safe + split text text-zipper time transformers unix vector vty + ]; + description = "Curses-style terminal interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hledger-vty" = callPackage ({ mkDerivation, base, cmdargs, hledger, hledger-lib, HUnit, safe , time, vty @@ -130263,6 +129987,43 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger-web_1_22" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , case-insensitive, clientsession, cmdargs, conduit, conduit-extra + , containers, data-default, Decimal, directory, extra, filepath + , hjsmin, hledger, hledger-lib, hspec, http-client, http-conduit + , http-types, megaparsec, mtl, network, shakespeare + , template-haskell, text, time, transformers, unix-compat + , unordered-containers, utf8-string, wai, wai-cors, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static, yesod-test + }: + mkDerivation { + pname = "hledger-web"; + version = "1.22"; + sha256 = "0miy111zz8yqw0i87sn91aiplznc7fbirznpar8y5mch8z4wn4bs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra containers data-default + Decimal directory extra filepath hjsmin hledger hledger-lib hspec + http-client http-conduit http-types megaparsec mtl network + shakespeare template-haskell text time transformers unix-compat + unordered-containers utf8-string wai wai-cors wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static yesod-test + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hledger hledger-lib hspec text yesod yesod-test + ]; + description = "Web-based user interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hlibBladeRF" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF }: @@ -134757,6 +134518,29 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; + "hs" = callPackage + ({ mkDerivation, base, containers, data-default, directory + , enum-text, filepath, fmt, optparse-applicative, possibly, text + , typed-process + }: + mkDerivation { + pname = "hs"; + version = "0.1.0.2"; + sha256 = "03hfjw777v2dkj1qcswb9ylqypiqhx5xcsnmksq99si3bi1xyrgm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory enum-text filepath fmt + optparse-applicative possibly text typed-process + ]; + executableHaskellDepends = [ + base containers data-default directory enum-text filepath fmt + optparse-applicative possibly text typed-process + ]; + description = "GHC-toolchain installer broker"; + license = lib.licenses.bsd3; + }) {}; + "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -135818,6 +135602,8 @@ self: { ]; description = "Akamai API(Edgegrid and Netstorage)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsaml2" = callPackage @@ -141390,8 +141176,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.7.2"; - sha256 = "1q0lp8hkzfc0srci9y794q5cqkih50r3iw2c32wbx8h502jcvv1q"; + version = "0.8.8.1"; + sha256 = "0jh7ps2hi72pjzrjwkmq8sq0djwjv9nf9cbxhjb121grg0gzzrbh"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -143345,6 +143131,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -144798,22 +144586,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, containers, text - , unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.8.1"; - sha256 = "0pzm9sfn1bw7yvwhby9a6d9z2ghcn91rcbj08x380gff31kn8lbx"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers text unordered-containers zlib - ]; - description = "Configurable Knuth-Liang hyphenation"; - license = lib.licenses.bsd2; - }) {}; - - "hyphenation_0_8_2" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, text , unordered-containers, zlib }: @@ -144828,7 +144600,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "hypher" = callPackage @@ -145946,6 +145717,42 @@ self: { license = lib.licenses.mit; }) {}; + "ihaskell_0_10_2_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, exceptions, filepath, ghc + , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec + , hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, text, time, transformers + , unix, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.2.1"; + sha256 = "1bpxm51c8f0cl7cvg7d2f39fnar7a811s3fgxvxmvsb7yw3v92vc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths + haskeline hlint http-client http-client-tls ipython-kernel mtl + parsec process random shelly split stm strict text time + transformers unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -147967,8 +147774,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.9.1.4"; - sha256 = "021r3ghn3cv1nykkkgyd50gq5cmczam8j37xqfi7vmyx5iwdv0a2"; + version = "0.9.1.5"; + sha256 = "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149797,8 +149604,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "3.0.0"; - sha256 = "1hi1q0kiqqp96w29y9699s66rmyr7k0fp6s7z86ll9n3bmf0a4g4"; + version = "3.1.0"; + sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; @@ -155761,6 +155568,108 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; + "keid-core" = callPackage + ({ mkDerivation, adjunctions, base, binary, bytestring + , cryptohash-md5, derive-storable, derive-storable-plugin + , distributive, foldl, geomancy, GLFW-b, ktx-codec + , neat-interpolation, optparse-applicative, optparse-simple + , resourcet, rio, rio-app, StateVar, tagged, template-haskell, text + , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-core"; + version = "0.1.0.0"; + sha256 = "05h4dp27sp23ihmr8hvflqr1bqyf590s607sxl9vc1k46k9hc179"; + libraryHaskellDepends = [ + adjunctions base binary bytestring cryptohash-md5 derive-storable + derive-storable-plugin distributive foldl geomancy GLFW-b ktx-codec + neat-interpolation optparse-applicative optparse-simple resourcet + rio rio-app StateVar tagged template-haskell text transformers + unagi-chan unliftio vector vulkan vulkan-utils + VulkanMemoryAllocator zstd + ]; + description = "Core parts of Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-geometry" = callPackage + ({ mkDerivation, base, geomancy, keid-core, rio, rio-app, vulkan }: + mkDerivation { + pname = "keid-geometry"; + version = "0.1.0.0"; + sha256 = "1bhmxgbza1l9qr25g8ad31j70z1dmvsa5gd05fgpwha9liixahsc"; + libraryHaskellDepends = [ + base geomancy keid-core rio rio-app vulkan + ]; + description = "Geometry primitives for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-render-basic" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cryptohash-md5 + , derive-storable, derive-storable-plugin, foldl, geomancy, GLFW-b + , keid-core, neat-interpolation, resourcet, rio, rio-app, tagged + , text, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-render-basic"; + version = "0.1.0.0"; + sha256 = "1rjvf5bxh3llfq1pd9hwy8laida9rhw4f49ca5hn69cnpchpngmy"; + libraryHaskellDepends = [ + aeson base binary bytestring cryptohash-md5 derive-storable + derive-storable-plugin foldl geomancy GLFW-b keid-core + neat-interpolation resourcet rio rio-app tagged text unliftio + vector vulkan vulkan-utils VulkanMemoryAllocator zstd + ]; + description = "Basic rendering programs for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-resource-gltf" = callPackage + ({ mkDerivation, base, bytestring, containers, derive-storable + , derive-storable-plugin, geomancy, gltf-codec, keid-core, rio + , rio-app, vulkan + }: + mkDerivation { + pname = "keid-resource-gltf"; + version = "0.1.0.0"; + sha256 = "1b5dbrlhb44xmgsv4l5mfwficlkjy3k36b01sha0j6yq1bv6mvhj"; + libraryHaskellDepends = [ + base bytestring containers derive-storable derive-storable-plugin + geomancy gltf-codec keid-core rio rio-app vulkan + ]; + description = "GLTF loader for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-ui-dearimgui" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , dear-imgui, derive-storable, derive-storable-plugin, foldl + , geomancy, GLFW-b, keid-core, neat-interpolation, resourcet, rio + , rio-app, tagged, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-ui-dearimgui"; + version = "0.1.0.0"; + sha256 = "1650h7mbzmkpzs2wjvjh3zwmjkvbcg1h36yk6frlvvf80fhhihjc"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 dear-imgui derive-storable + derive-storable-plugin foldl geomancy GLFW-b keid-core + neat-interpolation resourcet rio rio-app tagged unliftio vector + vulkan vulkan-utils VulkanMemoryAllocator zstd + ]; + description = "DearImGui elements for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , conduit, conduit-extra, directory, filepath, hslogger, network @@ -159612,6 +159521,8 @@ self: { pname = "large-hashable"; version = "0.1.0.4"; sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; + revision = "1"; + editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; libraryHaskellDepends = [ aeson base base16-bytestring bytes bytestring containers scientific strict template-haskell text time transformers unordered-containers @@ -161676,15 +161587,15 @@ self: { }) {inherit (pkgs) leveldb;}; "levenshtein" = callPackage - ({ mkDerivation, base, binary, deepseq, hashable, hspec - , hspec-discover, QuickCheck + ({ mkDerivation, base, binary, data-default, deepseq, hashable + , hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "levenshtein"; - version = "0.1.1.0"; - sha256 = "1a4pz175skaw8s02pa6l2jm7m21sfghivzpd2vm2p08lmmwykx5p"; + version = "0.1.3.0"; + sha256 = "1h9xygy65npn2a5pgngqzm39k9ms3krzn1in9h0adln6aq2kcgdx"; libraryHaskellDepends = [ - base binary deepseq hashable QuickCheck + base binary data-default deepseq hashable QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -163645,8 +163556,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.21.5"; - sha256 = "19pvz467wd8gss95qfi90xnd5fwm6dpdppr21g5n30x4m7niymn3"; + version = "1.21.6"; + sha256 = "0ax6prmc7b53w0lz5ddc40wrjj9bm7wldpp57283gx9hdf8qrb35"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -164647,8 +164558,8 @@ self: { ({ mkDerivation, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, cereal, cmdargs, containers , deepseq, directory, fgl, filepath, git, hashable, intern, mtl - , nettools, ocaml, parallel, parsec, pretty, process, stm, syb - , tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format + , nettools, parallel, parsec, pretty, process, stm, syb, tasty + , tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format , transformers, unordered-containers, z3 }: mkDerivation { @@ -164665,7 +164576,6 @@ self: { text-format transformers unordered-containers ]; executableHaskellDepends = [ base ]; - executableSystemDepends = [ ocaml ]; testHaskellDepends = [ base containers directory filepath mtl process stm tasty tasty-ant-xml tasty-hunit tasty-rerun transformers @@ -164675,7 +164585,7 @@ self: { description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = lib.licenses.bsd3; }) {inherit (pkgs) git; inherit (pkgs) nettools; - inherit (pkgs) ocaml; inherit (pkgs) z3;}; + inherit (pkgs) z3;}; "liquid-ghc-prim" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: @@ -180659,6 +180569,8 @@ self: { ]; description = "GraphQL support for Mu"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mu-grpc-client" = callPackage @@ -184483,7 +184395,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_0_0" = callPackage + "net-mqtt_0_8_0_2" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -184492,8 +184404,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.0.0"; - sha256 = "1635kk5619syjj80ynpnd61qdiaxm349qyzhbaa8nc8nm8kkw2gh"; + version = "0.8.0.2"; + sha256 = "0rvsyb9msp1dkba941094d07apdinlda0hg4pb32jxs17wwnj0a7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184523,22 +184435,6 @@ self: { }: mkDerivation { pname = "net-mqtt-lens"; - version = "0.1.0.0"; - sha256 = "1g0vvay4fdvr2n0hxi4w4av39wd70jgi3yixfx98xxydilw1v110"; - libraryHaskellDepends = [ base lens net-mqtt ]; - testHaskellDepends = [ - base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck - ]; - description = "Optics for net-mqtt"; - license = lib.licenses.bsd3; - }) {}; - - "net-mqtt-lens_0_1_1_0" = callPackage - ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "net-mqtt-lens"; version = "0.1.1.0"; sha256 = "0rlib45yqlcij12pij8y690n3ajma35fyj8292b1vggk07dscycq"; libraryHaskellDepends = [ base lens net-mqtt ]; @@ -184547,7 +184443,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "net-mqtt-rpc" = callPackage @@ -188621,31 +188516,32 @@ self: { license = lib.licenses.bsd3; }) {}; - "nri-observability" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs - , bytestring, directory, hostname, http-client, http-client-tls - , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text - , time, unordered-containers + "nri-kafka" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, hw-kafka-client, nri-env-parser, nri-observability + , nri-prelude, safe-exceptions, stm, text, time, unix, uuid }: mkDerivation { - pname = "nri-observability"; - version = "0.1.0.3"; - sha256 = "0njpgc873rh09hkg7pnagkmmrd8nibdq4q1p44wa3n71xzwzy771"; + pname = "nri-kafka"; + version = "0.1.0.0"; + sha256 = "0ifdmli7arrlpmh1l4q974rv0bw3xirfk96xrahfab3zp36r4x3y"; libraryHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers + aeson async base bytestring conduit containers hw-kafka-client + nri-env-parser nri-observability nri-prelude safe-exceptions stm + text time unix uuid ]; testHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers + aeson async base bytestring conduit containers hw-kafka-client + nri-env-parser nri-observability nri-prelude safe-exceptions stm + text time unix uuid ]; - description = "Report log spans collected by nri-prelude"; + description = "Functions for working with Kafka"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; - "nri-observability_0_1_1_1" = callPackage + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, conduit, directory, hostname, http-client , http-client-tls, nri-env-parser, nri-prelude, random @@ -188669,7 +188565,32 @@ self: { ]; description = "Report log spans collected by nri-prelude"; license = lib.licenses.bsd3; + }) {}; + + "nri-postgresql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath + , network, nri-env-parser, nri-observability, nri-prelude + , postgresql-typed, resource-pool, resourcet, safe-exceptions + , template-haskell, text, time + }: + mkDerivation { + pname = "nri-postgresql"; + version = "0.1.0.1"; + sha256 = "1kl5wriqdshhc2fjaicj60hrwrw2c6y8vrq2pv4fagn0gxa78fvc"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring filepath network nri-env-parser + nri-observability nri-prelude postgresql-typed resource-pool + resourcet safe-exceptions template-haskell text time + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring filepath network nri-env-parser + nri-observability nri-prelude postgresql-typed resource-pool + resourcet safe-exceptions template-haskell text time + ]; + description = "Make queries against Postgresql"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nri-prelude" = callPackage @@ -191052,7 +190973,7 @@ self: { broken = true; }) {}; - "opaleye" = callPackage + "opaleye_0_7_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -191062,10 +190983,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.7.1.0"; - sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; - revision = "3"; - editedCabalFile = "14y8nnng9307wb1mafzdr2fmn37cwyfpw9sby8lf9sj467rvghrq"; + version = "0.7.2.0"; + sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -191080,9 +190999,10 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "opaleye_0_7_3_0" = callPackage + "opaleye" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -191108,7 +191028,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -193063,8 +192982,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; - revision = "1"; - editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1"; + revision = "2"; + editedCabalFile = "172x8990wx4jhyb7yp9k18nd6q4sis8km09x2afr238siqviclrc"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -193091,24 +193010,6 @@ self: { "optparse-simple" = callPackage ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.1.1.3"; - sha256 = "1wymqhac2sngkka8w880gq6y1kk3xs0flbv4mrhfgzrplhax8r9k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_4" = callPackage - ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, th-compat, transformers }: mkDerivation { @@ -193124,7 +193025,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -194733,64 +194633,6 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.14.0.2"; - sha256 = "1jnckx29l6plg1zbkjdfj530djjl8zszwr54zsg0k0is4pcswa9f"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP - http-client http-client-tls http-types ipynb jira-wiki-markup - JuicyPixels mtl network network-uri pandoc-types parsec process - random safe scientific SHA skylighting skylighting-core split syb - tagsoup temporary texmath text text-conversions time - unicode-collation unicode-transforms unix unordered-containers xml - xml-conduit zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring containers Diff directory doctemplates exceptions - filepath Glob hslua mtl pandoc-types process QuickCheck tasty - tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml - zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers deepseq mtl tasty-bench text time - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_14_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, connection, containers, data-default, deepseq - , Diff, directory, doclayout, doctemplates, emojis, exceptions - , file-embed, filepath, Glob, haddock-library, hslua - , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML - , HTTP, http-client, http-client-tls, http-types, ipynb - , jira-wiki-markup, JuicyPixels, mtl, network, network-uri - , pandoc-types, parsec, process, QuickCheck, random, safe - , scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-collation, unicode-transforms, unix - , unordered-containers, xml, xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; version = "2.14.0.3"; sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; @@ -194827,7 +194669,6 @@ self: { ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -195558,47 +195399,6 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.2.2"; - sha256 = "05ykb6jn19jiakrn6mdcz3gyc6v6hkg3r8drwxncf04syz0l60mm"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = lib.licenses.bsd3; - }) {}; - - "pantry_0_5_2_3" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; version = "0.5.2.3"; sha256 = "17r9fgs83dp0s9wq14q5hvf5vnl8d7cg9p9dnbixgsysq6g6d29g"; libraryHaskellDepends = [ @@ -195624,7 +195424,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -197104,8 +196903,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "1.2.0.0"; - sha256 = "0q3kj5ima8i06rmm5659jhhzfm6shgb3k4sbf34dq1jbwgqrkja1"; + version = "1.3.0.0"; + sha256 = "0qx5q7a9hkj9swpwlxh24c19pf9i6yvlmp44xiwshflz4cf1n8dq"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -199701,42 +199500,6 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.2"; - sha256 = "1fn3hjn3pxxnawvdif691vmxahnmal5ivr5rll0f26ia7rjqrnn2"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data lift-type monad-logger - mtl path-pieces resource-pool resourcet scientific silently - template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck quickcheck-instances resource-pool resourcet - scientific shakespeare silently template-haskell text - th-lift-instances time transformers unliftio unliftio-core - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq file-embed template-haskell text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_13_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, criterion, deepseq - , fast-logger, file-embed, hspec, http-api-data, lift-type - , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances - , resource-pool, resourcet, scientific, shakespeare, silently - , template-haskell, text, th-lift-instances, time, transformers - , unliftio, unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; version = "2.13.1.1"; sha256 = "0sg51psmpjsz9hiva0gn3xcnd74a6dwbzx1bzi918idcfkpbn496"; libraryHaskellDepends = [ @@ -199759,7 +199522,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -200168,39 +199930,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.2"; - sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring conduit containers - monad-logger mtl persistent postgresql-libpq postgresql-simple - resource-pool resourcet string-conversions text time transformers - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted http-api-data HUnit - monad-logger path-pieces persistent persistent-qq persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio unliftio-core unordered-containers vector - ]; - description = "Backend for the persistent library using postgresql"; - license = lib.licenses.mit; - }) {}; - - "persistent-postgresql_2_13_0_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, http-api-data, HUnit, monad-logger - , mtl, path-pieces, persistent, persistent-qq, persistent-test - , postgresql-libpq, postgresql-simple, QuickCheck - , quickcheck-instances, resource-pool, resourcet - , string-conversions, text, time, transformers, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent-postgresql"; version = "2.13.0.3"; sha256 = "06f5yyv8bj3m4zpjwr1k66hkmh1gfy624rnq2g12sjrpz8nrax6j"; isLibrary = true; @@ -200220,7 +199949,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-protobuf" = callPackage @@ -200763,29 +200491,6 @@ self: { }) {}; "pg-transact" = callPackage - ({ mkDerivation, async, base, bytestring, exceptions, hspec - , hspec-expectations-lifted, monad-control, postgresql-libpq - , postgresql-simple, tmp-postgres, transformers - }: - mkDerivation { - pname = "pg-transact"; - version = "0.3.1.1"; - sha256 = "1z101hbfan8aidq7lcnzzni4b7ji8sbbqx1yar6ykf6wmzmn2pcd"; - libraryHaskellDepends = [ - base bytestring exceptions monad-control postgresql-simple - transformers - ]; - testHaskellDepends = [ - async base bytestring exceptions hspec hspec-expectations-lifted - postgresql-libpq postgresql-simple tmp-postgres - ]; - description = "A postgresql-simple transaction monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "pg-transact_0_3_2_0" = callPackage ({ mkDerivation, async, base, bytestring, criterion, deepseq , exceptions, hspec, hspec-expectations-lifted, monad-control , postgresql-libpq, postgresql-simple, tmp-postgres, transformers @@ -201400,28 +201105,30 @@ self: { }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage - ({ mkDerivation, base, heaps, mmsyn2-array, parallel + ({ mkDerivation, base, heaps, mmsyn2-array, mmsyn3, parallel , phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics, phonetic-languages-plus , phonetic-languages-simplified-base , phonetic-languages-simplified-generalized-examples-common - , phonetic-languages-simplified-generalized-properties-array, subG + , phonetic-languages-simplified-generalized-properties-array + , process, subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.3.0.0"; - sha256 = "15k2nij8rpf1yvm5kjgkrvx1y4zlfskxfdxjbjirmaidamr2ha6d"; + version = "0.4.1.1"; + sha256 = "1xk4vj7bj93s8r9l09z2w9h0sbkd73qcv441jisa04m0s6hlhgby"; libraryHaskellDepends = [ - base heaps mmsyn2-array parallel + base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-plus phonetic-languages-simplified-base phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-generalized-properties-array subG + phonetic-languages-simplified-generalized-properties-array process + subG ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; @@ -205446,6 +205153,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-keyed-state" = callPackage + ({ mkDerivation, base, constraints, constraints-extras, hspec + , polysemy, QuickCheck, some, StateVar, trivial-constraint + }: + mkDerivation { + pname = "polysemy-keyed-state"; + version = "0.1"; + sha256 = "00jcb0rd7s8yvflqx6xjas10lgh0dmg4ywb18cbkm8xd0pdn0d2j"; + libraryHaskellDepends = [ + base constraints constraints-extras polysemy some StateVar + trivial-constraint + ]; + testHaskellDepends = [ + base constraints constraints-extras hspec polysemy QuickCheck some + StateVar trivial-constraint + ]; + description = "Effect for a set of stateful values indexed by a type of keys"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-kvstore-jsonfile" = callPackage ({ mkDerivation, aeson, base, containers, exceptions, extra, path , polysemy, polysemy-zoo, unliftio-path @@ -206564,16 +206292,17 @@ self: { }) {inherit (pkgs) acl;}; "posix-api" = callPackage - ({ mkDerivation, base, byteslice, primitive, primitive-addr - , primitive-offset, primitive-unlifted, systemd, tasty, tasty-hunit + ({ mkDerivation, base, byte-order, byteslice, primitive + , primitive-addr, primitive-offset, primitive-unlifted, run-st + , systemd, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.3.4.0"; - sha256 = "163bblw200jr2vghc7i9g9xls6vhihayxvb4am4lr3j047ifqbmb"; + version = "0.3.5.0"; + sha256 = "0ygww5fcikalyqzliqdrcd4n4g8plhr01gz5p6zd0c5f1y9jgw7x"; libraryHaskellDepends = [ - base byteslice primitive primitive-addr primitive-offset - primitive-unlifted + base byte-order byteslice primitive primitive-addr primitive-offset + primitive-unlifted run-st ]; librarySystemDepends = [ systemd ]; testHaskellDepends = [ @@ -207430,19 +207159,18 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, fast-builder - , hashable, headed-megaparsec, hedgehog, megaparsec - , parser-combinators, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck, text, text-builder - , unordered-containers + ({ mkDerivation, base, bytestring, case-insensitive, hashable + , headed-megaparsec, hedgehog, megaparsec, parser-combinators + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.3.0.3"; - sha256 = "0zylrzd8dfks1jdx1yq1i2n2a7sxa8b04h6km9lx3bdpbpv84y7i"; + version = "0.4"; + sha256 = "133p9w35q7ynb15i97k9ci4w14vp5117v3hmgm4ys3jj07apjyxd"; libraryHaskellDepends = [ - base bytestring case-insensitive fast-builder hashable - headed-megaparsec megaparsec parser-combinators text text-builder + base bytestring case-insensitive hashable headed-megaparsec + megaparsec parser-combinators text text-builder unordered-containers ]; testHaskellDepends = [ @@ -211360,8 +211088,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.0"; - sha256 = "0y1vvcy0rdiraphi6c9i1xsw5zwdqsw0id40xhgvk37va36ryl3p"; + version = "0.9.1"; + sha256 = "1l2rxhs5v8mi77qw98849m0w2swwxvg5wm6d4j123sa29riyb70a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -211379,8 +211107,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, SDL2 }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.0"; - sha256 = "0ksdb89phsdjjq5q043wvqi3swibfd1840180jg3m8wj3zcy5g3k"; + version = "0.9.1"; + sha256 = "1qgb7zj7sj8sc3b7fwfq51s5m997dqgx74dmmkfam2s4v46fhqr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -212857,8 +212585,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.2"; - sha256 = "12gk4c311v39gh0kp5s97gia2xrglzzkpnhisbpxc4h7nd9dqf5m"; + version = "0.14.3"; + sha256 = "0g0zly5wh75w8p09zq6sy25phbb432vb0allmcbx34vd84nm70ia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212971,8 +212699,8 @@ self: { }: mkDerivation { pname = "purescript-cst"; - version = "0.2.0.0"; - sha256 = "0spsl9aq7hg2pkqawwjirgdr8ypzpb9amf2pznxmn6wm9ppaq73s"; + version = "0.3.0.0"; + sha256 = "15gf3fxpqngnx75w7g8nyvmj452y3x9p8ymwwk4mkzql0zps2fy2"; libraryHaskellDepends = [ aeson array base base-compat bytestring containers deepseq dlist filepath microlens mtl protolude scientific semigroups serialise @@ -218621,8 +218349,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.3"; - sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj"; + version = "2.2.4.4"; + sha256 = "09zssx2yqz22hm678ik5zz2zkanzfazcyfqmwlxc9mk6gxxdy6ia"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = lib.licenses.bsd3; @@ -222505,6 +222233,8 @@ self: { pname = "req"; version = "3.9.1"; sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; + revision = "1"; + editedCabalFile = "0g2g8l1nhmqxgk2ylvavv7rw6bq73d3awd21l438mzzljqj4kvh8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -223513,6 +223243,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "retry_0_9_0_0" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl + , random, stm, tasty, tasty-hedgehog, tasty-hunit, time + , transformers + }: + mkDerivation { + pname = "retry"; + version = "0.9.0.0"; + sha256 = "0n304r6vyx238558z62kz7nii8y58h2z4iyx54gbkxmz9dsck4ff"; + libraryHaskellDepends = [ + base exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base exceptions ghc-prim hedgehog HUnit mtl random stm tasty + tasty-hedgehog tasty-hunit time transformers + ]; + description = "Retry combinators for monadic actions that may fail"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -232361,34 +232112,6 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.18.2"; - sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5"; - revision = "1"; - editedCabalFile = "0f783bj89vb7j5cj5hk6hdmplhk3ay1z6swsinlr7a7f9h59x6vh"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bifunctors bytestring - case-insensitive deepseq http-api-data http-media http-types mmorph - mtl network-uri QuickCheck singleton-bool sop-core - string-conversions tagged text transformers vault - ]; - testHaskellDepends = [ - aeson base base-compat bytestring hspec http-media mtl QuickCheck - quickcheck-instances string-conversions text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant_0_18_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors - , bytestring, case-insensitive, deepseq, hspec, hspec-discover - , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, singleton-bool, sop-core - , string-conversions, tagged, text, transformers, vault - }: - mkDerivation { - pname = "servant"; version = "0.18.3"; sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; libraryHaskellDepends = [ @@ -232404,7 +232127,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -232944,38 +232666,6 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.18.2"; - sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1"; - revision = "1"; - editedCabalFile = "1phjfsqzmwc5m45f9zbpp76f7f9z96v0in7ngxz6pj8r90bcv8ga"; - libraryHaskellDepends = [ - base base-compat bytestring containers deepseq exceptions - http-client http-media http-types kan-extensions monad-control mtl - semigroupoids servant servant-client-core stm text time - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring entropy hspec http-api-data - http-client http-types HUnit kan-extensions markdown-unlit mtl - network QuickCheck servant servant-client-core servant-server - sop-core stm tdigest text transformers transformers-compat wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , deepseq, entropy, exceptions, hspec, hspec-discover - , http-api-data, http-client, http-media, http-types, HUnit - , kan-extensions, markdown-unlit, monad-control, mtl, network - , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, sop-core, stm, tdigest, text, time, transformers - , transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; version = "0.18.3"; sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; libraryHaskellDepends = [ @@ -232993,7 +232683,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-core" = callPackage @@ -233004,29 +232693,6 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.18.2"; - sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r"; - revision = "2"; - editedCabalFile = "0clbchlla9r0scz0giqmy3pwsnlfcf19hwkqj3yl1y77qx7kv4lr"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring containers - deepseq exceptions free http-media http-types network-uri safe - servant sop-core template-haskell text transformers - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, deepseq, exceptions, free, hspec - , hspec-discover, http-media, http-types, network-uri, QuickCheck - , safe, servant, sop-core, template-haskell, text, transformers - }: - mkDerivation { - pname = "servant-client-core"; version = "0.18.3"; sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; libraryHaskellDepends = [ @@ -233038,7 +232704,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-js" = callPackage @@ -233196,36 +232861,6 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.8"; - sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; - revision = "1"; - editedCabalFile = "0bfhypzm02aqwckjrvjmhvf602di0pmp4r0rjbfcraxzvkrzm6qv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - hashable http-media http-types lens servant string-conversions text - universe-base unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base base-compat lens servant string-conversions tasty - tasty-golden tasty-hunit transformers - ]; - description = "generate API docs for your servant webservice"; - license = lib.licenses.bsd3; - }) {}; - - "servant-docs_0_11_9" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, hashable, http-media, http-types, lens, servant - , string-conversions, tasty, tasty-golden, tasty-hunit, text - , transformers, universe-base, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; version = "0.11.9"; sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; isLibrary = true; @@ -233244,7 +232879,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-docs-simple" = callPackage @@ -233476,25 +233110,6 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.15.3"; - sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; - revision = "2"; - editedCabalFile = "1fdbxyyp2h5gcighjrww2mbg8z6givmhx2in8293kw58w7y2im0i"; - libraryHaskellDepends = [ - base base-compat http-types lens servant text - ]; - testHaskellDepends = [ base hspec servant ]; - testToolDepends = [ hspec-discover ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_15_4" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , http-types, lens, servant, text - }: - mkDerivation { - pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; libraryHaskellDepends = [ @@ -233504,7 +233119,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-gdp" = callPackage @@ -233667,43 +233281,6 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18.2"; - sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0"; - revision = "1"; - editedCabalFile = "0hkcyz93px5x6l5nyh9ymswhwpfidbji2kmlhrw7ksg4zsxkl2p9"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive containers deepseq - exceptions http-common http-media http-streams http-types - io-streams kan-extensions monad-control mtl semigroupoids servant - servant-client-core text time transformers transformers-base - transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring deepseq entropy hspec - http-api-data http-streams http-types HUnit kan-extensions - markdown-unlit mtl network QuickCheck servant servant-client-core - servant-server stm tdigest text transformers transformers-compat - wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-http-streams_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring - , case-insensitive, containers, deepseq, entropy, exceptions, hspec - , hspec-discover, http-api-data, http-common, http-media - , http-streams, http-types, HUnit, io-streams, kan-extensions - , markdown-unlit, monad-control, mtl, network, QuickCheck - , semigroupoids, servant, servant-client-core, servant-server, stm - , tdigest, text, time, transformers, transformers-base - , transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-http-streams"; version = "0.18.3"; sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; libraryHaskellDepends = [ @@ -234191,27 +233768,6 @@ self: { }: mkDerivation { pname = "servant-pipes"; - version = "0.15.2"; - sha256 = "1r5irq09j64iapi5n9mzsph984r5f7cyr6zz4sw3xqh648dmf75h"; - libraryHaskellDepends = [ - base bytestring monad-control mtl pipes pipes-safe servant - ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media pipes - pipes-bytestring pipes-safe servant servant-client servant-server - wai warp - ]; - description = "Servant Stream support for pipes"; - license = lib.licenses.bsd3; - }) {}; - - "servant-pipes_0_15_3" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, monad-control, mtl, pipes, pipes-bytestring - , pipes-safe, servant, servant-client, servant-server, wai, warp - }: - mkDerivation { - pname = "servant-pipes"; version = "0.15.3"; sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; libraryHaskellDepends = [ @@ -234224,7 +233780,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-polysemy" = callPackage @@ -234629,43 +234184,6 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.18.2"; - sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih"; - revision = "1"; - editedCabalFile = "0xhq2rpc4ry1xgwz835bcm8qdnsifpc8wck9wa5r510ff21dqw4d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant sop-core string-conversions - tagged text transformers transformers-base wai wai-app-static word8 - ]; - executableHaskellDepends = [ - aeson base base-compat servant text wai warp - ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory hspec - hspec-wai http-types mtl QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = lib.licenses.bsd3; - }) {}; - - "servant-server_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, directory, exceptions, filepath, hspec - , hspec-discover, hspec-wai, http-api-data, http-media, http-types - , monad-control, mtl, network, network-uri, QuickCheck, resourcet - , safe, servant, should-not-typecheck, sop-core, string-conversions - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; version = "0.18.3"; sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; isLibrary = true; @@ -234688,7 +234206,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-server-namedargs" = callPackage @@ -236020,35 +235537,6 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.3.0"; - sha256 = "1ky0jj47xp6g8shk5znrhncj71sg0p653csj1ds2yl36s7fiwgdk"; - libraryHaskellDepends = [ - array base bytestring containers data-fix deepseq - invertible-grammar prettyprinter recursion-schemes scientific - semigroups text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Invertible grammar combinators for S-expressions"; - license = lib.licenses.bsd3; - }) {}; - - "sexp-grammar_2_3_1" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, data-fix, deepseq, happy, invertible-grammar - , prettyprinter, QuickCheck, recursion-schemes, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , utf8-string - }: - mkDerivation { - pname = "sexp-grammar"; version = "2.3.1"; sha256 = "05vj998wzj1wja4848kd04c89jb8pmvdyl40aw6qvc9fq0qzw6m4"; libraryHaskellDepends = [ @@ -236067,7 +235555,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -236438,8 +235925,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19.4"; - sha256 = "1vkkgncar07na4kn3i02b2zdyjdjxl10hrcz2l23c498yrrqibjv"; + version = "0.19.5"; + sha256 = "105agfvn75czyq3jbmppybv776njlsqc7k4m1xnx0n78qjmcnpb9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -238486,23 +237973,11 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.6"; - sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; - libraryHaskellDepends = [ base optparse-applicative ]; - description = "Simple command args parsing and execution"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd-args_0_1_7" = callPackage - ({ mkDerivation, base, optparse-applicative }: - mkDerivation { - pname = "simple-cmd-args"; version = "0.1.7"; sha256 = "0lf0pyiv02sg2yh9avj92fm75sni61qnaq3rmjw5vlczy03ksxpc"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-conduit" = callPackage @@ -240350,27 +239825,6 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.5.1"; - sha256 = "11y2j9c4gw0x5h974jrp0yppy5dys9i0nxdbzm374nwx8mjwdl4w"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - }) {}; - - "skylighting_0_10_5_2" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; version = "0.10.5.2"; sha256 = "152ywiy7h04xjy0fdl571jwahl6c9350isqbm4p0na4cjd9cczzh"; configureFlags = [ "-fexecutable" ]; @@ -240384,7 +239838,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -240397,37 +239850,6 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.5.1"; - sha256 = "14mz7krfkidgplhp49w84ryz74jrsdqll44wqd0my0m28v2vg9ka"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath mtl safe text transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_10_5_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string - , xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; version = "0.10.5.2"; sha256 = "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d"; isLibrary = true; @@ -240447,7 +239869,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -246064,10 +245485,8 @@ self: { }: mkDerivation { pname = "sr-extra"; - version = "1.85.1"; - sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x"; - revision = "1"; - editedCabalFile = "0pmf6vlxv8kd6imq9xwnfc8j3mk6yswvcirdmb2hi8ql41cqwnay"; + version = "1.88"; + sha256 = "1cpigfdpgcy3bpp51snza0wwd88ky04hwqlzbmvmwkwznd7wqxrb"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -249529,28 +248948,25 @@ self: { }) {}; "streaming-benchmarks" = callPackage - ({ mkDerivation, base, bench-graph, bytestring, Chart - , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge - , getopt-generics, machines, mtl, pipes, random, split, streaming - , streamly, template-haskell, text, transformers, typed-process - , vector + ({ mkDerivation, base, bytestring, conduit, containers, deepseq + , dlist, drinkery, gauge, machines, mtl, pipes, random, streaming + , streamly, template-haskell, text, transformers, vector }: mkDerivation { pname = "streaming-benchmarks"; - version = "0.2.0"; - sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x"; + version = "0.3.0"; + sha256 = "0cy65d1aph2wk3yc7kj8ywq40f8jgpx72isywnnw2sg9jz9jnd85"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base bench-graph bytestring Chart Chart-diagrams csv directory - getopt-generics split text transformers typed-process - ]; benchmarkHaskellDepends = [ - base conduit deepseq drinkery gauge machines mtl pipes random - streaming streamly template-haskell transformers vector + base bytestring conduit containers deepseq dlist drinkery gauge + machines mtl pipes random streaming streamly template-haskell text + transformers vector ]; - description = "Benchmarks to compare streaming packages"; + description = "Measures and compares the performance of streaming libraries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streaming-binary" = callPackage @@ -249616,27 +249032,6 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.2.0"; - sha256 = "1vmbg84xc7ix7ihs96ia13gdpi7z3grrkq9qai6j8s1klnzpljhi"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; version = "0.2.1"; sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; libraryHaskellDepends = [ @@ -249649,7 +249044,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -251042,23 +250436,11 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.2.8"; - sha256 = "03sqgmbbjqi18wjb96sc3lvc6p3bqk5sgsgbcf9z8k9rbdspribm"; - libraryHaskellDepends = [ base bytestring text ]; - description = "Types for the Stripe API"; - license = lib.licenses.mit; - }) {}; - - "stripe-concepts_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "stripe-concepts"; version = "1.0.3"; sha256 = "1wykg9flg0qliqlz3ywkmnqhh55aa61r4mvbhsly6ib8r6knr382"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "stripe-core" = callPackage @@ -251295,6 +250677,28 @@ self: { license = lib.licenses.mit; }) {}; + "strong-path" = callPackage + ({ mkDerivation, base, exceptions, filepath, path, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "strong-path"; + version = "1.0.0.0"; + sha256 = "0xpflbqzdbf7pk2v5c5acd5j4ijldklx0vvypw36zvy50ld4ffpz"; + libraryHaskellDepends = [ + base exceptions filepath path template-haskell + ]; + testHaskellDepends = [ + base filepath path tasty tasty-discover tasty-hspec + tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "Strongly typed paths in Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "strongswan-sql" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base , bytestring, data-default, failable, haskeline, io-streams @@ -253309,7 +252713,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_1" = callPackage + "sydtest_0_3_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -253318,8 +252722,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.1"; - sha256 = "0ddbjs2p2vzmzadggyvdpknmcw935jmj2m9nxki2apc9ciq6skig"; + version = "0.3.0.2"; + sha256 = "1823g9czwgf0p0jyxlddqwnpwhs3622892c9ah6cacvl9xfl3sg9"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -255144,6 +254548,23 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; + "systemd-socket-activation" = callPackage + ({ mkDerivation, base, containers, network, text, transformers + , unix + }: + mkDerivation { + pname = "systemd-socket-activation"; + version = "1"; + sha256 = "10y7g2y62v48n6zkpgpjqyf2a7fqm8d9mx24vcwk6bcxkq1bciz2"; + revision = "1"; + editedCabalFile = "084phqk9wb0slsmb7pj68nivhjx3w6hs0djq589j771v579vck0r"; + libraryHaskellDepends = [ + base containers network text transformers unix + ]; + description = "Let systemd bind the server's socket for you"; + license = lib.licenses.mit; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -257131,6 +256552,20 @@ self: { broken = true; }) {}; + "tasty-prelude" = callPackage + ({ mkDerivation, base, tasty, tasty-expected-failure, tasty-focus + }: + mkDerivation { + pname = "tasty-prelude"; + version = "0.1.0.0"; + sha256 = "0kccgw0g45cll69hc9f5sifzpsmvcjskcyfvfqnd5zmdh4vcnj70"; + libraryHaskellDepends = [ + base tasty tasty-expected-failure tasty-focus + ]; + description = "Unopinionated top-level entry point to tasty ecosystem"; + license = lib.licenses.mpl20; + }) {}; + "tasty-program" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, process, tasty }: @@ -257202,29 +256637,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.2.1"; - sha256 = "1i39xks5rjpnid2y1n16fyb01wj7hpdw0n5ci1rnsps5f16nkcxr"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_2_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.2.2"; sha256 = "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"; libraryHaskellDepends = [ @@ -257238,7 +256650,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -257982,28 +257393,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant - , servant-client, servant-multipart, split, stm, template-haskell - , text, time, transformers, unordered-containers + , servant-client, servant-multipart, servant-multipart-api + , servant-multipart-client, split, stm, template-haskell, text + , time, transformers, unordered-containers }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.3.5"; - sha256 = "08b650z513lbmmb46xinwgdb3csgpx9rjk5vn345xb9b0ki94chq"; + version = "0.3.7"; + sha256 = "09bi2rbajiv3p2anky9zjnbvxxd79d70p3im94zrp14db0zjhnp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl pretty-show profunctors servant servant-client servant-multipart - split stm template-haskell text time transformers - unordered-containers + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl pretty-show profunctors servant servant-client servant-multipart - split stm template-haskell text time transformers - unordered-containers + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; @@ -258219,23 +257631,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.5"; - sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_6" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; version = "0.1.6"; sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -260897,14 +260297,16 @@ self: { }) {}; "text1" = callPackage - ({ mkDerivation, base, binary, HUnit, lens, QuickCheck, semigroups - , text + ({ mkDerivation, base, binary, HUnit, lens, QuickCheck + , semigroupoids, semigroups, text }: mkDerivation { pname = "text1"; - version = "0.0.6.1"; - sha256 = "10kzl1gwi08pxzs8flr5bhfcwqgcl0jz9cadw3hqmbmynpij95ij"; - libraryHaskellDepends = [ base binary lens semigroups text ]; + version = "0.0.7.0"; + sha256 = "0ph9vyx88mwh4d6n0wxbhicjc1x3d645kglw82nr5ggapgsab2a1"; + libraryHaskellDepends = [ + base binary lens semigroupoids semigroups text + ]; testHaskellDepends = [ base HUnit lens QuickCheck semigroups text ]; @@ -262402,6 +261804,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "thumbnail" = callPackage @@ -262616,28 +262020,6 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.7.5"; - sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - network parsec primitive random text transformers - ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - }) {}; - - "tidal_1_7_7" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, network, parsec - , primitive, random, text, transformers, weigh - }: - mkDerivation { - pname = "tidal"; version = "1.7.7"; sha256 = "19r9h45yd2xwmah81xqmwx5bi5gi0x2hqhq2nqa47jgb0nd12a25"; enableSeparateDataOutput = true; @@ -262651,7 +262033,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -264410,6 +263791,8 @@ self: { ]; description = "Start and stop a temporary postgres"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -266557,27 +265940,12 @@ self: { }: mkDerivation { pname = "traverse-with-class"; - version = "1.0.1.0"; - sha256 = "1yni197sxfpsjvjablhn8mjqpp1mz0v30r73f9ncs3pjcl93g6yn"; - libraryHaskellDepends = [ base template-haskell transformers ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Generic applicative traversals"; - license = lib.licenses.mit; - }) {}; - - "traverse-with-class_1_0_1_1" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "traverse-with-class"; version = "1.0.1.1"; sha256 = "0c0h902hr3gnlmlvqjhz3k5abyg0ays2g2c1kwrhbz0nhgfwk656"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Generic applicative traversals"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "travis" = callPackage @@ -267764,22 +267132,6 @@ self: { }: mkDerivation { pname = "ttc"; - version = "1.1.0.0"; - sha256 = "02b55f0dwgxvpr8x2727ryb6zhvz73l6l001szm4i821q0p4h00g"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - }) {}; - - "ttc_1_1_0_1" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text - }: - mkDerivation { - pname = "ttc"; version = "1.1.0.1"; sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; libraryHaskellDepends = [ base bytestring template-haskell text ]; @@ -267788,7 +267140,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ttl-hashtables" = callPackage @@ -269698,6 +269049,24 @@ self: { broken = true; }) {}; + "typeable-mock" = callPackage + ({ mkDerivation, base, call-stack, containers, hspec + , variadic-function + }: + mkDerivation { + pname = "typeable-mock"; + version = "0.1.0.1"; + sha256 = "1hfjyk5r2xikwfdz5hfiffc22dci821xzcj8lnml4kh7d0w55mfa"; + libraryHaskellDepends = [ + base call-stack containers variadic-function + ]; + testHaskellDepends = [ + base call-stack containers hspec variadic-function + ]; + description = "Mock functions and expressions anywhere"; + license = lib.licenses.bsd3; + }) {}; + "typeable-th" = callPackage ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { @@ -271938,8 +271307,8 @@ self: { ({ mkDerivation, base, bytestring, unordered-containers }: mkDerivation { pname = "uniq-deep"; - version = "1.2.0"; - sha256 = "1r0gq0mlnl9wdn3v0pdq3vnwn6r4pzc6j7ssha93lms9380kl4nx"; + version = "1.2.1"; + sha256 = "0281yfiv6qmq1q5pvrvf6qg4nwzzav6rvb4mcdzqshsrbw9n12ig"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -273585,22 +272954,20 @@ self: { "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics - , hedgehog, HUnit, network-uri, safe, semigroups, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, th-lift-instances - , transformers + , hedgehog, HUnit, network-uri, safe, tasty, tasty-hedgehog + , tasty-hunit, template-haskell, th-lift-instances, transformers }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.3.0"; - sha256 = "1zpynqz2q29cfk77n0d6lrnzmrqqi5nijvqd2pkz2fax3s6qhysz"; + version = "0.3.3.1"; + sha256 = "0s0k26v5x6601rbpkjkl5vp3dkp9xwj1dlgy4xkl470i4sna1rzk"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers template-haskell th-lift-instances ]; testHaskellDepends = [ attoparsec base base-compat blaze-builder bytestring containers - hedgehog HUnit safe semigroups tasty tasty-hedgehog tasty-hunit - transformers + hedgehog HUnit safe tasty tasty-hedgehog tasty-hunit transformers ]; benchmarkHaskellDepends = [ base blaze-builder bytestring criterion deepseq deepseq-generics @@ -275210,25 +274577,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.11.0.0"; - sha256 = "1jawa7d37al29zp2b5hba9w348g926ckbxp51l9bprii5v47lyln"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = lib.licenses.mit; - }) {}; - - "validity_0_11_0_1" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; version = "0.11.0.1"; sha256 = "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -275529,8 +274883,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "variadic-function"; - version = "0.1.0.1"; - sha256 = "0p458anbqlx23x77wp1nh465za3dad5s0gjrkdhi364rr4v58i3a"; + version = "0.1.0.2"; + sha256 = "0kwrhraq45vb9bs0xn4xbahywwrxcspmvmc4l133rilgzx2gcv5w"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Create and transform functions with variable arity"; @@ -276048,6 +275402,24 @@ self: { license = lib.licenses.mit; }) {}; + "vector-builder_0_3_8_2" = callPackage + ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.8.2"; + sha256 = "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -276342,24 +275714,6 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.3.1"; - sha256 = "0vm6wvbn3g4r028p46yh24rz7pr429w03jshpwyj2z2c6b058klr"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ expipiplus1 ]; - }) {}; - - "vector-sized_1_4_4" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; version = "1.4.4"; sha256 = "0rlzwxcxzrxg7nwqijigj80fr4fyi5c2a8785898kir5hcyd6v1d"; libraryHaskellDepends = [ @@ -276368,7 +275722,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; @@ -277930,8 +277283,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.11.1"; - sha256 = "18ci35csymc788hr2md5cfxmra3ad0rc5mrbk37jjf0qga9a375x"; + version = "3.11.2"; + sha256 = "1pvszf89q1b7r5a1lzdvc28cylmlgnvvss5nw6497iclzh6hs82i"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -280145,39 +279498,6 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.16"; - sha256 = "1qnngw7afh448hv7fzp4l36j7hz6f8a8f1qga976j8l53qhmgcf1"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers ghc-prim hashable http-date http-types http2 iproute - network simple-sendfile stm streaming-commons text time-manager - unix unix-compat unliftio vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute network - process QuickCheck simple-sendfile stm streaming-commons text time - time-manager unix unix-compat unliftio vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat unliftio x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_17" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, unliftio, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; version = "3.3.17"; sha256 = "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0"; libraryHaskellDepends = [ @@ -280199,7 +279519,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -280265,8 +279584,8 @@ self: { ({ mkDerivation, base, network, systemd, unix, wai, warp }: mkDerivation { pname = "warp-systemd"; - version = "0.1.1.0"; - sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x"; + version = "0.2.0.0"; + sha256 = "114ipqsfvg4bx15n7mnpym8pnj668854s4vdz188awzd0n60hf8z"; libraryHaskellDepends = [ base network systemd unix wai warp ]; description = "Socket activation and other systemd integration for the Warp web server (WAI)"; license = lib.licenses.bsd3; @@ -282451,8 +281770,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "2"; - editedCabalFile = "129amxjf05b6vi9ln8ijxry062av8bmv3wnng0jis71fyw8ldr0p"; + revision = "3"; + editedCabalFile = "10jidn34rmv0amhw3c24pkl64q5xl3c6l9yqwcvqdn0vkbd0bf2v"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -285267,34 +284586,6 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.8.3"; - sha256 = "11g6bfir21wgafnkzzx26r6mz8m39isaz2yqw92k5ymdb1qhs95q"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary-search bytestring conduit - containers data-default deepseq errors extra filepath lens mtl - network-uri old-locale safe text time transformers vector xeno - xml-conduit zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck text time vector - xml-conduit - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Simple and incomplete Excel file parser/writer"; - license = lib.licenses.mit; - }) {}; - - "xlsx_0_8_4" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search - , bytestring, conduit, containers, criterion, data-default, deepseq - , Diff, errors, extra, filepath, groom, lens, mtl, network-uri - , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xeno - , xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; version = "0.8.4"; sha256 = "0xmz9qpqyz2gwlrjsy2m79s4xswb6lz7fbvybd4awg5vy0y6pl41"; libraryHaskellDepends = [ @@ -285311,7 +284602,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "xlsx-tabular" = callPackage @@ -288258,27 +287548,6 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.6.1.1"; - sha256 = "1iiaixd1xrqjcvknl9g3yvr26nbpfa2amh2ayfxmnpjlxvdhfnyn"; - libraryHaskellDepends = [ - aeson base bytestring conduit data-default-class directory - fast-logger file-embed monad-logger shakespeare streaming-commons - template-haskell text unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod_1_6_1_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit - , data-default-class, directory, fast-logger, file-embed - , monad-logger, shakespeare, streaming-commons, template-haskell - , text, unix, unordered-containers, wai, wai-extra, wai-logger - , warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; version = "1.6.1.2"; sha256 = "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"; libraryHaskellDepends = [ @@ -288289,7 +287558,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-alerts" = callPackage @@ -288951,43 +288219,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.20.1"; - sha256 = "1y24sn30fm7bjq9rfv4lclz3vraaac9qbd2xgz949agm2irjwg4p"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq entropy fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod-core_1_6_20_2" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, entropy - , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit - , memory, monad-logger, mtl, network, parsec, path-pieces - , primitive, random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.20.2"; sha256 = "184j6nslwrfxw4zmsxlii6gs1z0h350kgmbnr5y3wwk3n4dsdzyb"; libraryHaskellDepends = [ @@ -289010,7 +288241,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -289301,8 +288531,8 @@ self: { }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "3.0.0"; - sha256 = "19lnn0xw13gcvp2jzw01pq47jfhxgwm1c84px3xm582p9vqyygx7"; + version = "3.0.1"; + sha256 = "0yf4b14y8b5066lwdr7r2ayiavsnkar3s8q984yb1nrz5956f7qd"; libraryHaskellDepends = [ base blaze-html blaze-markup shakespeare text yesod-core yesod-form ]; @@ -289955,15 +289185,15 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, aeson, base, classy-prelude, http-conduit + ({ mkDerivation, aeson, base, http-conduit, string-transform, text , yesod-core, yesod-form }: mkDerivation { pname = "yesod-recaptcha2"; - version = "1.0.1"; - sha256 = "0mf9n016jxiq6ayq80fv9zldfjh9yskcq8p9grfr0dl8njj88yn5"; + version = "1.0.2"; + sha256 = "0ql05yxq3k8sywncaz3cf3xaihf4pd0ijn139ms8snyps36k6l8h"; libraryHaskellDepends = [ - aeson base classy-prelude http-conduit yesod-core yesod-form + aeson base http-conduit string-transform text yesod-core yesod-form ]; description = "yesod recaptcha2"; license = lib.licenses.mit; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5d178e3b5a1..b79aace9e3b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -348,7 +348,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # ); # }); # in - # hpkgs.shellFor { + # haskellPkgs.shellFor { # packages = p: [ p.foo ]; # genericBuilderArgsModifier = args: args // { doCheck = true; doBenchmark = true }; # } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 30134a05628..f700eb163a9 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -236,9 +236,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "5"; }; - sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n"; + sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -247,15 +247,15 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy36 = callPackage ./pypy { - self = pypy36; + pypy37 = callPackage ./pypy { + self = pypy37; sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "5"; }; - sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2"; - pythonVersion = "3.6"; + sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI="; + pythonVersion = "3.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; inherit passthruFun; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index a5ba4983e43..668a4e24b39 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -73,6 +73,8 @@ in with passthru; stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ + ./dont_fetch_vendored_deps.patch + (substituteAll { src = ./tk_tcl_paths.patch; inherit tk tcl; @@ -81,12 +83,18 @@ in with passthru; stdenv.mkDerivation rec { tk_libprefix = tk.libPrefix; tcl_libprefix = tcl.libPrefix; }) + + (substituteAll { + src = ./sqlite_paths.patch; + inherit (sqlite) out dev; + }) ]; postPatch = '' - substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \ + --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; buildPhase = '' diff --git a/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch new file mode 100644 index 00000000000..bc959e15d1a --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py +--- a/lib_pypy/pypy_tools/build_cffi_imports.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/pypy_tools/build_cffi_imports.py 2021-07-16 06:37:03.000000000 -0400 +@@ -225,6 +225,8 @@ + + print('*', ' '.join(args), file=sys.stderr) + if embed_dependencies and key in cffi_dependencies: ++ print("Nixpkgs: skipping fetching/building dependency", key) ++ elif False: + status, stdout, stderr = _build_dependency(key) + if status != 0: + failures.append((key, module)) diff --git a/pkgs/development/interpreters/python/pypy/sqlite_paths.patch b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch new file mode 100644 index 00000000000..42de7efb3ea --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py +--- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400 +@@ -301,6 +301,8 @@ + else: + extra_args = dict( + libraries=libraries, ++ include_dirs=['@dev@/include'], ++ library_dirs=['@out@/lib'] + ) + + SOURCE = """ diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3863b97d6b1..ba132acf722 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index cf2ca1b766e..6f089e51221 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,24 +1,18 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; - version = "3.2.16"; + version = "3.2.24"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0"; + sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - # Ensure tmp directory are not left behind - # https://github.com/rubygems/rubygems/pull/4610 - (fetchpatch { - url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch"; - sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms="; - }) ]; installPhase = '' diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index b77c9044834..99cb863a598 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "1smvnid7r1mc4lp34pfrbzgzrcl0gmw0dlkga8z0r3g2zhj98lz1"; + sha256 = "14h3jprm6924g9576v25axn9v6xnip354hvpzlcqsc5qqyj7zzjs"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; @@ -16,7 +16,7 @@ mkDerivation rec { runhaskell GenerateEverything.hs # We will only build/consider Everything.agda, in particular we don't want Everything*.agda # do be copied to the store. - rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda + rm EverythingSafe.agda ''; passthru.tests = { inherit (nixosTests) agda; }; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 33b253718a7..bb987d069a7 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation { patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; + # For currently unknown reason, `-fPIC` has to be passed explicitly, otherwise + # downstream software like `elfutils` will get `recompile errors like: + # libargp.a(argp-help.o): relocation R_X86_64_PC32 against symbol `program_invocation_short_name' can not be used when making a shared object; recompile with -fPIC + # It seems that nixpkgs's on-by-default `-fPIC` is not in effect here. + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline -fPIC'"; postInstall = '' mkdir -p $out/lib $out/include diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaa78de47f7..725451da943 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -220,6 +220,7 @@ self = stdenv.mkDerivation { passthru = { inherit libdrm; inherit (libglvnd) driverLink; + inherit llvmPackages; tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-dev-does-not-depend-on-llvm"; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4635a80152d..4c21eb27422 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; + sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h"; }; # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 639dc53babf..9b02160dc4e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , filelock , flit-core , importlib-metadata @@ -8,6 +8,7 @@ , packaging , pep517 , pytest-mock +, pytest-rerunfailures , pytest-xdist , pytestCheckHook , pythonOlder @@ -17,13 +18,14 @@ buildPythonPackage rec { pname = "build"; - version = "0.3.0"; - + version = "0.5.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90="; + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "15hc9mbxsngfc9n805x8rk7yqbxnw12mpk6hfwcsldnfii1vg2ph"; }; nativeBuildInputs = [ @@ -42,20 +44,18 @@ buildPythonPackage rec { checkInputs = [ filelock - pytestCheckHook pytest-mock + pytest-rerunfailures pytest-xdist + pytestCheckHook ]; disabledTests = [ "test_isolation" "test_isolated_environment_install" "test_default_pip_is_never_too_old" - "test_build_isolated - StopIteration" - "test_build_raises_build_exception" - "test_build_raises_build_backend_exception" - "test_projectbuilder.py" - "test_projectbuilder.py" + "test_build" + "test_init" ]; pythonImportsCheck = [ "build" ]; diff --git a/pkgs/development/python-modules/convertdate/2.2.x.nix b/pkgs/development/python-modules/convertdate/2.2.x.nix index d67f4c5a344..1145a61ca4f 100644 --- a/pkgs/development/python-modules/convertdate/2.2.x.nix +++ b/pkgs/development/python-modules/convertdate/2.2.x.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; + sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index b543002bc07..c62e4c74576 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE="; + sha256 = "sha256-TNDQV1BOVVdvr0XAyWGcwgMbe4mV7J05hQeKVUqVT9s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4817480e57..597b6814281 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "4.0.3"; + version = "4.0.4"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "CLcmwobPrL6NiI/nw+/Dwho/r15owV16Jmt5OcfFqvo="; + sha256 = "g5G818Gq5EGyRIyg/ZW7guxMS0IyJ4nYaRjG/CtGhuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index e2ed5367df5..64dafa7bca2 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA="; + sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index c1a950dc2ae..24812deb1f9 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82"; + sha256 = "0l2b66z5ngyas3ijbzwz2wizw46kz47f8jr729pzbg4wbqbqjihr"; }; propagatedBuildInputs = [ skytemple-files ]; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 6ed265f6561..56dbc588c78 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.13"; + version = "0.3.14"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "subaru-v${version}"; - sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g"; + rev = "v${version}"; + sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index e20536b30eb..502eb5c4f68 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.11"; + version = "1.1.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVUYrzIcW4jbxdhS/Bh8eu+aJPFOqj0LXjoQKw+FZdg="; + sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index c8dba514208..7ba8c70a980 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -242,7 +242,10 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs; passthru = passthru // { isRubyGem = true; }; - inherit meta; + meta = { + # default to Ruby's platforms + platforms = ruby.meta.platforms; + } // meta; }) ) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7b028e28ed5..af47f65d298 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.48.2"; + version = "0.48.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZJHm+shCbyM2cyLW5ZgrqLMwnnvp7IOHI5+Ta2gdaNQ="; + sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index ba6f0bf652e..13ae74db977 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-9AYFC10AYbt/qHj5hfuLRxUwibizKk4n9rgtd5RBEQg="; + sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4bf0ab7b567..2dc5c4e77c8 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-iqWQAZV1H3p9Ud+6U2RwIpfFlsu+7SE96Abh3u8CCVs="; + sha256 = "sha256-2Y/eRIkskuk+7GC/br178XzWTnP4iXSFfa5ybLjvqDA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 701c22471ee..14518939dcd 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.51.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE="; + sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc="; }; - vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA="; + vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a0557eed9b1..b2c303caa54 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -150,6 +150,7 @@ in buildFHSUserEnv rec { # dependencies for mesa drivers, needed inside pressure-vessel mesa.drivers + mesa.llvmPackages.llvm.lib vulkan-loader expat wayland @@ -157,7 +158,6 @@ in buildFHSUserEnv rec { xorg.libXdamage xorg.libxshmfence xorg.libXxf86vm - llvm_11.lib libelf ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index dfc5f19de1d..9eb3b04dd7f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3406,6 +3406,18 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; + nterm-nvim = buildVimPluginFrom2Nix { + pname = "nterm-nvim"; + version = "2021-07-16"; + src = fetchFromGitHub { + owner = "jlesquembre"; + repo = "nterm.nvim"; + rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793"; + sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361"; + }; + meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; + }; + numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; version = "2021-07-12"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3ed642d76e8..02280936740 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -251,6 +251,7 @@ jiangmiao/auto-pairs jistr/vim-nerdtree-tabs jjo/vim-cue jlanzarotta/bufexplorer +jlesquembre/nterm.nvim jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ecddd603d56..c47e17b1c12 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -205,8 +205,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.6.6"; - sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + version = "0.6.13"; + sha256 = "098vrm28b7jpzk0c2d0cgxvdw4jsswzf18cx1m9jwsm1j40fp5f4"; }; meta = with lib; { license = licenses.mpl20; @@ -270,8 +270,8 @@ let mktplcRef = { name = "bracket-pair-colorizer-2"; publisher = "CoenraadS"; - version = "0.2.0"; - sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh"; + version = "0.2.1"; + sha256 = "0bfvzs4ac537zqhnqaa38jf4lhiy1fmqcv6lq89nnx8k963380z7"; }; meta = with lib; { license = licenses.mit; @@ -454,8 +454,8 @@ let mktplcRef = { name = "vscode-great-icons"; publisher = "emmanuelbeziat"; - version = "2.1.64"; - sha256 = "sha256-qsL1vWiEAYeWkMDNSrr1yzg0QxroEQQeznoDL3Ujy/o="; + version = "2.1.79"; + sha256 = "1cr1pxgxlfr643sfxbcr2xd53s1dnzcpacjj0ffkgizfda2psy78"; }; meta = with lib; { license = licenses.mit; @@ -474,8 +474,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "5.8.0"; - sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7"; + version = "8.0.1"; + sha256 = "017lqpmzjxq5f1zr49akcm9gfki0qq8v7pj7gks6a3szjdx16mnl"; }; }; @@ -776,8 +776,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.4"; - sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc"; + version = "1.4.7"; + sha256 = "04ghqg4s7g7yylmvbxzwzpnyy4zin2bwlgvflh18m77w4j0ckpiq"; }; meta = with lib; { license = licenses.mit; @@ -824,8 +824,8 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.15"; - sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; + version = "0.6.18"; + sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w"; }; meta = { license = lib.licenses.mit; @@ -1096,8 +1096,8 @@ let mktplcRef = { name = "crates"; publisher = "serayuzgur"; - version = "0.5.3"; - sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; + version = "0.5.9"; + sha256 = "0l26pyvw7n3bszf97yx6qps72acq112akg3q4jq5mvlibng1nwk0"; }; meta = { license = lib.licenses.mit; @@ -1198,8 +1198,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.0.0"; - sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + version = "105.3.0"; + sha256 = "11plqsj3c4dv0xg2d76pxrcn382qr9wbh1lhln2x8mzv840icvwr"; }; meta = { license = lib.licenses.mit; @@ -1252,8 +1252,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.1"; - sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE="; + version = "0.14.4"; + sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; }; nativeBuildInputs = [ jq ]; postInstall = '' @@ -1323,8 +1323,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.11.3"; - sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; + version = "1.21.5"; + sha256 = "1v1xs1wcigisr6xip31i02cfryxrb157sla34y59pwlnhc5x1gny"; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index 659ed8da791..8e0af182cec 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -48,7 +48,7 @@ EOF if [ $# -ne 0 ]; then CODE=$1 else - CODE=$(command -v code) + CODE=$(command -v code || command -v codium) fi if [ -z "$CODE" ]; then diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index a5445488534..4293f53e47d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-05-11"; + version = "2021-07-16"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw"; + sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a"; + outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bad7622771a..e10af3abf92 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.9"; + version = "4.0.10"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz"; + sha256 = "1sgsic9dzj3wv2k5bx2vhcgappivhp1glkqfc2yrgr6jas052351"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 440e81266c8..3ed80269d3a 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "sha256-8Tack2gM3AU3coGXs5hEbAaBCo5ss1sGUFFEjZDn5Lg="; + sha256 = "0zx58lair8hwi4bxm5h7i8n1j5fcdgw5cr6f4wk9qhks0sr5dip5"; }; nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 2d98f377b3b..638dba8f56c 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "unstable-2021-05-29"; + version = "0.99.1"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; - rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7"; - sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI="; + rev = "v${version}"; + sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 96451764990..71490b34280 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -9,11 +9,11 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; nginxVersion = "1.19.3"; - version = "${nginxVersion}.1"; + version = "${nginxVersion}.2"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; + sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f"; }; # generic.nix applies fixPatch on top of every patch defined there. This @@ -44,7 +44,7 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = "http://openresty.org"; + homepage = "https://openresty.org"; license = lib.licenses.bsd2; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 4844d3fcbf2..07d72a6b436 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c="; + sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs="; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index eb389f4051f..03e4f346155 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -4,4 +4,5 @@ lib.recurseIntoAttrs { shellFor = callPackage ./shellFor { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; + writers = callPackage ./writers { }; } diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f26..e3214fb49fe 100644 --- a/pkgs/test/haskell/documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -4,7 +4,11 @@ let drv = haskellPackages.vector; docs = pkgs.haskell.lib.documentationTarball drv; -in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' +in pkgs.runCommand "test haskell.lib.documentationTarball" { + meta = { + inherit (docs.meta) platforms; + }; +} '' tar xvzf "${docs}/${drv.name}-docs.tar.gz" # Check for Haddock html diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index b1335e2a74c..5a8391d0886 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -30,7 +30,12 @@ let fi ''; -in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' +in +pkgs.runCommand "test haskell.lib.setBuildTarget" { + meta = { + inherit (drv.meta) platforms; + }; +} '' ${test "foo" "bar"} ${test "bar" "foo"} touch "$out" diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 37ad2e90d89..04f5e045361 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -29,5 +29,8 @@ additionalMaintainers = with lib.maintainers; [ cdepillabout ]; allMaintainers = oldMaintainers ++ additionalMaintainers; in - oldMeta // { maintainers = allMaintainers; }; + oldMeta // { + maintainers = allMaintainers; + inherit (cabal-install.meta) platforms; + }; }) diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix new file mode 100644 index 00000000000..f05fda4bc73 --- /dev/null +++ b/pkgs/test/haskell/writers/default.nix @@ -0,0 +1,26 @@ +# Wrap only the haskell-related tests from tests.writers +# in their own derivation for Hydra CI in the haskell-updates +# jobset. Can presumably removed as soon as tests.writers is +# always green on darwin as well: +# https://github.com/NixOS/nixpkgs/issues/126182 +{ runCommand, tests }: + +let + inherit (tests.writers) + writeTest + bin + simple + path + ; +in + +runCommand "test-haskell-writers" { + meta = { + inherit (tests.writers.meta) platforms; + }; +} '' + ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} + ${writeTest "success" "test-haskell-simple-writer" simple.haskell} + ${writeTest "success" "test-haskell-path-writer" path.haskell} + touch $out +'' diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index caeca4ae00c..2444334f526 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -152,4 +152,16 @@ | tee "$out/scheme-infraonly/$fname.patch" done ''; + + # test that fmtutil.cnf is fully regenerated on scheme-full + fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { + kpathsea = lib.head texlive.kpathsea.pkgs; + schemeFull = texlive.combined.scheme-full; + } '' + mkdir -p "$out" + + diff --ignore-matching-lines='^# Generated by ' -u \ + {"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \ + | tee "$out/fmtutil.cnf.patch" + ''; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 5d9790ec2be..a0aed739c2a 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; + sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU="; }; - vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; + vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; doCheck = false; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index bf8a1b8e4f8..184ba0862c5 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; + sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY="; }; - vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; + vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8="; outputs = [ "out" "wordlists" ]; @@ -24,6 +24,9 @@ buildGoModule rec { gzip $wordlists/*.txt ''; + # https://github.com/OWASP/Amass/issues/640 + doCheck = false; + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' @@ -37,8 +40,8 @@ buildGoModule rec { Amass ships with a set of wordlist (to be used with the amass -w flag) that are found under the wordlists output. ''; - homepage = "https://www.owasp.org/index.php/OWASP_Amass_Project"; + homepage = "https://owasp.org/www-project-amass/"; license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit fab ]; }; } diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 5eda4e75f94..163728a37c6 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "darkoperator"; @@ -19,8 +22,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace dnsrecon.py \ - --replace "namelist.txt" "../share/namelist.txt" \ - --replace "0.9.0" "${version}" + --replace "namelist.txt" "../share/namelist.txt" ''; installPhase = '' @@ -37,8 +39,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "DNS Enumeration Script"; homepage = "https://github.com/darkoperator/dnsrecon"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; + maintainers = with maintainers; [ c0bw3b fab ]; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 1f00eb18b3c..ba4844d9ed1 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-s3aohQJM6oDdmzBRfiz45rqGOPl3YdjdE1XrFjBPyaw="; + sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg="; }; installPhase = '' diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index a7ce0fb4b6e..d49c1e925dc 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.9.6"; + version = "1.10.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0anyxmqgn4kx102l3qjhh1f2b0cg7mnlapfhriyjw0zyy5gyqvng"; + sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 05b32512687..f5cded1beab 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "theryangeary"; repo = pname; rev = "v${version}"; - sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; + sha256 = "sha256-QX0tAo1cGPpRhggiAPxsVhKXg6TgaVl1lcp3na7jUNw="; }; - cargoSha256 = "1fdcz7vnmrw92y7bx49napi7j2jjc41liz5k63kbijfwqnaaiswy"; + cargoSha256 = "sha256-3pK7y/zC5iZkto5p5Xerlpu3yfN6sB2kjLF2fURlUj0="; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index c503a1fd82a..1367d651a09 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -121,10 +121,12 @@ in (buildEnv { mkdir $out/share/texmf-local ) '' + - # now filter hyphenation patterns, in a hacky way ATM + # now filter hyphenation patterns and formats (let hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong; - pnames = uniqueStrings (map (p: p.pname) hyphens); + hyphenPNames = uniqueStrings (map (p: p.pname) hyphens); + formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong; + formatPNames = uniqueStrings (map (p: p.pname) formats); # sed expression that prints the lines in /start/,/end/ except for /end/ section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n"; script = @@ -134,7 +136,7 @@ in (buildEnv { # pick up the header + "2,/^% from/{ /^% from/!p; };\n" # pick up all sections matching packages that we combine - + lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") pnames + + lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") hyphenPNames # pick up the footer (for language.def) + "/^%%% No changes may be made beyond this point.$/,$p;\n" ); @@ -142,9 +144,15 @@ in (buildEnv { writeText "hyphens.lua.sed" ( "1{ s/^(-- Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + "2,/^-- END of language.us.lua/p;\n" - + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") pnames + + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + "$p;\n" ); + fmtutilSed = + writeText "fmtutil.sed" ( + "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + + "2,/^# from/{ /^# from/!p; };\n" + + lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames + ); in '' ( cd ./share/texmf/tex/generic/config/ @@ -153,6 +161,10 @@ in (buildEnv { done [[ -e language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i language.dat.lua ) + ( + cd ./share/texmf/web2c/ + [[ -e fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i fmtutil.cnf + ) '') + # function to wrap created executables with required env vars @@ -213,7 +225,7 @@ in (buildEnv { perl `type -P mktexlsr.pl` ./share/texmf ${bin.texlinks} "$out/bin" && wrapBin - (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose + perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 386e0d8d3be..4497cdfbed2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -109,10 +109,11 @@ let pkgs = # tarball of a collection/scheme itself only contains a tlobj file [( if (attrs.hasRunfiles or false) then mkPkgV "run" - # the fake derivations are used for filtering of hyphenation patterns + # the fake derivations are used for filtering of hyphenation patterns and formats else { inherit pname version; tlType = "run"; + hasFormats = attrs.hasFormats or false; hasHyphens = attrs.hasHyphens or false; } )] @@ -171,6 +172,7 @@ let # metadata for texlive.combine passthru = { inherit pname tlType version; + hasFormats = args.hasFormats or false; hasHyphens = args.hasHyphens or false; }; } // lib.optionalAttrs (fixedHash != null) { diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index ea9a11b8a33..a42b384803a 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -584,6 +584,7 @@ tl: { # no indentation deps."lambda" = tl."lambda"; deps."latex" = tl."latex"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "7d9241eab3e1e34f8c1aef85c4f2278680cd147cc4f188194c8c27147df3b9bf2a3bee7c651227aac79996e0745124990950ddc010a4f6662fda4a2f72575211"; sha512.doc = "87de188abf9880f2e680d6582cfb20d8166eb0c3ed2d3a85971eeac6ba8abea2d7f46b8037c26b719c1289f778d4e94ae1813598e73f8f56f6224e3299852cf6"; }; @@ -862,6 +863,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "d52e4a817f839c95b7718c65b6cba571443f9f25533a9c7412a69b3f15c89e995494ed812ead2ddac9f0952e0e842216a7fd443ecf2360f50a36107241397c19"; sha512.doc = "ed91ca4af98a72f081aa021b598ed58888150a73346d5d8da9ef7171f7d757c6d690169e1eb4b3e409ed8b988b8ffff9475f35ca7a443074080c1c9568ebaa0d"; hasRunfiles = true; @@ -10423,6 +10425,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."stmaryrd" = tl."stmaryrd"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69"; sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd"; hasRunfiles = true; @@ -11077,6 +11080,7 @@ tl: { # no indentation deps."latex-fonts" = tl."latex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "dd6b98eb22786f39c830a4c012396507dca694d727f1a7eb147a1c8c2d4442d8120e016de4c08c038239dfac866f828bc7686d8fd124d1af63edd0994db80f9f"; sha512.doc = "8ec3527c25c07641788b809cca4f4cc8bb034f63f1100b74270041b503dbc8926a410429a370692502596bd6ffec69a970a19b1c32178e4722f81acdbf0ea934"; sha512.source = "0563f453bf7e34b4948a29d832207f8148082c5186a6915a6bdc1c41d0c08399505491ccdea0b45e8bf326a8e8459d37eeaca546143d9f622ce4dacba11cac7f"; @@ -11094,6 +11098,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "27fc3fbb1aa29693fcd1d39abf92e3248fa769b8c4e0171948c2a7957e52dad2e08759050321401f7cb900285de62246bc0013d22141281111a82681c11802e4"; hasRunfiles = true; version = "Mar._2021"; @@ -13810,6 +13815,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479"; sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67"; sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89"; @@ -19379,6 +19385,7 @@ tl: { # no indentation deps."url" = tl."url"; deps."wasysym" = tl."wasysym"; deps."zapfding" = tl."zapfding"; + hasFormats = true; sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22"; sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895"; sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f"; @@ -20306,6 +20313,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "b349e8fad2765c4a87b471532dcfafedc0a9711237c6e967011727da7bad3a5ed27a89eca81af324aa84958872d0b78c68e6d9490fced44eb7636b2fbf36611f"; sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041"; }; @@ -20336,6 +20344,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "31c364be709db593c1a1d4e5250a7d8899fe0f5eb534c61c5f67d1a032b4afca9a91c5d2d1a541e96045d294c87d7ca1758a6a59bce8a3e94bf5511e20cf8854"; sha512.doc = "94474a52fb6a2bb801405c83562d6dd69038cca8d73705f382c2acc6c63d57e057a6b6c1b93556e41f5d0d9f9adfa269f0857c35e6523108eb230985752c3261"; }; @@ -21427,6 +21436,7 @@ tl: { # no indentation revision = 45678; deps."cm" = tl."cm"; deps."hyphen-base" = tl."hyphen-base"; + hasFormats = true; sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78"; sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86"; hasRunfiles = true; @@ -21924,6 +21934,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "bb198606ca33912f75327b0799061a81aeb9e2315182001710929d5a7c786fc11b58a5eadcc186f2db21df01777904ada31058c0a03376c04020b213d9f7c519"; sha512.doc = "9b7c72ad24d459b345552ee8ae05c047c61cf3e0b6eabb927e2a02bf62558f143e937463574bdb0cc60a0a4c8b2da3f86b1d9361275142519044051039275f1c"; }; @@ -21979,6 +21990,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "01777af9a468b6216417c5158034c3dea3cfb1c3ca7d28f1c4ca2b239fe569fbde410d17662bf9a10f5fddfd1bb6541c505d772e705832b52a1c2d6225d0fc6f"; sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924"; }; @@ -22104,6 +22116,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "c16a8cfa5ce0991d4b667471dd32f692c4e340d1856a36fd684811d40322f912b94125ae101ba095ca6c54b2afa3a37f1ab9af83e4a10328f8c1a1906a02a44b"; sha512.doc = "0d2492075eb2bb6b9cc8a67b0ed53cf5a8c4c700797d8bce8061a4cf938db5cf19fa4ed6f7adb59b1da0701ff365504e813289dea3c245ad717c82bc58df9128"; hasRunfiles = true; @@ -22996,6 +23009,7 @@ tl: { # no indentation revision = 57972; deps."kpathsea" = tl."kpathsea"; deps."modes" = tl."modes"; + hasFormats = true; sha512.run = "7ea3271c2a9682ae5ee29a05a95e794f4a6dc5a6244a6c243e856aaa857310127d5593b0643d4ca53eae7feb9c205574f5ea216b7c3c0b731e7f98be99bf1588"; sha512.doc = "95e7221ac9e3438d4cae336296e7db855df9a7e49ebaaec5dfea294565824938f3d6544459cee9ecbf17312daad4e44c92a7a9a65269feebd2b819f226f305bc"; hasRunfiles = true; @@ -23149,6 +23163,7 @@ tl: { # no indentation deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."utf8mex" = tl."utf8mex"; + hasFormats = true; sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be"; sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e"; sha512.source = "6f20a7e4f80670f7dfe5b2cfe3357a5d16b0f627b5e9e95c2d7d46598e00b989d5ae8c797589c56c594b7d3610f5f79cad42f3bb64a628be968e4e9e5d541e98"; @@ -23192,6 +23207,7 @@ tl: { # no indentation revision = 54074; deps."luatex" = tl."luatex"; deps."metafont" = tl."metafont"; + hasFormats = true; sha512.run = "ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6"; hasRunfiles = true; }; @@ -23549,6 +23565,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5"; sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53"; hasRunfiles = true; @@ -23877,6 +23894,7 @@ tl: { # no indentation "mptopdf" = { revision = 57347; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd"; sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769"; hasRunfiles = true; @@ -25321,6 +25339,7 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; + hasFormats = true; sha512.run = "d734139205c47599f3490dfbf13e6f71532ed7c311c3c76b6e444e539f1be6dd1bfffc612f8d019c38923d46ea7c98be72b28cf83c2b00885d787f6f526b0f0a"; sha512.doc = "285d74614c05d3776a41269da1156930024359eef282b3d5479a5397bdb928357ff3020d3fcf47bc92d8ce4ae37a9c4fd68c9e601d7083911145a2bed2bad4f9"; hasRunfiles = true; @@ -26068,6 +26087,7 @@ tl: { # no indentation deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "17c2b07af5e14f9f581d1094f4a3657ec1fe2b19fa96d952d1e4859265dc26e42743dc1fd7e8d6a7de56867be1b50a7071524d0580a8a680c605146893e7ff1b"; sha512.doc = "8422210dceae381676a4c03784ab2c9b0e9233913eca6d25a9a7d5c5675f9ecb32f0a93dd624dbcc715f20d7e386a7844ea00e6e85473c1af14f8e384cd3f61e"; hasRunfiles = true; @@ -26781,6 +26801,7 @@ tl: { # no indentation deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "787554d26ec4acb3811efbe96349a51b517e5b3b4677754d94dfe1d0ce61088d016f21995e5e9f49e1ace76a1e1f2c057c126981a9e340a9e047597f637aae3e"; sha512.doc = "f0085548bc20f0389d475a9abf294a8713d36184aef1c65e12d5a7621a4f60e26cf8b63f6a1d558afe964f633455fffd9f492e749938c290b91c10e02c6cb4d7"; sha512.source = "50afb0b5a1b766f89d7f3dda64b74f080a06d25d66618a4466018209fe4e3245f8deb274b22e30b45fac0a8a9f903ae70ec0301bfb72a394ebc3759e065205fd"; @@ -28314,6 +28335,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; + hasFormats = true; sha512.run = "d59108f06a06b7ac46195ef05c0ba6fb4873a88d327839a6143e94392faf3df73ae7b128548ae1ab69915f9883bad554f0e2dbd8d36b8f8c959897210895fba0"; sha512.doc = "4f863d89fca4c137a84fe75365f600da96f3901d29dd98e9d5733523648b746861a22284707c6e9df90a9939c83adc7bcdf21b310785b8d403459d65294d1133"; }; @@ -32455,6 +32477,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "e38f62fcc5ccee22a909eae5ea196e055eae59eedc652ce9788a3b4520995e97f64c683f1ba940853a06030a7ea6f1d749ed4dda1cb30433f87f5f9cdce5a9a7"; sha512.doc = "3056263569276ca7a62ccb03542eac99b648d36c398ded17204a2624f06920c506985aedd1a639a48bc60af6394d091cdfd9ec44000730bd8e8c83c2234bb569"; version = "3.141592653"; @@ -32862,6 +32885,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e"; sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90"; hasRunfiles = true; @@ -34981,6 +35005,7 @@ tl: { # no indentation deps."unicode-data" = tl."unicode-data"; deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "8acef423a0359136795301e1deaba156c702ee360f309d1884a90b3ed89842389bcc015e70c1461611ebb4a21fb9d5853db5ef40226ce0f61eb11f2a424a70f4"; sha512.doc = "7cbc40c770c1e04114add004fc4920e3c7dea62f959d06fcbfe54b9fdc45893214ef3e960ac685cce258b07fab424aa7a242da368aa1ee0015ddf8579d582820"; sha512.source = "9c1c1d0fec518410938e6642123f64242a6ff0bbb6425945897c10754e436fbd82d6739d31717152d183da385800a569d9209f37dd38c8eb77767842e0822a67"; @@ -35021,6 +35046,7 @@ tl: { # no indentation deps."ptex-base" = tl."ptex-base"; deps."uptex-base" = tl."uptex-base"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "1ee2679e7531fe4406fea72f7efc482f7900da50cb74045a62c0b5e5596862011509c3d966a795bc13538170afd7db26e8cf4f406391a746e45804414f26cff0"; sha512.doc = "06a3459702bc9838f2246aad7af99c427413a43356d88165e68a132bf8b926d9ab668e6dc10127c27eaac6526085c3fa069bb9709833cef241c94d0f4fb3e02a"; }; @@ -35954,6 +35980,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; }; "xellipsis" = { @@ -36021,6 +36048,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; + hasFormats = true; sha512.run = "dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6"; sha512.doc = "544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa"; hasRunfiles = true; @@ -36247,6 +36275,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xmltexconfig" = tl."xmltexconfig"; + hasFormats = true; sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead"; sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb"; hasRunfiles = true; diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 5b4f5efe762..61150fa8b7c 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -32,6 +32,7 @@ s/^catalogue-version_(.*)/ version = "\1";/p # extract deps s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p -# extract hyphenation patterns +# extract hyphenation patterns and formats # (this may create duplicate lines, use uniq to remove them) /^execute\sAddHyphen/i\ hasHyphens = true; +/^execute\sAddFormat/i\ hasFormats = true; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index f05c4a43b9c..f169ec7b854 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,23 +11,24 @@ }: let - specVersion = "4.98.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + specVersion = "4.99.0"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "sha256-3SweDMfgq2+QQIdeb6EjL7A2Grd/7KQzsbMNZKPtXts="; + sha256 = "10z63a2clbiskdnmnyf4m8v2hgc4bdm703y7s2dpw0q09msx9aca"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-hljvcYtck89Lzje0XgnvYqh+jebOEOFnOkgEnGZJm0o="; + sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA="; }; # remove need for git history diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b61572351..cf4670295d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8056,10 +8056,7 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = if stdenv.isDarwin then - callPackage ../applications/virtualization/podman { } - else - callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -12583,7 +12580,7 @@ in python3 = python38; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy36; + pypy3 = pypy37; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -12639,7 +12636,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37; # Python package sets. python27Packages = python27.pkgs; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8bea40efe64..b872f3286e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -57,7 +57,8 @@ in { ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 then + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then packages.ghc8102BinaryMinimal else packages.ghc865Binary; @@ -67,7 +68,8 @@ in { }; ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then packages.ghc8102BinaryMinimal else packages.ghc865Binary; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c4db73d416c..fe5241e3634 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -89,11 +89,13 @@ let haskellPackages = packagePlatforms pkgs.haskellPackages; haskell.compiler = packagePlatforms pkgs.haskell.compiler; - tests = let - testPlatforms = packagePlatforms pkgs.tests; - in { - haskell = testPlatforms.haskell; - writers = testPlatforms.writers; + tests.haskell = packagePlatforms pkgs.tests.haskell; + + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; }; # test some statically linked packages to catch regressions @@ -247,11 +249,10 @@ let }; constituents = accumulateDerivations [ # haskell specific tests - jobs.tests.haskell - # writeHaskell and writeHaskellBin - # TODO: writeHaskell currently fails on darwin - jobs.tests.writers.x86_64-linux - jobs.tests.writers.aarch64-linux + # + # TODO: The writers test appears to be failing on darwin for unknown + # reasons. See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881307871. + (lib.recursiveUpdate jobs.tests.haskell { writers.x86_64-darwin = null; }) # important top-level packages jobs.cabal-install jobs.cabal2nix @@ -309,6 +310,21 @@ let jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; + muslGHCs = pkgs.releaseTools.aggregate { + name = "haskell-pkgsMusl-ghcs"; + meta = { + description = "GHCs built with musl"; + maintainers = with lib.maintainers; [ + nh2 + ]; + }; + constituents = accumulateDerivations [ + jobs.pkgsMusl.haskell.compiler.ghc8102Binary + jobs.pkgsMusl.haskell.compiler.ghc884 + jobs.pkgsMusl.haskell.compiler.ghc8104 + jobs.pkgsMusl.haskell.compiler.ghc901 + ]; + }; } ]; |