From 07730a7b4992a3c7e1b637cc24bb5fbc47b6bad8 Mon Sep 17 00:00:00 2001 From: Astro <astro@spaceboyz.net> Date: Mon, 15 Aug 2022 22:50:27 +0200 Subject: [PATCH 1/2] nomad_1_3: 1.3.2 -> 1.3.3 --- pkgs/applications/networking/cluster/nomad/1.3.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix index 2ab2cf99634c..8d4c9805b52a 100644 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.2"; - sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq"; - vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj"; + version = "1.3.3"; + sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU="; + vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f6cb1c482c..0438cec07576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9045,7 +9045,7 @@ with pkgs; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; }; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From b474599529b4572e0e07088e15e6e7818231a9f1 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey <maxeaubrey@gmail.com> Date: Tue, 16 Aug 2022 01:10:00 +0200 Subject: [PATCH 2/2] nomad: default to nomad_1_3, add to release notes --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index b30bd7940aab..0d0e2647a070 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -479,6 +479,12 @@ dbus service. </para> </listitem> + <listitem> + <para> + The <literal>nomad</literal> package now defaults to 1.3, + which no longer has a downgrade path to releases 1.2 or older. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index c248856a74e5..c560da8df27a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -165,4 +165,6 @@ Use `configure.packages` instead. - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. +- The `nomad` package now defaults to 1.3, which no longer has a downgrade path to releases 1.2 or older. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0438cec07576..d462b0149147 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9032,7 +9032,7 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_2; + nomad = nomad_1_3; # 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 @@ -9040,11 +9040,9 @@ with pkgs; # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; }; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo118Module; };