diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:05:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 00:05:56 +0000 |
commit | eb0f97ec8f3619757dc73ab87502280a6aea71fd (patch) | |
tree | bc5ff7caae6e4838e656e8e4d3f857849990bb2d /pkgs | |
parent | 627eee1f66f115ac1be9ac1afe2963d39d02b840 (diff) | |
parent | 688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff) | |
download | nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.gz nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.bz2 nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.lz nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.xz nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.tar.zst nixpkgs-eb0f97ec8f3619757dc73ab87502280a6aea71fd.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs')
285 files changed, 2467 insertions, 2084 deletions
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 2ff82804318..f6ec6a0ec69 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs="; + sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg="; }; patches = [ diff --git a/pkgs/applications/blockchains/ethabi/default.nix b/pkgs/applications/blockchains/ethabi/default.nix index e2598ba22db..49f34a68bba 100644 --- a/pkgs/applications/blockchains/ethabi/default.nix +++ b/pkgs/applications/blockchains/ethabi/default.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-ethereum/ethabi"; maintainers = [ maintainers.dbrock ]; license = licenses.asl20; - inherit version; }; } diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 0e39587fabb..8e8d3da92be 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Wallet for Nano cryptocurrency"; homepage = "https://nano.org/en/wallet/"; license = lib.licenses.bsd2; 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/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index b7c3887cc08..bbef0d8a405 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4107"; - x64sha256 = "05ar7qd1d880442bx4w32mapsib7j27g9l96q2v2s7591r9fgnf7"; - aarch64sha256 = "4MzwhZ17c6cYtlwPA+SBiey6GiVruADXOLJAeJlMrgM="; + buildVersion = "4113"; + x64sha256 = "13679mnmigy1sgj355zs4si6gnx42rgjl4rn5d6gqgj5qq7zj3lh"; + aarch64sha256 = "0hg6g3cichma1x82963m7xwazmpdvv5zmz8rpwxs337zq7j3dmb3"; } {}; sublime4-dev = common { - buildVersion = "4106"; + buildVersion = "4112"; dev = true; - x64sha256 = "09jnn52zb0mjxpj5xz4sixl34cr6j60x46c2dj1m0dlgxap0sh8x"; - aarch64sha256 = "7blbeSZI0V6q89jMM+zi2ODEdoc1b3Am8F2b2jLr5O8="; + x64sha256 = "1yy8wzcphsk3ji2sv2vjcw8ybn62yibzsv9snmm01gvkma16p9dl"; + aarch64sha256 = "12bl235rxgw3q99yz9x4nfaryb32a2vzyam88by6p1s1zw2fxnp9"; } {}; } 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/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index acd9c576f73..0075abc0f6f 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation (rec { meta = with lib; { description = "Quick image viewer"; homepage = "http://spiegl.de/qiv/"; - inherit version; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index cca061ed2a6..c43127bfa99 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { makeFlags = ["PREFIX=$(out)"]; meta = { - inherit version; description = ""; # Code cannot be used in commercial programs # Looks like the definition hinges on the price, not license diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index b4b55fa264d..0803b495b2f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -28,15 +28,16 @@ , nss , pango , systemd +, udev , xdg-utils }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.34"; + version = "8.1.1"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "0mp119v5vgsva7pnxpsbq4xhh4vbhwv7ga9b5b7f6slx3biy1wmh"; + sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy"; }; nativeBuildInputs = [ makeWrapper ]; @@ -95,8 +96,12 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${rpath}:$out/share/1password $file done + # Electron is trying to open udev via dlopen() + # and for some reason that doesn't seem to be impacted from the rpath. + # Adding udev to LD_LIBRARY_PATH fixes that. makeWrapper $out/share/1password/1password $out/bin/1password \ - --prefix PATH : ${xdg-utils}/bin + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} runHook postInstall ''; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 30715dd51f3..0eb432bc734 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -54,6 +54,5 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tstrobel ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 23e42539d79..90b4883ec29 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -33,6 +33,5 @@ buildPythonApplication rec { homepage = "https://github.com/insanum/gcalcli"; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; - inherit version; }; } diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 15b7c37244f..6ac5f2327f0 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; - inherit version; }; } diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index a98017f095c..8943fc17de4 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ flokli ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 9694e9b6918..3605e7c416f 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QGVBJKTBo2RckGwW1deM2toRPT73PYDLvr7YVepkQvg="; + sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 37d44d8bf16..b2839a97efc 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 7bc4bd1ff76..531c108cdbf 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; - inherit version; updateWalker = true; changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; }; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 71907fc80b1..11216b1d887 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -86,7 +86,6 @@ buildPythonApplication rec { ''; meta = { - inherit version; description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.raskin ]; diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix new file mode 100644 index 00000000000..201add9cda2 --- /dev/null +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, jq }: + +let + emojiJSON = fetchFromGitHub { + owner = "github"; + repo = "gemoji"; + sha256 = "sha256-Tn0vba129LPlX+MRcCBA9qp2MU1ek1jYzVCqoNxCL/w="; + rev = "v4.0.0.rc2"; + }; + +in stdenv.mkDerivation rec { + pname = "wofi-emoji"; + version = "unstable-2021-05-24"; + + src = fetchFromGitHub { + owner = "dln"; + repo = pname; + rev = "bfe35c1198667489023109f6843217b968a35183"; + sha256 = "sha256-wMIjTUCVn4uF0cpBkPfs76NRvwS0WhGGJRy9vvtmVWQ="; + }; + + nativeBuildInputs = [ jq ]; + + postPatch = '' + cp "${emojiJSON}/db/emoji.json" . + substituteInPlace build.sh \ + --replace 'curl https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json' 'cat emoji.json' + ''; + + buildPhase = '' + runHook preBuild + + bash build.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp wofi-emoji $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; + homepage = "https://github.com/dln/wofi-emoji"; + license = licenses.mit; + maintainers = [ maintainers.ymarkus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 03f0bf63818..122433d197a 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/baresip-.*[.]tar[.].*"; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 42ea1c52fa9..db30ede8a10 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -54,6 +54,5 @@ mkDerivation rec { maintainers = with maintainers; [ colemickens ]; broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index e3595e07a78..33f3b90873d 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Perl Console Twitter Client"; homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index f918cbdc2b8..31b37fc2dfb 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -42,6 +42,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 3969627a67a..5bbdc6460c6 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -60,6 +60,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index d66dcbf47c1..e9e5fb5f70e 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; - inherit version; - longDescription = '' A simple command line tool to check for new mail in local mbox and maildir and remote POP3 and IMAP mailboxes. 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/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 46d39c1a7ba..d0196c0e25a 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw"; + sha256 = "sha256-E7+h2ipe3aj6URlqR6C0r7P+8XUWRR5PDnhHfz3TC5A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 75eaa089ecf..1e3c96ae8c6 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { ''; meta = { - inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index 4d64a813e62..0f3218b7673 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ]; meta = { - inherit version; description = "Extension of clingo to handle constraints over integers"; license = lib.licenses.gpl3; # for now GPL3, next version MIT! platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 091b098fa3f..2e907a2d3a3 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; meta = { - inherit version; description = "ASP system to ground and solve logic programs"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 8c88f47327e..9bfad1fa010 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Automated theorem prover for higher-order logic"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index bb912742b7c..23136ddf7a7 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; inherit (z3.meta) license homepage platforms; description = "TPTP wrapper for Z3 prover"; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 1a2835932c6..11a42d1cfdf 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpir cddlib ]; meta = { - inherit version; description = "A software package for computing Gröbner fans and tropical varieties"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 05a7d874d91..a941a633450 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; checkTarget = "checks"; meta = with lib; { - inherit version; description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; maintainers = teams.sage.members; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 1ee45ca266a..63aa34c78a1 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with lib.maintainers; [ ftrvxmtrx ]; platforms = lib.platforms.linux; - inherit version; }; } diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index 552881c5f1a..b1abb31c765 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Software for research in polyhedral geometry"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; 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/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 14330b0f19b..ec5d9ef366f 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; meta = { - inherit version; description = "A program to find rational points on hyperelliptic curves"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 7741f7ba65b..9846be8a43a 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Cellular automata simulation program"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index be61ec86b32..724a1008c1f 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Cellular automata simulation program"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 62e4c6876fd..bc67c30aa61 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { zlib ]; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; installPhase = '' mkdir -p "$out" diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3394d44a4be..128b70c38e8 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -90,7 +90,6 @@ let passthru.tests = {}; meta = with lib; { - inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index cfde0721baf..3c92a93851b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Monotone ancestry visualiser"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 3bea6d89334..06a4b2c98a6 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -29,7 +29,6 @@ buildPythonApplication rec { ''; meta = { - inherit version; description = "Strip output from Jupyter and IPython notebooks"; homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5ab696ed1d5..e604cb25920 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-D1gtKaDZ7/SyySYWmDa3eDHbh2f5B3q1VEYKgl1pXCE="; + sha256 = "sha256-P8/4jehfcjM+r/pwW6fxrwquMVUqXxvvTur7Tesjmnc="; }; vendorSha256 = null; @@ -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/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 0acad8edbe5..d0c35ab7cbb 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { description = "A small window manager controlled by a 9P filesystem"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; - inherit version; platforms = with lib.platforms; linux; }; } 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/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 530cfca7424..70e43efdb72 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -154,7 +154,6 @@ in ''; meta = with lib; { - inherit version; description = "Color and Black-and-White emoji fonts"; homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 6fdeadf3776..5b4d2cb740f 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "extra" ]; meta = { - inherit version; description = "Bitmapped character-art-friendly Unicode fonts"; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index f5b450b4f2a..b4c4d43e99a 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -29,7 +29,7 @@ in ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}" ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}" ''; - phases = [ "installPhase" ]; + dontUnpack = true; meta = with lib; { description = "A large database of handwritten digits"; longDescription = '' diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index a4d91eeb037..15c2699d8bb 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Spell checker oriented word lists"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 24689d571da..056c56b4118 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkg-config]; buildInputs = [xorgproto]; meta = { - inherit version; description = "X11 colorname to RGB mapping database"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index b909f2472ad..c990ecb24d6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "unstable-2021-06-21"; + version = "6.0.0"; repoName = "mail"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "c64c87fabb31dea8dc388152d5a835401993acf4"; - sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4="; + rev = version; + sha256 = "07iiipl0nsp63g5bn1y2hg6bmgj6i9cxqcfpd7q3vmldnkijvaxs"; }; passthru = { diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index fff88eddd19..f3a3541e7cf 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [jre ant jdk jre]; meta = { - inherit version; description = "A JVM-based Common Lisp implementation"; license = lib.licenses.gpl3 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 31a669c313e..3aa7063f551 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { CLASP_SRC_DONTTOUCH = "true"; meta = { - inherit version; description = "A Common Lisp implementation based on LLVM with C++ integration"; license = lib.licenses.lgpl21Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index de0964155fc..f47e447334b 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -43,7 +43,6 @@ in stdenv.mkDerivation { ''; meta = with lib; { - inherit version; description = "Digital Mars D Compiler Package"; # As of 2.075 all sources and binaries use the boost license license = licenses.boost; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 5c829386651..4721cac2783 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -46,6 +46,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - inherit version; }; } diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 19aab27ba74..d8640228513 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.6.1"; + version = "1.6.2"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w"; + sha256 = "0h1jh8gbvxb0pl1an0fbbg4lbd0sa24yj2f4yqwavw8dbdvvbd1y"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 3a07009296a..7b43a2c2e8d 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -32,7 +32,6 @@ in stdenv.mkDerivation { ''; meta = with lib; { - inherit version; description = "The LLVM-based D Compiler"; homepage = "https://github.com/ldc-developers/ldc"; # from https://github.com/ldc-developers/ldc/blob/master/LICENSE diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch index f6f9336ad5a..66742e5b149 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch @@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 3a66dd9c3fb..7efc85d9f9f 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt -@@ -301,6 +301,10 @@ if (NOT MSVC) - i386/umoddi3.S - ) +@@ -345,4 +345,8 @@ if (NOT MSVC) + set(i486_SOURCES ${i386_SOURCES}) + set(i586_SOURCES ${i386_SOURCES}) diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 8a647a31c7c..b7ec54ace7a 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/compilers/sbcl/common.nix b/pkgs/development/compilers/sbcl/common.nix index b020eeafc5c..eb3f6aba200 100644 --- a/pkgs/development/compilers/sbcl/common.nix +++ b/pkgs/development/compilers/sbcl/common.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation rec { ''); meta = sbclBootstrap.meta // { - inherit version; updateWalker = true; }; } diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index c01cc761e8c..eea60786f4a 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -99,7 +99,6 @@ let homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - inherit version; }; }; in diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index dabcc44261b..491ff959ece 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,9 +5,10 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.12"; out = "1.0.0"; } + { case = isGe "8.12"; out = "1.1.0"; } { case = range "8.11" "8.12"; out = "0.10.0"; } ] null; + release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q="; release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; @@ -16,11 +17,14 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ coq-elpi ]; + mlPlugin = true; + + installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ]; extraInstallFlags = [ "VFILES=structures.v" ]; meta = { - description = "Coq plugin embedding ELPI."; - maintainers = [ maintainers.cohencyril ]; - license = licenses.lgpl21; + description = "High level commands to declare a hierarchy based on packed classes"; + maintainers = with maintainers; [ cohencyril siraben ]; + license = licenses.mit; }; } 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/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 003727c608f..b06f057f82e 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -8,6 +8,7 @@ let mca = mkCoqDerivation { pname = "analysis"; owner = "math-comp"; + release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c"; release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867"; @@ -16,7 +17,7 @@ let mca = mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; } + { cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.9"; } { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } { cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; } diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 1809f9fd2dc..810d783d4fb 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/java 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/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 927bd00656e..2761eaf3753 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: -let - version = "0.6.3"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "libgme"; - inherit version; + version = "0.6.3"; meta = with lib; { description = "A collection of video game music chip emulators"; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 15e2516c1b6..ad373300e02 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, cmake, boost, python2}: -let version = "1.8.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c++"; - inherit version; + version = "1.8.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 95e3053b534..ee43daf2d04 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: -let - version = "1.10.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c"; - inherit version; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix index de9c182df14..36873f03f7e 100644 --- a/pkgs/development/libraries/bearssl/default.nix +++ b/pkgs/development/libraries/bearssl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, fetchurl }: -let - version = "0.6"; - sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bearssl"; - inherit version; + version = "0.6"; src = fetchurl { url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; - inherit sha256; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; }; outputs = [ "bin" "lib" "dev" "out" ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index d51cf159598..32a4859a1bc 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,17 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "2021-04-18"; + version = "2021-07-09"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127"; - sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39"; + rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21"; + sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx"; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 9ff54f8ebf9..e0d6149362c 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; meta = with lib; { - inherit version; description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index ba8961c8f6c..991fb2b41d5 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pcre }: -let version = "1.0.10"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "classads"; - inherit version; + version = "1.0.10"; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 91267208d2e..db18bce72be 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: -let - version = "2.12.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clfft"; - inherit version; + version = "2.12.2"; src = fetchFromGitHub { owner = "clMathLibraries"; @@ -29,6 +27,5 @@ in stdenv.mkDerivation { homepage = "http://clmathlibraries.github.io/clFFT/"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ chessai ]; - inherit version; }; } diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 740b0d81ca9..74a6f21992b 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; meta = with lib; { - inherit version; description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 2a394f8279b..930bfc99f28 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -10,6 +10,7 @@ , doxygen , graphviz , libxslt +, libiconv }: stdenv.mkDerivation rec { @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { libxslt ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + propagatedBuildInputs = [ expat zlib diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index fd7d89a8831..ca2f3b0e381 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - inherit version; description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 50f9e688cb9..028ab6a7530 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -2,13 +2,9 @@ , libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: -let - version = "1.6.57"; -in - stdenv.mkDerivation rec { pname = "fox"; - inherit version; + version = "1.6.57"; src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index e13302319a1..0e96a346f41 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; - inherit version; homepage = "http://openkinect.org"; license = with lib.licenses; [ gpl2 asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index dfd6b6b476b..a9b6325c3d7 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index 9d216b9d8e5..1bfe7682ffa 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index f6d6ddab4d0..29674118dfe 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index c4df9f1f0fd..4194064a5a2 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: -let - version = "2.0.4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "goocanvas"; - inherit version; + version = "2.0.4"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 9d1d23ede8b..36ca0b0ca0b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "2.9.4"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "http-parser"; - inherit version; + version = "2.9.4"; src = fetchFromGitHub { owner = "nodejs"; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 09ae213eb5d..474605fe769 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { "--with-cblas=-lblas" ]; meta = { - inherit version; description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index bc50f020659..e6742520865 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -1,17 +1,14 @@ { fetchurl, lib, stdenv, unzip, ant, javac, jvm }: let - version = "1.7R2"; - xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rhino"; - inherit version; + version = "1.7R2"; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index f41bf0f0c80..6c162c381ac 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages ]; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 41d07d58cba..d1f942a3498 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; license = lib.licenses.publicDomain; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 01c10dab60a..5d86dd12246 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.raskin ] ; platforms = lib.platforms.unix; - inherit version; }; } diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index fc871f174eb..df05754da58 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Denable-test=false" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Ddisable-introspection=true" ]; passthru = { diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 77df340a55f..0aeef61dae9 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { description = "Portable, simple C-language 9P client and server libary"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; - inherit version; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index c78aa3f617e..a64afbb930a 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, expat, curl, fftw }: -let - version = "0.9.3"; - deb_patch = "5"; -in stdenv.mkDerivation rec { pname = "libofa"; - inherit version; + version = "0.9.3"; + deb_patch = "5"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 625e780d192..0130af66459 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libsigcxx }: -let version = "0.4"; in - stdenv.mkDerivation rec { pname = "libpar2"; - inherit version; + version = "0.4"; src = fetchurl { url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index e960fe8f4b2..7c91950a4c4 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/re-.*[.]tar[.].*"; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 60b52152f67..acf82886d46 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: -let - version = "5.4"; -in stdenv.mkDerivation rec { pname = "libxklavier"; - inherit version; + version = "5.4"; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index a2b4800ec4c..21052df8630 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -4,11 +4,9 @@ , enableStatic ? stdenv.hostPlatform.isStatic }: -let - version = "1.16.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libxsmm"; - inherit version; + version = "1.16.1"; src = fetchFromGitHub { owner = "hfp"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 8a21bd3bcde..821edd33369 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - inherit version; description = "C++ library for exact, high-performance linear algebra"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 0fc74963299..89fbdd9f215 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; meta = with lib; { - inherit version; homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = platforms.all; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 5ff0dcd29e7..152c35e6e6f 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr ]; meta = { - inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; homepage = "https://gforge.inria.fr/projects/mpfi/"; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 36505b4a667..b8ee4fb4e76 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; meta = { - inherit version; description = "A highly optimised library for bignum arithmetic forked from GMP"; license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index c3df23052e2..4048f28e5d7 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap , pkg-config }: -let version = "3.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ndpi"; - inherit version; + version = "3.4"; src = fetchFromGitHub { owner = "ntop"; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 915e733473e..a4c18e9f046 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: -let version = "6.0.0"; in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "nix-plugins"; - inherit version; + version = "6.0.0"; src = fetchFromGitHub { owner = "shlevy"; diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index 9f281743f6c..5d44a4d2469 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -9,15 +9,12 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.53.1"; - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; - in stdenv.mkDerivation rec { pname = "nss"; - inherit version; + version = "3.53.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d"; }; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index cb9f9ff575f..eef6bbdd580 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: -let - version = "016"; -in - stdenv.mkDerivation rec { pname = "ntrack"; - inherit version; + version = "016"; src = fetchurl { url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index d1348d96e3b..26b2715658b 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "0.1.5"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "opencore-amr"; - inherit version; + version = "0.1.5"; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 05f1ef65a30..9276ccac6fd 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; platforms = platforms.linux; # PAM is not available on Darwin - inherit version; }; } diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index b7cfc5da9d3..b0603cc454f 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.all; - inherit version; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index b7adc3d2a42..7791973bb12 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -2,12 +2,9 @@ , libtool, flex, libevent, hwloc, munge, zlib, pandoc } : -let - version = "3.2.3"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pmix"; - inherit version; + version = "3.2.3"; src = fetchFromGitHub { repo = "openpmix"; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 293a13dbddc..2865ab06319 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { }; meta = { - inherit version; description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index c871f18e69b..351eb5c1547 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { license = licenses.cpl10; maintainers = with maintainers; [ deepfire ]; platforms = platforms.unix; - inherit version; }; } diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 58c2744605a..6adf5251471 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-VLuMkhZ6fxP4qnP8S4oJeFJW0smCE0Z968eigqQxMYs="; + sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U="; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 66f343d4912..79e494a053b 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,12 +7,11 @@ }: let inherit (lib) optional; - version = "3.9.1"; in stdenv.mkDerivation rec { pname = "liblapack"; - inherit version; + version = "3.9.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index f7f981e223b..063fead1165 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index c9a326afa7f..7ed5070ebb0 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -3,13 +3,9 @@ , IOKit, Foundation, AppKit, OpenAL }: -let - version = "2.5.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sfml"; - inherit version; + version = "2.5.1"; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index f334bb2f35a..cef23779c7a 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,11 +1,8 @@ {lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: -let - version = "0.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libstartup-notification"; - inherit version; + version = "0.12"; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 5994aeb0a59..fa6ca014181 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation rec { cp -r scenes "$out/share/tachyon/scenes" ''; meta = { - inherit version; description = "A Parallel / Multiprocessor Ray Tracing System"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 7ddae062f76..97c6d10191f 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, perl }: -let - version = "2.1.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uthash"; - inherit version; + version = "2.1.0"; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 567a5e3e251..ce2f7c20d3c 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -4,11 +4,9 @@ , buildPackages }: -let - version = "0.3.11"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "volume_key"; - inherit version; + version = "0.3.11"; src = fetchgit { url = "https://pagure.io/volume_key.git"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 77e0e20eaf5..5674f076bec 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -11,12 +11,9 @@ assert withMesa -> libGLU != null && libGL != null; with lib; -let - version = "2.9.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wxwidgets"; - inherit version; + version = "2.9.4"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 8bf98760950..71a10764667 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,12 +4,9 @@ , openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: -let - version = "1.2.31"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xmlsec"; - inherit version; + version = "1.2.31"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 83054b46a94..b1d8eb4332e 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, automake, autoconf }: -let - version = "2.0.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avr-libc"; - inherit version; + version = "2.0.0"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 486ca04d36a..1ecf9be5d8d 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -9,14 +9,10 @@ "OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? ]}: -let - - version = "3.4.0-rc4"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "betaflight"; - inherit version; + version = "3.4.0-rc4"; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index c7e59a5d27e..c1f762e47d8 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -2,14 +2,10 @@ , gcc-arm-embedded, binutils-arm-embedded, ruby }: -let - - version = "2.0.0-rc2"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "inav"; - inherit version; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "iNavFlight"; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index bec022f08c7..3c7a2840e49 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }: -let - version = "0.6"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "abootimg"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "ggrandou"; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index daa97bfddde..f3c1ec3dff8 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv, fetchFromGitHub }: +{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -191,6 +191,31 @@ let node2nix = super.node2nix.override { buildInputs = [ pkgs.makeWrapper ]; + # We need to apply a patch to the source, but buildNodePackage doesn't allow patches. + # So we pin the patched commit instead. The commit actually contains two other newer commits + # since the last (1.9.0) release, but actually this is a good thing since one of them is a + # Hydra-specific fix. + src = applyPatches { + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "node2nix"; + rev = "node2nix-1.9.0"; + sha256 = "0l4wp1131nhl9c14cn8bwawb8f77h1nfbnswgi5lp5m3kzkb27jn"; + }; + + patches = [ + # remove node_ name prefix + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch"; + sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh"; + }) + # set meta platform + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; + sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n"; + }) + ]; + }; postInstall = '' wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index c2b723195b7..21089c4d545 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c3a9224410d..6f1f9b0337e 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.15.1"; + version = "3.15.3"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-aUYerhg5iqKsZ5SW3dI6EpFnaB7dRGjXpIDVsjwS7vY="; + sha256 = "sha256-cmeCh54dwYwbL1AwGrPwTDp4F6VONclV7iu2Sm1g33Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index c5508fb3303..f8733eeed62 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1"; + sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix new file mode 100644 index 00000000000..1445c2046fb --- /dev/null +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, fetchPypi +, lib +, distro +, pysnmp +, python-gnupg +, qrcode +, requests +, sseclient-py +, zfec +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "blocksat-cli"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "06ky5kahh8dm1d7ckid3fdwizvkh3g4aycm39r00kwxdlfca7bgf"; + }; + + propagatedBuildInputs = [ + distro + pysnmp + python-gnupg + qrcode + requests + sseclient-py + zfec + ]; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + # disable tests which require being connected to the satellite + "--ignore=blocksatcli/test_satip.py" + "--ignore=blocksatcli/api/test_net.py" + # disable tests which require being online + "--ignore=blocksatcli/api/test_order.py" + ]; + + meta = with lib; { + description = "Blockstream Satellite CLI"; + homepage = "https://github.com/Blockstream/satellite"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ prusnak ]; + }; +} 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/editables/default.nix b/pkgs/development/python-modules/editables/default.nix new file mode 100644 index 00000000000..ee902d772c9 --- /dev/null +++ b/pkgs/development/python-modules/editables/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "editables"; + version = "0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6918f16225258f24ef9800c2327e14eded42ddac344e77982380749464024f35"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + # Tests not included in archive. + doCheck = false; + + pythonImportsCheck = [ "editables" ]; + + meta = with lib; { + description = "Editable installations"; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/pfmoore/editables"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/ev3dev2/default.nix new file mode 100644 index 00000000000..f6233db68db --- /dev/null +++ b/pkgs/development/python-modules/ev3dev2/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, pillow +}: + +buildPythonPackage rec { + pname = "ev3dev2"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "ev3dev"; + repo = "ev3dev-lang-python"; + rev = version; + sha256 = "XxsiQs3k5xKb+3RewARbvBbxaztdvdq3w5ZMgTq+kRc="; + fetchSubmodules = true; + }; + + postPatch = '' + echo "${version}\n" > RELEASE-VERSION + ''; + + propagatedBuildInputs = [ pillow ]; + + checkPhase = '' + chmod -R g+rw ./tests/fake-sys/devices/**/* + ${python.interpreter} -W ignore::ResourceWarning tests/api_tests.py + ''; + + meta = with lib; { + description = "Python language bindings for ev3dev"; + homepage = "https://github.com/ev3dev/ev3dev-lang-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 38334d5cc6b..7e8d9f8d4ac 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"; + sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f"; }; checkInputs = [ astunparse ] ; meta = with lib; { 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/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index fd44f3e4480..8805c203903 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -4,7 +4,7 @@ , meson , ninja , intreehooks -, pytoml +, toml , pythonOlder }: @@ -12,17 +12,15 @@ buildPythonPackage rec { pname = "mesonpep517"; - version = "0.1.9999994"; + version = "0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b5bcca61024164c4a51d29e6921ea1f756d54197c8f052e4c66a2b8399aa9349"; + sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; - nativeBuildInputs = [ intreehooks ]; - - propagatedBuildInputs = [ pytoml ]; + propagatedBuildInputs = [ toml ]; # postPatch = '' # # Meson tries to detect ninja as well, so we should patch meson as well. 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/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 0eb13c732d7..f01bfa33186 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -1,22 +1,23 @@ { lib, stdenv , buildPythonPackage , fetchPypi -, isPy27 , python-dateutil , pkgs +, coreutils +, which }: buildPythonPackage rec { version = "2.0.3"; pname = "pync"; - disabled = ! isPy27; src = fetchPypi { inherit pname version; sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f"; }; - buildInputs = [ pkgs.coreutils ]; + nativeBuildInputs = [ coreutils ]; + checkInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' @@ -25,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Wrapper for Mac OS 10.8 Notification Center"; - homepage = "https://pypi.python.org/pypi/pync/1.4"; + homepage = "https://pypi.python.org/pypi/pync"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 7f6eee4906c..a679100d376 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { }; meta = with lib; { - inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; homepage = "http://pythonwifi.tuxfamily.org/"; # From the README: "pythonwifi is licensed under LGPLv2+, however, the diff --git a/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch b/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch new file mode 100644 index 00000000000..14d2c2fbfd2 --- /dev/null +++ b/pkgs/development/python-modules/pythran/0001-hardcode-path-to-libgomp.patch @@ -0,0 +1,64 @@ +From 208fe98f10c580a5a2fb6a8cfdd56de109073925 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Sat, 17 Jul 2021 18:36:27 +0200 +Subject: [PATCH] hardcode path to libgomp + +--- + omp/__init__.py | 40 ++++------------------------------------ + 1 file changed, 4 insertions(+), 36 deletions(-) + +diff --git a/omp/__init__.py b/omp/__init__.py +index bddae3063..9ba3678d8 100644 +--- a/omp/__init__.py ++++ b/omp/__init__.py +@@ -69,43 +69,11 @@ class OpenMP(object): + + def init_not_msvc(self): + """ Find OpenMP library and try to load if using ctype interface. """ +- # find_library() does not search automatically LD_LIBRARY_PATH +- paths = os.environ.get('LD_LIBRARY_PATH', '').split(':') ++ libgomp_path = "@gomp@" + +- for libomp_name in self.get_libomp_names(): +- if cxx is None or sys.platform == 'win32': +- # Note: Clang supports -print-file-name, but not yet for +- # clang-cl as of v12.0.0 (April '21) +- continue +- +- cmd = [cxx, '-print-file-name=' + libomp_name] +- # the subprocess can fail in various ways in that case just give up +- try: +- path = os.path.dirname(check_output(cmd).decode().strip()) +- if path: +- paths.append(path) +- except (OSError, CalledProcessError): +- pass +- +- # Try to load find libgomp shared library using loader search dirs +- libgomp_path = find_library("gomp") +- +- # Try to use custom paths if lookup failed +- for path in paths: +- if libgomp_path: +- break +- path = path.strip() +- if os.path.isdir(path): +- libgomp_path = find_library(os.path.join(str(path), "libgomp")) +- +- if not libgomp_path: +- raise ImportError("I can't find a shared library for libgomp," +- " you may need to install it or adjust the " +- "LD_LIBRARY_PATH environment variable.") +- else: +- # Load the library (shouldn't fail with an absolute path right?) +- self.libomp = ctypes.CDLL(libgomp_path) +- self.version = 45 ++ # Load the library (shouldn't fail with an absolute path right?) ++ self.libomp = ctypes.CDLL(libgomp_path) ++ self.version = 45 + + def __getattr__(self, name): + """ +-- +2.32.0 + diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 864234a37e2..10dc9f30572 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -1,4 +1,5 @@ { lib +, python , buildPythonPackage , fetchFromGitHub , pytestrunner @@ -12,19 +13,31 @@ , pytestCheckHook , scipy , isPy3k +, substituteAll }: -buildPythonPackage rec { +let + inherit (python) stdenv; + +in buildPythonPackage rec { pname = "pythran"; - version = "0.9.8post3"; + version = "0.9.12"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - sha256 = "sha256-GCWjJlf7zpFzELR6wTF8FoJzJ3F/WdT1hHjY5A5h/+4="; + sha256 = "sha256-lQbVq4K/Q8RzlFhE+l3HPCmUGmauXawcKe31kfbUHsI="; }; + patches = [ + # Hardcode path to mp library + (substituteAll { + src = ./0001-hardcode-path-to-libgomp.patch; + gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + nativeBuildInputs = [ pytestrunner ]; @@ -62,7 +75,7 @@ buildPythonPackage rec { meta = { description = "Ahead of Time compiler for numeric kernels"; - homepage = https://github.com/serge-sans-paille/pythran; + homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index dd1c7b2da5b..f559afb6a4d 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, setuptoolsDarcs -, setuptoolsTrial , simplejson +, mock , twisted , isPyPy }: @@ -17,12 +16,9 @@ buildPythonPackage rec { sha256 = "8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848"; }; - buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []); - propagatedBuildInputs = [ twisted ]; + propagatedBuildInputs = [ simplejson ]; - # Tests fail because they try to write new code into the twisted - # package, apparently some kind of plugin. - doCheck = false; + checkInputs = [ mock twisted ]; prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" @@ -41,8 +37,9 @@ buildPythonPackage rec { we're not alone in wanting tools like these. ''; - homepage = "http://allmydata.org/trac/pyutil"; + homepage = "https://github.com/tpltnt/pyutil"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7c87431d80b..274cb0379c2 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -1,29 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , requests_oauthlib , simplejson +, pkce +, pytestCheckHook }: buildPythonPackage rec { pname = "pyvicare"; - version = "0.2.5"; + version = "1.0.0"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyViCare"; - inherit version; - sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk"; + src = fetchFromGitHub { + owner = "somm15"; + repo = "PyViCare"; + rev = version; + sha256 = "05dlasx18fkmh4z1w8550yrb26fmsb5bc73wr9whmkasm32gpfl1"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ requests_oauthlib simplejson + pkce + ]; + + checkInputs = [ + pytestCheckHook ]; - # The published tarball on PyPI is incomplete and there are GitHub releases - doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace "version_config=True," 'version="${version}",' \ + --replace "'setuptools-git-versioning'" " " + ''; + pythonImportsCheck = [ "PyViCare" ]; meta = with lib; { 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/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index bcec7a09251..391e1656749 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, setuptoolsDarcs , pyutil +, setuptoolsTrial +, twisted }: buildPythonPackage rec { @@ -14,16 +15,17 @@ buildPythonPackage rec { sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; }; - buildInputs = [ setuptoolsDarcs ]; propagatedBuildInputs = [ pyutil ]; + checkInputs = [ setuptoolsTrial twisted ]; + # argparse is in the stdlib but zfec doesn't know that. postPatch = '' sed -i -e '/argparse/d' setup.py ''; meta = with lib; { - homepage = "http://allmydata.org/trac/zfec"; + homepage = "https://github.com/tahoe-lafs/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' Fast, portable, programmable erasure coding a.k.a. "forward @@ -34,6 +36,7 @@ buildPythonPackage rec { and Haskell API. ''; license = licenses.gpl2Plus; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 17f5d6553f6..d4cfe217b83 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -28,7 +28,6 @@ buildRubyGem rec { ''; meta = { - inherit version; description = "Creates Nix packages from Gemfiles"; longDescription = '' This is a tool that converts Gemfile.lock files to nix expressions. 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/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a8e7c10ce44..5c239cfc63e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,6 +86,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ raskin makefu mic92 ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 93644caa5a4..7ae24c69148 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.9.15"; in +let version = "1.9.16"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr"; + sha256 = "0rif9kj6njajy951w3aapk27y1mbaxb08whs126v533h96rb1kjp"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index d2ef8361ec0..6ff91a4e5a6 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.10.9"; in +let version = "1.10.11"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47"; + sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index fb9dab54049..8e0095bb819 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }: - -assert guileSupport -> ( pkg-config != null && guile != null ); +{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }: let version = "4.3"; 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/butane/default.nix b/pkgs/development/tools/butane/default.nix index f417dc42035..f5eafd4a90f 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "1bgh7h3hwrgjkw72233qzqpkshzbizhdapa0lalzj1xnclq3rqlp"; + sha256 = "0z1cq43dnj73k0idjhc310h00a1mryk2297w3yy6k1sa95swlz9m"; }; vendorSha256 = null; 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/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index cfe69886d4b..ba549d5aaa5 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.6.10"; + version = "0.7.0"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "13mv6rvqlmgn1shx0hnlqxgqiiiz1ij37j30jz1jkr9kcrbxpacr"; + sha256 = "0vylrsmpszij23yngk7mfysp8rjbf29nyskbrwwysf63r9xbrwbi"; }; modRoot = "gopls"; - vendorSha256 = "01apsvkds8f3m88inb37z4lgalrbjp12xr2jikwx7n10hjddgbqi"; + vendorSha256 = "1mnc84nvl7zhl4pzf90cd0gvid9g1jph6hcxk6lrlnfk2j2m75mj"; doCheck = false; diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/development/tools/misc/debugedit/default.nix new file mode 100644 index 00000000000..0328d1f597b --- /dev/null +++ b/pkgs/development/tools/misc/debugedit/default.nix @@ -0,0 +1,30 @@ +#TODO@deliciouslytyped The tool seems to unnecessarily force mutable access for the debugedit `-l` feature +{fetchgit, lib, stdenv, autoreconfHook, pkg-config, elfutils, help2man, util-linux}: +stdenv.mkDerivation { + name = "debugedit"; + version = "unstable-2021-07-05"; + + nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; + buildInputs = [ elfutils ]; + checkInputs = [ util-linux ]; # Tests use `rev` + + src = fetchgit { + url = "git://sourceware.org/git/debugedit.git"; + rev = "e04296ddf34cbc43303d7af32ab3a73ac20af51a"; + sha256 = "19cjkpzhdn2z6fl7xw8556m6kyrb7nxwbz2rmiv2rynyp74yg44z"; + }; + + preBuild = '' + patchShebangs scripts/find-debuginfo.in + ''; + + doCheck = true; + + meta = with lib; { + description = "Provides programs and scripts for creating debuginfo and source file distributions, collect build-ids and rewrite source paths in DWARF data for debugging, tracing and profiling"; + homepage = "https://sourceware.org/debugedit/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ deliciouslytyped ]; + }; +} diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix new file mode 100644 index 00000000000..ee661e62202 --- /dev/null +++ b/pkgs/development/tools/mold/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, lib +, autoPatchelfHook +, cmake +, tbb +, llvmPackages_latest +, xxHash +, zlib +, openssl +}: + +stdenv.mkDerivation rec { + pname = "mold"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "rui314"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2LXOPirhjAifKYPgngUJwEdGrKMYsRySr5TL2x2p8J0="; + }; + + buildInputs = [ tbb zlib openssl ]; + nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; + + dontUseCmakeConfigure = true; + EXTRA_LDFLAGS = "-fuse-ld=${llvmPackages_latest.lld}/bin/ld.lld"; + LTO = 1; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "A high performance drop-in replacement for existing unix linkers"; + homepage = "https://github.com/rui314/mold"; + license = lib.licenses.agpl3Plus; + maintainers = with maintainers; [ nitsky ]; + broken = stdenv.isAarch64; + }; +} 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/fairymax/default.nix b/pkgs/games/fairymax/default.nix index d7433950451..49a91e7a64d 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cp fmax.ini "$out/share/fairymax" ''; meta = { - inherit version; description = "A small chess engine supporting fairy pieces"; longDescription = '' A version of micro-Max that reads the piece description diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index aa93633906f..5ddad7fda4c 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "A puzzle game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index ddc43518de6..bb749b57d01 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A generic Sokoban game for X11"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index de230aafd78..6b90d6f58e1 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; # Once had cygwin problems - inherit version; downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; }; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9eb3b04dd7f..d6465324bda 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,6 +39,18 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; + aerial-nvim = buildVimPluginFrom2Nix { + pname = "aerial-nvim"; + version = "2021-07-17"; + src = fetchFromGitHub { + owner = "stevearc"; + repo = "aerial.nvim"; + rev = "e641878818c5545afd09b093a368f2d03f169273"; + sha256 = "1zykpbd42nwvpkgbq0hh52micyybxyvia6558fp6nlcs56bdmqf4"; + }; + meta.homepage = "https://github.com/stevearc/aerial.nvim/"; + }; + agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; version = "2020-11-23"; @@ -65,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "d8f4e8b7081724c0b9ff2491dd68409b3da69b0f"; - sha256 = "0rwj9rhkzg004jv9q8wr86l9xak4wqf7l5skq1nf8k0xis9aw6d3"; + rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2"; + sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -185,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-06-06"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "6a77e8ecf38b0e7a547df58f499cecc1c50cd444"; - sha256 = "1yh88v6p1ingwydzr40jcva9gw58ihmgjndaf7h3sp0ldvl75ci2"; + rev = "af110b7f6080bdc4685cdd5551ba1f79a81910f1"; + sha256 = "1h2czb183lliib95jn4dxq8cn713s22dc4hd1cj19bzqy4j39qhi"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -413,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "8ed122e474a0316f8b967bb6c35a47e8dd383453"; - sha256 = "0zk12wd1xs668j3wfdd5vyj685irnjsksrmn2dln6vsyb7xpq3r5"; + rev = "fa78312b378a7d3a6cb1222d1df05c28238f888b"; + sha256 = "05j42c3h374hyqqb5m7dddyh4sn08cw64nji3fnv3rk63gm2r4if"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -521,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-09"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "0b3967864c7d5cf94682f07d1cdb8afec3c8753f"; - sha256 = "0jpjarg6fjlkwwk69pl44f1r8racb0fzf5dqr58fgn31l7zcvrak"; + rev = "75b97dfdd641d530b86dee603308aea0079736e9"; + sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -557,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-15"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "3c3f118f8d48707f1890c2c212c083228aeac596"; - sha256 = "0nim2hd0pn910ymm87zwfcw5b7x64h3dsnqhc20yj0r3s5xjg6qi"; + rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a"; + sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -678,12 +690,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-09"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "d2837688cb0de46712b602eb9fbd17c6c0a8047b"; - sha256 = "089vcjqhdbzld89w5rfw6rx2fnybc0xbaa3q6abpckyir175d7a7"; + rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd"; + sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1751,12 +1763,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-04-28"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "9b016fd42ba37395d9299e1e811b282b29effb63"; - sha256 = "0x3rg1pxildm2mrfr28f4d41z4zzf6v2jng41nzylwm5r4c5r1gd"; + rev = "14aec3bde121c797f9131da0d4b18a932598bb8f"; + sha256 = "1mcn4dhwjay5c0y650y2rxz9acxwfsninwrvp20ssgi4gcw2vg76"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1847,12 +1859,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-09"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "acbf54d357ddb2c558d7f536a8da409d6e357dff"; - sha256 = "0kvgfvabgg992309xw15slpk0klvzlcjdlnbvgva0bkwkybagnja"; + rev = "f29e8a461e05881c69953b41784a1aeb4b70a422"; + sha256 = "1nda02nd9v17yv6fawidg8c3haijysb9zc04sjy0v708h2nw8qhj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2580,12 +2592,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-12"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "a3c62fc1d2bb9fffa14b42b97c100f148e96f15b"; - sha256 = "0mp4p5d2m51f716938pzm8xifh8nxlmspdxpwbzqgnkf1b1rcvz0"; + rev = "62f02aabce3b5af190cf113d5bdf4a8271a966c3"; + sha256 = "1cckxvr035vsall3891j60yc1a12p8q63rjnm7ac1wzdhh7d8c38"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2664,12 +2676,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-10"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "27fa218ca099a07eefbe9d5b5e57f06887b48b5f"; - sha256 = "0yi35p05f28dm6l1qk93chizachnk2ciybrnvqcnx0ry0cipd727"; + rev = "29e685953d362c723c55417eea2b795b5bcc2ef5"; + sha256 = "183511fy34sazpkaxcpr250id4zyxhs5mqws49b516sh0d875fjj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2808,12 +2820,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "1db8e5588bfd2038efb690de5991746c8bf03543"; - sha256 = "00mpza33p3yybr3fgigx7gy8faj8f5ypdws9aymxs30a12p67d1q"; + rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961"; + sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3180,12 +3192,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "4a6eb9d52d544d378c82f17c448eb9c697cf448c"; - sha256 = "14hsyy23xb5p8lfna3kiarr0na1n1bykr8scwslczhpi9fwcgq85"; + rev = "7f9f1d328c218b041ce899def4923334a5355c14"; + sha256 = "1f7acjy3xhiz2yzkdp5x5f4p28zz583h7snyzrc2l8w7fwz600x9"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3238,6 +3250,18 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; + neovim-ayu = buildVimPluginFrom2Nix { + pname = "neovim-ayu"; + version = "2021-07-17"; + src = fetchFromGitHub { + owner = "Shatur"; + repo = "neovim-ayu"; + rev = "755b4a379ef4812f9656fb3f59220cf3a45c2070"; + sha256 = "0irjjpfrl6i7hfvay6b187i7dkkjq40fdcrx53xxfk9qq47l1z13"; + }; + meta.homepage = "https://github.com/Shatur/neovim-ayu/"; + }; + neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; version = "2021-07-02"; @@ -3384,12 +3408,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-10"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "05814232c4369ef36961123de6ff3826936e9784"; - sha256 = "16z7kk8cvf52xnpkw8jvaaskd6zmah14va8cfgi52ckfl482w2pd"; + rev = "44ae0a84087135e23fb5a90c9726f8b161277652"; + sha256 = "0zhv06arl7x3wx20r26v3vc1i4909h657syrqbyh5k93n1hmc21j"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3408,7 +3432,7 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm-nvim"; - version = "2021-07-16"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; @@ -3504,12 +3528,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "cebafb95622205a414a6c10bf0e40d197cc652b1"; - sha256 = "1qd8gaigkyhkz5nrizc3jhwa69v4fcymd2446l0s24pv3kxc2an3"; + rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329"; + sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3540,12 +3564,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-14"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "29879b29b63fcd315e247a110a505e6a337b584a"; - sha256 = "18ybvc2l07l91gkl3w63l58pm9q7bx2p0fmkyxpqb48cii98n4yj"; + rev = "ef97a9b17c655d8b603c5fa9abf6fbb623a1dad4"; + sha256 = "0lrna8ryw391dpvi64x3q2gj484mf5s6wlqqg6a52a5s3ganh41n"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3624,12 +3648,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-06-12"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "dd688e37458a6fdeb050942da8c1260389c2a99a"; - sha256 = "0q4bmp3wy0miaysldpfm6646r8c0llygfnlbmk5brs4la321hjld"; + rev = "1df774df358e70cbc9f74f34d38a82e756ceb001"; + sha256 = "1zf5i30g49f7ks6hhvr84ac3ka57lv96c124cpr1d4h9xld1n9q8"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3672,12 +3696,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9d49032a64d8a275123ad7f84e9c699d279307fe"; - sha256 = "18z22v8qn6jhg16hsrldqaqqp987w1nnqz0lhn0byzbsac62xwga"; + rev = "1729b502fa00df2fdcbfa118b404b8b8a8a2d6a3"; + sha256 = "1r4ajaxvf9kpfq42b81c08ixfqakiq8fibn89qar7sd4a7634dsg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3828,12 +3852,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "15e8a45517c596b9acd9406bcb6f650d6bfdb339"; - sha256 = "1m1bc5w1qw8cxjnhhanh7rw78d3zkdxm6vgldh22zhmvgj1cb7zl"; + rev = "4887eb7526004e069bd8898041a714c7eaad72e7"; + sha256 = "1abdjkiyyzgaw3lskjfb0lcilkp8qqlaqj8kyfmzf4w4mz9ijh4d"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3924,12 +3948,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark-nvim"; - version = "2021-06-18"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "1304235686bc682e744ba9691c7545e0b27762ea"; - sha256 = "0ygy9hl171qa9zp8gmj80azp4vxxn5ba3v19mgy36qf390jgrwc4"; + rev = "df80982b43ced71a286933e830b26faabb9a36e9"; + sha256 = "1hddmi543js7z77383ppvdray2dri5jn8lcqivk9xm5l8maz52cz"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; @@ -3984,12 +4008,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-15"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "d693133efb4a1f171d581dad8d399d6a3cd4b90a"; - sha256 = "1avcdfsq14nqbqrvlgz7cslaxi1ni5lsvz78dj5xc35ppgwyr1ci"; + rev = "b6a904b341c56c5386bdd5c991439a834d061874"; + sha256 = "1ja6k5cw6v5nhi91s643r6c38a15rgi4n8cb0k5pc5q252q8km04"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4429,12 +4453,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "da8fb66af44fe2472b58fbf0b83ad4fe2243aaea"; - sha256 = "0mkjb42ff0w80kbik6hwdx1hvhxlihq17fqypdagmxk58wn71z9y"; + rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0"; + sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4766,12 +4790,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2021-06-28"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "03af68c1ecec4a01b4fe713393c1b3fa4dd21e77"; - sha256 = "15qja2ywi83qv365b19xrcw02j693bhrdn0wanxdhbqzpp9kwsb9"; + rev = "e5c60658d9aca5af479ef6371037cc6453a6b1eb"; + sha256 = "07l7acnhp9nwwkmybjs2fdprql5nanyxxn9z3wl59y8jx2ca44p7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -4779,12 +4803,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-04-13"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "afd60eef9edff543d4d05ac51d518fd501f2e413"; - sha256 = "115l3dp1i7pmfsqyqir5c73bprvsnnm737sbbz0dwibnlr5sd2q3"; + rev = "76277236829ca77dd41d285c794ab8878129e3f8"; + sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5030,6 +5054,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; + telescope-fzf-native-nvim = buildVimPluginFrom2Nix { + pname = "telescope-fzf-native-nvim"; + version = "2021-07-06"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-fzf-native.nvim"; + rev = "fe8c8d8cf7ff215ac83e1119cba87c016070b27e"; + sha256 = "0kzxf3kzw45mlccp8z5zl3cfda4n5afymmdyir3kd248ll904jy1"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; + }; + telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-writer-nvim"; version = "2021-04-16"; @@ -5069,24 +5105,24 @@ final: prev: telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z-nvim"; - version = "2021-03-09"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "c14b6335f42bdda5100f135f18632bf6421c5f0e"; - sha256 = "01y3b41ff00qi4g11pry73nd851dc5hjl039symhd2y0lf447j7h"; + rev = "27694fa19bc00cc24b436d671951f516a4a966a1"; + sha256 = "0g12nfmv2hllw0ylsy362mp1gyaf4ldyiza3jg74c66xwi2jj8i9"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-14"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "37a3a68a78e15900254ae5d9d4f9f0b5100a1735"; - sha256 = "1a5hsjsz62nb5hlrd0k8wbcnyxa3574jgipphs9s2llf6qfwkfh1"; + rev = "5b597e7709eec08331ce71b45193117f6fb5626b"; + sha256 = "1lwr3gayqj6h0ha749p5dfgihjlqydgaidcnblcvvj8vi10ick35"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5153,12 +5189,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2019-09-28"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "a071b6d41b20069a3520e0d101194a752968973b"; - sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3"; + rev = "70c4e222464020edc2809c932b488daaf891eeef"; + sha256 = "1amx220nbh1s51z35pkhvl3110pbha5qj2rdgxvg8dbqha7py9fx"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -5250,12 +5286,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-06-24"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "7de8bc46164ec1f787dee34b6843b61251b1ea91"; - sha256 = "1ybv7vdvyvyx09zwwx1vw91ids13g24as0ag0jnw6ck95f12r7mn"; + rev = "059ea2b999171f50019291ee776dd496799fdf3a"; + sha256 = "06v2jvlw8rjlarx89kfb7ys8y0jkm1f7c4vnws60nfbqgp9c9k98"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -5286,12 +5322,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight-nvim"; - version = "2021-07-13"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "f5718ddbd9bba3184493a4fc11cd38342966904f"; - sha256 = "1j532h0imw782rvhg75ryqmy5lm0clg32fs3a1cm84srx97l05fp"; + rev = "f722fa24411d0423a3d2daf6f1b5f8b11df9db2b"; + sha256 = "0k2vbhs960h346w37ky2mpv1syzjxi19zl9zmnvlsy6annqd892x"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -5958,12 +5994,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-11"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e8fda02cd9ee8cbd4955a387cce3752584b85ac0"; - sha256 = "1l88pxfxjjfc0wfgkr2nj2x3dp3sj2xghyjzihafdp4nrynvygb8"; + rev = "ee390feaa3bc40de2afa32910ab09de287181146"; + sha256 = "0q2bnmi6yz7i7lx8i59gzk39fqzjc3y325qjhhyyahwb2xsazzcz"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6294,12 +6330,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-05-13"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "4c2df59e37b6680e0ec17b543b11a405dc40262c"; - sha256 = "0knpfl0lwiy0w2f9qd3gz3yl03dqzn6fllv0isl0iz24csya6v2h"; + rev = "0a11dae811e6c8b939fe80aeb750469f8ca44d67"; + sha256 = "07lgjzi10h1gfvr2ij1pc4qxj63n4bg3jvj01ilj6yas56a3hk09"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -6738,12 +6774,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-12"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1c2663f516c32f8453f542be10192a49ee844a93"; - sha256 = "01gh4p2d41khx5cb7hcpjp9gs5fkgil838rnik1gawiw7w83hnaa"; + rev = "58516a13c623e6b21be6fed1f6067eed67005949"; + sha256 = "0gzdsp1gz1wpw8z47v3sr9b0ma41qnz0r4iiq0jr84srr3817zpl"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7592,12 +7628,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2021-05-29"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "2b5565881b31ed4e7ac32b4903827ec9c164216d"; - sha256 = "13nzkqhyz8jydrwprw06jqcx3w37xv0qdq0809gx748kfvh1dznw"; + rev = "4e4404dffbd99159af9cfe816d13a6e69aadcee2"; + sha256 = "1a1k27gvsd2ssnw3w8b29z3q8z2w2jxgcwpx5gd6djk1id26rhb6"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -8421,12 +8457,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-04-15"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "2590324d7fdaf0c6311fad4ee2a2878acaaec42d"; - sha256 = "0ljlkzy2r8dzqkcl9pbgshr7swdcdbbxcgfvvmyxrw7swfx1srk9"; + rev = "b4aad6dc43660db554bba2942026fb9965f1a45e"; + sha256 = "04ckpl3q1k4l530fhf5srbklfqdz4rfrcapwsa92n4bwskfxbnsp"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -8733,12 +8769,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-07-11"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e77399e64d6f54a623c52797973a23ecfe28b813"; - sha256 = "13c90zq8pxd1kfrk5f0zj6r48v86j4fnijss71j7ilb38mj4dyxq"; + rev = "f1b72d866d6564075a8b0da1f179c0b7de723131"; + sha256 = "1vfpf0mjwk519gdly44f0ixc5y4609j33fsjsfzwgcmp3xgmf081"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9190,12 +9226,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-03-19"; + version = "2021-07-16"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "cf8aa913329991bfeaa1cabab4bbd8889b0f0790"; - sha256 = "0j0h95xhb5c59qyx8gc1yrcnsjxffbnycya6wnl7axd71iawwgh8"; + rev = "cd7286702319d676c622a5f5891dc68563bf6ad5"; + sha256 = "1xmcnhbny74hr0zciy55gq8c8agds2x1xvdsr1wrghkcr2k15w46"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9639,8 +9675,8 @@ final: prev: src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "431f520553bfe721d1ef5db0bb23ec03a86c00a0"; - sha256 = "1a9j27404hi8s3v7h9kghl7xwgmcblbranlp6kclvvrl7wahvnhg"; + rev = "13fac7d1d820ee4d72196841800705f149af9868"; + sha256 = "0k9325pdh5fscj8nhqwj36vdz6lvcgf14r7mmimc7g6i7bxxfpmb"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 6c2063e0a97..0cf3222c9f3 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -479,6 +479,12 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + buildPhase = "make"; + meta.platforms = lib.platforms.all; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -625,7 +631,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-hcbNjp9KLJO0RANOvtopvdiK0w9ESUXk0KOTPvVcCX4="; + cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 02280936740..8aaa0c8f31d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -484,6 +484,7 @@ nvim-lua/plenary.nvim nvim-lua/popup.nvim nvim-telescope/telescope-dap.nvim nvim-telescope/telescope-frecency.nvim +nvim-telescope/telescope-fzf-native.nvim@main nvim-telescope/telescope-fzf-writer.nvim nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope-symbols.nvim @@ -595,6 +596,7 @@ samoshkin/vim-mergetool sbdchd/neoformat sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github +Shatur/neovim-ayu shaunsingh/moonlight.nvim@pure-lua shaunsingh/nord.nvim sheerun/vim-polyglot @@ -637,6 +639,7 @@ steelsojka/completion-buffers steelsojka/pears.nvim stefandtw/quickfix-reflector.vim stephpy/vim-yaml +stevearc/aerial.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 50a3e3e6316..b082c594acb 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; - inherit version; license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; 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/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 5566103b2cd..5f44622c512 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3 ; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - inherit version; }; } diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 797e7a5b130..912d9078c94 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://www.netfilter.org/projects/iptables/files/"; updateWalker = true; - inherit version; }; } diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index b40b3c46e77..d6604f9e15b 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux Netlink interface library suite"; license = licenses.lgpl21; 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/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index b92975149db..f8a9875914d 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -25,7 +25,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - inherit version; description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; homepage = "http://bftpd.sf.net/"; 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/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix index 65323323962..5baba231026 100644 --- a/pkgs/servers/http/nix-binary-cache/default.nix +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ''; maintainers = [lib.maintainers.raskin]; license = lib.licenses.gpl2Plus; - inherit version; platforms = lib.platforms.all; hydraPlatforms = []; }; 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/es/default.nix b/pkgs/shells/es/default.nix index 5efb860c1d5..52131a214a5 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, readline, bison }: -let - version = "0.9.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "es"; - inherit version; + version = "0.9.1"; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index c80471677f0..935939f90e6 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' outdir=$out/share/antigen 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/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index c48bf209d0f..f60bb966003 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "0.4.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - inherit version; + version = "0.4.4"; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 9696e441cf5..b92ced6be71 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time 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/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 4e6f40707a7..036ba8bc4e9 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; homepage = "https://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 706194cc0dd..48d28562c20 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -33,8 +33,6 @@ }: let - version = "3.2.1"; - nvidia_x11s = [ nvidia_x11 ] ++ lib.optional nvidia_x11.useGLVND libglvnd ++ lib.optionals (nvidia_x11_i686 != null) @@ -57,7 +55,7 @@ let in stdenv.mkDerivation rec { pname = "bumblebee"; - inherit version; + version = "3.2.1"; src = fetchurl { url = "https://bumblebee-project.org/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 432193950cd..deefddf23ce 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }: -let version = "1.6.1"; -in stdenv.mkDerivation rec { pname = "nitrogen"; - inherit version; + version = "1.6.1"; src = fetchurl { url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index ae0e5b89a61..b3b5233564a 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildPhase = '' cc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index adf3b3d9250..0519f2c4204 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { sed -e "s@/etc/xdg@$out&@" -i Makefile ''; meta = { - inherit version; description = "Expose-style compositing-based standalone window switcher"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index 4ee2c8acc25..e489ad0237b 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A gesture control for X11"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index 9c88a038e3e..9eafb5e6b49 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - inherit version; description = "A tool to scribble over X windows"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index 0521b6f8b3b..a1fb8817632 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }: -let version = "1.09"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xautomation"; - inherit version; + version = "1.09"; src = fetchurl { url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index ba45442a449..17e0ca66e3f 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libX11, guile }: -let version = "1.8.7"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xbindkeys"; - inherit version; + version = "1.8.7"; src = fetchurl { url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index 311f1e42901..af17f3ade7d 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libXdamage ]; meta = { - inherit version; description = "X window switcher drawing a colourful grid"; license = lib.licenses.bsd2 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index 00ee7413189..3921df9fffa 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchbzr, xlibsWrapper }: -let - version = "4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xwinwrap"; - inherit version; + version = "4"; src = fetchbzr { url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index ba62704bdd3..979e2725098 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; meta = { - inherit version; description = "An X11 screen zoom tool"; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index a21a3ebdde1..706ac84afb3 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -4,13 +4,10 @@ , lib }: -let - version = "release-2019-10-13"; - -in buildGoPackage { +buildGoPackage rec{ pname = "boulder"; - inherit version; + version = "release-2019-10-13"; goPackagePath = "github.com/letsencrypt/boulder"; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 5bd9c95d3a5..f461a5c30ed 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,23 +21,23 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd"; + sha256 = "1h02pywzjn2d4p07xic1936w5qjbaz33qny8afrgzvgbqnqx7dvs"; }; aarch64-darwin = { url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "sha256-EZbJgMzEZScvaqSKay5aDuayVaIK1zZUzqAHgT0czZk="; + sha256 = "0qrmrxzphslhq3xf01zh91v7fvqn0z4hv8rpd15qwq9q84d2c3gr"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb"; + sha256 = "0lz14d9gs6k0zbnyvrl6zyj8w7f6a5z7q95y48jkizc822rajhc3"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "347.0.0"; + version = "348.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 4021bc92e06..f3f7b32e119 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' - The Unarchiver is an archive unpacker program with support for the popular \ - zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, \ - and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, \ - Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ + The Unarchiver is an archive unpacker program with support for the popular + zip, RAR, 7z, tar, gzip, bzip2, LZMA, XZ, CAB, MSI, NSIS, EXE, ISO, BIN, + and split file formats, as well as the old Stuffit, Stuffit X, DiskDouble, + Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e9409221069..57d35633128 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper, - coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: + coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { version = "0.5.4.17"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/xarchiver \ - --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unar gnutar bzip2 gzip lhasa coreutils ]} ''; meta = { diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 08d98716f1f..150633e620a 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - inherit version; }; } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 4b4dadd4faf..12308b24045 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; - inherit version; }; } diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index c289c3938ab..e36e20902df 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index a202ee9376b..59e8bf8843a 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, libdvdread, pkg-config }: -let - version = "0.17"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lsdvd"; - inherit version; + version = "0.17"; src = fetchurl { url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz"; sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x"; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 9f4f66521f6..820389300e3 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; license = lib.licenses.gpl2Plus; - inherit version; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index dabde674d2e..0aec49827e6 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { - inherit version; description = "A script to handle Mozilla's mozlz4 files"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index d0418ffdd60..bb504e85f61 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A parallel compressor/decompressor for xz format"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index ec7563dfc49..7c9edf2f84d 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - inherit version; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 3bbff2903bc..bb042a95ecc 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; - inherit version; homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index d2779e2b4c5..e837350abd6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; + sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; + sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373"; }; in stdenv.mkDerivation rec { pname = "yandex-disk"; - version = "0.1.5.1039"; + version = "0.1.6.1074"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 9dc2ad4d5f5..8ebccd8047a 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,12 +1,10 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText , libXdmcp, libXau, lib, openssl }: -let - version = "2.1.2"; - in + stdenv.mkDerivation rec { pname = "argyllcms"; - inherit version; + version = "2.1.2"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index b554ac9b3c0..07f7b63ad7d 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -2,17 +2,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let - - version = "0.9"; - sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "briss"; - inherit version; + version = "0.9"; src = fetchurl { url = "mirror://sourceforge/briss/briss-${version}.tar.gz"; - inherit sha256; + sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9"; }; nativeBuildInputs = [makeWrapper]; diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix index 714cdd656df..20f29b2a0ad 100644 --- a/pkgs/tools/graphics/convchain/default.nix +++ b/pkgs/tools/graphics/convchain/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Bitmap generation from a single example with convolutions and MCMC"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index 257de05a898..26a9b3e24bd 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python python2Packages.wrapPython ]; pythonPath = [ python2Packages.numpy python2Packages.opencv4 ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + dontConfigure = true; patchPhase = '' substituteInPlace facedetect \ diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 6cd8777f525..6749a193c00 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -11,12 +11,9 @@ , zlib }: -let - version = "0.20"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mscgen"; - inherit version; + version = "0.20"; src = fetchurl { url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index edffad57963..eab3996811e 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "4.0.3"; + version = "5.0.0"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w="; + sha256 = "sha256-rTAY+3ViPkOsRjT9FHKnVOEGfLscuBdMAiQq+N9PRNU="; }; - cargoSha256 = "sha256-sxvOFxSZCANBa/448SpjoLqk/HjqtaFrOhjrQro446Q="; + cargoSha256 = "sha256-Z5tA2bUE/5qGKXP2hIKo6tBegaSUALRzEZ/Xext3EWY="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 14cd83c3fcf..8976700006b 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -1,13 +1,9 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: with lib; - -let - version = "6.14.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pgf"; - inherit version; + version = "6.14.12"; src = fetchurl { url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz"; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix index a076e97d056..b149333f2ea 100644 --- a/pkgs/tools/graphics/syntex/default.nix +++ b/pkgs/tools/graphics/syntex/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "Texture synthesis from examples"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 7c43063fb81..58d4d0df913 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub , libGL, libGLU, freeglut, libX11 }: -let - version = "2018-04-19"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "twilight"; - inherit version; + version = "unstable-2018-04-19"; src = fetchFromGitHub { owner = "tweakoz"; diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix index f761e2bbde6..2c7ce427245 100644 --- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [mono]; meta = { - inherit version; description = "A generator of bitmaps that are locally similar to the input bitmap"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index f4eeb50fc03..18721390a51 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done ''; meta = { - inherit version; description = "1D and 2D code reading library"; license = lib.licenses.asl20; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index bc9aa73c2fc..d165f404f6c 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' function dictname() { src=$1 diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 1d4a3a2b6ec..79320401454 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -4,63 +4,59 @@ , systemd , xrandr }: -let - python = python3Packages.python; +stdenv.mkDerivation rec { + pname = "autorandr"; version = "1.11"; -in - stdenv.mkDerivation { - pname = "autorandr"; - inherit version; - buildInputs = [ python ]; - - # no wrapper, as autorandr --batch does os.environ.clear() - buildPhase = '' - substituteInPlace autorandr.py \ - --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ - --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' - ''; - - outputs = [ "out" "man" ]; - - installPhase = '' - runHook preInstall - make install TARGETS='autorandr' PREFIX=$out - - make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions - - make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out - - make install TARGETS='manpage' PREFIX=$man - - ${if systemd != null then '' - make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ - SYSTEMD_UNIT_DIR=/lib/systemd/system \ - UDEV_RULES_DIR=/etc/udev/rules.d - substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ - --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" - '' else '' - make install TARGETS='pmutils' DESTDIR=$out \ - PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d - make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ - UDEV_RULES_DIR=/etc/udev/rules.d - ''} - - runHook postInstall - ''; - - src = fetchFromGitHub { - owner = "phillipberndt"; - repo = "autorandr"; - rev = version; - sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; - }; - - meta = with lib; { - homepage = "https://github.com/phillipberndt/autorandr/"; - description = "Automatically select a display configuration based on connected devices"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ coroa globin ]; - platforms = platforms.unix; - }; - } + buildInputs = [ python3Packages.python ]; + + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; + + outputs = [ "out" "man" ]; + + installPhase = '' + runHook preInstall + make install TARGETS='autorandr' PREFIX=$out + + make install TARGETS='bash_completion' DESTDIR=$out/share/bash-completion/completions + + make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + + make install TARGETS='manpage' PREFIX=$man + + ${if systemd != null then '' + make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ + SYSTEMD_UNIT_DIR=/lib/systemd/system \ + UDEV_RULES_DIR=/etc/udev/rules.d + substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \ + --replace /bin/systemctl "/run/current-system/systemd/bin/systemctl" + '' else '' + make install TARGETS='pmutils' DESTDIR=$out \ + PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d + make install TARGETS='udev' PREFIX=$out DESTDIR=$out \ + UDEV_RULES_DIR=/etc/udev/rules.d + ''} + + runHook postInstall + ''; + + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "autorandr"; + rev = version; + sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; + }; + + meta = with lib; { + homepage = "https://github.com/phillipberndt/autorandr/"; + description = "Automatically select a display configuration based on connected devices"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ coroa globin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 099ae294bec..61fc84fef7e 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "A fork of CUnit test framework"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; 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/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 4f26b2036a7..acf9b6b867d 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Interactive stack-based calculator"; homepage = "https://github.com/soveran/clac"; license = licenses.bsd2; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 4fc0d2c2f8c..401a2006c6f 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "3.1.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clasp"; - inherit version; + version = "3.1.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/tools/misc/cp437/default.nix index ac9282ae434..c08214ff548 100644 --- a/pkgs/tools/misc/cp437/default.nix +++ b/pkgs/tools/misc/cp437/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let version = "0.6"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "cp437"; - inherit version; + version = "0.6"; src = fetchFromGitHub { owner = "keaston"; diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9a6bd799921..606bba0dff9 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.2.7"; in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "dijo"; - inherit version; + version = "0.2.7"; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices; src = fetchFromGitHub { owner = "NerdyPepper"; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 1e7bbd6bfce..265218dfcfd 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; - inherit version; license = licenses.gpl3; }; } diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 99a21e28b07..f39fc1b5524 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchgit }: -let - version = "2018-12-06"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-decode-unstable"; - inherit version; + version = "unstable-2018-12-06"; src = fetchgit { url = "git://linuxtv.org/edid-decode.git"; diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index 89ac21db5f5..d3abb37b9f4 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -6,11 +6,10 @@ , zsh , modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync }: -let - version = "unstable-2018-03-15"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "edid-generator"; - inherit version; + version = "unstable-2018-03-15"; src = fetchFromGitHub { owner = "akatrevorjay"; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 6c4160b06e3..93e13996f7f 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.17"; + version = "0.1.20"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq2UjeZiKy9BjNQ9xnC7tppEwrEtg8ZN5BVDz1bUOmw="; + sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk="; }; - cargoSha256 = "sha256-Bf3fYHhpoX05AmTdwwdRU2YRfGVb1EmaGDm75i+Vs2w="; + cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c="; doInstallCheck = true; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 100e7023232..dac33eaedb3 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -19,7 +19,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; - inherit version; }; } diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index f08bad03916..87902de0cb0 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -3,13 +3,9 @@ libcxx }: -let - version = "4.5.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gringo"; - inherit version; + version = "4.5.4"; src = fetchurl { url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index 41de7ef5d28..8ea863f4641 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -1,24 +1,23 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }: -let version = "0.0.7"; in -stdenv.mkDerivation { - pname = "hdaps-gl"; - inherit version; - src = fetchFromGitHub { - owner = "linux-thinkpad"; - repo = "hdaps-gl"; - rev = version; - sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; - }; +stdenv.mkDerivation rec { + pname = "hdaps-gl"; + version = "0.0.7"; + src = fetchFromGitHub { + owner = "linux-thinkpad"; + repo = "hdaps-gl"; + rev = version; + sha256 = "0jywsrcr1wzkjig5cvz014c3r026sbwscbkv7zh1014lkjm0kyyh"; + }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ freeglut libGL libGLU ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ freeglut libGL libGLU ]; - meta = with lib; { - description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.symphorien ]; - }; + meta = with lib; { + description = "GL-based laptop model that rotates in real-time via hdaps"; + homepage = "https://github.com/linux-thinkpad/hdaps-gl"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.symphorien ]; + }; } diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index ea4b2a9cbbc..ce3a5acd4c9 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -7,12 +7,11 @@ }: let - version = "0.48.1"; perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]); in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lbdb"; - inherit version; + version = "0.48.1"; src = fetchurl { url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh"; diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 464183cf579..d59b759503f 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Rewrite of unclutter using the X11 Xfixes extension"; platforms = platforms.unix; license = lib.licenses.mit; - inherit version; maintainers = [ maintainers.globin ]; }; } diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 00e3ec1fbdc..cb575adf75e 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -59,7 +59,6 @@ mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces"; homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; 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/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 44481802cc0..fc06ba0363d 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -23,7 +23,6 @@ python2Packages.buildPythonApplication rec { platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; - inherit version; updateWalker = true; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e852fdb1c2d..e3e4a67c131 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -8,7 +8,9 @@ , libmysqlclient , log4cplus , postgresql -, python3 }: +, python3 +, nixosTests +}: stdenv.mkDerivation rec { pname = "kea"; @@ -48,11 +50,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) kea; + }; + meta = with lib; { homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' - KEA is a new open source DHCPv4/DHCPv6 server being developed by + Kea is a new open source DHCPv4/DHCPv6 server being developed by Internet Systems Consortium. The objective of this project is to provide a very high-performance, extensible DHCP server engine for use by enterprises and service providers, either as is or with @@ -60,6 +66,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz hexa ]; }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 3a7e64623af..175595edafb 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.0.9"; + version = "4.1.1"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx"; + sha256 = "1a74py0ib1gr3znv9ah5acw67ngl08b14dbc90ww9clvgdr2ag0l"; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 19bfd6ae454..c54c4f8691a 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index da64ec138a6..eedd4f97db6 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; - inherit version; }; } diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 16ecc7f11de..5b4729e2abd 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -2,12 +2,9 @@ , fetchurl, fetchpatch }: -let - version = "1.7"; - -in python2Packages.buildPythonApplication { +python2Packages.buildPythonApplication rec { pname = "nixops"; - inherit version; + version = "1.7"; src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 08508dd157a..363abbd3950 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { buildInputs = [ libusb1 libiconv ]; meta = with lib; { - inherit version; description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = with maintainers; [imalsogreg Chili-Man]; 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/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 9fd57c82e88..eec82712c8c 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , python3Packages , makeWrapper , coreutils @@ -19,15 +20,18 @@ python3Packages.buildPythonApplication rec { patches = [ ./sudo.patch ]; - nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace '--cov=sshuttle --cov-branch --cov-report=term-missing' "" + ''; - checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { @@ -40,6 +44,5 @@ python3Packages.buildPythonApplication rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar carlosdagos ]; - platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 53f99636b45..242da1a67bb 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,7 +22,6 @@ buildGoPackage rec { ]; meta = with lib; { - inherit version; inherit (src.meta) homepage; description = "Get 1password access from iterm2"; license = licenses.mit; 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/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index ba18c58becb..ce996bf7c6f 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; license = licenses.gpl2Plus; - inherit version; updateWalker = true; }; } diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix index 2c30e7e9348..e8f21c6fbd3 100644 --- a/pkgs/tools/system/fancy-motd/default.nix +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-07-04"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "2cc3c3c164ef695c9dd465beca61716a364db32c"; - sha256 = "003p5rsyl216xwldrk8slpnzw6wdrcm8hpfdgy9a0mja5g1xdqzr"; + rev = "e8d2d2602d9b9fbc132ddc4f9fbf22428d715721"; + sha256 = "10fxr1grsiwvdc5m2wd4n51lvz0zd4sldg9rzviaim18nw68gdq3"; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 8dbe4b5e003..77828ae823d 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice updateWalker = true; - inherit version; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 4efc8024cc4..a11890dabd6 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.bsd3; downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; - inherit version; }; } diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index be4eaf5f079..912afb7021c 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; license = lib.licenses.ipl10; - inherit version; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 8d0539d118f..0142156a737 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -4,8 +4,6 @@ , IOKit, ApplicationServices }: let - version = "7.2"; - dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { @@ -16,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "smartmontools"; - inherit version; + version = "7.2"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz"; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index dea7fd2e2b6..ab76de74762 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl }: let - version = "1.8.0"; - # These settings are found in the Makefile, but there seems to be no # way to select one ore the other setting other than editing the file # manually, so we have to duplicate the know how here. @@ -23,9 +21,9 @@ let '' else ""; # use linux flags by default in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tree"; - inherit version; + version = "1.8.0"; src = fetchurl { url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz"; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index bb7a206ced8..ac6a561bb0a 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; - inherit version; }; } 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/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index beedabe34ae..93f65f45d37 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -8,6 +8,7 @@ , Security , ansi2html , installShellFiles +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -21,6 +22,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; }; + patches = [ + # detect wezterm through TERM again which was removed in 0.23.1 + (fetchpatch { + url = "https://github.com/lunaryorn/mdcat/commit/a897b223904748a47c277f7c9a07d59e7d5c916b.patch"; + sha256 = "sha256-tSeNyrlqoGvlfQ3xMRkvqZ7HajMvPCIk7kyt/sVjmTo="; + }) + ]; + nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index e5b3f59db8c..e748515b051 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -1,30 +1,21 @@ -{ fetchurl, lib, stdenv, perl }: +{ fetchurl, lib, stdenv, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "namazu-2.0.21"; + pname = "namazu"; + version = "2.0.21"; src = fetchurl { - url = "http://namazu.org/stable/${name}.tar.gz"; + url = "http://namazu.org/stable/${pname}-${version}.tar.gz"; sha256 = "1xvi7hrprdchdpzhg3fvk4yifaakzgydza5c0m50h1yvg6vay62w"; }; - buildInputs = [ perl ]; + buildInputs = [ perl perlPackages.FileMMagic ]; + nativeBuildInputs = [ makeWrapper ]; - # First install the `File::MMagic' Perl module. - preConfigure = '' - ( cd File-MMagic && \ - perl Makefile.PL \ - LIB="$out/${perl.libPrefix}/${perl.version}" \ - INSTALLSITEMAN3DIR="$out/man" && \ - make && make install ) - export PERL5LIB="$out/${perl.libPrefix}/${perl.version}:$PERL5LIB" + postInstall = '' + wrapProgram $out/bin/mknmz --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.FileMMagic ]} ''; - # FIXME: The `tests/namazu-6' test fails on GNU/Linux, presumably because - # phrase searching is broken somehow. However, it doesn't fail on other - # platforms. - doCheck = !stdenv.isLinux; - meta = { description = "Full-text search engine"; @@ -39,6 +30,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; - broken = true; # File-MMagic is not compatible with our Perl version }; } diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 47256f9f7ee..33f8481bc1a 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -67,6 +67,5 @@ stdenv.mkDerivation rec { homepage = "https://jwilk.net/software/pdf2djvu"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; - inherit version; }; } diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 8365163c2fc..6b64ee46609 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -44,6 +44,5 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; - inherit version; }; } 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/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 8b9cd18cd0a..1945e56b96e 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -1,23 +1,23 @@ -{ python2Packages, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -with python2Packages; - -buildPythonApplication rec { +buildGoModule rec { pname = "cloudmonkey"; - version = "5.3.3"; + version = "6.1.0"; - propagatedBuildInputs = [ argcomplete pygments ]; + src = fetchFromGitHub { + owner = "apache"; + repo = "cloudstack-cloudmonkey"; + rev = version; + sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + }; - doCheck = false; # upstream has no tests defined + runVend = true; - src = fetchPypi { - inherit pname version; - sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7"; - }; + vendorSha256 = null; meta = with lib; { description = "CLI for Apache CloudStack"; - homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; + homepage = "https://github.com/apache/cloudstack-cloudmonkey"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; 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..a1dd7beb83a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1333,6 +1333,8 @@ in blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; + blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; + bmap-tools = callPackage ../tools/misc/bmap-tools { }; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; @@ -4081,6 +4083,8 @@ in debootstrap = callPackage ../tools/misc/debootstrap { }; + debugedit-unstable = callPackage ../development/tools/misc/debugedit { }; + deer = callPackage ../shells/zsh/zsh-deer { }; delta = callPackage ../applications/version-management/git-and-tools/delta { @@ -8056,10 +8060,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 +12584,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 +12640,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; @@ -13905,6 +13906,10 @@ in modd = callPackage ../development/tools/modd { }; + mold = callPackage ../development/tools/mold { + stdenv = llvmPackages_latest.stdenv; + }; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msgpuck = callPackage ../development/libraries/msgpuck { }; @@ -27933,6 +27938,8 @@ in wofi = callPackage ../applications/misc/wofi { }; + wofi-emoji = callPackage ../applications/misc/wofi-emoji { }; + wordnet = callPackage ../applications/misc/wordnet { inherit (darwin.apple_sdk.frameworks) Cocoa; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ea1e6a456b..77256c8cc5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1141,6 +1141,8 @@ in { block-io = callPackage ../development/python-modules/block-io { }; + blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; + blspy = callPackage ../development/python-modules/blspy { }; bluepy = callPackage ../development/python-modules/bluepy { }; @@ -2247,6 +2249,8 @@ in { ed25519 = callPackage ../development/python-modules/ed25519 { }; + editables = callPackage ../development/python-modules/editables { }; + editdistance = callPackage ../development/python-modules/editdistance { }; editdistance-s = callPackage ../development/python-modules/editdistance-s { }; @@ -2355,6 +2359,8 @@ in { et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; + evdev = callPackage ../development/python-modules/evdev { }; eve = callPackage ../development/python-modules/eve { }; @@ -5409,6 +5415,8 @@ in { python-tado = callPackage ../development/python-modules/python-tado { }; + pyutil = callPackage ../development/python-modules/pyutil { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -6276,7 +6284,9 @@ in { pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; - pync = callPackage ../development/python-modules/pync { }; + pync = callPackage ../development/python-modules/pync { + inherit (pkgs) coreutils which; + }; pynest2d = callPackage ../development/python-modules/pynest2d { }; @@ -9468,6 +9478,8 @@ in { zetup = callPackage ../development/python-modules/zetup { }; + zfec = callPackage ../development/python-modules/zfec { }; + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; zict = callPackage ../development/python-modules/zict { }; |