From 72feff227bcd1f1a7b17b2b0e22f58ab9f27794d Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 6 Sep 2022 21:54:08 +0200 Subject: [PATCH] overlay: use nomad_1_3 from nixos-unstable --- overlay/default.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/overlay/default.nix b/overlay/default.nix index 9760bdfa..5c06c997 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -51,8 +51,6 @@ with final; { mlat-client = prev.python3Packages.callPackage ./mlat-client.nix { }; nixVersions = - let - in prev.nixVersions // { stable = prev.nixVersions.stable.overrideAttrs (oldAttrs: { patches = oldAttrs.patches or [ ] ++ lib.optionals (lib.versionAtLeast prev.nixVersions.stable.version "2.9") [ @@ -75,19 +73,7 @@ with final; { SimpleYggGen-CPP = prev.callPackage ./simpleygggen.nix { }; - # TODO: pending https://github.com/NixOS/nixpkgs/pull/186847 - nomad_1_3 = with prev; nomad_1_3.override { - buildGoModule = buildGo118Module; - callPackage = f: _: prev.callPackage f { - buildGoModule = buildGo118Module; - version = "1.3.3"; - sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU="; - vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ="; - nvidiaGpuSupport = false; - patchelf = null; - nvidia_x11 = null; - }; - }; + inherit (nixos-unstable.legacyPackages.${prev.targetPlatform.system}) nomad_1_3; wander = if prev ? wander