diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2023-11-21 18:26:15 +0200 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2023-11-28 16:48:10 +0200 |
| commit | 8672b5cabdc10359cc6e9bc2c04fd281618ae2c5 (patch) | |
| tree | c7a1b7df91d0c81bf1d31aeed9a65ede403ded9d /pkgs/development/compilers/nim | |
| parent | 7bd3fa9faf6581a6167c63f721db0112245a0872 (diff) | |
| download | nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar.gz nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar.bz2 nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar.lz nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar.xz nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.tar.zst nixlib-8672b5cabdc10359cc6e9bc2c04fd281618ae2c5.zip | |
Remove nimPackages and nim2Packages
Diffstat (limited to 'pkgs/development/compilers/nim')
| -rw-r--r-- | pkgs/development/compilers/nim/build-nim-package.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/nim/default.nix | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix index 73190575a576..5085edf90a76 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 19773ebe4999..425eda585c27 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 { |