From b2278ae3c8a7b8ef6dd976df9c0c0600b1baa038 Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 15:19:20 +0000 Subject: [PATCH 1/6] helm (kubernetes): init at v2.0.2 Added a nix expression to download and install helm; added it to top level packages as kubernetes_helm. --- .../networking/cluster/helm/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/cluster/helm/default.nix diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix new file mode 100644 index 00000000000..6cd751f970d --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, kubernetes }: +let + arch = if stdenv.isLinux + then "linux-amd64" + else "darwin-amd64"; + checksum = if stdenv.isLinux + then "dad3791fb07e6cf34f4cf611728cb8ae109a75234498a888529a68ac6923f200" + else "d27bd7e40e12c0a5f08782a8a883166008565b28e0b82126d2089300ff3f8465"; +in +stdenv.mkDerivation rec { + pname = "helm"; + version = "2.0.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; + sha256 = "${checksum}"; + }; + + buildInputs = [ ]; + + propagatedBuildInputs = [ kubernetes ]; + + phases = [ "buildPhase" "installPhase" ]; + + buildPhase = '' + mkdir -p $out/bin + ''; + + installPhase = '' + tar -xvzf $src + cp ${arch}/helm $out/bin/${pname} + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/kubernetes/helm; + description = "A package manager for kubernetes"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aab12d2288..ea0457d9cb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13341,6 +13341,8 @@ in hello = callPackage ../applications/misc/hello { }; + kubernetes_helm = callPackage ../applications/networking/cluster/helm { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; From 23064168ee1e0f24e9383f3df30661180ec31b9c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:05:37 +0100 Subject: [PATCH 2/6] vault: 0.6.1 -> 0.6.3 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 9118bd3c18f..acd71017a4e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vault-${version}"; - version = "0.6.1"; + version = "0.6.3"; goPackagePath = "github.com/hashicorp/vault"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx"; + sha256 = "0cbaws106v5dxqjii1s9rmk55pm6y34jls35iggpx0pp1dd433xy"; }; buildFlagsArray = '' From af5be37ed5bcbf47deb7577895db9fd1b09173aa Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Dec 2016 15:06:04 +0100 Subject: [PATCH 3/6] vault: add offline as maintainer --- pkgs/tools/security/vault/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index acd71017a4e..85c3625ad46 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -22,6 +22,6 @@ buildGoPackage rec { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; license = licenses.mpl20; - maintainers = [ maintainers.rushmorem ]; + maintainers = with maintainers; [ rushmorem offline ]; }; } From 6107b8932117b722eeb52c6c715f27d7132f388f Mon Sep 17 00:00:00 2001 From: montag451 Date: Sun, 11 Dec 2016 16:58:13 +0100 Subject: [PATCH 4/6] pytun: init at 2.2.1 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31745e5380a..7a8a9cc1cfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9114,6 +9114,29 @@ in { }; + pytun = buildPythonPackage rec { + name = "pytun-${version}"; + version = "2.2.1"; + rev = "v${version}"; + + src = pkgs.fetchFromGitHub { + inherit rev; + owner = "montag451"; + repo = "pytun"; + sha256 = "1bxk0z0v8m0b01xg94f039j3bsclkshb7girvjqfzk5whbd2nryh"; + }; + + doCheck = false; + + meta = { + homepage = https://github.com/montag451/pytun; + description = "Linux TUN/TAP wrapper for Python"; + license = licenses.mit; + maintainers = with maintainers; [ montag451 ]; + platforms = platforms.linux; + }; + }; + raven = buildPythonPackage rec { name = "raven-3.4.1"; From 0783a7d262a929cc1e00ae9049095a17cb1dc662 Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 16:08:24 +0000 Subject: [PATCH 5/6] helm (kubernetes): init at v2.0.2 Added self as package maintainer. Set preferLocalBuild. --- lib/maintainers.nix | 1 + pkgs/applications/networking/cluster/helm/default.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8a3584b0b8d..28258856917 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -384,6 +384,7 @@ retrry = "Tadas BarzdÅžius "; rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; + rlupton20 = "Richard Lupton "; rnhmjoj = "Michele Guerini Rocco "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 6cd751f970d..58ac31ce49f 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "${checksum}"; }; + preferLocalBuild = true; + buildInputs = [ ]; propagatedBuildInputs = [ kubernetes ]; @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/kubernetes/helm; description = "A package manager for kubernetes"; license = licenses.asl20; + maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux ++ platforms.darwin; }; } From 0a8409855558a895699dcd076604ec5e33ad578c Mon Sep 17 00:00:00 2001 From: Richard Lupton Date: Sun, 11 Dec 2016 16:20:51 +0000 Subject: [PATCH 6/6] helm (kubernetes): init at v2.0.2 Changed package name to kubernetes-helm. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea0457d9cb0..be30875f137 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13341,7 +13341,7 @@ in hello = callPackage ../applications/misc/hello { }; - kubernetes_helm = callPackage ../applications/networking/cluster/helm { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };