From 901e1ea7dbd6eb72d5046d94998839c0d8c976e5 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 6 Feb 2021 23:43:58 +0100 Subject: [PATCH 1/5] nomad_0_12: 0.12.9 -> 0.12.10 --- pkgs/applications/networking/cluster/nomad/0.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index b6e053e757d..82f508c63ee 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.9"; - sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; + version = "0.12.10"; + sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; } From 94365804d0d5fab6a3abfc5716e2e7aaba9f17c9 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 6 Feb 2021 23:44:17 +0100 Subject: [PATCH 2/5] nomad_1_0: 1.0.2 -> 1.0.3 --- pkgs/applications/networking/cluster/nomad/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index ff4434399bd..6ae59033835 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.2"; - sha256 = "1l9j6k5dzh9ym9j75mam10vd9b5qh4xqfj6d63bjp7gkk4hd1jxx"; + version = "1.0.3"; + sha256 = "142rwpli8mbyg4vhhybnym34rk9w1ns4ddfhqjr1ygmxb1rlsngi"; } From 8ae4b1be1cb2116bb63e96312dae9c9aa22eebd1 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 6 Feb 2021 23:45:03 +0100 Subject: [PATCH 3/5] nomad_0_11: drop appears upstream has dropped support as fixes for CVE-2021-3283 were not backported --- pkgs/applications/networking/cluster/nomad/0.11.nix | 11 ----------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/nomad/0.11.nix diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix deleted file mode 100644 index 58bdb694eed..00000000000 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.11.8"; - sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf3fd5e4b9..d551683a973 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6506,11 +6506,6 @@ in # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. - nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { - buildGoPackage = buildGo114Package; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11; From dd7f5b0065f0b03a53bb9dc59aa2438215ed9963 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 6 Feb 2021 23:46:06 +0100 Subject: [PATCH 4/5] nomad: default to nomad_1_0 --- 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 d551683a973..4aaadcf4feb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6501,7 +6501,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = nomad_0_12; + nomad = nomad_1_0; # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled From 1830a06e2c2aaa1fc72effd260cbf1d8b9510a08 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 6 Feb 2021 23:51:42 +0100 Subject: [PATCH 5/5] nomad: reference upstream for go pinning upstream has started keeping track of used go versions in contributing docs, added reference to this in our comment --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aaadcf4feb..0e99b2fcafb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6506,6 +6506,8 @@ in # Nomad never updates major go versions within a release series and is unsupported # on Go versions that it did not ship with. Due to historic bugs when compiled # with different versions we pin Go for all versions. + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; inherit (linuxPackages) nvidia_x11;