git.iko.soy/typeable/nixpkgs
on master help sign in
Merge master into staging-next
commit6662f5be2d0eefb297c420f3b092465a498f465b authorFrederik Rietdijk <fridh@fridh.nl> dateSun 1 Dec 2019, 18:55 (7 years ago) parentd7bf92bb7f5048
69 files changed+307−409
nixos/lib/test-driver/test-driver.py+34−1 nixos/modules/config/no-x-libs.nix−1 nixos/modules/services/misc/gitea.nix+22 nixos/tests/ferm.nix+14−16 nixos/tests/nat.nix+29−26 nixos/tests/predictable-interface-names.nix+3−3 pkgs/applications/audio/mda-lv2/default.nix+2−2 pkgs/applications/audio/qtractor/default.nix+2−2 pkgs/applications/audio/strawberry/default.nix+2−2 pkgs/applications/audio/yoshimi/default.nix+2−2 pkgs/applications/display-managers/lightdm/gtk-greeter.nix+2−2 pkgs/applications/editors/neovim/neovim-remote.nix+2−2 pkgs/applications/graphics/fig2dev/default.nix+2−2 pkgs/applications/misc/kanboard/default.nix+2−2 pkgs/applications/misc/minder/default.nix+2−2 pkgs/applications/misc/opencpn/default.nix+3−3 pkgs/applications/misc/taskell/default.nix+2−2 pkgs/applications/misc/xmrig/default.nix+2−2 pkgs/applications/misc/xmrig/proxy.nix+2−2 pkgs/applications/networking/mailreaders/mutt/default.nix+2−2 pkgs/applications/networking/newsreaders/pan/default.nix+2−2 pkgs/applications/office/libreoffice/default.nix+1−1 pkgs/applications/office/libreoffice/still.nix+1−1 pkgs/applications/science/biology/paml/default.nix+2−3 pkgs/applications/window-managers/icewm/default.nix+2−2 pkgs/development/compilers/go-jsonnet/default.nix+13−22 pkgs/development/compilers/go-jsonnet/deps.nix−48 pkgs/development/libraries/libfprint/default.nix+12−28 pkgs/development/libraries/libsolv/default.nix+3−2 pkgs/development/libraries/libxl/default.nix+6−4 pkgs/development/libraries/polkit/default.nix+3−3 pkgs/development/python-modules/aiorpcx/default.nix+2−2 pkgs/development/python-modules/apsw/default.nix+2−10 pkgs/development/python-modules/buildbot/default.nix+2−9 pkgs/development/python-modules/buildbot/pkg.nix+2−2 pkgs/development/python-modules/buildbot/plugins.nix+5−5 pkgs/development/python-modules/buildbot/worker.nix+2−2 pkgs/development/python-modules/matrix-nio/default.nix+2−1 pkgs/development/python-modules/owslib/default.nix+2−2 pkgs/development/python-modules/pykde4/default.nix−46 pkgs/development/python-modules/pykde4/dlfcn.patch−13 pkgs/development/python-modules/pykde4/kdelibs.nix−48 pkgs/development/tools/ammonite/default.nix+1 pkgs/development/tools/clang-tools/wrapper+1−1 pkgs/development/tools/kubectx/default.nix+2−2 pkgs/games/pioneer/default.nix+2−2 pkgs/games/zandronum/default.nix+5−4 pkgs/os-specific/linux/intel-compute-runtime/default.nix+2−2 pkgs/os-specific/linux/ipset/default.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/perf.nix+5−4 pkgs/os-specific/linux/mcelog/default.nix+2−2 pkgs/os-specific/linux/nvidia-x11/default.nix+13−13 pkgs/os-specific/linux/psmisc/default.nix+2−2 pkgs/servers/dns/nsd/default.nix+2−2 pkgs/servers/mail/postfix/default.nix+2−2 pkgs/servers/misc/subsonic/default.nix+2−2 pkgs/servers/squid/default.nix+2−2 pkgs/servers/web-apps/moodle/default.nix+2−2 pkgs/shells/nushell/default.nix+3−3 pkgs/tools/filesystems/grive2/default.nix+2−2 pkgs/tools/networking/haproxy/default.nix+2−2 pkgs/tools/networking/nebula/default.nix+43 pkgs/tools/networking/openapi-generator-cli/default.nix+2−2 pkgs/tools/security/fprintd/default.nix+5−9 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix+2−6 pkgs/top-level/python-packages.nix−5
nixos/lib/test-driver/test-driver.py+34−1
@@ -16,6 +16,8 @@ import tempfile
1616import time
1717import unicodedata
1818from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
19+import shlex
20+import pathlib
1921
2022CHAR_TO_KEY = {
2123 "A": "shift-a",
@@ -91,6 +93,10 @@ def eprint(*args: object, **kwargs: Any) -> None:
9193 print(*args, file=sys.stderr, **kwargs)
9294
9395
96+def make_command(args: list) -> str:
97+ return " ".join(map(shlex.quote, (map(str, args))))
98+
99+
94100def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]:
95101 global log
96102 log.log("starting VDE switch for network {}".format(vlan_nr))
@@ -215,7 +221,7 @@ class Machine:
215221 return path
216222
217223 self.state_dir = create_dir("vm-state-{}".format(self.name))
218− self.shared_dir = create_dir("xchg-shared")
224+ self.shared_dir = create_dir("{}/xchg".format(self.state_dir))
219225
220226 self.booted = False
221227 self.connected = False
@@ -524,6 +530,33 @@ class Machine:
524530 if ret.returncode != 0:
525531 raise Exception("Cannot convert screenshot")
526532
533+ def copy_from_vm(self, source: str, target_dir: str = "") -> None:
534+ """Copy a file from the VM (specified by an in-VM source path) to a path
535+ relative to `$out`. The file is copied via the `shared_dir` shared among
536+ all the VMs (using a temporary directory).
537+ """
538+ # Compute the source, target, and intermediate shared file names
539+ out_dir = pathlib.Path(os.environ.get("out", os.getcwd()))
540+ vm_src = pathlib.Path(source)
541+ with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
542+ shared_temp = pathlib.Path(shared_td)
543+ vm_shared_temp = pathlib.Path("/tmp/xchg") / shared_temp.name
544+ vm_intermediate = vm_shared_temp / vm_src.name
545+ intermediate = shared_temp / vm_src.name
546+ # Copy the file to the shared directory inside VM
547+ self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
548+ self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate]))
549+ self.succeed("sync")
550+ abs_target = out_dir / target_dir / vm_src.name
551+ abs_target.parent.mkdir(exist_ok=True, parents=True)
552+ # Copy the file from the shared directory outside VM
553+ if intermediate.is_dir():
554+ shutil.copytree(intermediate, abs_target)
555+ else:
556+ shutil.copy(intermediate, abs_target)
557+ # Make sure the cleanup is synced into VM
558+ self.succeed("sync")
559+
527560 def dump_tty_contents(self, tty: str) -> None:
528561 """Debugging: Dump the contents of the TTY<n>
529562 """
nixos/modules/config/no-x-libs.nix−1
@@ -35,7 +35,6 @@ with lib;
3535 networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
3636 networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
3737 gobject-introspection = super.gobject-introspection.override { x11Support = false; };
38− polkit = super.polkit.override { withGnome = false; };
3938 }));
4039 };
4140}
nixos/modules/services/misc/gitea.nix+22
@@ -394,6 +394,28 @@ in
394394 WorkingDirectory = cfg.stateDir;
395395 ExecStart = "${gitea.bin}/bin/gitea web";
396396 Restart = "always";
397+
398+ # Filesystem
399+ ProtectSystem = "strict";
400+ ProtectHome = true;
401+ PrivateTmp = true;
402+ PrivateDevices = true;
403+ ProtectKernelTunables = true;
404+ ProtectKernelModules = true;
405+ ProtectControlGroups = true;
406+ ReadWritePaths = cfg.stateDir;
407+ # Caps
408+ CapabilityBoundingSet = "";
409+ NoNewPrivileges = true;
410+ # Misc.
411+ LockPersonality = true;
412+ RestrictRealtime = true;
413+ PrivateMounts = true;
414+ PrivateUsers = true;
415+ MemoryDenyWriteExecute = true;
416+ SystemCallFilter = "~@chown @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap";
417+ SystemCallArchitectures = "native";
418+ RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
397419 };
398420
399421 environment = {
nixos/tests/ferm.nix+14−16
@@ -1,5 +1,5 @@
11
2−import ./make-test.nix ({ pkgs, ...} : {
2+import ./make-test-python.nix ({ pkgs, ...} : {
33 name = "ferm";
44 meta = with pkgs.stdenv.lib.maintainers; {
55 maintainers = [ mic92 ];
@@ -53,24 +53,22 @@ import ./make-test.nix ({ pkgs, ...} : {
5353
5454 testScript =
5555 ''
56− startAll;
56+ start_all()
5757
58− $client->waitForUnit("network-online.target");
59− $server->waitForUnit("ferm.service");
60− $server->waitForUnit("nginx.service");
61− $server->waitUntilSucceeds("ss -ntl | grep -q 80");
58+ client.wait_for_unit("network-online.target")
59+ server.wait_for_unit("ferm.service")
60+ server.wait_for_unit("nginx.service")
61+ server.wait_until_succeeds("ss -ntl | grep -q 80")
6262
63− subtest "port 80 is allowed", sub {
64− $client->succeed("curl --fail -g http://192.168.1.1:80/status");
65− $client->succeed("curl --fail -g http://[fd00::1]:80/status");
66− };
63+ with subtest("port 80 is allowed"):
64+ client.succeed("curl --fail -g http://192.168.1.1:80/status")
65+ client.succeed("curl --fail -g http://[fd00::1]:80/status")
6766
68− subtest "port 8080 is not allowed", sub {
69− $server->succeed("curl --fail -g http://192.168.1.1:8080/status");
70− $server->succeed("curl --fail -g http://[fd00::1]:8080/status");
67+ with subtest("port 8080 is not allowed"):
68+ server.succeed("curl --fail -g http://192.168.1.1:8080/status")
69+ server.succeed("curl --fail -g http://[fd00::1]:8080/status")
7170
72− $client->fail("curl --fail -g http://192.168.1.1:8080/status");
73− $client->fail("curl --fail -g http://[fd00::1]:8080/status");
74− };
71+ client.fail("curl --fail -g http://192.168.1.1:8080/status")
72+ client.fail("curl --fail -g http://[fd00::1]:8080/status")
7573 '';
7674})
nixos/tests/nat.nix+29−26
@@ -3,7 +3,7 @@
33# client on the inside network, a server on the outside network, and a
44# router connected to both that performs Network Address Translation
55# for the client.
6−import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
6+import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
77 let
88 unit = if withFirewall then "firewall" else "nat";
99
@@ -69,49 +69,52 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
6969 routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel;
7070 routerClosure = nodes.router.config.system.build.toplevel;
7171 in ''
72− $client->start;
73− $router->start;
74− $server->start;
72+ client.start()
73+ router.start()
74+ server.start()
7575
7676 # The router should have access to the server.
77− $server->waitForUnit("network.target");
78− $server->waitForUnit("httpd");
79− $router->waitForUnit("network.target");
80− $router->succeed("curl --fail http://server/ >&2");
77+ server.wait_for_unit("network.target")
78+ server.wait_for_unit("httpd")
79+ router.wait_for_unit("network.target")
80+ router.succeed("curl --fail http://server/ >&2")
8181
8282 # The client should be also able to connect via the NAT router.
83− $router->waitForUnit("${unit}");
84− $client->waitForUnit("network.target");
85− $client->succeed("curl --fail http://server/ >&2");
86− $client->succeed("ping -c 1 server >&2");
83+ router.wait_for_unit("${unit}")
84+ client.wait_for_unit("network.target")
85+ client.succeed("curl --fail http://server/ >&2")
86+ client.succeed("ping -c 1 server >&2")
8787
8888 # Test whether passive FTP works.
89− $server->waitForUnit("vsftpd");
90− $server->succeed("echo Hello World > /home/ftp/foo.txt");
91− $client->succeed("curl -v ftp://server/foo.txt >&2");
89+ server.wait_for_unit("vsftpd")
90+ server.succeed("echo Hello World > /home/ftp/foo.txt")
91+ client.succeed("curl -v ftp://server/foo.txt >&2")
9292
9393 # Test whether active FTP works.
94− $client->${if withConntrackHelpers then "succeed" else "fail"}(
95− "curl -v -P - ftp://server/foo.txt >&2");
94+ client.${if withConntrackHelpers then "succeed" else "fail"}("curl -v -P - ftp://server/foo.txt >&2")
9695
9796 # Test ICMP.
98− $client->succeed("ping -c 1 router >&2");
99− $router->succeed("ping -c 1 client >&2");
97+ client.succeed("ping -c 1 router >&2")
98+ router.succeed("ping -c 1 client >&2")
10099
101100 # If we turn off NAT, the client shouldn't be able to reach the server.
102− $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1");
103− $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
104− $client->fail("ping -c 1 server >&2");
101+ router.succeed(
102+ "${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"
103+ )
104+ client.fail("curl --fail --connect-timeout 5 http://server/ >&2")
105+ client.fail("ping -c 1 server >&2")
105106
106107 # And make sure that reloading the NAT job works.
107− $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1");
108+ router.succeed(
109+ "${routerClosure}/bin/switch-to-configuration test 2>&1"
110+ )
108111 # FIXME: this should not be necessary, but nat.service is not started because
109112 # network.target is not triggered
110113 # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
111114 ${lib.optionalString (!withFirewall) ''
112− $router->succeed("systemctl start nat.service");
115+ router.succeed("systemctl start nat.service")
113116 ''}
114− $client->succeed("curl --fail http://server/ >&2");
115− $client->succeed("ping -c 1 server >&2");
117+ client.succeed("curl --fail http://server/ >&2")
118+ client.succeed("ping -c 1 server >&2")
116119 '';
117120 })
nixos/tests/predictable-interface-names.nix+3−3
@@ -4,7 +4,7 @@
44}:
55
66let
7− inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest;
7+ inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
88in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
99 name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
1010 + pkgs.lib.optionalString withNetworkd "Networkd";
@@ -20,8 +20,8 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
2020 };
2121
2222 testScript = ''
23− print $machine->succeed("ip link");
24− $machine->${if predictable then "fail" else "succeed"}("ip link show eth0 ");
23+ print(machine.succeed("ip link"))
24+ machine.${if predictable then "fail" else "succeed"}("ip link show eth0")
2525 '';
2626 };
2727}) [[true false] [true false]])
pkgs/applications/audio/mda-lv2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "mda-lv2";
5− version = "1.2.2";
5+ version = "1.2.4";
66
77 src = fetchurl {
88 url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
9− sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
9+ sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig wafHook ];
pkgs/applications/audio/qtractor/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "qtractor";
8− version = "0.9.10";
8+ version = "0.9.11";
99
1010 src = fetchurl {
1111 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
12− sha256 = "00fj762qdna4bm8hshdhkwfa48s01bi5sk4f030rfk77mivl09jk";
12+ sha256 = "02cpjlf3j4sm74hz88r1frnlycs52rs11mzplr2q8plji3ic5w50";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/applications/audio/strawberry/default.nix+2−2
@@ -35,13 +35,13 @@
3535
3636mkDerivation rec {
3737 pname = "strawberry";
38− version = "0.6.6";
38+ version = "0.6.7";
3939
4040 src = fetchFromGitHub {
4141 owner = "jonaski";
4242 repo = pname;
4343 rev = version;
44− sha256 = "113z2qdcg0fm6ff2k36nl5zbbj5wsidl94ca1sfnsv9bq9lkvck5";
44+ sha256 = "14bw4hmysrbl4havz03s3wl8bv76380wddf5zzrjvfjjpwn333r6";
4545 };
4646
4747 buildInputs = [
pkgs/applications/audio/yoshimi/default.nix+2−2
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
66
77stdenv.mkDerivation rec {
88 pname = "yoshimi";
9− version = "1.6.0.2";
9+ version = "1.6.0.3";
1010
1111 src = fetchurl {
1212 url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
13− sha256 = "0q2cw168r53r50zghkdqcxba2cybn44axbdkwacvkm7ag2z0j2l8";
13+ sha256 = "1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7";
1414 };
1515
1616 buildInputs = [
pkgs/applications/display-managers/lightdm/gtk-greeter.nix+2−2
@@ -20,7 +20,7 @@
2020
2121let
2222 ver_branch = "2.0";
23− version = "2.0.6";
23+ version = "2.0.7";
2424in
2525stdenv.mkDerivation rec {
2626 pname = "lightdm-gtk-greeter";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 src = fetchurl {
3030 url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
31− sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
31+ sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms";
3232 };
3333
3434 nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
pkgs/applications/editors/neovim/neovim-remote.nix+2−2
@@ -4,14 +4,14 @@ with stdenv.lib;
44
55pythonPackages.buildPythonApplication rec {
66 pname = "neovim-remote";
7− version = "2.2.2";
7+ version = "2.2.3";
88 disabled = !pythonPackages.isPy3k;
99
1010 src = fetchFromGitHub {
1111 owner = "mhinz";
1212 repo = "neovim-remote";
1313 rev = "v${version}";
14− sha256 = "129yjpwn6480rd5na866h4mcr6rf60rqv651hks5fn3ws112n751";
14+ sha256 = "0g7gs5gigk3krydxdpmscgfr1fms0a6rc6am2y4c5szkgbd1d0ph";
1515 };
1616
1717 propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
pkgs/applications/graphics/fig2dev/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, ghostscript, libpng } :
22
33let
4− version = "3.2.7a";
4+ version = "3.2.7b";
55
66in stdenv.mkDerivation {
77 pname = "fig2dev";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
99
1010 src = fetchurl {
1111 url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
12− sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx";
12+ sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27";
1313 };
1414
1515 buildInputs = [ libpng ];
pkgs/applications/misc/kanboard/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "kanboard";
5− version = "1.2.11";
5+ version = "1.2.12";
66
77 src = fetchFromGitHub {
88 owner = "kanboard";
99 repo = "kanboard";
1010 rev = "v${version}";
11− sha256 = "0if5nh4m4y3xlvlv86jph7ix5nvpgc1zjkp4cq5iig6z0041bw98";
11+ sha256 = "1m1drgbyk1m6mf69xqlz9gqcj650n9m4y2fdj7d2yv20q8r31489";
1212 };
1313
1414 dontBuild = true;
pkgs/applications/misc/minder/default.nix+2−2
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "minder";
10− version = "1.5.0";
10+ version = "1.5.1";
1111
1212 src = fetchFromGitHub {
1313 owner = "phase1geo";
1414 repo = pname;
1515 rev = version;
16− sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc";
16+ sha256 = "1z3if8bbiigb3m5py641y0j8d9z0s6kbb325waxbqs240pcxipml";
1717 };
1818
1919 nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
pkgs/applications/misc/opencpn/default.nix+3−3
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "opencpn-unstable";
6− version = "2019-05-15";
6+ version = "2019-11-21";
77
88 src = fetchFromGitHub {
99 owner = "OpenCPN";
1010 repo = "OpenCPN";
11− rev = "83a3c4b5ff011d4eb070f009e0a46d194b177047";
12− sha256 = "00s1mxnkf1gg41hrz0zp8ypkp98py0m1c22im2zd09k6lcddxw5p";
11+ rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";
12+ sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
1313 };
1414
1515 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/misc/taskell/default.nix+2−2
@@ -1,8 +1,8 @@
11{ lib, haskellPackages, fetchFromGitHub }:
22
33let
4− version = "1.6.1";
5− sha256 = "047gvpq52pif9sfb4qcfdiwz50x3wlnjvsnnjzypm1qlwyl2rbz1";
4+ version = "1.7.3";
5+ sha256 = "1439fh79ilc6jvz894cfzhk7gy5r2sv4v79bvqmmqbzbqk9qsbvx";
66
77in (haskellPackages.mkDerivation {
88 pname = "taskell";
pkgs/applications/misc/xmrig/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "xmrig";
7− version = "5.0.1";
7+ version = "5.1.0";
88
99 src = fetchFromGitHub {
1010 owner = "xmrig";
1111 repo = "xmrig";
1212 rev = "v${version}";
13− sha256 = "0w6vbrp44l25jhv3kx1m0841rkv7im30581gds0qb7lhyqm0hnbg";
13+ sha256 = "1lkw7xrj20ppfmv7abki9i60yjks9i7nr8ni9p6n7rilfbp4603k";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
pkgs/applications/misc/xmrig/proxy.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "xmrig-proxy";
7− version = "5.0.0";
7+ version = "5.0.1";
88
99 src = fetchFromGitHub {
1010 owner = "xmrig";
1111 repo = "xmrig-proxy";
1212 rev = "v${version}";
13− sha256 = "0h0yxzpar952ix94j10qyf31c20g45w0nxr02vfybjip48dvlf76";
13+ sha256 = "0lp11p4lf03l9x2kcpq1j19z7c1zrdvjmcfh2xyvlbw8pqx0hxkv";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
pkgs/applications/networking/mailreaders/mutt/default.nix+2−2
@@ -27,11 +27,11 @@ with stdenv.lib;
2727
2828stdenv.mkDerivation rec {
2929 pname = "mutt";
30− version = "1.12.2";
30+ version = "1.13.0";
3131
3232 src = fetchurl {
3333 url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
34− sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw";
34+ sha256 = "1dzmypmcyqsxcb0qwz1b2v3nhvd83jcqlnn3acvgaiag10hxq3d0";
3535 };
3636
3737 patches = optional smimeSupport (fetchpatch {
pkgs/applications/networking/newsreaders/pan/default.nix+2−2
@@ -7,7 +7,7 @@
77
88assert spellChecking -> gtkspell3 != null;
99
10−let version = "0.145"; in
10+let version = "0.146"; in
1111
1212stdenv.mkDerivation {
1313 pname = "pan";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515
1616 src = fetchurl {
1717 url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
18− sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
18+ sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
1919 };
2020
2121 nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
pkgs/applications/office/libreoffice/default.nix+1−1
@@ -13,7 +13,7 @@
1313, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
1414, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
1515, gnome3, glib, ncurses, epoxy, gpgme
16−, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
16+, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
1717, withHelp ? true
1818, kdeIntegration ? false
1919}:
pkgs/applications/office/libreoffice/still.nix+1−1
@@ -13,7 +13,7 @@
1313, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
1414, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
1515, gnome3, glib, ncurses, epoxy, gpgme
16−, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
16+, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
1717, withHelp ? true
1818, kdeIntegration ? false
1919}:
pkgs/applications/science/biology/paml/default.nix+2−3
@@ -1,11 +1,11 @@
11{stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
4− version = "4.9i";
4+ version = "4.9j";
55 pname = "paml";
66 src = fetchurl {
77 url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
8− sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
8+ sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp";
99 };
1010
1111 preBuild = ''
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
2929 longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.'';
3030 license = "non-commercial";
3131 homepage = http://abacus.gene.ucl.ac.uk/software/paml.html;
32− broken = true;
3332 };
3433}
pkgs/applications/window-managers/icewm/default.nix+2−2
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 pname = "icewm";
11− version = "1.6.0";
11+ version = "1.6.3";
1212
1313 src = fetchFromGitHub {
1414 owner = "bbidulock";
1515 repo = "icewm";
1616 rev = version;
17− sha256 = "1l8hjmb19d7ds7z21cx207h86wkjcmmmamcnalgkwh4alvbawc2p";
17+ sha256 = "0h3w718x28fd4sz36ka9wpgcb98scna6qpycxzls4cjji3rjgm0l";
1818 };
1919
2020 nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
pkgs/development/compilers/go-jsonnet/default.nix+13−22
@@ -1,33 +1,24 @@
1−{ lib, buildGoPackage, fetchFromGitHub }:
1+{ lib, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "go-jsonnet";
5− version = "0.13.0";
6−
7− goPackagePath = "github.com/google/go-jsonnet";
8−
9− # regenerate deps.nix using following steps:
10− #
11− # go get -u github.com/google/go-jsonnet
12− # cd $GOPATH/src/github.com/google/go-jsonnet
13− # git checkout <version>
14− # dep init
15− # dep2nix
16− goDeps = ./deps.nix;
5+ version = "0.14.0";
176
187 src = fetchFromGitHub {
19− rev = "v${version}";
208 owner = "google";
219 repo = "go-jsonnet";
22− sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy";
23− fetchSubmodules = true;
10+ rev = "v${version}";
11+ sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp";
2412 };
2513
26− meta = {
14+ modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq";
15+
16+ subPackages = [ "cmd/jsonnet" ];
17+
18+ meta = with lib; {
2719 description = "An implementation of Jsonnet in pure Go";
28− maintainers = with lib.maintainers; [ nshalman ];
29− license = lib.licenses.asl20;
30− homepage = https://github.com/google/go-jsonnet;
31− platforms = lib.platforms.unix;
20+ homepage = "https://github.com/google/go-jsonnet";
21+ license = licenses.asl20;
22+ maintainers = with maintainers; [ nshalman ];
3223 };
3324}
pkgs/development/compilers/go-jsonnet/deps.nixdeleted−48
@@ -1,48 +0,0 @@
1−# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
2−[
3− {
4− goPackagePath = "github.com/fatih/color";
5− fetch = {
6− type = "git";
7− url = "https://github.com/fatih/color";
8− rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
9− sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
10− };
11− }
12− {
13− goPackagePath = "github.com/mattn/go-colorable";
14− fetch = {
15− type = "git";
16− url = "https://github.com/mattn/go-colorable";
17− rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
18− sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
19− };
20− }
21− {
22− goPackagePath = "github.com/mattn/go-isatty";
23− fetch = {
24− type = "git";
25− url = "https://github.com/mattn/go-isatty";
26− rev = "1311e847b0cb909da63b5fecfb5370aa66236465";
27− sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h";
28− };
29− }
30− {
31− goPackagePath = "github.com/sergi/go-diff";
32− fetch = {
33− type = "git";
34− url = "https://github.com/sergi/go-diff";
35− rev = "1744e2970ca51c86172c8190fadad617561ed6e7";
36− sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
37− };
38− }
39− {
40− goPackagePath = "golang.org/x/sys";
41− fetch = {
42− type = "git";
43− url = "https://go.googlesource.com/sys";
44− rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307";
45− sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq";
46− };
47− }
48−]
pkgs/development/libraries/libfprint/default.nix+12−28
@@ -1,41 +1,27 @@
1−{ thinkpad ? false
2−, stdenv
3−, fetchFromGitHub
1+{ stdenv
42, fetchurl
53, pkgconfig
64, meson
75, ninja
8−, libusb
6+, gusb
97, pixman
108, glib
119, nss
12−, gtk3
10+, gobject-introspection
1311, coreutils
1412, gtk-doc
1513, docbook_xsl
1614, docbook_xml_dtd_43
17−, openssl ? null
1815}:
1916
20−assert thinkpad -> openssl != null;
21−
2217stdenv.mkDerivation rec {
23− pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
24− version = "1.0";
18+ pname = "libfprint";
19+ version = "1.90";
2520
26− src = {
27− libfprint-thinkpad =
28− fetchFromGitHub {
29− owner = "3v1n0";
30− repo = "libfprint";
31− rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c";
32− sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
33− };
34− libfprint = fetchurl {
35− url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
36− sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
37− };
38− }.${pname};
21+ src = fetchurl {
22+ url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
23+ sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
24+ };
3925
4026 nativeBuildInputs = [
4127 pkgconfig
@@ -44,17 +30,15 @@ stdenv.mkDerivation rec {
4430 gtk-doc
4531 docbook_xsl
4632 docbook_xml_dtd_43
33+ gobject-introspection
4734 ];
4835
4936 buildInputs = [
50− libusb
37+ gusb
5138 pixman
5239 glib
5340 nss
54− gtk3
55− ]
56− ++ stdenv.lib.optional thinkpad openssl
57− ;
41+ ];
5842
5943 mesonFlags = [
6044 "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
pkgs/development/libraries/libsolv/default.nix+3−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
22
33stdenv.mkDerivation rec {
4− version = "0.7.7";
4+ version = "0.7.9";
55 pname = "libsolv";
66
77 src = fetchFromGitHub {
88 owner = "openSUSE";
99 repo = "libsolv";
1010 rev = version;
11− sha256 = "0f6r5j5d4fbzx9ihbbwrqylayw90qac8kapkhmfcvsh7f8whr623";
11+ sha256 = "1ijb4nywc3hx142194d85x7db0j5g2n0i750665fal30qrw2x43y";
1212 };
1313
1414 cmakeFlags = [
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 meta = with stdenv.lib; {
2626 description = "A free package dependency solver";
27+ homepage = "https://github.com/openSUSE/libsolv";
2728 license = licenses.bsd3;
2829 platforms = platforms.linux;
2930 maintainers = with maintainers; [ copumpkin ];
pkgs/development/libraries/libxl/default.nix+6−4
@@ -2,14 +2,15 @@
22
33stdenv.mkDerivation rec {
44 pname = "libxl";
5− version = "3.8.5";
5+ version = "3.8.7";
66
77 src = fetchurl {
88 url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
9− sha256 = "15n8gxyznk1nm2kgp86hd36rnivjsby9ccl12lyabv6q3fab6fsx";
9+ sha256 = "0mfi2mlsgqjw9ki3c5bsb6nr2aqym7s1priw70f69r12azzxfqw3";
1010 };
1111
12− phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
12+ dontConfigure = true;
13+ dontBuild = true;
1314
1415 installPhase = ''
1516 mkdir $out
@@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
1819 '';
1920
2021 meta = with stdenv.lib; {
21− description = "A lbrary for parsing excel files";
22+ description = "A library for parsing Excel files";
23+ homepage = "http://www.libxl.com/";
2224 license = licenses.unfree;
2325 platforms = platforms.linux;
2426 maintainers = with maintainers; [ ];
pkgs/development/libraries/polkit/default.nix+3−3
@@ -2,7 +2,7 @@
22, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
33, docbook_xml_dtd_412, gtk-doc, coreutils
44, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
5−, withGnome ? true
5+, withIntrospection ? true
66# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
77# Not yet investigated; it may be due to the "Make netgroup support optional"
88# patch not updating the tests correctly yet, or doing something wrong,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 [ expat pam spidermonkey_60 ]
5858 # On Linux, fall back to elogind when systemd support is off.
5959 ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
60− ++ stdenv.lib.optional withGnome gobject-introspection;
60+ ++ stdenv.lib.optional withIntrospection gobject-introspection;
6161
6262 propagatedBuildInputs = [
6363 glib # in .pc Requires
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
8686 "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
8787 "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
8888 "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
89− (if withGnome then "--enable-introspection" else "--disable-introspection")
89+ (if withIntrospection then "--enable-introspection" else "--disable-introspection")
9090 ] ++ stdenv.lib.optional (!doCheck) "--disable-test";
9191
9292 makeFlags = [
pkgs/development/python-modules/aiorpcx/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "aiorpcx";
5− version = "0.18.3";
5+ version = "0.18.4";
66
77 src = fetchPypi {
88 inherit version;
99 pname = "aiorpcX";
10− sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp";
10+ sha256 = "0jpvrkan6w8bpq017m8si7r9hb1pyw3ip4vr1fl2pmi8ngzc1jdy";
1111 };
1212
1313 propagatedBuildInputs = [ attrs ];
pkgs/development/python-modules/apsw/default.nix+2−10
@@ -3,7 +3,7 @@
33
44buildPythonPackage rec {
55 pname = "apsw";
6− version = "3.29.0-r1";
6+ version = "3.30.1-r1";
77
88 disabled = isPyPy;
99
@@ -11,19 +11,11 @@ buildPythonPackage rec {
1111 owner = "rogerbinns";
1212 repo = "apsw";
1313 rev = version;
14− sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb";
14+ sha256 = "1zp38gj44bmzfxxpvgd7nixkp8vs2fpl839ag8vrh9z70dax22f0";
1515 };
1616
1717 buildInputs = [ sqlite ];
1818
19− patches = [
20− # Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275
21− (fetchpatch {
22− url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff";
23− sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv";
24− })
25− ];
26−
2719 meta = with stdenv.lib; {
2820 description = "A Python wrapper for the SQLite embedded relational database engine";
2921 homepage = https://github.com/rogerbinns/apsw;
pkgs/development/python-modules/buildbot/default.nix+2−9
@@ -25,11 +25,11 @@ let
2525
2626 package = buildPythonPackage rec {
2727 pname = "buildbot";
28− version = "2.5.0";
28+ version = "2.5.1";
2929
3030 src = fetchPypi {
3131 inherit pname version;
32− sha256 = "06dza7kggybz8nf3i1skkadwrq9s0nkpqjfahifysaag3j3b5rp4";
32+ sha256 = "13ddpcbndb22zlg9gjsf2pbgad45g1w5cg4a3z83085fkgnib7sr";
3333 };
3434
3535 propagatedBuildInputs = [
@@ -74,13 +74,6 @@ let
7474 # This patch disables the test that tries to read /etc/os-release which
7575 # is not accessible in sandboxed builds.
7676 ./skip_test_linux_distro.patch
77− # Work around https://github.com/glyph/automat/issues/117
78− (fetchpatch {
79− url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/buildbot-automat-117.diff?h=packages/buildbot&id=7904292340f98578adfe783a09e9eb4c5b1d4632";
80− name = "buildbot-automat-117.diff";
81− stripLen = 1;
82− sha256 = "0rng6f8nvghkihajz9m925rdp9q3c395bj4wc7r2s1minv613hba";
83− })
8477 ];
8578
8679 postPatch = ''
pkgs/development/python-modules/buildbot/pkg.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "buildbot-pkg";
5− version = "2.5.0";
5+ version = "2.5.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1my9a791y6hsazzqs3f3svl6zw28x3qwj0a0vxffybqdij650nvw";
9+ sha256 = "1g87pddsyas1r0f6z29047cwnz7ds4925f6n9g7b0pkj3k73ci06";
1010 };
1111
1212 postPatch = ''
pkgs/development/python-modules/buildbot/plugins.nix+5−5
@@ -7,7 +7,7 @@
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0awy96pb9s9g0nrmlrvqf5zi878z6mvj653inf9sm89x601a6lp1";
10+ sha256 = "00k5dbcwzqlyk4lcp5qh1q8xbrxmg9gzqs7vl2r6f3wxi4ydb5nw";
1111 };
1212
1313 # Remove unneccessary circular dependency on buildbot
@@ -36,7 +36,7 @@
3636
3737 src = fetchPypi {
3838 inherit pname version;
39− sha256 = "0bp7bbq6rq1kdg3pf8plcpc4amam0pks5dlmyqj6bn29skfa5h1j";
39+ sha256 = "0ai334y779jwqabrn2yjma41pw0a9k1qy7v68qbjd22n4my227ma";
4040 };
4141
4242 buildInputs = [ buildbot-pkg ];
@@ -58,7 +58,7 @@
5858
5959 src = fetchPypi {
6060 inherit pname version;
61− sha256 = "1mxxkqzh4a6574n2lk2ndi77d9g93hjpkwsqizj911n6ibsn4qw3";
61+ sha256 = "1j450hwvg729mivzijbrx8ngalx56qvrx8mwwgy8arfwpnyfkr9l";
6262 };
6363
6464 buildInputs = [ buildbot-pkg ];
@@ -80,7 +80,7 @@
8080
8181 src = fetchPypi {
8282 inherit pname version;
83− sha256 = "1fkrd5crbgqgp8mr8qgfy559f59ys6hrspddzk3fwg5hrsckkjwr";
83+ sha256 = "19w8is5s7d7l60mlchh1zd9nidpkswi8fivfa36b97plibn0jgw1";
8484 };
8585
8686 buildInputs = [ buildbot-pkg ];
@@ -102,7 +102,7 @@
102102
103103 src = fetchPypi {
104104 inherit pname version;
105− sha256 = "0cvbizcc92df08xcs8w6ah51yfilxz7sx9g8bbdrvw6m586ziczb";
105+ sha256 = "1zl7y08rkw7bya6cli44msvcdgirsyfg3kxpf2z82vwgc6bwi785";
106106 };
107107
108108 buildInputs = [ buildbot-pkg ];
pkgs/development/python-modules/buildbot/worker.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage (rec {
55 pname = "buildbot-worker";
6− version = "2.5.0";
6+ version = "2.5.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "05c8q6ykharry4lv47imh6agq55fxar8a9ldwx46clb480qwyc43";
10+ sha256 = "1kpj85x8xflrccvy840v9bl3q1j63rk9kahj1qirbai1fxwvzbik";
1111 };
1212
1313 propagatedBuildInputs = [ twisted future ];
pkgs/development/python-modules/matrix-nio/default.nix+2−1
@@ -1,6 +1,6 @@
11{ lib, buildPythonPackage, fetchFromGitHub, git,
22 attrs, future, peewee, h11, h2, atomicwrites, pycryptodome, sphinx, Logbook, jsonschema,
3− python-olm, unpaddedbase64, aiohttp }:
3+ python-olm, unpaddedbase64, aiohttp, cachetools }:
44
55buildPythonPackage rec {
66 pname = "nio";
@@ -36,6 +36,7 @@ buildPythonPackage rec {
3636 python-olm
3737 unpaddedbase64
3838 aiohttp
39+ cachetools
3940 ];
4041
4142 doCheck = false;
pkgs/development/python-modules/owslib/default.nix+2−2
@@ -1,11 +1,11 @@
11{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } :
22buildPythonPackage rec {
33 pname = "OWSLib";
4− version = "0.18.0";
4+ version = "0.19.0";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "018p2ypmpbbcgl0hp92s0vig1wirh41lj0wy62aafn5050pmqr7m";
8+ sha256 = "0rdhymayyc6w1izlv1bf2wgx2dfxbp4k1vll5s1364isw60rjj8x";
99 };
1010
1111 buildInputs = [ pytest ];
pkgs/development/python-modules/pykde4/default.nixdeleted−46
@@ -1,46 +0,0 @@
1−{ pyqt4, openssl_1_0_2
2−, stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
3−
4−let
5− kdelibs = callPackage ./kdelibs.nix {
6− openssl = openssl_1_0_2;
7− };
8− sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
9− src = fetchurl {
10− url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
11− sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
12− };
13− });
14− pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: {
15− propagatedBuildInputs = [ sip4_19_3 ];
16− });
17−in stdenv.mkDerivation rec {
18− version = "4.14.3";
19− pname = "pykde4";
20−
21− src = fetchurl {
22− url = "mirror://kde/stable/${version}/src/${pname}-${version}.tar.xz";
23− sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
24− };
25−
26− patches = [ ./dlfcn.patch ];
27−
28− buildInputs = [
29− kdelibs
30− ];
31−
32− nativeBuildInputs = [ cmake automoc4 ];
33−
34− propagatedBuildInputs = [ pyqt4_fixed ];
35−
36− enableParallelBuilding = true;
37−
38− meta = with stdenv.lib; {
39− platforms = platforms.linux;
40− hydraPlatforms = platforms.none;
41− description = "Python bindings for KDE";
42− license = with licenses; [ gpl2 lgpl2 ];
43− homepage = https://api.kde.org/pykde-4.3-api/;
44− maintainers = with maintainers; [ gnidorah ];
45− };
46−}
pkgs/development/python-modules/pykde4/dlfcn.patchdeleted−13
@@ -1,13 +0,0 @@
1−--- __init__.py.orig 2017-11-02 09:06:48.998054459 +0300
2−+++ ./__init__.py 2017-11-02 09:24:28.089072752 +0300
3−@@ -1,4 +1,8 @@
4−-import sys,DLFCN
5−+import sys
6−+try:
7−+ import DLFCN
8−+except ImportError:
9−+ import os as DLFCN
10− # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs.
11− sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL)
12−
13−\ No newline at end of file
pkgs/development/python-modules/pykde4/kdelibs.nixdeleted−48
@@ -1,48 +0,0 @@
1−{
2− stdenv, fetchurl, fetchpatch,
3− automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
4− attica, docbook_xml_dtd_42, docbook_xsl, giflib,
5− libdbusmenu_qt, libjpeg, phonon, qt4, openssl
6−}:
7−
8−stdenv.mkDerivation rec {
9− version = "4.14.38";
10− pname = "kdelibs";
11− src = fetchurl {
12− url = "mirror://kde/stable/applications/17.08.3/src/${pname}-${version}.tar.xz";
13− sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
14− };
15− patches = [
16− # https://phabricator.kde.org/D22989
17− (fetchpatch {
18− url = "https://cgit.kde.org/kdelibs.git/patch/?id=2c3762feddf7e66cf6b64d9058f625a715694a00";
19− sha256 = "1wbzywh8lcc66n6y3pxs18h7cwkq6g216faz27san33jpl8ra1i9";
20− name = "CVE-2019-14744.patch";
21− })
22− ];
23−
24− enableParallelBuilding = true;
25−
26− nativeBuildInputs = [
27− automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
28− ];
29− buildInputs = [
30− attica giflib libdbusmenu_qt libjpeg openssl
31− ];
32− propagatedBuildInputs = [ qt4 phonon ];
33−
34− cmakeFlags = [
35− "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
36− "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
37− "-DKJS_FORCE_DISABLE_PCRE=true"
38− "-DWITH_SOLID_UDISKS2=OFF"
39− ];
40−
41− meta = with stdenv.lib; {
42− platforms = platforms.linux;
43− hydraPlatforms = platforms.none;
44− homepage = http://www.kde.org;
45− license = with licenses; [ gpl2 fdl12 lgpl21 ];
46− maintainers = with maintainers; [ gnidorah ];
47− };
48−}
pkgs/development/tools/ammonite/default.nix+1
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
2323 '' + optionalString (disableRemoteLogging) ''
2424 sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
25+ sed -i '1i #!/bin/sh' $out/bin/amm
2526 '';
2627
2728 meta = {
pkgs/development/tools/clang-tools/wrapper+1−1
@@ -6,7 +6,7 @@ buildcpath() {
66 case $1 in
77 -isystem)
88 shift
9− path=$path${path':'}$1
9+ path=$path${path:+':'}$1
1010 esac
1111 shift
1212 done
pkgs/development/tools/kubectx/default.nix+2−2
@@ -4,13 +4,13 @@ with lib;
44
55stdenv.mkDerivation rec {
66 pname = "kubectx";
7− version = "0.7.0";
7+ version = "0.7.1";
88
99 src = fetchFromGitHub {
1010 owner = "ahmetb";
1111 repo = pname;
1212 rev = "v${version}";
13− sha256 = "11snp3li2w4ds2r7fc6mldlgj24mga40v0knlralaiz296bd6zcs";
13+ sha256 = "0mv40jh94by99i5wkf3p52wk4l68hvly1k5gnn7zsy9avc8fjd0p";
1414 };
1515
1616 buildInputs = [ makeWrapper ];
pkgs/games/pioneer/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "pioneer";
8− version = "20191009";
8+ version = "20191117";
99
1010 src = fetchFromGitHub{
1111 owner = "pioneerspacesim";
1212 repo = "pioneer";
1313 rev = version;
14− sha256 = "1ll6pv1931z29kz1zvhnc6mgvjxz30q25lvb00qrsvh236nvll7n";
14+ sha256 = "0ka5w1sfp56bs3njiwyr6ffy34qvqbzcvmra9cqwyvi7famn8b49";
1515 };
1616
1717 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/games/zandronum/default.nix+5−4
@@ -9,13 +9,14 @@ let
99 sqlite = callPackage ./sqlite.nix { };
1010 clientLibPath = lib.makeLibraryPath [ fluidsynth ];
1111
12−in stdenv.mkDerivation {
13− name = "zandronum${suffix}-3.0";
12+in stdenv.mkDerivation rec {
13+ pname = "zandronum${suffix}";
14+ version = "3.0.1";
1415
1516 src = fetchhg {
1617 url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
17− rev = "dd3c3b57023f";
18− sha256 = "1f8pd8d2zjwdp6v9anp9yrkdbfhd2mp7svmnna0jiqgxjw6wkyls";
18+ rev = "ZA_${version}";
19+ sha256 = "16v5b6wfrmabs3ky6isbfhlrqdjrr1pvfxlxwk0im02kcpxxw9qw";
1920 };
2021
2122 # zandronum tries to download sqlite now when running cmake, don't let it
pkgs/os-specific/linux/intel-compute-runtime/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "intel-compute-runtime";
14− version = "19.34.13959";
14+ version = "19.44.14658";
1515
1616 src = fetchFromGitHub {
1717 owner = "intel";
1818 repo = "compute-runtime";
1919 rev = version;
20− sha256 = "1m54w5p5pilrkmlmqgvgrsm3d5dqfdr4jai5siq5ccsqj4gnv1wz";
20+ sha256 = "1pl7yhmgzf7r2b8jyxzmwdc7772gd24izy2z2g4n5s205s125k7x";
2121 };
2222
2323 # Build script tries to write the ICD to /etc
pkgs/os-specific/linux/ipset/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pkgconfig, libmnl }:
22
33stdenv.mkDerivation rec {
4− name = "ipset-7.3";
4+ name = "ipset-7.4";
55
66 src = fetchurl {
77 url = "http://ipset.netfilter.org/${name}.tar.bz2";
8− sha256 = "0nm3vagr1pb5hr1028qrwx6v6s8bxf1m4qjx72vak42y032wfi26";
8+ sha256 = "110q996yrf74ckpkc5f4pn8j5bqq98f27fsak3ibgr3zwmv435sa";
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.14.156";
6+ version = "4.14.157";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1h47fxfbq0d5ry7j3jxz45v5c4103qncgm2vydpz6zdx1kmrz27q";
16+ sha256 = "0cvpagbjwpj63lpybfq1rnwdnxcjw49z0b5prah39krf0nd7dylh";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "4.19.86";
6+ version = "4.19.87";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1xmzcxsiydym574y7k313qd8s4c3mdahpb3nx3cingfl36ivnb5z";
16+ sha256 = "07fsds2k0hxqgny86winzl46d79g6mb9s28bp7nwlvwf67l22wm5";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/perf.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
1+{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper
22, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
33, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
44, zlib, withGtk ? false, gtk2 ? null
@@ -36,12 +36,13 @@ stdenv.mkDerivation {
3636 # perf refers both to newt and slang
3737 nativeBuildInputs = [
3838 asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
39− flex bison libiberty audit makeWrapper pkgconfig python perl
39+ flex bison libiberty audit makeWrapper pkgconfig
4040 ];
4141 buildInputs = [
4242 elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
43− libopcodes
44− ] ++ stdenv.lib.optional withGtk gtk2;
43+ libopcodes python3 perl
44+ ] ++ stdenv.lib.optional withGtk gtk2
45+ ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]);
4546
4647 # Note: we don't add elfutils to buildInputs, since it provides a
4748 # bad `ld' and other stuff.
pkgs/os-specific/linux/mcelog/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "mcelog";
5− version = "165";
5+ version = "166";
66
77 src = fetchFromGitHub {
88 owner = "andikleen";
99 repo = "mcelog";
1010 rev = "v${version}";
11− sha256 = "1g242qz3jj7amgar497bbd8krljspwy89g1r32wz3fdpkn9m1w8s";
11+ sha256 = "0q76lf5yrjq7b96ynj5dbf9ll94ymiab1b9106xpb4vbiwz0ia7w";
1212 };
1313
1414 postPatch = ''
pkgs/os-specific/linux/nvidia-x11/default.nix+13−13
@@ -20,25 +20,25 @@ if ((!lib.versionOlder args.version "391")
2020in
2121rec {
2222 # Policy: use the highest stable version as the default (on our master).
23− stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_43x else legacy_390;
23+ stable = if stdenv.hostPlatform.system == "x86_64-linux"
24+ then generic {
25+ version = "440.36";
26+ sha256_64bit = "0nbdldwizb802w4x0rqnyb1p7iqz5nqiahqr534n5ihz21a6422h";
27+ settingsSha256 = "07hnl3bq76vsl655ipfx9v4zxjq0nc5hp43dk49nny4pi6ly06p1";
28+ persistencedSha256 = "08zm1i5sax16xfhkivkmady0yy5argmxv846x21q98ry1ic6cp6w";
29+ }
30+ else legacy_390;
2431
2532 # No active beta right now
2633 beta = stable;
2734
28− stable_43x = generic {
29− version = "435.21";
30− sha256_64bit = "0v3pq677ab01qdmwl5dawk8hn39qlwj05p8s9qzh9irmrlnc1izs";
31− settingsSha256 = "1p13cz79kncwx5067a3d7dbz6a1ibp611zynp1qdxpa65hwp2pxa";
32− persistencedSha256 = "0br8znxhz2ryzdj0j4jhqzvdgw9h899q8yz0p9429xz4wxkavgdr";
33− };
34−
3535 # Last one supporting x86
3636 legacy_390 = generic {
37− version = "390.129";
38− sha256_32bit = "0dkgkp0zx40hf1fsq5xnvbschp7r3c1x1pnpdxna24pi4s62cm2q";
39− sha256_64bit = "0h0jcckqpd63vaj95lvdgj2sbbn9y1ri1xx7r2snxfx0plhwz46n";
40− settingsSha256 = "1w5nkxs7a40mq0qf97nhfazdqhfn1bvr54v50s8p0ggixb6vdm3l";
41− persistencedSha256 = "02v76202qcnh8hvg4y9wmk9swdlv7z39ppfd1c850nlv158vn5nf";
37+ version = "390.132";
38+ sha256_32bit = "0xgjywzkmmm6a5gby67l2kx0gn7bcxksv4wam0sqym6l1s7v5bai";
39+ sha256_64bit = "0qgzsajrc3xkf2jjkwip3la0f2ixp45f76nmz5cphvzrb7k2slxn";
40+ settingsSha256 = "07nylqzhldq1gr40q7x5424p2aml3qqnvl2zvnpzc65x2way34v6";
41+ persistencedSha256 = "0vab5rj9b1n9yl9674q7i88w1i5p8nhvrwsayn7i1vh4wp3m840r";
4242 };
4343
4444 legacy_340 = generic {
pkgs/os-specific/linux/psmisc/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "psmisc";
5− version = "23.2";
5+ version = "23.3";
66
77 src = fetchFromGitLab {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0d90wmibxpkl0d7sdibvvkwpyxyg6m6ksh5gwrjh15vf1swvd5i1";
11+ sha256 = "1132xvrldv0dar2mf221mv5kvajq0v6yrq8k3nl0wslnh5baa0r0";
1212 };
1313
1414 nativeBuildInputs = [ autoconf automake gettext ];
pkgs/servers/dns/nsd/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717stdenv.mkDerivation rec {
1818 pname = "nsd";
19− version = "4.2.2";
19+ version = "4.2.3";
2020
2121 src = fetchurl {
2222 url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
23− sha256 = "1ys608jyp5scc957q4brm094c97sxlwymina7d2nvzi51aa37cw3";
23+ sha256 = "1664wpglrwqk627xma10f9qa652vzmf90gsjd8pribyj74xrczc1";
2424 };
2525
2626 prePatch = ''
pkgs/servers/mail/postfix/default.nix+2−2
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
2626
2727 pname = "postfix";
2828
29− version = "3.4.7";
29+ version = "3.4.8";
3030
3131 src = fetchurl {
3232 url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
33− sha256 = "0rzr0n1gljhmxidsslbr9505xcv0hm8jahkp4dm87a1v3l956cpy";
33+ sha256 = "0hw9kbr05qdzvfqhxi4dp4n3s9xvdh0gr0la08a4bip06ybl4pcd";
3434 };
3535
3636 nativeBuildInputs = [ makeWrapper m4 ];
pkgs/servers/misc/subsonic/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "subsonic";
5− version = "6.1.5";
5+ version = "6.1.6";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz";
9− sha256 = "1xz3flxd5hxcvvg1izzxpv5rxwb5zprk92vsgvmcniy7j7r66936";
9+ sha256 = "180qdk8mnc147az8v9rmc1kgf8b13mmq88l195gjdwiqpflqzdyz";
1010 };
1111
1212 inherit jre;
pkgs/servers/squid/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "squid-4.8";
6+ name = "squid-4.9";
77
88 src = fetchurl {
99 url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
10− sha256 = "0432m0ix046rkja7r7qpydgsm2kf1w393xym15nx6h9kv4jb7kbq";
10+ sha256 = "188znkbpr315yxbpvpvbpb5sbsn15zmg8l207a55dc43cs687c8w";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
pkgs/servers/web-apps/moodle/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, writeText }:
22
33let
4− version = "3.7.3";
4+ version = "3.8";
55 stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
66in
77
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 src = fetchurl {
1313 url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
14− sha256 = "1n82n77lw83a5wjfjbvc74h2ny2z0zkdprxk7sai88rg6rix33ak";
14+ sha256 = "00ssx0drgp1fy062x6alp0x8di7hjn4xc87v8skpy3aznchfxyk9";
1515 };
1616
1717 phpConfig = writeText "config.php" ''
pkgs/shells/nushell/default.nix+3−3
@@ -13,16 +13,16 @@
1313
1414rustPlatform.buildRustPackage rec {
1515 pname = "nushell";
16− version = "0.6.0";
16+ version = "0.6.1";
1717
1818 src = fetchFromGitHub {
1919 owner = pname;
2020 repo = pname;
2121 rev = version;
22− sha256 = "012fhy7ni4kyxypn25ssj6py1zxwk41bj4xb1ni4zaw47fqsj1nw";
22+ sha256 = "0fdi5c9l8ij2vqcxwi9203mh1qj3lcqsl4kl2rkshqj45hn4ab2a";
2323 };
2424
25− cargoSha256 = "17r6g80qcy1mb195fl5iwcr83d35q2hs71camhwjbdh8yrs9l1la";
25+ cargoSha256 = "11cr88jmy34lzjka7agzfvm13hvg66ksa735rzcdx7lcxha538f3";
2626
2727 nativeBuildInputs = [ pkg-config ]
2828 ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ];
pkgs/tools/filesystems/grive2/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
22
33stdenv.mkDerivation rec {
4− version = "0.5.0";
4+ version = "0.5.1";
55 pname = "grive2";
66
77 src = fetchFromGitHub {
88 owner = "vitalif";
99 repo = "grive2";
1010 rev = "v${version}";
11− sha256 = "0gyic9228j25l5x8qj9xxxp2cgbw6y4skxqx0xrq6qilhv4lj23c";
11+ sha256 = "1kv34ys8qarjsxpb1kd8dp7b3b4ycyiwjzd6mg97d3jk7405g6nm";
1212 };
1313
1414 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/tools/networking/haproxy/default.nix+2−2
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
1111
1212stdenv.mkDerivation rec {
1313 pname = "haproxy";
14− version = "2.0.8";
14+ version = "2.0.10";
1515
1616 src = fetchurl {
1717 url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
18− sha256 = "02i87hr1dfhrk6nvvcig4m9bpww7hyl6qcxcl20rfvxd2n2iwzn3";
18+ sha256 = "1sm42q9l159pdmjs5dg544z10dn6x073caljkqh0p4syshysnf0x";
1919 };
2020
2121 buildInputs = [ openssl zlib ]
pkgs/tools/networking/nebula/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ lib, buildGoModule, fetchFromGitHub }:
2+
3+buildGoModule rec {
4+ pname = "nebula";
5+ version = "1.0.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "slackhq";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "0j7fna352z8kzx6n0hck7rp122c0v44j9syz0v30vq47xq2pwj5c";
12+ };
13+
14+ modSha256 = "130h0gc5z0w5inpc99y6mismwg3nyzk3bqdq5v9yclkxlhkbcp6d";
15+
16+ subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
17+
18+ buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ];
19+
20+ meta = with lib; {
21+ description = "A scalable overlay networking tool with a focus on performance, simplicity and security";
22+ longDescription = ''
23+ Nebula is a scalable overlay networking tool with a focus on performance,
24+ simplicity and security. It lets you seamlessly connect computers
25+ anywhere in the world. Nebula is portable, and runs on Linux, OSX, and
26+ Windows. (Also: keep this quiet, but we have an early prototype running
27+ on iOS). It can be used to connect a small number of computers, but is
28+ also able to connect tens of thousands of computers.
29+
30+ Nebula incorporates a number of existing concepts like encryption,
31+ security groups, certificates, and tunneling, and each of those
32+ individual pieces existed before Nebula in various forms. What makes
33+ Nebula different to existing offerings is that it brings all of these
34+ ideas together, resulting in a sum that is greater than its individual
35+ parts.
36+ '';
37+ homepage = "https://github.com/slackhq/nebula";
38+ license = licenses.mit;
39+ maintainers = with maintainers; [ filalex77 ];
40+ platforms = platforms.all;
41+ };
42+
43+}
pkgs/tools/networking/openapi-generator-cli/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, jre, makeWrapper }:
22
33stdenv.mkDerivation rec {
4− version = "4.2.0";
4+ version = "4.2.1";
55 pname = "openapi-generator-cli";
66
77 jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 src = fetchurl {
1414 url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
15− sha256 = "00c5y06b8lm6lhnnvl42yndwdgn42bwwfc7p1q7zcsga275b6jpb";
15+ sha256 = "1inkiqbr183ksmkvpawagv1gqgc323wa1d6sdrd33pb9lk6wahdl";
1616 };
1717
1818 phases = [ "installPhase" ];
pkgs/tools/security/fprintd/default.nix+5−9
@@ -1,11 +1,9 @@
1−{ thinkpad ? false
2−, stdenv
1+{ stdenv
32, fetchurl
43, fetchpatch
54, pkgconfig
65, intltool
7−, libfprint-thinkpad ? null
8−, libfprint ? null
6+, libfprint
97, glib
108, dbus-glib
119, polkit
@@ -17,7 +15,7 @@
1715}:
1816
1917stdenv.mkDerivation rec {
20− pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
18+ pname = "fprintd";
2119 version = "0.9.0";
2220
2321 src = fetchurl {
@@ -46,10 +44,8 @@ stdenv.mkDerivation rec {
4644 nss
4745 pam
4846 systemd
49− ]
50− ++ stdenv.lib.optional thinkpad libfprint-thinkpad
51− ++ stdenv.lib.optional (!thinkpad) libfprint
52− ;
47+ libfprint
48+ ];
5349
5450 configureFlags = [
5551 # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
pkgs/top-level/aliases.nix+2
@@ -115,6 +115,7 @@ mapAliases ({
115115 '';
116116 font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
117117 foomatic_filters = foomatic-filters; # 2016-08
118+ fprintd-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
118119 fuse_exfat = exfat; # 2015-09-11
119120 fuseki = apache-jena-fuseki; # added 2018-04-25
120121 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
@@ -193,6 +194,7 @@ mapAliases ({
193194 liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
194195 liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
195196 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
197+ libfprint-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
196198 libgnome_keyring = libgnome-keyring; # added 2018-02-25
197199 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
198200 libgumbo = gumbo; # added 2018-01-21
pkgs/top-level/all-packages.nix+2−6
@@ -3303,9 +3303,6 @@ in
33033303 fprot = callPackage ../tools/security/fprot { };
33043304
33053305 fprintd = callPackage ../tools/security/fprintd { };
3306− fprintd-thinkpad = fprintd.override {
3307− thinkpad = true;
3308− };
33093306
33103307 franz = callPackage ../applications/networking/instant-messengers/franz { };
33113308
@@ -5075,6 +5072,8 @@ in
50755072
50765073 ndppd = callPackage ../applications/networking/ndppd { };
50775074
5075+ nebula = callPackage ../tools/networking/nebula { };
5076+
50785077 nemiver = callPackage ../development/tools/nemiver { };
50795078
50805079 neofetch = callPackage ../tools/misc/neofetch { };
@@ -12220,9 +12219,6 @@ in
1222012219 };
1222112220
1222212221 libfprint = callPackage ../development/libraries/libfprint { };
12223− libfprint-thinkpad = libfprint.override {
12224− thinkpad = true;
12225− };
1222612222
1222712223 libfpx = callPackage ../development/libraries/libfpx { };
1222812224
pkgs/top-level/python-packages.nix−5
@@ -1049,11 +1049,6 @@ in {
10491049
10501050 pyjwkest = callPackage ../development/python-modules/pyjwkest { };
10511051
1052− pykde4 = callPackage ../development/python-modules/pykde4 {
1053− inherit (self) pyqt4;
1054− callPackage = pkgs.callPackage;
1055− };
1056−
10571052 pykdtree = callPackage ../development/python-modules/pykdtree {
10581053 inherit (pkgs.llvmPackages) openmp;
10591054 };