diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-20 18:27:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 18:27:12 +0200 |
| commit | ab5f5fb163ddc8e285c087a0e984a505ee779b77 (patch) | |
| tree | f9da219a57c4e59c852fd7bd2b7d520557417649 /pkgs/applications/networking/cluster | |
| parent | 0e13cd9f49764db41220637ac56c2040ee48ce07 (diff) | |
| parent | e4e631ebb81da8b76f9159736b63c727c05aa4db (diff) | |
| download | nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.gz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.bz2 nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.lz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.xz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.zst nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.zip | |
Merge pull request #129359 from Stunkymonkey/app-networking
Diffstat (limited to 'pkgs/applications/networking/cluster')
| -rw-r--r-- | pkgs/applications/networking/cluster/kubectl/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/kuttl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/pig/default.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index c550a0e2f2b..fec93d8878e 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -1,7 +1,8 @@ { stdenv, kubernetes, installShellFiles }: stdenv.mkDerivation { - name = "kubectl-${kubernetes.version}"; + pname = "kubectl"; + version = kubernetes.version; # kubectl is currently part of the main distribution but will eventially be # split out (see homepage) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 0c8f7f1574c..dfa06cc6968 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -1,7 +1,6 @@ { lib, buildGoModule, fetchFromGitHub}: buildGoModule rec { - name = "kuttl"; pname = "kuttl"; version = "0.9.0"; cli = "kubectl-kuttl"; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index ded8a2ea493..a4270fbcea3 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }: stdenv.mkDerivation rec { - - name = "pig-0.17.0"; + pname = "pig"; + version = "0.17.0"; src = fetchurl { - url = "mirror://apache/pig/${name}/${name}.tar.gz"; + url = "mirror://apache/pig/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd"; }; |