From dab5668f6be905a7f0de39a7d67fd8f78a13d600 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 13 Apr 2022 13:23:06 +0100 Subject: [PATCH] nomad_1_1: drop --- pkgs/applications/networking/cluster/nomad/1.1.nix | 12 ------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/nomad/1.1.nix diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix deleted file mode 100644 index aa5d723b70c8..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage -, buildGoModule -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.14"; - sha256 = "0jzcmv6kw555lz7mrm673qgjfmzm4pznibbz9qn3w1jj4x9ddncy"; - vendorSha256 = "04nyd37viz521qb3frcy39alha0bpx029cy3kswldhh7wbyp7284"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 521317b62d7c..bb88c91d1c87 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -905,6 +905,7 @@ mapAliases ({ nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 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 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 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62cec1c89745..58ecf3b1ce7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8646,11 +8646,6 @@ with pkgs; # 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_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix { - buildGoModule = buildGo116Module; - inherit (linuxPackages) nvidia_x11; - nvidiaGpuSupport = config.cudaSupport or false; - }; nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { buildGoModule = buildGo117Module; inherit (linuxPackages) nvidia_x11;