From 8672b5cabdc10359cc6e9bc2c04fd281618ae2c5 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 21 Nov 2023 18:26:15 +0200
Subject: Remove nimPackages and nim2Packages

---
 pkgs/development/compilers/nim/build-nim-package.nix | 2 --
 pkgs/development/compilers/nim/default.nix           | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/compilers/nim')

diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix
index 73190575a5763..5085edf90a762 100644
--- a/pkgs/development/compilers/nim/build-nim-package.nix
+++ b/pkgs/development/compilers/nim/build-nim-package.nix
@@ -90,7 +90,6 @@ let
         , nativeBuildInputs ? [ ]
         , nimFlags ? [ ]
         , requiredNimVersion ? defaultNimVersion
-        , nimCopySources ? (lockAttrs == {}) # TODO: remove when nimPackages is gone
         , ...
         }:
         (if requiredNimVersion == 1 then {
@@ -103,7 +102,6 @@ let
           throw
             "requiredNimVersion ${toString requiredNimVersion} is not valid") // {
           nimFlags = lockFileNimFlags ++ nimFlags;
-          inherit nimCopySources;
         };
 
       attrs = postLock // finalOverride postLock;
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 19773ebe49995..425eda585c273 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -181,9 +181,8 @@ in {
 
 } // (let
   wrapNim = { nim', patches }:
-    let
-      targetPlatformConfig = stdenv.targetPlatform.config;
-      self = stdenv.mkDerivation (finalAttrs: {
+    let targetPlatformConfig = stdenv.targetPlatform.config;
+    in stdenv.mkDerivation (finalAttrs: {
         name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}";
         inherit (nim') version;
         preferLocalBuild = true;
@@ -307,9 +306,6 @@ in {
           platforms = with lib.platforms; unix ++ genode;
         };
       });
-    in self // {
-      pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; };
-    };
 in {
 
   nim2 = wrapNim {
-- 
cgit 1.4.1