From f902cb49892d300ff15cb237e48aa1cad79d68c3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 2 Oct 2023 00:59:54 -0700 Subject: [PATCH] nim: fix evaluation nimble-unwrapped was breaking ofborg. :( By the looks of it nimble-unwrapped was removed but the references in all-packages.nix and in the callPackage invocation were not removed. So remove them. Proximal cause: https://github.com/NixOS/nixpkgs/pull/258093 https://gist.github.com/GrahamcOfBorg/7a33204709bf948180670867a9e22e02 --- pkgs/development/compilers/nim/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index df5730eba426..f0ffa4309f9f 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -3,7 +3,7 @@ { lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub , makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security, nim-unwrapped -, nim-unwrapped-2, nimble-unwrapped, nim }: +, nim-unwrapped-2, nim }: let parseCpu = platform: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 505401c56f07..358d79cc695e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16803,7 +16803,7 @@ with pkgs; inherit (callPackages ../development/compilers/nim { inherit (darwin) Security; } - ) nim-unwrapped nim-unwrapped-2 nimble-unwrapped nim nim2; + ) nim-unwrapped nim-unwrapped-2 nim nim2; nimPackages = recurseIntoAttrs nim.pkgs; nim2Packages = recurseIntoAttrs nim2.pkgs;