From a8dbeb26013afb7715ae4e46dda2c05a6bf520ee Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 14 Oct 2020 15:53:06 +0900 Subject: [PATCH 01/20] cli11: fix license and platforms --- pkgs/development/tools/misc/cli11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 0d058ef1f881..5a4cb7669a7f 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI11 is a command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ nand0p ]; - license = licenses.unfreeRedistributable; + license = licenses.bsd3; }; } From aa2148eb1f669436230ffde111061f1f2b59e836 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 23:06:36 +0000 Subject: [PATCH 02/20] picard-tools: 2.23.8 -> 2.23.9 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 0353f2e7cebd..af29dd77ac28 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.8"; + version = "2.23.9"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2"; + sha256 = "1ygdl590sbcsxpk0qwr0bx163nx51h0545n1xxkbc3pk2r6n51lk"; }; nativeBuildInputs = [ makeWrapper ]; From 7714faefd44f40f7b3e7f7432658f7e73d8455f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 11 Dec 2020 00:39:02 +0000 Subject: [PATCH 03/20] rdkafka: 1.5.2 -> 1.5.3 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 7b3d5b3db16f..da595dfb3b67 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0qm9rvvkqypqh0vpgkrlqgaxkqdvs3finpr5niwxc6ypblc3ir1g"; + sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb"; }; nativeBuildInputs = [ pkgconfig ]; From 8402f88878f82211d18b4c45ee6d1406b2556f3e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 11 Dec 2020 04:20:00 +0000 Subject: [PATCH 04/20] faac: 1.29.9.2 -> 1.30 --- pkgs/development/libraries/faac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index c8ec81f79e51..b2c4d3741e18 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -8,11 +8,11 @@ assert mp4v2Support -> (mp4v2 != null); with stdenv.lib; stdenv.mkDerivation rec { pname = "faac"; - version = "1.29.9.2"; + version = "1.30"; src = fetchurl { - url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; - sha256 = "0wf781vp7rzmxkx5h0w8j2i4xc63iixxikgbvvkdljbwhffj0pyl"; + url = "mirror://sourceforge/faac/${pname}-${builtins.replaceStrings ["."] ["_"] version}.tar.gz"; + sha256 = "1lmj0dib3mjp84jhxc5ddvydkzzhb0gfrdh3ikcidjlcb378ghxd"; }; configureFlags = [ ] From 5b81081415691c7ccfe5e2306ee47d73ce14fb7c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Dec 2020 04:20:00 +0000 Subject: [PATCH 05/20] kbs2: 0.2.2 -> 0.2.5 --- pkgs/tools/security/kbs2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index b605078b5750..a13e7214cbbd 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1qf17ga5k1shim6lk5lqp6my90gj6qldc36f6l4634kndiv2xflb"; + sha256 = "1jilsczz22fyqbgz43gl5ilz62gfqsahfk30gayj7q5bx9k35m4w"; }; - cargoSha256 = "03nilfc0wvzhvx48m0qj05dqb18ypgkpkmbfj5nb96nridizwg0r"; + cargoSha256 = "1gvvmfavaq29p40p5mq1phpp2a1nw04dz4975pzm1b6z89p0jlzl"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; From ef3f1f80e7d4002658b795b6677e2ec7790622df Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Dec 2020 04:20:00 +0000 Subject: [PATCH 06/20] recursive: 1.064 -> 1.069 --- pkgs/data/fonts/recursive/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 39d63e7dd990..ff5070b1bd7a 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.064"; + version = "1.069"; in fetchzip { name = "recursive-${version}"; @@ -12,10 +12,9 @@ fetchzip { mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "1pbrqk848nkaambvsz0n8f88xdm8hyib83in27rmal739qh9d1z6"; + sha256 = "07l35vkarj8f748vbnca98zrl0yl456ddqf1wpmshs24r97cx96h"; meta = with lib; { homepage = "https://recursive.design/"; From 2d52070858392f4f69bc2c95ca64815e159855a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 04:33:09 +0000 Subject: [PATCH 07/20] insomnia: 2020.5.1 -> 2020.5.2 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 870e6b0474e9..15dc040dc571 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2020.5.1"; + version = "2020.5.2"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "18wbyf5qq2x0dzaf6bprs4nhv0ckrgq679l3w61p1yf4y3j7xwn4"; + sha256 = "03j76a0dj3ak5h6malwxqf7cdc2ycwgyr6993bhiq75yhxhblhc4"; }; nativeBuildInputs = From 2e703eccc9ad1a5497324d6ea59d1bb2b363d4c2 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 12 Dec 2020 14:06:04 +0100 Subject: [PATCH 08/20] ardour: 6.3 -> 6.5 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 49579e332946..314153bf260c 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -52,13 +52,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.3"; + version = "6.5"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "050p1adgyirr790a3xp878pq3axqwzcmrk3drgm9z6v753h0xhcd"; + sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx"; }; patches = [ From bc6577767183e3047a0398c1c996a7d35a5f8653 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Dec 2020 18:51:11 +0100 Subject: [PATCH 09/20] python3Packages.tensorflow_2: relax h5py dependency --- .../python-modules/tensorflow/2/default.nix | 2 +- ...ast-restriction.patch => relax-dependencies.patch} | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/tensorflow/2/{lift-gast-restriction.patch => relax-dependencies.patch} (53%) diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index bcf693691785..68c983c05941 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -110,7 +110,7 @@ let # Fixes for NixOS jsoncpp ../system-jsoncpp.patch - ./lift-gast-restriction.patch + ./relax-dependencies.patch # see https://github.com/tensorflow/tensorflow/issues/40688 (fetchpatch { diff --git a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch similarity index 53% rename from pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch rename to pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch index 7b1b3b135bb0..fc11a04cbdc5 100644 --- a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch +++ b/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch @@ -1,11 +1,16 @@ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 992f2eae22..d9386f9b13 100644 +index 594e74f40c0..bfbf010144f 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [ +@@ -54,9 +54,9 @@ _VERSION = '2.3.1' + REQUIRED_PACKAGES = [ + 'absl-py >= 0.7.0', 'astunparse == 1.6.3', - 'gast == 0.3.3', + 'gast >= 0.3.3', 'google_pasta >= 0.1.8', - 'h5py >= 2.10.0, < 2.11.0', +- 'h5py >= 2.10.0, < 2.11.0', ++ 'h5py >= 2.10.0', 'keras_preprocessing >= 1.1.1, < 1.2', + # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage + # https://github.com/numpy/numpy/pull/15355 From beade0f11d6cb39d6df6a135cd1f4d5d00f81af9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 12 Dec 2020 20:15:40 +0000 Subject: [PATCH 10/20] python37Packages.mysqlclient: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 0d4aa5423256..bc924000ed1f 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.0.1"; + version = "2.0.2"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "fb2f75aea14722390d2d8ddf384ad99da708c707a96656210a7be8af20a2c5e5"; + sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2"; }; meta = with stdenv.lib; { From 9d8b218d004ad0f0d1f5540a2bdca302923c7f67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 13 Dec 2020 03:05:23 +0000 Subject: [PATCH 11/20] iosevka-bin: 4.0.2 -> 4.0.3 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 42 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 97b0f3b76b6e..8b8e4f25fef2 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 4ce815b09399..13fad48f900d 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1p85mrgz63h4q09xy9gchf93fpzwxjnmr5acrfdp9ybrqzpv6gza"; - iosevka-aile = "01kaawf0slhgj21shlvnlq5has4iz0prq89c4xg3k3dhnxdyfkaz"; - iosevka-curly = "1rbmnxwkihfah5y9vi1zz2qvdx2f3a5lrkgwn46wcxmn0y3hk0ii"; - iosevka-curly-slab = "0svvqs8ybimaq7rad1vh1b6jxkszaan407zm7j66576pf3djkg2f"; - iosevka-etoile = "1aiwrjk5590l7hwiis448bwfjhz5shbc3cq74lbvk56130nv0d96"; - iosevka-slab = "0rsx8sr2f446jax5dk42r19kgpja8cvb8d0hwfv1aqqs3xp7k4zr"; - iosevka-sparkle = "0nfg9ibzz1dqr4bw5gnslvx7b7zdd8mfvjyriwkvpkxycwsaa60k"; - iosevka-ss01 = "044y1drbdv5xcxxg9vgxms95b97zi6bgy4im2mvhhxphx6sa8zdr"; - iosevka-ss02 = "0ndp38fsswz5fcdvh3577q4pxmfss7czyvsnswyka5rz2q40dyrd"; - iosevka-ss03 = "1ypdlsirkgcnakbgd585jqxiafsjdrwmgdd5h9ppf4giaiclsv5w"; - iosevka-ss04 = "0l7xbv7mcdsqw50lb7ldrwrswc0gb02l19ccv073xinpf3lh1d91"; - iosevka-ss05 = "0qd2dvfrv9wjynaqbhzr2bsrbsgp4db5s32jmxnf3y92qinr91sc"; - iosevka-ss06 = "0vkvs772lmzcqyg7wrjqjjkk7ij0rrqbr2i8y63f3hsgwm9g6chw"; - iosevka-ss07 = "1s0dpxfzy5sk82cv5ipp1c5813rl98izbzr06w44ss1bma3zr5af"; - iosevka-ss08 = "12fhw8fw264pybavpdpqywaqvrinap6bp9gspsd788im1fqzm5mw"; - iosevka-ss09 = "1h2i82h9lj3lncc0im8v53jk31jpiaxxydwlrrks9sii56705ddf"; - iosevka-ss10 = "0km8yj5p1g03ykpx1v2zrflw6ixbk31ps6qknacc06n6xxmlqj09"; - iosevka-ss11 = "0kcgp4pbqrlcggv2774zygiw2klx9340sxxk708y4yjd9ha6gznn"; - iosevka-ss12 = "0fbp9lxc6qw8ahgvyjf52qy5p4c5qyqcyfbqy3qlaj0iasprp9fi"; - iosevka-ss13 = "1jpgvhsxzshdx6ww4zyznzybc5q1ss8l07v9011grmxil7lr0hya"; - iosevka-ss14 = "1ssz9m3b7ls34y8rgi185xzx8avzkzjs9jkn79ir240gmi77s161"; + iosevka = "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"; + iosevka-aile = "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"; + iosevka-curly = "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"; + iosevka-curly-slab = "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"; + iosevka-etoile = "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"; + iosevka-slab = "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"; + iosevka-sparkle = "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"; + iosevka-ss01 = "1c6pfv792cjf5xqjnhjmpvcy36mzr7ymv6h0qwjl94mglw8qrhqs"; + iosevka-ss02 = "1j05p2gky2z2bm5gajnm8mbbc7w1isg8m66lhd7mc42y6ygs0b2g"; + iosevka-ss03 = "1kn9khfkk53my4mhpf43gl4ryd4ibw21f7jv553xlrnhm3vn8hxy"; + iosevka-ss04 = "0bc4mqkxvjyvslrv43rwcmmpfyjiszpi77f6bng60h25ah3kdnqs"; + iosevka-ss05 = "01m2z1vr5a404kxbzgcnavhsz0jj7hqda61bcvvir6xdqb881rp3"; + iosevka-ss06 = "1qdlm9ky3rn6m9mgi2idwiy6jd3f0f74j87ms097khvnh6jg2wd7"; + iosevka-ss07 = "14il043liricgxximsrklx36sfs4qa1a4dw017jaaqarr0gyar49"; + iosevka-ss08 = "19la0b99msphhfbbw88fwkh0ni875q73976mdskvr5j63715cqx3"; + iosevka-ss09 = "1m3rh42941r6nk5dq136vs8iaq8vhclcbl955f6zxcgk4aqdmp84"; + iosevka-ss10 = "1kda7k8jqgpfajq1c6n656wpab7hh9icyiy31l21ilpmj0dzsxx6"; + iosevka-ss11 = "1ch0c3i3063955ckp1af384ad70m6fiff6x6rxqk76s2vsywmxcf"; + iosevka-ss12 = "01s16301rm8mr833zlairv19rb5aavb0lidhy9cr2p0d59p96b0h"; + iosevka-ss13 = "0gnlmfka2hyr1g7a4gw97776aa6j7iz9zjhxliam0gh0iwnz5w41"; + iosevka-ss14 = "1rar6cs8d4x9p0qnwvlkjcnfh1bhk6v7r05v1l68wlsmvrvriv17"; } From ef5e90f6e3ce4dd4171b38812515d26ca5a55c5c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 13 Dec 2020 11:04:09 +0100 Subject: [PATCH 12/20] MMA: 20.02 -> 20.12 --- pkgs/applications/audio/MMA/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 8b7629bc908b..baeae7ae01f4 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { - version = "20.02"; + version = "20.12"; pname = "mma"; src = fetchurl { url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; - sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv"; + sha256 = "18k0hwlqky5x4y461fxmw77gvz7z8jyrvxicrqphsgvwwinzy732"; }; buildInputs = [ makeWrapper python3 alsaUtils timidity ]; @@ -19,7 +19,7 @@ sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' - find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g' + find . -type f | xargs sed -i 's@/usr/bin/python3@${python3.interpreter}@g' ''; installPhase = '' From 03504303a7b55c24988eb2957be8809421dd13d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 13 Dec 2020 14:37:58 +0000 Subject: [PATCH 13/20] gallery-dl: 1.15.4 -> 1.16.0 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index a93ebb12ed4c..906c458fbaf6 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.4"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111"; + sha256 = "35df7605a21a05c3290f4324289fd6f584029f4135a8220dec7d490c4e742a1c"; }; propagatedBuildInputs = [ requests ]; From 1fe24de3a206efcc0493e3d89f4f571922b7780f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 16:20:52 +0000 Subject: [PATCH 14/20] emacs2nix: update to add trailing newline Files generated by emacs2nix will now end in a final newline, as is now required by the Nixpkgs editorconfig-checker CI action. See . --- pkgs/applications/editors/emacs-modes/emacs2nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index 852f395c4a22..b4b9adfa619e 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c"; - sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh"; + rev = "798542b34dc8d7f5c110119350bd9bafef9f8439"; + sha256 = "1lna9z90sxjnanggjh2si018cfzp60xsrissnv9bbkc8wish1537"; }; in pkgs.mkShell { From 65a223026b5ac4e739637047c79c8c6493b5cb44 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 13 Dec 2020 16:26:48 +0000 Subject: [PATCH 15/20] dee: enableParallelBuilding Works fine for me at -j48. --- pkgs/development/libraries/dee/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 65f9982b42c3..594cac5002f6 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; homepage = "https://launchpad.net/dee"; From e1451c8858b5f3d5d3dff41625d32993b4fadf3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Dec 2020 17:22:25 +0100 Subject: [PATCH 16/20] python3Packages.clldutils: 3.5.4 -> 3.6.0 https://github.com/clld/clldutils/blob/master/CHANGES.md#360 --- pkgs/development/python-modules/clldutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 19daa2de573d..b9ffd35bf96d 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "clldutils"; - version = "3.5.4"; + version = "3.6.0"; disabled = isPy27; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "0yirww9abp6hffxz57ms7ljyjw0pamw2bhfrf7cshpwwb6sx5ycf"; + sha256 = "10jcd2x99z5ym2aki92c54caw97b3xgrkjj83qpln26hbdwpaz99"; }; patchPhase = '' From 54121ff3173b83c8e88accdcdb02807518ceca55 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 13 Dec 2020 12:22:45 +0000 Subject: [PATCH 17/20] nerdctl: init at 0.2.0 --- .../networking/cluster/nerdctl/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/nerdctl/default.nix diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix new file mode 100644 index 000000000000..050c414ce1e9 --- /dev/null +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, buildkit +, cni-plugins +, extraPackages ? [] +}: + +let + binPath = lib.makeBinPath ([ + buildkit + ] ++ extraPackages); +in +buildGoModule rec { + pname = "nerdctl"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "AkihiroSuda"; + repo = pname; + rev = "v${version}"; + sha256 = "181qapqgp7zd0imk0zkn4wzpsw292ai2yz9pbiirpjcjx9h26w5h"; + }; + + vendorSha256 = "0scywhllxk1m6456wggdmn7sgvy5x3gz2xnyfq9jnvvzap8byr2v"; + + nativeBuildInputs = [ makeWrapper ]; + + buildFlagsArray = [ + "-ldflags=" + "-w" + "-s" + "-X github.com/AkihiroSuda/nerdctl/pkg/version.Version=v${version}" + "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=" + ]; + + postInstall = '' + wrapProgram $out/bin/nerdctl \ + --prefix PATH : "${binPath}" \ + --prefix CNI_PATH : "${cni-plugins}/bin" + ''; + + meta = with lib; { + description = "A Docker-compatible CLI for containerd"; + homepage = src.meta.homepage; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1c965e9c0d..923b725701f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5311,6 +5311,8 @@ in ncrack = callPackage ../tools/security/ncrack { }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; + netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; From 0bf2300501b3462f8205aea09594aa2ecdf3004c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Dec 2020 06:02:13 +1000 Subject: [PATCH 18/20] gnomeExtensions.paperwm: remove maintainer --- pkgs/desktops/gnome-3/extensions/paperwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix index c2d5136e45eb..382f8aa732b9 100644 --- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Tiled scrollable window management for Gnome Shell"; homepage = "https://github.com/paperwm/PaperWM"; license = licenses.gpl3; - maintainers = with maintainers; [ hedning zowoq ]; + maintainers = with maintainers; [ hedning ]; }; } From f37a1749c3115c8cd896bbf81f027d63e5302aae Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Dec 2020 06:02:13 +1000 Subject: [PATCH 19/20] youtube-dl: add maintainer --- pkgs/tools/misc/youtube-dl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index c1bc0bd84177..a394a1a667c5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 zowoq ]; }; } From d444a5ff39fde18574cb344ec4ee4d48c2bf1439 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 14 Dec 2020 05:57:43 +1000 Subject: [PATCH 20/20] youtube-dl: 2020.12.12 -> 2020.12.14 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.12.14 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a394a1a667c5..9e2afd9b0683 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.12.12"; + version = "2020.12.14"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iv4l78ylzx8q6myv4v7xq6r5y0hacz6l30bqk1szncfikvfc3cf"; + sha256 = "0ws2nsvn0qlnnyxz9g95ffygscfmg5npzmwbq8iyyi6b2njsb0cn"; }; nativeBuildInputs = [ installShellFiles makeWrapper ];