diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-20 18:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 18:01:42 +0000 |
| commit | 23c6d36ba0f72916be4c69c9d353a1999c6b01a0 (patch) | |
| tree | 1fdbd95e934a9aa66102d69dbb2670e738713e5a /pkgs/tools/networking | |
| parent | ab5f5fb163ddc8e285c087a0e984a505ee779b77 (diff) | |
| parent | 61eb7e2e9e36e062a3bd323155441f78e9fcd7ed (diff) | |
| download | nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar.gz nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar.bz2 nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar.lz nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar.xz nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.tar.zst nixpkgs-23c6d36ba0f72916be4c69c9d353a1999c6b01a0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 896b3402d16..6632485b709 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -7,7 +7,8 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "maphosts-${env.gems.maphosts.version}"; + pname = "maphosts"; + version = env.gems.maphosts.version; dontUnpack = true; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index b195c655c93..34d2c22fb24 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 306654f05d9..33eb33e10b0 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index ebbaaa73fce..ddccc9ac635 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.13"; + version = "3.8.2"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; + sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc="; meta = with lib; { description = "Unified hosts file with base extensions"; |