Unverified Commit d7e6face authored by maxine [they]'s avatar maxine [they] Committed by GitHub
Browse files

Merge pull request #186847 from astro/nomad 

nomad_1_3: 1.3.2 -> 1.3.3
parents 332819b1 b4745995

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>

nixos/doc/manual/release-notes/rl-2211.section.md

+2 −0
Original line number Diff line number Diff line
@@ -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. -->

pkgs/applications/networking/cluster/nomad/1.3.nix

+3 −3
Original line number Diff line number Diff line
@@ -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=";

}

pkgs/top-level/all-packages.nix

+2 −4
Original line number Diff line number Diff line
@@ -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,12 +9040,10 @@ 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 = buildGo117Module;













    buildGoModule = buildGo118Module;















  };





























  nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };