diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-08 06:20:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 06:20:08 +0000 |
| commit | 3494be83655119b8e0550d6c92b71a8cbfe208d9 (patch) | |
| tree | 12d91769e3772e828263ec989ba0a200bfea0f68 /pkgs/tools | |
| parent | 2c8518891165fdc1c5e04e3a33e5bd2695605519 (diff) | |
| parent | e21fb16f9a9073f6eba5e250ad13d94eca968df2 (diff) | |
| download | nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar.gz nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar.bz2 nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar.lz nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar.xz nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.tar.zst nixlib-3494be83655119b8e0550d6c92b71a8cbfe208d9.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/oci-cli/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/misc/tlp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 16ecff07b734..8996ef5069f3 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -46,7 +46,8 @@ python3Packages.buildPythonApplication rec { --replace "cryptography==3.2.1" "cryptography" \ --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ --replace "PyYAML==5.3.1" "PyYAML" \ - --replace "six==1.14.0" "six" + --replace "six==1.14.0" "six" \ + --replace "arrow==0.17.0" "arrow" ''; meta = with lib; { diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index b39f631f95bf..a615330a4a8f 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -88,7 +88,7 @@ systemd util-linux ] ++ lib.optional enableRDW networkmanager - ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform x86_energy_perf_policy) x86_energy_perf_policy ); in '' diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index eefa49acb93a..bb79ad956a67 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "USE_PCRE_JIT=yes" ] ++ lib.optionals useLua [ "USE_LUA=yes" + "LUA_LIB_NAME=lua" "LUA_LIB=${lua5_3}/lib" "LUA_INC=${lua5_3}/include" ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac61a64180dc..4dfdb7075a5b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -21,7 +21,7 @@ common = , storeDir , stateDir , confDir - , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp + , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , pname, version, suffix ? "", src |