From 1dfae0678d33f88c787d249cd360d30717411a1a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 9 Jun 2016 11:25:27 +0200
Subject: [PATCH] nomad: extracted from goPackages
---
.../networking/cluster/nomad/default.nix | 25 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +-
pkgs/top-level/go-packages.nix | 8 ------
3 files changed, 26 insertions(+), 9 deletions(-)
create mode 100644 pkgs/applications/networking/cluster/nomad/default.nix
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
new file mode 100644
index 00000000000..b718447e8f8
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "nomad-${version}";
+ version = "0.3.2";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/hashicorp/nomad";
+ subPackages = [ "." ];
+
+ src = fetchFromGitHub {
+ owner = "hashicorp";
+ repo = "nomad";
+ inherit rev;
+ sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://www.nomadproject.io/;
+ license = licenses.mpl20;
+ description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ rushmorem ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51f4ada1374..3ed2ea1eeae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2611,7 +2611,7 @@ in
noip = callPackage ../tools/networking/noip { };
- nomad = goPackages.nomad.bin // { outputs = [ "bin" ]; };
+ nomad = callPackage ../applications/networking/cluster/nomad { };
milu = callPackage ../applications/misc/milu { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ea363589423..25f31085da1 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2260,14 +2260,6 @@ let
sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
};
- nomad = buildFromGitHub {
- rev = "v0.3.2";
- owner = "hashicorp";
- repo = "nomad";
- sha256 = "1m2pdragpzrq0xbmnba039iiyhb16wirj3n1s52z5r8r0mr7drai";
- subPackages = [ "." ];
- };
-
ntp = buildFromGitHub {
rev = "0a5264e2563429030eb922f258229ae3fee5b5dc";
owner = "beevik";