git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75700 from NixOS/staging-next

Staging next

commitc704c07ff17d95a358e315c2ffd5ad2732f47b47 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateThu 19 Dec 2019, 09:21 (7 years ago) parent7315dc0f79e100
107 files changed+509−417
nixos/modules/tasks/filesystems/nfs.nix+6 nixos/release-combined.nix+2−2 nixos/tests/all-tests.nix+3−2 nixos/tests/nfs.nix−90 nixos/tests/nfs/default.nix+9 nixos/tests/nfs/kerberos.nix+133 nixos/tests/nfs/simple.nix+94 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+3−1 pkgs/development/libraries/gstreamer/bad/default.nix+2−2 pkgs/development/libraries/gstreamer/base/default.nix+2−2 pkgs/development/libraries/gstreamer/core/default.nix+2−2 pkgs/development/libraries/gstreamer/ges/default.nix+2−2 pkgs/development/libraries/gstreamer/good/default.nix+2−2 pkgs/development/libraries/gstreamer/libav/default.nix+2−2 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2 pkgs/development/libraries/gstreamer/ugly/default.nix+2−2 pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2 pkgs/development/libraries/gstreamer/validate/default.nix+2−2 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/nghttp2/default.nix+2−2 pkgs/development/libraries/openh264/default.nix+7−9 pkgs/development/python-modules/Rtree/default.nix+2−2 pkgs/development/python-modules/aresponses/default.nix+2−2 pkgs/development/python-modules/argcomplete/default.nix+2−2 pkgs/development/python-modules/astor/default.nix+4−12 pkgs/development/python-modules/awkward/default.nix+2−2 pkgs/development/python-modules/aws-xray-sdk/default.nix+2−2 pkgs/development/python-modules/bottle/default.nix+2−2 pkgs/development/python-modules/caldav/default.nix+2−2 pkgs/development/python-modules/catalogue/default.nix+2−2 pkgs/development/python-modules/cmd2/default.nix+2−2 pkgs/development/python-modules/colorama/default.nix+2−2 pkgs/development/python-modules/configargparse/default.nix+2−2 pkgs/development/python-modules/ddt/default.nix+2−2 pkgs/development/python-modules/django-mailman3/default.nix+2−2 pkgs/development/python-modules/django/2_1.nix+2−2 pkgs/development/python-modules/django_contrib_comments/default.nix+2−2 pkgs/development/python-modules/django_reversion/default.nix+2−2 pkgs/development/python-modules/dulwich/default.nix+2−2 pkgs/development/python-modules/faker/default.nix+2−2 pkgs/development/python-modules/fiona/default.nix+2−2 pkgs/development/python-modules/foxdot/default.nix+2−2 pkgs/development/python-modules/hdbscan/default.nix+2−2 pkgs/development/python-modules/holoviews/default.nix+2−2 pkgs/development/python-modules/homeassistant-pyozw/default.nix+2−2 pkgs/development/python-modules/identify/default.nix+2−2 pkgs/development/python-modules/joblib/default.nix+2−2 pkgs/development/python-modules/junos-eznc/default.nix+2−2 pkgs/development/python-modules/kajiki/default.nix+2−2 pkgs/development/python-modules/kombu/default.nix+2−2 pkgs/development/python-modules/lightgbm/default.nix+2−2 pkgs/development/python-modules/marionette-harness/mozdevice.nix+2−2 pkgs/development/python-modules/matplotlib/default.nix+2−2 pkgs/development/python-modules/mysqlclient/default.nix+1−1 pkgs/development/python-modules/nest-asyncio/default.nix+2−2 pkgs/development/python-modules/nipype/neurdflib.nix+2−2 pkgs/development/python-modules/openpyxl/default.nix+2−2 pkgs/development/python-modules/pafy/default.nix+2−2 pkgs/development/python-modules/parameterized/default.nix+2−2 pkgs/development/python-modules/passlib/default.nix+2−2 pkgs/development/python-modules/pbr/default.nix+2−2 pkgs/development/python-modules/pgspecial/default.nix+2−2 pkgs/development/python-modules/pluggy/default.nix+2−2 pkgs/development/python-modules/preggy/default.nix+2−2 pkgs/development/python-modules/psd-tools/default.nix+2−2 pkgs/development/python-modules/psutil/default.nix+2−2 pkgs/development/python-modules/publicsuffix/default.nix+2−2 pkgs/development/python-modules/pybullet/default.nix+2−2 pkgs/development/python-modules/pyfaidx/default.nix+2−2 pkgs/development/python-modules/pygobject/default.nix+5−9 pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch−50 pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch−28 pkgs/development/python-modules/pyhomematic/default.nix+2−2 pkgs/development/python-modules/pyopengl/default.nix+4−3 pkgs/development/python-modules/pyrsistent/default.nix+2−2 pkgs/development/python-modules/pytest/4.nix+2−2 pkgs/development/python-modules/pyvcd/default.nix+2−2 pkgs/development/python-modules/pywebpush/default.nix+2−2 pkgs/development/python-modules/responses/default.nix+2−2 pkgs/development/python-modules/runsnakerun/default.nix+2−2 pkgs/development/python-modules/runway-python/default.nix+2−2 pkgs/development/python-modules/scipy/default.nix+2−2 pkgs/development/python-modules/semantic-version/default.nix+2−2 pkgs/development/python-modules/sentry-sdk/default.nix+2−2 pkgs/development/python-modules/setuptools/default.nix+2−2 pkgs/development/python-modules/sqlmap/default.nix+2−2 pkgs/development/python-modules/squaremap/default.nix+2−2 pkgs/development/python-modules/statsmodels/default.nix+2−2 pkgs/development/python-modules/testfixtures/default.nix+2−2 pkgs/development/python-modules/tifffile/default.nix+2−2 pkgs/development/python-modules/tox/default.nix+2−2 pkgs/development/python-modules/uamqp/default.nix+2−2 pkgs/development/python-modules/validators/default.nix+2−2 pkgs/development/python-modules/virtualenv/default.nix+2−2 pkgs/development/python-modules/wasabi/default.nix+2−2 pkgs/development/python-modules/xarray/default.nix+2−2 pkgs/development/python-modules/xattr/default.nix+2−2 pkgs/os-specific/linux/bluez/default.nix+2 pkgs/os-specific/linux/kernel/patches.nix+5 pkgs/os-specific/linux/kernel/request-key-helper.patch+13 pkgs/os-specific/linux/keyutils/conf-symlink.patch+13 pkgs/os-specific/linux/keyutils/default.nix+1 pkgs/os-specific/linux/nfs-utils/default.nix+8−1 pkgs/tools/networking/libreswan/default.nix+14−9 pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch−36 pkgs/tools/networking/unbound/default.nix+4 pkgs/top-level/all-packages.nix+14
nixos/modules/tasks/filesystems/nfs.nix+6
@@ -25,6 +25,9 @@ let
2525 '';
2626
2727 nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
28+ requestKeyConfFile = pkgs.writeText "request-key.conf" ''
29+ create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
30+ '';
2831
2932 cfg = config.services.nfs;
3033
@@ -57,9 +60,12 @@ in
5760
5861 systemd.packages = [ pkgs.nfs-utils ];
5962
63+ environment.systemPackages = [ pkgs.keyutils ];
64+
6065 environment.etc = {
6166 "idmapd.conf".source = idmapdConfFile;
6267 "nfs.conf".source = nfsConfFile;
68+ "request-key.conf".source = requestKeyConfFile;
6369 };
6470
6571 systemd.services.nfs-blkmap =
nixos/release-combined.nix+2−2
@@ -120,8 +120,8 @@ in rec {
120120 (all nixos.tests.networking.scripted.macvlan)
121121 (all nixos.tests.networking.scripted.sit)
122122 (all nixos.tests.networking.scripted.vlan)
123− (all nixos.tests.nfs3)
124− (all nixos.tests.nfs4)
123+ (all nixos.tests.nfs3.simple)
124+ (all nixos.tests.nfs4.simple)
125125 (all nixos.tests.openssh)
126126 (all nixos.tests.php-pcre)
127127 (all nixos.tests.predictable-interface-names.predictable)
nixos/tests/all-tests.nix+3−2
@@ -190,8 +190,9 @@ in
190190 networkingProxy = handleTest ./networking-proxy.nix {};
191191 nextcloud = handleTest ./nextcloud {};
192192 nexus = handleTest ./nexus.nix {};
193− nfs3 = handleTest ./nfs.nix { version = 3; };
194− nfs4 = handleTest ./nfs.nix { version = 4; };
193+ # TODO: Test nfsv3 + Kerberos
194+ nfs3 = handleTest ./nfs { version = 3; };
195+ nfs4 = handleTest ./nfs { version = 4; };
195196 nghttpx = handleTest ./nghttpx.nix {};
196197 nginx = handleTest ./nginx.nix {};
197198 nginx-sso = handleTest ./nginx-sso.nix {};
nixos/tests/nfs.nixdeleted−90
@@ -1,90 +0,0 @@
1−import ./make-test.nix ({ pkgs, version ? 4, ... }:
2−
3−let
4−
5− client =
6− { pkgs, ... }:
7− { fileSystems = pkgs.lib.mkVMOverride
8− [ { mountPoint = "/data";
9− # nfs4 exports the export with fsid=0 as a virtual root directory
10− device = if (version == 4) then "server:/" else "server:/data";
11− fsType = "nfs";
12− options = [ "vers=${toString version}" ];
13− }
14− ];
15− networking.firewall.enable = false; # FIXME: only open statd
16− };
17−
18−in
19−
20−{
21− name = "nfs";
22− meta = with pkgs.stdenv.lib.maintainers; {
23− maintainers = [ eelco ];
24− };
25−
26− nodes =
27− { client1 = client;
28− client2 = client;
29−
30− server =
31− { ... }:
32− { services.nfs.server.enable = true;
33− services.nfs.server.exports =
34− ''
35− /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
36− '';
37− services.nfs.server.createMountPoints = true;
38− networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
39− };
40− };
41−
42− testScript =
43− ''
44− $server->waitForUnit("nfs-server");
45− $server->succeed("systemctl start network-online.target");
46− $server->waitForUnit("network-online.target");
47−
48− startAll;
49−
50− $client1->waitForUnit("data.mount");
51− $client1->succeed("echo bla > /data/foo");
52− $server->succeed("test -e /data/foo");
53−
54− $client2->waitForUnit("data.mount");
55− $client2->succeed("echo bla > /data/bar");
56− $server->succeed("test -e /data/bar");
57−
58− # Test whether restarting ‘nfs-server’ works correctly.
59− $server->succeed("systemctl restart nfs-server");
60− $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period
61−
62− # Test whether we can get a lock.
63− $client2->succeed("time flock -n -s /data/lock true");
64−
65− # Test locking: client 1 acquires an exclusive lock, so client 2
66− # should then fail to acquire a shared lock.
67− $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
68− $client1->waitForFile("locked");
69− $client2->fail("flock -n -s /data/lock true");
70−
71− # Test whether client 2 obtains the lock if we reset client 1.
72− $client2->succeed("flock -x /data/lock -c 'echo acquired; touch locked; sleep 100000' >&2 &");
73− $client1->crash;
74− $client1->start;
75− $client2->waitForFile("locked");
76−
77− # Test whether locks survive a reboot of the server.
78− $client1->waitForUnit("data.mount");
79− $server->shutdown;
80− $server->start;
81− $client1->succeed("touch /data/xyzzy");
82− $client1->fail("time flock -n -s /data/lock true");
83−
84− # Test whether unmounting during shutdown happens quickly.
85− my $t1 = time;
86− $client1->shutdown;
87− my $duration = time - $t1;
88− die "shutdown took too long ($duration seconds)" if $duration > 30;
89− '';
90−})
nixos/tests/nfs/default.nixnew file+9
@@ -0,0 +1,9 @@
1+{ version ? 4
2+, system ? builtins.currentSystem
3+, pkgs ? import ../../.. { inherit system; }
4+}: {
5+ simple = import ./simple.nix { inherit version system pkgs; };
6+} // pkgs.lib.optionalAttrs (version == 4) {
7+ # TODO: Test kerberos + nfsv3
8+ kerberos = import ./kerberos.nix { inherit version system pkgs; };
9+}
nixos/tests/nfs/kerberos.nixnew file+133
@@ -0,0 +1,133 @@
1+import ../make-test-python.nix ({ pkgs, lib, ... }:
2+
3+with lib;
4+
5+let
6+ krb5 =
7+ { enable = true;
8+ domain_realm."nfs.test" = "NFS.TEST";
9+ libdefaults.default_realm = "NFS.TEST";
10+ realms."NFS.TEST" =
11+ { admin_server = "server.nfs.test";
12+ kdc = "server.nfs.test";
13+ };
14+ };
15+
16+ hosts =
17+ ''
18+ 192.168.1.1 client.nfs.test
19+ 192.168.1.2 server.nfs.test
20+ '';
21+
22+ users = {
23+ users.alice = {
24+ isNormalUser = true;
25+ name = "alice";
26+ uid = 1000;
27+ };
28+ };
29+
30+in
31+
32+{
33+ name = "nfsv4-with-kerberos";
34+
35+ nodes = {
36+ client = { lib, ... }:
37+ { inherit krb5 users;
38+
39+ networking.extraHosts = hosts;
40+ networking.domain = "nfs.test";
41+ networking.hostName = "client";
42+
43+ fileSystems = lib.mkVMOverride
44+ { "/data" = {
45+ device = "server.nfs.test:/";
46+ fsType = "nfs";
47+ options = [ "nfsvers=4" "sec=krb5p" "noauto" ];
48+ };
49+ };
50+ };
51+
52+ server = { lib, ...}:
53+ { inherit krb5 users;
54+
55+ networking.extraHosts = hosts;
56+ networking.domain = "nfs.test";
57+ networking.hostName = "server";
58+
59+ networking.firewall.allowedTCPPorts = [
60+ 111 # rpc
61+ 2049 # nfs
62+ 88 # kerberos
63+ 749 # kerberos admin
64+ ];
65+
66+ services.kerberos_server.enable = true;
67+ services.kerberos_server.realms =
68+ { "NFS.TEST".acl =
69+ [ { access = "all"; principal = "admin/admin"; } ];
70+ };
71+
72+ services.nfs.server.enable = true;
73+ services.nfs.server.createMountPoints = true;
74+ services.nfs.server.exports =
75+ ''
76+ /data *(rw,no_root_squash,fsid=0,sec=krb5p)
77+ '';
78+ };
79+ };
80+
81+ testScript =
82+ ''
83+ server.succeed("mkdir -p /data/alice")
84+ server.succeed("chown alice:users /data/alice")
85+
86+ # set up kerberos database
87+ server.succeed(
88+ "kdb5_util create -s -r NFS.TEST -P master_key",
89+ "systemctl restart kadmind.service kdc.service",
90+ )
91+ server.wait_for_unit(f"kadmind.service")
92+ server.wait_for_unit(f"kdc.service")
93+
94+ # create principals
95+ server.succeed(
96+ "kadmin.local add_principal -randkey nfs/server.nfs.test",
97+ "kadmin.local add_principal -randkey nfs/client.nfs.test",
98+ "kadmin.local add_principal -pw admin_pw admin/admin",
99+ "kadmin.local add_principal -pw alice_pw alice",
100+ )
101+
102+ # add principals to server keytab
103+ server.succeed("kadmin.local ktadd nfs/server.nfs.test")
104+ server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service")
105+ server.wait_for_unit(f"rpc-gssd.service")
106+ server.wait_for_unit(f"rpc-svcgssd.service")
107+
108+ client.wait_for_unit("network-online.target")
109+
110+ # add principals to client keytab
111+ client.succeed("echo admin_pw | kadmin -p admin/admin ktadd nfs/client.nfs.test")
112+ client.succeed("systemctl start rpc-gssd.service")
113+ client.wait_for_unit("rpc-gssd.service")
114+
115+ with subtest("nfs share mounts"):
116+ client.succeed("systemctl restart data.mount")
117+ client.wait_for_unit("data.mount")
118+
119+ with subtest("permissions on nfs share are enforced"):
120+ client.fail("su alice -c 'ls /data'")
121+ client.succeed("su alice -c 'echo alice_pw | kinit'")
122+ client.succeed("su alice -c 'ls /data'")
123+
124+ client.fail("su alice -c 'echo bla >> /data/foo'")
125+ client.succeed("su alice -c 'echo bla >> /data/alice/foo'")
126+ server.succeed("test -e /data/alice/foo")
127+
128+ with subtest("uids/gids are mapped correctly on nfs share"):
129+ ids = client.succeed("stat -c '%U %G' /data/alice").split()
130+ expected = ["alice", "users"]
131+ assert ids == expected, f"ids incorrect: got {ids} expected {expected}"
132+ '';
133+})
nixos/tests/nfs/simple.nixnew file+94
@@ -0,0 +1,94 @@
1+import ../make-test-python.nix ({ pkgs, version ? 4, ... }:
2+
3+let
4+
5+ client =
6+ { pkgs, ... }:
7+ { fileSystems = pkgs.lib.mkVMOverride
8+ [ { mountPoint = "/data";
9+ # nfs4 exports the export with fsid=0 as a virtual root directory
10+ device = if (version == 4) then "server:/" else "server:/data";
11+ fsType = "nfs";
12+ options = [ "vers=${toString version}" ];
13+ }
14+ ];
15+ networking.firewall.enable = false; # FIXME: only open statd
16+ };
17+
18+in
19+
20+{
21+ name = "nfs";
22+ meta = with pkgs.stdenv.lib.maintainers; {
23+ maintainers = [ eelco ];
24+ };
25+
26+ nodes =
27+ { client1 = client;
28+ client2 = client;
29+
30+ server =
31+ { ... }:
32+ { services.nfs.server.enable = true;
33+ services.nfs.server.exports =
34+ ''
35+ /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
36+ '';
37+ services.nfs.server.createMountPoints = true;
38+ networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
39+ };
40+ };
41+
42+ testScript =
43+ ''
44+ import time
45+
46+ server.wait_for_unit("nfs-server")
47+ server.succeed("systemctl start network-online.target")
48+ server.wait_for_unit("network-online.target")
49+
50+ start_all()
51+
52+ client1.wait_for_unit("data.mount")
53+ client1.succeed("echo bla > /data/foo")
54+ server.succeed("test -e /data/foo")
55+
56+ client2.wait_for_unit("data.mount")
57+ client2.succeed("echo bla > /data/bar")
58+ server.succeed("test -e /data/bar")
59+
60+ with subtest("restarting 'nfs-server' works correctly"):
61+ server.succeed("systemctl restart nfs-server")
62+ # will take 90 seconds due to the NFS grace period
63+ client2.succeed("echo bla >> /data/bar")
64+
65+ with subtest("can get a lock"):
66+ client2.succeed("time flock -n -s /data/lock true")
67+
68+ with subtest("client 2 fails to acquire lock held by client 1"):
69+ client1.succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &")
70+ client1.wait_for_file("locked")
71+ client2.fail("flock -n -s /data/lock true")
72+
73+ with subtest("client 2 obtains lock after resetting client 1"):
74+ client2.succeed(
75+ "flock -x /data/lock -c 'echo acquired; touch locked; sleep 100000' >&2 &"
76+ )
77+ client1.crash()
78+ client1.start()
79+ client2.wait_for_file("locked")
80+
81+ with subtest("locks survive server reboot"):
82+ client1.wait_for_unit("data.mount")
83+ server.shutdown()
84+ server.start()
85+ client1.succeed("touch /data/xyzzy")
86+ client1.fail("time flock -n -s /data/lock true")
87+
88+ with subtest("unmounting during shutdown happens quickly"):
89+ t1 = time.monotonic()
90+ client1.shutdown()
91+ duration = time.monotonic() - t1
92+ assert duration < 30, f"shutdown took too long ({duration} seconds)"
93+ '';
94+})
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+3−1
@@ -42,7 +42,9 @@ wrapGAppsHook() {
4242 fi
4343
4444 for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
45− gappsWrapperArgs+=(--prefix "$v" : "${!v}")
45+ if [ -n "${!v}" ]; then
46+ gappsWrapperArgs+=(--prefix "$v" : "${!v}")
47+ fi
4648 done
4749
4850 if [[ -z "${dontWrapGApps:-}" ]]; then
pkgs/development/libraries/gstreamer/bad/default.nix+2−2
@@ -86,13 +86,13 @@ let
8686 inherit (stdenv.lib) optional optionals;
8787in stdenv.mkDerivation rec {
8888 pname = "gst-plugins-bad";
89− version = "1.16.1";
89+ version = "1.16.2";
9090
9191 outputs = [ "out" "dev" ];
9292
9393 src = fetchurl {
9494 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
95− sha256 = "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n";
95+ sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi";
9696 };
9797
9898 patches = [
pkgs/development/libraries/gstreamer/base/default.nix+2−2
@@ -41,13 +41,13 @@
4141
4242stdenv.mkDerivation rec {
4343 pname = "gst-plugins-base";
44− version = "1.16.1";
44+ version = "1.16.2";
4545
4646 outputs = [ "out" "dev" ];
4747
4848 src = fetchurl {
4949 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
50− sha256 = "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w";
50+ sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi";
5151 };
5252
5353 patches = [
pkgs/development/libraries/gstreamer/core/default.nix+2−2
@@ -25,14 +25,14 @@
2525
2626stdenv.mkDerivation rec {
2727 pname = "gstreamer";
28− version = "1.16.1";
28+ version = "1.16.2";
2929
3030 outputs = [ "out" "dev" "devdoc" ];
3131 outputBin = "dev";
3232
3333 src = fetchurl {
3434 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
35− sha256 = "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882";
35+ sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73";
3636 };
3737
3838 patches = [
pkgs/development/libraries/gstreamer/ges/default.nix+2−2
@@ -15,13 +15,13 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "gstreamer-editing-services";
18− version = "1.16.1";
18+ version = "1.16.2";
1919
2020 outputs = [ "out" "dev" ];
2121
2222 src = fetchurl {
2323 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
24− sha256 = "10375z5mc3bwfs07mhmfx943sbp55z8m8ihp9xpcknkdks7qg168";
24+ sha256 = "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf";
2525 };
2626
2727 patches = [
pkgs/development/libraries/gstreamer/good/default.nix+2−2
@@ -48,13 +48,13 @@ let
4848in
4949stdenv.mkDerivation rec {
5050 pname = "gst-plugins-good";
51− version = "1.16.1";
51+ version = "1.16.2";
5252
5353 outputs = [ "out" "dev" ];
5454
5555 src = fetchurl {
5656 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
57− sha256 = "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz";
57+ sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0";
5858 };
5959
6060 patches = [ ./fix_pkgconfig_includedir.patch ];
pkgs/development/libraries/gstreamer/libav/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "gst-libav";
18− version = "1.16.1";
18+ version = "1.16.2";
1919
2020 src = fetchurl {
2121 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
22− sha256 = "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8";
22+ sha256 = "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967";
2323 };
2424
2525 outputs = [ "out" "dev" ];
pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "gst-rtsp-server";
14− version = "1.16.1";
14+ version = "1.16.2";
1515
1616 src = fetchurl {
1717 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
18− sha256 = "0i01f1nr0921z6z4nrh8icz76s2n7i228aqxg1ihvxl65ynsraxh";
18+ sha256 = "0vn23nxwvs96g7gcxw5zbnw23hkhky8a8r42wq68411vgf1s41yy";
1919 };
2020
2121 outputs = [ "out" "dev" ];
pkgs/development/libraries/gstreamer/ugly/default.nix+2−2
@@ -21,13 +21,13 @@
2121
2222stdenv.mkDerivation rec {
2323 pname = "gst-plugins-ugly";
24− version = "1.16.1";
24+ version = "1.16.2";
2525
2626 outputs = [ "out" "dev" ];
2727
2828 src = fetchurl {
2929 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
30− sha256 = "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab";
30+ sha256 = "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m";
3131 };
3232
3333 nativeBuildInputs = [
pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2
@@ -21,11 +21,11 @@
2121
2222stdenv.mkDerivation rec {
2323 pname = "gstreamer-vaapi";
24− version = "1.16.1";
24+ version = "1.16.2";
2525
2626 src = fetchurl {
2727 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
28− sha256 = "0fk0nymvbfc04fv63fj2r6q9vvi431svhkrwpr7kdjvq3rphymyb";
28+ sha256 = "00f6sx700qm1ximi1ag2c27m35dywwhhg6awhz85va34mfqff78r";
2929 };
3030
3131 outputs = [ "out" "dev" ];
pkgs/development/libraries/gstreamer/validate/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "gst-validate";
13− version = "1.16.1";
13+ version = "1.16.2";
1414
1515 src = fetchurl {
1616 url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
17− sha256 = "1698arvmpb0cvyi8ll1brvs51vs7i3f3fw19iswh8xhj5adrn1vz";
17+ sha256 = "1jpfrzg3yc6kp66bgq3jy14xsj3x71mk2zh0k16yf0326awwqqa8";
1818 };
1919
2020 outputs = [ "out" "dev" ];
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.33.1";
4+ version = "1.34.0";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "13w60g9pc6998v8plslwpwn7f1hx3c1y4zhgmw025nyd504h5lak";
11+ sha256 = "0vcrrqf0zqgsfmgbyl45qhajyab98kxqq66l0w4lkj5say86aln8";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/nghttp2/default.nix+2−2
@@ -20,11 +20,11 @@ let inherit (stdenv.lib) optional; in
2020
2121stdenv.mkDerivation rec {
2222 pname = "nghttp2";
23− version = "1.39.2";
23+ version = "1.40.0";
2424
2525 src = fetchurl {
2626 url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
27− sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj";
27+ sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2";
2828 };
2929
3030 outputs = [ "bin" "out" "dev" "lib" ];
pkgs/development/libraries/openh264/default.nix+7−9
@@ -2,25 +2,23 @@
22
33stdenv.mkDerivation rec {
44 pname = "openh264";
5− version = "1.8.0";
5+ version = "2.0.0";
66
77 src = fetchFromGitHub {
88 owner = "cisco";
9− repo = "openh264";
9+ repo = pname;
1010 rev = "v${version}";
11− sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4";
11+ sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r";
1212 };
1313
14− buildInputs = [ nasm ];
14+ nativeBuildInputs = [ nasm ];
1515
16− installPhase = ''
17− make PREFIX=$out install
18− '';
16+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
1917
2018 meta = with stdenv.lib; {
2119 description = "A codec library which supports H.264 encoding and decoding";
22− homepage = http://www.openh264.org;
23− license = stdenv.lib.licenses.bsd2;
20+ homepage = "https://www.openh264.org";
21+ license = licenses.bsd2;
2422 platforms = platforms.unix;
2523 };
2624}
pkgs/development/python-modules/Rtree/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "Rtree";
5− version = "0.9.1";
5+ version = "0.9.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "140j1vsbcj6sivq1b6pgkwm0czivx2x3d66mqq0d9ymg46njrzn9";
9+ sha256 = "6a34b25f588e1563e45af251a8469b43a125d972eb2fa66e9ce96ed29f06c454";
1010 };
1111
1212 propagatedBuildInputs = [ libspatialindex ];
pkgs/development/python-modules/aresponses/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "aresponses";
13− version = "1.1.1";
13+ version = "1.1.2";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "d1d6ef52b9a97142d106688cf9b112602ef3dc66f6368de8f91f47241d8cfc9c";
17+ sha256 = "20a63536d86af6f31f9b0720c561bdc595b6bfe071940e347ab58b11caff9e1b";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/argcomplete/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44buildPythonPackage rec {
55 pname = "argcomplete";
6− version = "1.10.2";
6+ version = "1.10.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "ec88b5ccefe2d47d8f14916a006431d0afb756751ee5c46f28654a7d8a69be53";
10+ sha256 = "a37f522cf3b6a34abddfedb61c4546f60023b3799b22d1cd971eacdc0861530a";
1111 };
1212
1313 doCheck = false; # bash-completion test fails with "compgen: command not found".
pkgs/development/python-modules/astor/default.nix+4−12
@@ -1,22 +1,14 @@
1−{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }:
1+{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }:
22
33buildPythonPackage rec {
44 pname = "astor";
5− version = "0.8.0";
5+ version = "0.8.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0qkq5bf13fqcwablg0nk7rx83izxdizysd42n26j5wbingcfx9ip";
9+ sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka";
1010 };
1111
12− # fix packaging for setuptools>=41.4
13− patches = [
14− ( fetchpatch {
15− url = "https://github.com/berkerpeksag/astor/pull/163/commits/bd697678674aafcf3f7b1c06af67df181ed584e2.patch";
16− sha256 = "1m4szdyzalngd5klanmpjx5smgpc7rl5klky0lc0yhwbx210mla6";
17− })
18− ];
19−
2012 # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89
2113 checkInputs = [ pytest ];
2214 checkPhase = ''
@@ -28,7 +20,7 @@ buildPythonPackage rec {
2820 and not test_codegen_from_root'
2921 '';
3022
31− meta = with stdenv.lib; {
23+ meta = with lib; {
3224 description = "Library for reading, writing and rewriting python AST";
3325 homepage = https://github.com/berkerpeksag/astor;
3426 license = licenses.bsd3;
pkgs/development/python-modules/awkward/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "awkward";
14− version = "0.12.16";
14+ version = "0.12.17";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "df5380b96dc9c1b129e68057578e4a2d42d9b73a0ae97ff263a9072baf8f7a5e";
18+ sha256 = "f794c926e726b3545035ffcb8e6defe6a4ea975c6266c0154024e4591739a253";
1919 };
2020
2121 nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/aws-xray-sdk/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "aws-xray-sdk";
13− version = "2.4.2";
13+ version = "2.4.3";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "ce4adb60fe67ebe91f2fc57d5067b4e44df6e233652987be4fb2e549688cf9fe";
17+ sha256 = "263a38f3920d9dc625e3acb92e6f6d300f4250b70f538bd009ce6e485676ab74";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/bottle/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "bottle";
5− version = "0.12.17";
5+ version = "0.12.18";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c";
9+ sha256 = "0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e";
1010 };
1111
1212 propagatedBuildInputs = [ setuptools ];
pkgs/development/python-modules/caldav/default.nix+2−2
@@ -3,13 +3,13 @@
33
44buildPythonPackage rec {
55 pname = "caldav";
6− version = "0.6.1";
6+ version = "0.6.2";
77
88 propagatedBuildInputs = [ tzlocal requests vobject lxml nose ];
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "eddb7f4e6a3eb5f02eaa2227817a53ac4372d4c4d51876536f4c6f00282f569e";
12+ sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d";
1313 };
1414
1515 meta = with lib; {
pkgs/development/python-modules/catalogue/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "catalogue";
9− version = "0.0.7";
9+ version = "0.0.8";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0m7xp85fg57wi1l1vdsq2k0b8dv5bnfccds33lb04z9vrds4l3jv";
13+ sha256 = "c407a51c22f51b0f938104b6396c489145bae234386e68eb1d56326c3b3e128e";
1414 };
1515
1616 propagatedBuildInputs = [ importlib-metadata ];
pkgs/development/python-modules/cmd2/default.nix+2−2
@@ -6,11 +6,11 @@
66}:
77buildPythonPackage rec {
88 pname = "cmd2";
9− version = "0.9.21";
9+ version = "0.9.22";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0pxxxhcxf4wzxvlh6jvw30pzgk1nsciq1qfxilpa8idv06jzx048";
13+ sha256 = "ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6";
1414 };
1515
1616 LC_ALL="en_US.UTF-8";
pkgs/development/python-modules/colorama/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "colorama";
5− version = "0.4.1";
5+ version = "0.4.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d";
9+ sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1";
1010 };
1111
1212 # No tests in archive
pkgs/development/python-modules/configargparse/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "ConfigArgParse";
5− version = "0.15.1";
5+ version = "0.15.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac";
9+ sha256 = "558738aff623d6667aa5b85df6093ad3828867de8a82b66a6d458fb42567beb3";
1010 };
1111
1212 # no tests in tarball
pkgs/development/python-modules/ddt/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "ddt";
9− version = "1.2.1";
9+ version = "1.2.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3";
13+ sha256 = "9f79cf234064cf9b43492b72da35c473de3f03163d37bd13cec5bd8d200dda6b";
1414 };
1515
1616 checkInputs = [ nose six pyyaml mock ];
pkgs/development/python-modules/django-mailman3/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "django-mailman3";
7− version = "1.3.0";
7+ version = "1.3.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0wppv1q3jkkg2d66qsygc4dfpvhfcj5i2as2xpqnzf3l3w7dgja1";
11+ sha256 = "b05cf04b2c36916d15b78e24610002206529f1441e2632253a26b2db6bfd3b27";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/django/2_1.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "Django";
9− version = "2.1.14";
9+ version = "2.1.15";
1010
1111 disabled = !isPy3k;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "d9159141fc354c4c28cc2b2586d55ba6d5e1531f5470218bb56a75be03d67398";
15+ sha256 = "a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c";
1616 };
1717
1818 patches = stdenv.lib.optionals withGdal [
pkgs/development/python-modules/django_contrib_comments/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "django-contrib-comments";
9− version = "1.9.1";
9+ version = "1.9.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890";
13+ sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31";
1414 };
1515
1616 propagatedBuildInputs = [ django ];
pkgs/development/python-modules/django_reversion/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "django-reversion";
9− version = "3.0.4";
9+ version = "3.0.5";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "ed46722389fb2441860d471c7538967dee545bcee891d3d907b04f4baa98f5fa";
13+ sha256 = "1add55bb05311f4acd26683dd71af60729d4f33dfe42c608da8e15e679a32009";
1414 };
1515
1616 # tests assume the availability of a mysql/postgresql database
pkgs/development/python-modules/dulwich/default.nix+2−2
@@ -4,12 +4,12 @@
44, git, glibcLocales }:
55
66buildPythonPackage rec {
7− version = "0.19.13";
7+ version = "0.19.14";
88 pname = "dulwich";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "aa628449c5f594a9a282f4d9e5993fef65481ef5e3b9b6c52ff31200f8f5dc95";
12+ sha256 = "d1320232c859ab086fff79eee8fa6ddbcbcbe01ff0c64c9bed48eca470b00b46";
1313 };
1414
1515 LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/faker/default.nix+2−2
@@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
1717
1818buildPythonPackage rec {
1919 pname = "Faker";
20− version = "2.0.4";
20+ version = "2.0.5";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "6327c665c0d8721280b3036d9c9e851c60092bc1f30c8394cc433f8723e2bda5";
24+ sha256 = "29093e61f12745150774fd05ab499e87252a4fa51ed51e45c40179e854f87925";
2525 };
2626
2727 nativeBuildInputs = [ pytestrunner ];
pkgs/development/python-modules/fiona/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "Fiona";
9− version = "1.8.11";
9+ version = "1.8.13";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1e7ca9e051f5bffa1c43c70d573da9ca223fc076b84fa73380614fc02b9eb7f6";
13+ sha256 = "5ec34898c8b983a723fb4e949dd3e0ed7e691c303e51f6bfd61e52ac9ac813ae";
1414 };
1515
1616 CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
pkgs/development/python-modules/foxdot/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "FoxDot";
5− version = "0.8.3";
5+ version = "0.8.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "07ll1rh1bkq1dpb7gxd86jsjhxni73kp9iljiy0d2b86ji8h108p";
9+ sha256 = "8b6d810f5389692c45d236dec89cecc4ff32ad053e4c878c91363acfa4508639";
1010 };
1111
1212 propagatedBuildInputs = [ tkinter supercollider ];
pkgs/development/python-modules/hdbscan/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "hdbscan";
15− version = "0.8.23";
15+ version = "0.8.24";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "ff60c66591452ceb6bdb7592c560a1ebc7e128a02dd3880e048861f7fea7f78d";
19+ sha256 = "fe31a7ea0ce2c9babd190a195e491834ff9f64c74daa4ca94fa65a88f701269a";
2020 };
2121
2222 checkInputs = [ nose ];
pkgs/development/python-modules/holoviews/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "holoviews";
18− version = "1.12.6";
18+ version = "1.12.7";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "4f6ad184fb6136e5ee37a74b5276825fc3d5fce5033ff3c8db8831ec11ea2e75";
22+ sha256 = "c63f76d1ce2261eb0cd147a24be25daff399e7df2c3d6ade3e813d2e9cb7d42f";
2323 };
2424
2525 propagatedBuildInputs = [
pkgs/development/python-modules/homeassistant-pyozw/default.nix+2−2
@@ -2,12 +2,12 @@
22
33python_openzwave.overridePythonAttrs (oldAttrs: rec {
44 pname = "homeassistant_pyozw";
5− version = "0.1.4";
5+ version = "0.1.7";
66
77 src = fetchPypi {
88 inherit pname version;
99 extension = "zip";
10− sha256 = "a4ec26b95dba630df8c95c617c510e4a33db93a6a39e8a97056eec7dc9a49d1e";
10+ sha256 = "2d500638270ee4f0e7e9e114d9b4402c94c232f314116cdcf88d7c1dc9a44427";
1111 };
1212
1313 meta.homepage = https://github.com/home-assistant/python-openzwave;
pkgs/development/python-modules/identify/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "identify";
5− version = "1.4.7";
5+ version = "1.4.8";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0vi9qxgnjgxdk4wj3c5ha3hjmc97j3pw1zh2cg39jprapn4rb4fq";
9+ sha256 = "7782115794ec28b011702815d9f5e532244560cd2bf0789c4f09381d43befd90";
1010 };
1111
1212 # Tests not included in PyPI tarball
pkgs/development/python-modules/joblib/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "joblib";
15− version = "0.14.0";
15+ version = "0.14.1";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "1zwkl6hgi8wbygcc6ql6yk1if665hwk43sa9shglb2afrfm5gk3g";
19+ sha256 = "0630eea4f5664c463f23fbf5dcfc54a2bc6168902719fa8e19daf033022786c8";
2020 };
2121
2222 checkInputs = [ sphinx numpydoc pytest ];
pkgs/development/python-modules/junos-eznc/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "junos-eznc";
18− version = "2.3.0";
18+ version = "2.3.1";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "c0f853cdad12256ae8c33a80ff6c31a3ce867c481f805b085d554fbb5b5b084f";
22+ sha256 = "0f8c4763fe2281979bc00350b93d510368992dbae0dae4fea0bafee5904a7e68";
2323 };
2424
2525
pkgs/development/python-modules/kajiki/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "Kajiki";
12− version = "0.8.1";
12+ version = "0.8.2";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "85202ff7c2ce2466e9da82f06b25d1d6753d411d0e1b3ab3b145ed1e04c46782";
16+ sha256 = "bbec46b19285d42769d7c4f5a8a0195b72a62b54cd360a26a8875319d58efef6";
1717 };
1818
1919 propagatedBuildInputs = [ Babel pytz nine ];
pkgs/development/python-modules/kombu/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "kombu";
12− version = "4.6.6";
12+ version = "4.6.7";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86";
16+ sha256 = "67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1";
1717 };
1818
1919 postPatch = ''
pkgs/development/python-modules/lightgbm/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "lightgbm";
13− version = "2.3.0";
13+ version = "2.3.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "37225b9f816ea3365ff5988fc8a3717e46ac99a5f223986c86c86cec4f111b54";
17+ sha256 = "bd1817be401e74c0d8b049e97ea2f35d2ce155cfa130119ce4195ea207bd6388";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/development/python-modules/marionette-harness/mozdevice.nix+2−2
@@ -7,12 +7,12 @@
77
88buildPythonPackage rec {
99 pname = "mozdevice";
10− version = "3.0.5";
10+ version = "3.0.6";
1111 format = "wheel";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1gpz0y81407pk71p9yzf15kqqk10fcansw8a607488d11m1jn3yf";
15+ sha256 = "4cbeb4558f952cb08f53c4b57a405981b5683f38df0b293f0e7d20b6f4c17d84";
1616 format = "wheel";
1717 };
1818
pkgs/development/python-modules/matplotlib/default.nix+2−2
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
2020assert enableQt -> pyqt5 != null;
2121
2222buildPythonPackage rec {
23− version = "3.1.1";
23+ version = "3.1.2";
2424 pname = "matplotlib";
2525
2626 disabled = !isPy3k;
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93";
30+ sha256 = "8e8e2c2fe3d873108735c6ee9884e6f36f467df4a143136209cff303b183bada";
3131 };
3232
3333 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
pkgs/development/python-modules/mysqlclient/default.nix+1−1
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "05ifrfz7rrl7j4gq4xz5acd76lrnmry9vrvg98hknakm72damzgk";
20+ sha256 = "f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16";
2121 };
2222
2323 meta = with stdenv.lib; {
pkgs/development/python-modules/nest-asyncio/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.2.0";
8+ version = "1.2.1";
99 pname = "nest_asyncio";
1010 disabled = !(pythonAtLeast "3.5");
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "f5b22dd23ee6195cea509c344d9ec34274f45bff078d8f18e9dc322dc74c6008";
14+ sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc";
1515 };
1616
1717 meta = with stdenv.lib; {
pkgs/development/python-modules/nipype/neurdflib.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "neurdflib";
14− version = "5.0.0.post1";
14+ version = "5.0.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "1qgmprixqxycxpjk9wjdmjykma14qqa2wcbx4nsldxi0ga7i7vv5";
18+ sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50";
1919 };
2020
2121 propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ];
pkgs/development/python-modules/openpyxl/default.nix+2−2
@@ -10,12 +10,12 @@
1010
1111buildPythonPackage rec {
1212 pname = "openpyxl";
13− version = "3.0.1";
13+ version = "3.0.2";
1414 disabled = isPy27; # 2.6.4 was final python2 release
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "a3ee361d3ff04af6048d594775b3a54ffdf215d40fa5c6c78b2a41c0d0b020d3";
18+ sha256 = "eb68c08a72ac6d9812df181e88ebece3a68436364353eb6eda3bed863e3d73a6";
1919 };
2020
2121 checkInputs = [ pytest ];
pkgs/development/python-modules/pafy/default.nix+2−2
@@ -1,11 +1,11 @@
11{ lib, buildPythonPackage, youtube-dl, fetchPypi }:
22buildPythonPackage rec {
33 pname = "pafy";
4− version = "0.5.4";
4+ version = "0.5.5";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "e842dc589a339a870b5869cc3802f2e95824edf347f65128223cd5ebdff21024";
8+ sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e";
99 };
1010
1111 # No tests included in archive
pkgs/development/python-modules/parameterized/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "parameterized";
5− version = "0.7.0";
5+ version = "0.7.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5";
9+ sha256 = "6a94dbea30c6abde99fd4c2f2042c1bf7f980e48908bf92ead62394f93cf57ed";
1010 };
1111
1212 # Tests require some python3-isms but code works without.
pkgs/development/python-modules/passlib/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "passlib";
10− version = "1.7.1";
10+ version = "1.7.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0";
14+ sha256 = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8";
1515 };
1616
1717 checkInputs = [ nose ];
pkgs/development/python-modules/pbr/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pbr";
5− version = "5.4.3";
5+ version = "5.4.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8";
9+ sha256 = "139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b";
1010 };
1111
1212 # circular dependencies with fixtures
pkgs/development/python-modules/pgspecial/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pgspecial";
5− version = "1.11.8";
5+ version = "1.11.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "8c53fa2b2490fa9ec34ede4eafff8ddbe8bce5cba3dcae96509be36ec8c75575";
9+ sha256 = "77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/pluggy/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pluggy";
10− version = "0.13.0";
10+ version = "0.13.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34";
14+ sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0";
1515 };
1616
1717 checkPhase = ''
pkgs/development/python-modules/preggy/default.nix+2−2
@@ -2,14 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "preggy";
5− version = "1.4.2";
5+ version = "1.4.4";
66
77 propagatedBuildInputs = [ six unidecode ];
88 checkInputs = [ nose yanc ];
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0g4ifjh01dkmdzs4621ahk8hpkngid1xxhl51jvzy4h4li4590hw";
12+ sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c";
1313 };
1414
1515 checkPhase = ''
pkgs/development/python-modules/psd-tools/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "psd-tools";
7− version = "1.8.30";
7+ version = "1.8.32";
88
99 meta = {
1010 description = "Python package for reading Adobe Photoshop PSD files";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "101d7df09f9a745f7729c25a1621428e501910ed6436d639e1aded4b03c14e02";
17+ sha256 = "fff16658c9ca6bc586adbe0ab060a7d0b7d057eb2a600c3b2001c0558873fb94";
1818 };
1919
2020 propagatedBuildInputs = [ docopt pillow ];
pkgs/development/python-modules/psutil/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "psutil";
9− version = "5.6.5";
9+ version = "5.6.7";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "d051532ac944f1be0179e0506f6889833cf96e466262523e57a871de65a15147";
13+ sha256 = "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa";
1414 };
1515
1616 # No tests in archive
pkgs/development/python-modules/publicsuffix/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "publicsuffix";
5− version = "1.1.0";
5+ version = "1.1.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf";
9+ sha256 = "22ce1d65ab6af5e9b2122e2443facdb93fb5c4abf24138099cb10fe7989f43b6";
1010 };
1111
1212
pkgs/development/python-modules/pybullet/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pybullet";
10− version = "2.5.7";
10+ version = "2.5.8";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "82a235a8fe3c8dee753d765c295ff0da92bcb5096209d26a0cfc3f5c6054e374";
14+ sha256 = "5824e902e0dd8bf7177ce5d9e038c6b04be65f72621fe13f93ec15c9d9c85a49";
1515 };
1616
1717 buildInputs = [
pkgs/development/python-modules/pyfaidx/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "pyfaidx";
9− version = "0.5.5.2";
9+ version = "0.5.7";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1akc8hk8rlw7sv07bv1n2r471acvmxwc57gb69frjpcwggf2phls";
13+ sha256 = "512c409b36eadfe39c40e46112d8f96b29fdc1032dc424da2bdc783d476f5b0a";
1414 };
1515
1616 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pygobject/default.nix+5−9
@@ -2,21 +2,17 @@
22
33buildPythonPackage rec {
44 pname = "pygobject";
5− version = "2.28.6";
5+ version = "2.28.7";
66 format = "other";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz";
10− sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
10+ sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv";
1111 };
1212
1313 outputs = [ "out" "devdoc" ];
1414
15− patches = [
16− # Fix warning spam
17− ./pygobject-2.28.6-set_qdata.patch
18− ./pygobject-2.28.6-gio-types-2.32.patch
19− ] ++ stdenv.lib.optionals stdenv.isDarwin [
15+ patches = stdenv.lib.optionals stdenv.isDarwin [
2016 ./pygobject-2.0-fix-darwin.patch
2117 ];
2218
@@ -38,8 +34,8 @@ buildPythonPackage rec {
3834 '';
3935
4036 meta = {
41− homepage = http://live.gnome.org/PyGObject;
42− description = "Python bindings for Glib";
37+ homepage = "https://pygobject.readthedocs.io/";
38+ description = "Python bindings for GLib";
4339 platforms = stdenv.lib.platforms.unix;
4440 };
4541}
pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patchdeleted−50
@@ -1,50 +0,0 @@
1−From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
2−From: Ryan Lortie <desrt@desrt.ca>
3−Date: Mon, 12 Mar 2012 16:44:14 -0400
4−Subject: [PATCH] gio-types.defs: change some enums to flags
5−
6−These flags types were originally incorrectly handled in glib as being
7−enums. That bug was fixed, but they're still enums here, leading to
8−warnings about the mismatch.
9−
10−Change them to flags.
11−
12−https://bugzilla.gnome.org/show_bug.cgi?id=668522
13−---
14− gio/gio-types.defs | 6 +++---
15− 1 files changed, 3 insertions(+), 3 deletions(-)
16−
17−diff --git a/gio/gio-types.defs b/gio/gio-types.defs
18−index 331e0bc..7eee5c8 100644
19−--- a/gio/gio-types.defs
20−+++ b/gio/gio-types.defs
21−@@ -526,7 +526,7 @@
22− )
23− )
24−
25−-(define-enum MountMountFlags
26−+(define-flags MountMountFlags
27− (in-module "gio")
28− (c-name "GMountMountFlags")
29− (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
30−@@ -545,7 +545,7 @@
31− )
32− )
33−
34−-(define-enum DriveStartFlags
35−+(define-flags DriveStartFlags
36− (in-module "gio")
37− (c-name "GDriveStartFlags")
38− (gtype-id "G_TYPE_DRIVE_START_FLAGS")
39−@@ -770,7 +770,7 @@
40− )
41− )
42−
43−-(define-enum SocketMsgFlags
44−+(define-flags SocketMsgFlags
45− (in-module "gio")
46− (c-name "GSocketMsgFlags")
47− (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
48−--
49−1.7.8.5
50−
pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patchdeleted−28
@@ -1,28 +0,0 @@
1−From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
2−From: Ivan Stankovic <ivan.stankovic@avl.com>
3−Date: Tue, 21 Feb 2012 12:24:58 +0100
4−Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property
5−
6−https://bugzilla.gnome.org/show_bug.cgi?id=661155
7−---
8− gobject/pygobject.c | 4 +++-
9− 1 files changed, 3 insertions(+), 1 deletions(-)
10−
11−diff --git a/gobject/pygobject.c b/gobject/pygobject.c
12−index 6c2f06c..70dc89a 100644
13−--- a/gobject/pygobject.c
14−+++ b/gobject/pygobject.c
15−@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
16− PyObject *
17− pygobject_new_sunk(GObject *obj)
18− {
19−- g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
20−+ if (obj)
21−+ g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
22−+
23− return pygobject_new_full(obj, TRUE, NULL);
24− }
25−
26−--
27−1.7.8.5
28−
pkgs/development/python-modules/pyhomematic/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "pyhomematic";
5− version = "0.1.61";
5+ version = "0.1.62";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "7ef0f3b2ed30023297840d365cf94dcf81b7ee6d2be62fff14730e9eb7b59c00";
11+ sha256 = "3547ad176f287a9d3b4409692485b6fb456107d70350a32071423e13803cfdab";
1212 };
1313
1414 # PyPI tarball does not include tests/ directory
pkgs/development/python-modules/pyopengl/default.nix+4−3
@@ -7,11 +7,12 @@
77
88buildPythonPackage rec {
99 pname = "pyopengl";
10− version = "3.1.0";
10+ version = "3.1.4";
1111
1212 src = fetchPypi {
13− inherit pname version;
14− sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf";
13+ pname = "PyOpenGL";
14+ inherit version;
15+ sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee";
1516 };
1617
1718 propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ];
pkgs/development/python-modules/pyrsistent/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pyrsistent";
12− version = "0.15.5";
12+ version = "0.15.6";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778";
16+ sha256 = "f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b";
1717 };
1818
1919 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pytest/4.nix+2−2
@@ -3,7 +3,7 @@
33, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy
44}:
55buildPythonPackage rec {
6− version = "4.6.6";
6+ version = "4.6.7";
77 pname = "pytest";
88
99 preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "692d9351353ef709c1126266579edd4fd469dcf6b5f4f583050f72161d6f3592";
16+ sha256 = "9ea149066f566c943d3122f4b1cf1b577cab73189d11f490b54703fa5fa9df50";
1717 };
1818
1919 checkInputs = [ hypothesis mock ];
pkgs/development/python-modules/pyvcd/default.nix+2−2
@@ -6,12 +6,12 @@
66, pytest }:
77
88buildPythonPackage rec {
9− version = "0.1.4";
9+ version = "0.1.5";
1010 pname = "pyvcd";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0dv9wac5y5z9j54ypyc59csxdiy9ybpphw9ipxp1k8nfg65q9jxx";
14+ sha256 = "9e796f8d00d8392716bef9759f118231f5d77d2fff79d8a32151e3bb5579ff25";
1515 };
1616
1717 buildInputs = [ setuptools_scm ];
pkgs/development/python-modules/pywebpush/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "pywebpush";
7− version = "1.10.0";
7+ version = "1.10.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "de8b7e638c6b595c6405f16fd5356e92d2feb8237ab4e50a89770e4ed93aebd6";
11+ sha256 = "e80ae0ea978b2e3b7860d2a9ae836528f5fa2e13936673e0b6613589965937ee";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/responses/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "responses";
6− version = "0.10.6";
6+ version = "0.10.7";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790";
10+ sha256 = "46d4e546a19fc6106bc7e804edd4551ef04690405e41e7e750ebc295d042623b";
1111 };
1212
1313 propagatedBuildInputs = [ cookies mock requests six ];
pkgs/development/python-modules/runsnakerun/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "runsnakerun";
10− version = "2.0.4";
10+ version = "2.0.5";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef";
14+ sha256 = "a66a0cdf0333dc3c0830c18e2f3d62f741dea197cd01a7e0059da4886a3a123f";
1515 };
1616
1717 propagatedBuildInputs = [ squaremap wxPython ];
pkgs/development/python-modules/runway-python/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "runway-python";
16− version = "0.5.3";
16+ version = "0.5.4";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "30046ced74b5502eca604b1ae766fd3daa1b5ed6379fbe1210730710c752d4f6";
20+ sha256 = "c5293bca6589747db687c593b81f52dc9df8155367ffa57ddc1993a6f9d95bde";
2121 };
2222
2323 propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ];
pkgs/development/python-modules/scipy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "scipy";
5− version = "1.3.2";
5+ version = "1.3.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4";
9+ sha256 = "64bf4e8ae0db2d42b58477817f648d81e77f0b381d0ea4427385bba3f959380a";
1010 };
1111
1212 checkInputs = [ nose pytest ];
pkgs/development/python-modules/semantic-version/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "semantic_version";
5− version = "2.8.2";
5+ version = "2.8.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "71c716e99086c44d068262b86e4775aa6db7fabee0743e4e33b00fbf6f672585";
9+ sha256 = "9dcc6fbad58da3c4d5eee2287025e226bb05c39463f14b741357801baae9dcce";
1010 };
1111
1212 # ModuleNotFoundError: No module named 'tests'
pkgs/development/python-modules/sentry-sdk/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121buildPythonPackage rec {
2222 pname = "sentry-sdk";
23− version = "0.13.2";
23+ version = "0.13.5";
2424
2525 src = fetchPypi {
2626 inherit pname version;
27− sha256 = "ff1fa7fb85703ae9414c8b427ee73f8363232767c9cd19158f08f6e4f0b58fc7";
27+ sha256 = "c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82";
2828 };
2929
3030 checkInputs = [ django flask tornado bottle rq falcon ]
pkgs/development/python-modules/setuptools/default.nix+2−2
@@ -13,7 +13,7 @@
1313
1414let
1515 pname = "setuptools";
16− version = "41.6.0";
16+ version = "42.0.2";
1717
1818 # Create an sdist of setuptools
1919 sdist = stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ let
2323 owner = "pypa";
2424 repo = pname;
2525 rev = "v${version}";
26− sha256 = "0j7bfxq9fwa55ijzw8zn9aa2z2zx4lw2n4jbn1662pjg7v62knv1";
26+ sha256 = "1xqx3sha5ir40g1h15r7q063bcbl9bvh967vig574k3jgwxrz2ik";
2727 name = "${pname}-${version}-source";
2828 };
2929
pkgs/development/python-modules/sqlmap/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "sqlmap";
8− version = "1.3.11";
8+ version = "1.3.12";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "27ef900b1116776128d0d09bff21f8d2f6bb2ea887cd59fe1a32aec5563aacb0";
12+ sha256 = "3bad3275e2f29ffa54d4013a2ac2c77e87d01a1d745065d54ed5e60bc68dfbf0";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/squaremap/default.nix+2−2
@@ -6,12 +6,12 @@
66
77buildPythonPackage rec {
88 pname = "squaremap";
9− version = "1.0.4";
9+ version = "1.0.5";
1010 disabled = isPy3k;
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8";
14+ sha256 = "b16ce5950cbfa63e3284015095293cd26ed5e26045fd14d488fb825b4f95e9a8";
1515 };
1616
1717 meta = with stdenv.lib; {
pkgs/development/python-modules/statsmodels/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "statsmodels";
16− version = "0.10.1";
16+ version = "0.10.2";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10";
20+ sha256 = "9cd2194c6642a8754e85f9a6e6912cdf996bebf6ff715d3cc67f65dadfd37cc9";
2121 };
2222
2323 checkInputs = with self; [ nose ];
pkgs/development/python-modules/testfixtures/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "testfixtures";
6− version = "6.10.2";
6+ version = "6.10.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "c0eb9d20ce3b53e0cf543da7c46c263cc9792f13223def8b26edb6180ecdc895";
10+ sha256 = "8f22100d4fb841b958f64e71c8820a32dc46f57d4d7e077777b932acd87b7327";
1111 };
1212
1313 checkInputs = [ pytest mock sybil zope_component twisted ];
pkgs/development/python-modules/tifffile/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "tifffile";
8− version = "2019.7.26";
8+ version = "2019.7.26.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "82c5c72de4dc19cc7011e4e8c45492e17121bd02cfa98c015ddd2a83e36f09bc";
12+ sha256 = "2abb91c3a23a61593c5635ac1a19f67e732b46291c305fcee0eeaad41181a13f";
1313 };
1414
1515 patches = lib.optional isPy27 ./python2-regex-compat.patch;
pkgs/development/python-modules/tox/default.nix+2−2
@@ -13,7 +13,7 @@
1313
1414buildPythonPackage rec {
1515 pname = "tox";
16− version = "3.14.1";
16+ version = "3.14.2";
1717
1818 buildInputs = [ setuptools_scm ];
1919 propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "bcfa3e40abc1e9b70607b56adfd976fe7dc8286ad56aab44e3151daca7d2d0d0";
25+ sha256 = "7efd010a98339209f3a8292f02909b51c58417bfc6838ab7eca14cf90f96117a";
2626 };
2727
2828 meta = with lib; {
pkgs/development/python-modules/uamqp/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "uamqp";
14− version = "1.2.3";
14+ version = "1.2.4";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "9d15cb12d61a6481f7de412c2d53a99f87650e0d1e5394b047aeee5514964fb8";
18+ sha256 = "efb53d244bbe336557bad206f9e48159661934baeb0bfe0addfadc1f69796137";
1919 };
2020
2121 buildInputs = [
pkgs/development/python-modules/validators/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "validators";
13− version = "0.14.0";
13+ version = "0.14.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1bhla1l8gbks572zp4f254acz23822dz2mp122djxvp328i87b7h";
17+ sha256 = "0bfe836a1af37bb266d71ec1e98b530c38ce11bc7fbe0c4c96ef7b1532d019e5";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/virtualenv/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "virtualenv";
9− version = "16.7.7";
9+ version = "16.7.8";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136";
13+ sha256 = "116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0";
1414 };
1515
1616 # Doubt this is needed - FRidh 2017-07-07
pkgs/development/python-modules/wasabi/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "wasabi";
9− version = "0.4.0";
9+ version = "0.4.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0w2jkgrf0x58v8x90v4nifbwcb87pp613vp3sld1fk2avn80imnw";
13+ sha256 = "9af48b37709000dac34653be376aaac2e3e15392b8c78d0898124c52e083d088";
1414 };
1515
1616 checkInputs = [
pkgs/development/python-modules/xarray/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "xarray";
13− version = "0.14.0";
13+ version = "0.14.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "a8b93e1b0af27fa7de199a2d36933f1f5acc9854783646b0f1b37fed9b4da091";
17+ sha256 = "04b2f4d24707b8871a7ffa37328d0a2de74e81bd30791c9608712612601abd23";
1818 };
1919
2020 checkInputs = [ pytest ];
pkgs/development/python-modules/xattr/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "xattr";
10− version = "0.9.6";
10+ version = "0.9.7";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "7cb1b28eeab4fe99cc4350e831434142fce658f7d03f173ff7722144e6a47458";
14+ sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44";
1515 };
1616
1717 propagatedBuildInputs = [ cffi ];
pkgs/os-specific/linux/bluez/default.nix+2
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
7777
7878 makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ];
7979
80+ doCheck = stdenv.hostPlatform.isx86_64;
81+
8082 postInstall = ''
8183 mkdir -p $test/{bin,test}
8284 cp -a test $test
pkgs/os-specific/linux/kernel/patches.nix+5
@@ -6,6 +6,11 @@
66 patch = ./bridge-stp-helper.patch;
77 };
88
9+ request_key_helper =
10+ { name = "request-key-helper";
11+ patch = ./request-key-helper.patch;
12+ };
13+
914 p9_fixes =
1015 { name = "p9-fixes";
1116 patch = ./p9-fixes.patch;
pkgs/os-specific/linux/kernel/request-key-helper.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/security/keys/request_key.c b/security/keys/request_key.c
2+index 957b9e3e1492..5436a0d8b81d 100644
3+--- a/security/keys/request_key.c
4++++ b/security/keys/request_key.c
5+@@ -114,7 +114,7 @@ static int call_usermodehelper_keys(const char *path, char **argv, char **envp,
6+ */
7+ static int call_sbin_request_key(struct key *authkey, void *aux)
8+ {
9+- static char const request_key[] = "/sbin/request-key";
10++ static char const request_key[] = "/run/current-system/sw/bin/request-key";
11+ struct request_key_auth *rka = get_request_key_auth(authkey);
12+ const struct cred *cred = current_cred();
13+ key_serial_t prkey, sskey;
pkgs/os-specific/linux/keyutils/conf-symlink.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/request-key.c b/request-key.c
2+index bf47c0a..105fee8 100644
3+--- a/request-key.c
4++++ b/request-key.c
5+@@ -313,7 +313,7 @@ static void scan_conf_dir(struct parameters *params, const char *confdir)
6+ while ((d = readdir(dir))) {
7+ if (d->d_name[0] == '.')
8+ continue;
9+- if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG)
10++ if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG && d->d_type != DT_LNK)
11+ continue;
12+ l = strlen(d->d_name);
13+ if (l < 5)
pkgs/os-specific/linux/keyutils/default.nix+1
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
1515 url = "https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch";
1616 sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm";
1717 })
18+ ./conf-symlink.patch
1819 ];
1920
2021 BUILDDATE = "1970-01-01";
pkgs/os-specific/linux/nfs-utils/default.nix+8−1
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent
22, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
3−, python3, buildPackages
3+, python3, buildPackages, nixosTests
44}:
55
66let
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
3939
4040 configureFlags =
4141 [ "--enable-gss"
42+ "--enable-svcgss"
4243 "--with-statedir=/var/lib/nfs"
4344 "--with-krb5=${lib.getLib kerberos}"
4445 "--with-systemd=${placeholder "out"}/etc/systemd/system"
@@ -104,6 +105,12 @@ stdenv.mkDerivation rec {
104105
105106 disallowedReferences = [ (lib.getDev kerberos) ];
106107
108+ passthru.tests = {
109+ nfs3-simple = nixosTests.nfs3.simple;
110+ nfs4-simple = nixosTests.nfs4.simple;
111+ nfs4-kerberos = nixosTests.nfs4.kerberos;
112+ };
113+
107114 meta = with stdenv.lib; {
108115 description = "Linux user-space NFS utilities";
109116
pkgs/tools/networking/libreswan/default.nix+14−9
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, makeWrapper,
22 pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
33 bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python,
4− docs ? false, xmlto
4+ docs ? false, xmlto, libselinux, ldns
55 }:
66
77let
88 optional = stdenv.lib.optional;
9− version = "3.18";
9+ version = "3.29";
1010 name = "libreswan-${version}";
1111 binPath = stdenv.lib.makeBinPath [
1212 bash iproute iptables procps coreutils gnused gawk nss.tools which python
@@ -14,6 +14,7 @@ let
1414in
1515
1616assert docs -> xmlto != null;
17+assert stdenv.isLinux -> libselinux != null;
1718
1819stdenv.mkDerivation {
1920 inherit name;
@@ -21,7 +22,7 @@ stdenv.mkDerivation {
2122
2223 src = fetchurl {
2324 url = "https://download.libreswan.org/${name}.tar.gz";
24− sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig";
25+ sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn";
2526 };
2627
2728 # These flags were added to compile v3.18. Try to lift them when updating.
@@ -34,15 +35,21 @@ stdenv.mkDerivation {
3435
3536 nativeBuildInputs = [ makeWrapper pkgconfig ];
3637 buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
37− libcap_ng curl nspr nss python ]
38− ++ optional docs xmlto;
38+ libcap_ng curl nspr nss python ldns ]
39+ ++ optional docs xmlto
40+ ++ optional stdenv.isLinux libselinux;
3941
4042 prePatch = ''
4143 # Correct bash path
4244 sed -i -e 's|/bin/bash|/usr/bin/env bash|' mk/config.mk
4345
44− # Fix systemd unit directory, and prevent the makefile from trying to reload the systemd daemon
45− sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|' -e 's|systemctl --system daemon-reload|true|' initsystems/systemd/Makefile
46+ # Fix systemd unit directory, and prevent the makefile from trying to reload the
47+ # systemd daemon or create tmpfiles
48+ sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|g' \
49+ -e 's|TMPFILESDIR=.*$|TMPFILESDIR=$\{out}/tmpfiles.d/|g' \
50+ -e 's|systemctl|true|g' \
51+ -e 's|systemd-tmpfiles|true|g' \
52+ initsystems/systemd/Makefile
4653
4754 # Fix the ipsec program from crushing the PATH
4855 sed -i -e 's|\(PATH=".*"\):.*$|\1:$PATH|' programs/ipsec/ipsec.in
@@ -51,8 +58,6 @@ stdenv.mkDerivation {
5158 sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in
5259 '';
5360
54− patches = [ ./libreswan-3.18-glibc-2.26.patch ];
55−
5661 # Set appropriate paths for build
5762 preBuild = "export INC_USRLOCAL=\${out}";
5863
pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patchdeleted−36
@@ -1,36 +0,0 @@
1−diff --git a/lib/libswan/id.c b/lib/libswan/id.c
2−index 8f06275..efb0394 100644
3−--- a/lib/libswan/id.c
4−+++ b/lib/libswan/id.c
5−@@ -22,6 +22,7 @@
6− #include <sys/socket.h>
7− #include <netinet/in.h>
8− #include <arpa/inet.h>
9−+#include <limits.h>
10− #include <unistd.h>
11− #ifndef HOST_NAME_MAX /* POSIX 1003.1-2001 says <unistd.h> defines this */
12− #define HOST_NAME_MAX 255 /* upper bound, according to SUSv2 */
13−diff --git a/linux/include/libreswan.h b/linux/include/libreswan.h
14−index c5efc6a..b0af4d7 100644
15−--- a/linux/include/libreswan.h
16−+++ b/linux/include/libreswan.h
17−@@ -211,6 +211,7 @@ static inline deltatime_t monotimediff(monotime_t a, monotime_t b) {
18− #include <assert.h>
19− #define user_assert(foo) assert(foo)
20− #include <stdio.h>
21−+#include <stdint.h>
22−
23− # define uint8_t u_int8_t
24− # define uint16_t u_int16_t
25−diff --git a/programs/pluto/rcv_whack.c b/programs/pluto/rcv_whack.c
26−index 588c66c..4fc6289 100644
27−--- a/programs/pluto/rcv_whack.c
28−+++ b/programs/pluto/rcv_whack.c
29−@@ -24,6 +24,7 @@
30− #include <stddef.h>
31− #include <stdlib.h>
32− #include <string.h>
33−+#include <limits.h>
34− #include <unistd.h>
35− #ifndef HOST_NAME_MAX /* POSIX 1003.1-2001 says <unistd.h> defines this */
36− # define HOST_NAME_MAX 255 /* upper bound, according to SUSv2 */
pkgs/tools/networking/unbound/default.nix+4
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
3434
3535 installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
3636
37+ postInstall = ''
38+ make unbound-event-install
39+ '';
40+
3741 preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit
3842 # Build libunbound again, but only against nettle instead of openssl.
3943 # This avoids gnutls.out -> unbound.lib -> openssl.out.
pkgs/top-level/all-packages.nix+14
@@ -16151,6 +16151,7 @@ in
1615116151 linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix {
1615216152 kernelPatches =
1615316153 [ kernelPatches.bridge_stp_helper
16154+ kernelPatches.request_key_helper
1615416155 kernelPatches.cpu-cgroup-v2."4.11"
1615516156 kernelPatches.modinst_arg_list_too_long
1615616157 ]
@@ -16168,6 +16169,7 @@ in
1616816169 linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
1616916170 kernelPatches = with kernelPatches; [
1617016171 bridge_stp_helper
16172+ request_key_helper
1617116173 ];
1617216174 rpiVersion = 1;
1617316175 };
@@ -16175,6 +16177,7 @@ in
1617516177 linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
1617616178 kernelPatches = with kernelPatches; [
1617716179 bridge_stp_helper
16180+ request_key_helper
1617816181 ];
1617916182 rpiVersion = 2;
1618016183 };
@@ -16182,6 +16185,7 @@ in
1618216185 linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
1618316186 kernelPatches = with kernelPatches; [
1618416187 bridge_stp_helper
16188+ request_key_helper
1618516189 ];
1618616190 rpiVersion = 3;
1618716191 };
@@ -16189,6 +16193,7 @@ in
1618916193 linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
1619016194 kernelPatches = with kernelPatches; [
1619116195 bridge_stp_helper
16196+ request_key_helper
1619216197 ];
1619316198 rpiVersion = 4;
1619416199 };
@@ -16196,6 +16201,7 @@ in
1619616201 linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
1619716202 kernelPatches =
1619816203 [ kernelPatches.bridge_stp_helper
16204+ kernelPatches.request_key_helper
1619916205 kernelPatches.cpu-cgroup-v2."4.4"
1620016206 kernelPatches.modinst_arg_list_too_long
1620116207 # https://github.com/NixOS/nixpkgs/issues/42755
@@ -16209,6 +16215,7 @@ in
1620916215 linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix {
1621016216 kernelPatches =
1621116217 [ kernelPatches.bridge_stp_helper
16218+ kernelPatches.request_key_helper
1621216219 kernelPatches.cpu-cgroup-v2."4.9"
1621316220 kernelPatches.modinst_arg_list_too_long
1621416221 ];
@@ -16217,6 +16224,7 @@ in
1621716224 linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix {
1621816225 kernelPatches =
1621916226 [ kernelPatches.bridge_stp_helper
16227+ kernelPatches.request_key_helper
1622016228 # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
1622116229 # when adding a new linux version
1622216230 kernelPatches.cpu-cgroup-v2."4.11"
@@ -16228,6 +16236,7 @@ in
1622816236 linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
1622916237 kernelPatches =
1623016238 [ kernelPatches.bridge_stp_helper
16239+ kernelPatches.request_key_helper
1623116240 kernelPatches.modinst_arg_list_too_long
1623216241 kernelPatches.export_kernel_fpu_functions."4.14"
1623316242 ];
@@ -16236,6 +16245,7 @@ in
1623616245 linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix {
1623716246 kernelPatches = [
1623816247 kernelPatches.bridge_stp_helper
16248+ kernelPatches.request_key_helper
1623916249 kernelPatches.export_kernel_fpu_functions."5.3"
1624016250 ];
1624116251 };
@@ -16243,18 +16253,21 @@ in
1624316253 linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix {
1624416254 kernelPatches = [
1624516255 kernelPatches.bridge_stp_helper
16256+ kernelPatches.request_key_helper
1624616257 ];
1624716258 };
1624816259
1624916260 linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
1625016261 kernelPatches = [
1625116262 kernelPatches.bridge_stp_helper
16263+ kernelPatches.request_key_helper
1625216264 ];
1625316265 };
1625416266
1625516267 linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
1625616268 kernelPatches =
1625716269 [ kernelPatches.bridge_stp_helper
16270+ kernelPatches.request_key_helper
1625816271 kernelPatches.modinst_arg_list_too_long
1625916272 ];
1626016273 };
@@ -16262,6 +16275,7 @@ in
1626216275 linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {
1626316276 kernelPatches = [
1626416277 kernelPatches.bridge_stp_helper
16278+ kernelPatches.request_key_helper
1626516279 kernelPatches.modinst_arg_list_too_long
1626616280 ];
1626716281 };