diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/admin/bubblewrap/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/misc/gringo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/sudo/default.nix | 8 |
8 files changed, 19 insertions, 33 deletions
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index cbec7e86a63f..01172adf075d 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -11,10 +11,7 @@ let ''; # Prevent these __init__'s from violating PEP420, only needed for python2 - postInstall = (attrs.postInstall or "") + '' - rm $out/${python.sitePackages}/azure/{,__pycache__/}__init__.* \ - $out/${python.sitePackages}/azure/cli/{,__pycache__/}__init__.* - ''; + pythonNamespaces = [ "azure.cli" ]; checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []); checkPhase = attrs.checkPhase or '' @@ -39,9 +36,7 @@ let ''; # force PEP420 - postInstall = '' - rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; }); py = python.override { @@ -277,9 +272,7 @@ let propagatedBuildInputs = with self; [ azure-common azure-nspkg msrest msrestazure cryptography ]; - postInstall = '' - rm -f $out/${self.python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; pythonImportsCheck = [ ]; }); diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 8e2ef7c87e1d..eaf283e046ea 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"; }; - nativeBuildInputs = [ libcap libxslt docbook_xsl ]; + nativeBuildInputs = [ libxslt docbook_xsl ]; + buildInputs = [ libcap ]; meta = with stdenv.lib; { description = "Unprivileged sandboxing tool"; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index fd967fce9c6c..6bc365b8e1e1 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { - sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"; + sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"; rev = "v${version}"; repo = pname; owner = pname; }; - patches = [ - # Fix detection of Darwin - (fetchpatch { - url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch"; - sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3"; - }) - ]; - # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; @@ -61,7 +53,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://lz4.github.io/lz4/; + homepage = "https://lz4.github.io/lz4/"; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 705c1a7e1d6a..2d1284d66529 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; }; - buildInputs = [ bison re2c scons ]; + buildInputs = [ bison re2c scons.py2 ]; patches = [ ./gringo-4.5.4-cmath.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index bbec39b9502b..3e1d6c8b8e65 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.22.8"; + version = "1.22.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm"; + sha256 = "0xyaizyp3yz6x3pladw3nvl3hf4n5g140zx9jnxfp9qvag0wqa9b"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 18d9defdd946..e7493ada0584 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca"; + sha256 = "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"; }; # https://github.com/NLnetLabs/unbound/pull/90 diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 203f50a9c0e9..f67e8bedcef1 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.19"; + version = "2.2.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994"; + sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 842509888b41..e92ce05ad1a9 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.8.31"; + version = "1.8.31p1"; src = fetchurl { - url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; - sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y"; + url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; + sha256 = "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67"; }; prePatch = '' @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = https://www.sudo.ws/; + homepage = "https://www.sudo.ws/"; license = https://www.sudo.ws/sudo/license.html; |