Unverified Commit 018203f7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #252996 from risicle/ris-nomad-1.4.12 

nomad_1_4: 1.4.6 -> 1.4.12, nomad_1_3, nomad_1_2: remove
parents 29a08c11 6df23bec

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

+3 −17
Original line number Diff line number Diff line
@@ -53,25 +53,11 @@ rec { 


  nomad = nomad_1_5;



  nomad_1_2 = generic {

    buildGoModule = buildGo120Module;

    version = "1.2.16";

    sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ=";

    vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8=";

  };



  nomad_1_3 = generic {

    buildGoModule = buildGo120Module;

    version = "1.3.9";

    sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w=";

    vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY=";

  };



  nomad_1_4 = generic {

    buildGoModule = buildGo120Module;

    version = "1.4.6";

    sha256 = "sha256-l4GvQIS5JSSgjBjPivAKAb7gKlVLw4WoZpPR8LxnLNc=";

    vendorSha256 = "sha256-05BhKF6kx0wbu74cidpTFhUN668R/AxV6qWmchCm/WE=";

    version = "1.4.12";

    sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI=";

    vendorSha256 = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM=";

    passthru.tests.nomad = nixosTests.nomad;

  };

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,8 @@ mapAliases ({ 
  nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06

  nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

  nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22

  nomad_1_2 = throw "nomad_1_2 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02

  nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02

  nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

  noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

  noto-fonts-extra = noto-fonts; # Added 2023-04-08

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -11154,8 +11154,6 @@ with pkgs; 














  inherit (callPackage ../applications/networking/cluster/nomad { })















    nomad













    nomad_1_2













    nomad_1_3















    nomad_1_4















    nomad_1_5















    nomad_1_6