From 536617361497ad0badce015040ccd35d3d1fbf3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Kne=C5=BEevi=C4=87?= Date: Mon, 1 Jul 2019 22:02:25 +0200 Subject: [PATCH] nomad: 0.8.7 -> 0.9.3 (#63854) 0.9 series require go 1.11.11+ so switching to default 1.12. --- pkgs/applications/networking/cluster/nomad/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 9e55c2f8a0f..63a127def7f 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.8.7"; + version = "0.9.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,9 +12,13 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "0nkqiqkrccfmn7qkbhd48m9m56ix4xb0a3ar0z0pl4sbm25rlj0b"; + sha256 = "0hn9rr5v2y2pw0pmn27gz8dx5n964dsaf48sh0jhwc95b5q1rjwr"; }; + # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: + # Ref: https://github.com/hashicorp/nomad/issues/5535 + buildFlags = stdenv.lib.optionalString (stdenv.isLinux) "-tags nonvidia"; + meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71773a7ae60..13f13bf266b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4841,9 +4841,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { - buildGoPackage = buildGo110Package; - }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { };