From dfbe568454e98626f720fa3c950971bba0625561 Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Thu, 13 Nov 2025 01:21:33 +1100 Subject: [PATCH 1/2] nim1: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/build-support/build-nim-package.nix | 8 +---- pkgs/by-name/ni/nim-1_0/nim.cfg.patch | 31 ------------------- pkgs/by-name/ni/nim-1_0/package.nix | 9 ------ pkgs/by-name/ni/nim-unwrapped-1_0/package.nix | 30 ------------------ .../extra-mangling.patch | 0 pkgs/by-name/ni/nim-unwrapped-2_0/package.nix | 6 ++-- .../toLocation.patch | 0 pkgs/top-level/aliases.nix | 5 +++ pkgs/top-level/all-packages.nix | 2 -- 10 files changed, 11 insertions(+), 82 deletions(-) delete mode 100644 pkgs/by-name/ni/nim-1_0/nim.cfg.patch delete mode 100644 pkgs/by-name/ni/nim-1_0/package.nix delete mode 100644 pkgs/by-name/ni/nim-unwrapped-1_0/package.nix rename pkgs/by-name/ni/{nim-unwrapped-1_0 => nim-unwrapped-2_0}/extra-mangling.patch (100%) rename pkgs/by-name/ni/{nim-unwrapped-1_0 => nim-unwrapped-2_0}/toLocation.patch (100%) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 2a9912f269fcb..5eda30ba584de 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -124,6 +124,8 @@ - `cudaPackages.cudatoolkit-legacy-runfile` has been removed. +- `nim1` and respective aliases has been removed due to EOL, please use nim. + - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. - `asciidoctor-with-extension` had its `asciidoctor-mathematical` extension removed, because it fails to build, and it is not maintained properly. diff --git a/pkgs/build-support/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix index 1e8489212cd6b..fa7e97be8e72e 100644 --- a/pkgs/build-support/build-nim-package.nix +++ b/pkgs/build-support/build-nim-package.nix @@ -3,7 +3,6 @@ buildPackages, callPackage, stdenv, - nim1, nim2, nim_builder, defaultNimVersion ? 2, @@ -115,12 +114,7 @@ let ... }: ( - if requiredNimVersion == 1 then - { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs; - } - else if requiredNimVersion == 2 then + if requiredNimVersion == 2 then { depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs; diff --git a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch b/pkgs/by-name/ni/nim-1_0/nim.cfg.patch deleted file mode 100644 index 7195132e52f6a..0000000000000 --- a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 3b964d124..850ed0ed9 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -8,26 +8,12 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - - hint[LineTooLong]=off - #hint[XDeclaredButNotUsed]=off - --# Examples of how to setup a cross-compiler: -- --# Cross-compiling for Raspberry Pi. --# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu) --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- -- - path="$lib/deprecated/core" - path="$lib/deprecated/pure" - path="$lib/pure/collections" diff --git a/pkgs/by-name/ni/nim-1_0/package.nix b/pkgs/by-name/ni/nim-1_0/package.nix deleted file mode 100644 index 63df8623109e3..0000000000000 --- a/pkgs/by-name/ni/nim-1_0/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nim-unwrapped-1, - nim, -}: - -nim.passthru.wrapNim { - nimUnwrapped = nim-unwrapped-1; - patches = [ ./nim.cfg.patch ]; -} diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix deleted file mode 100644 index a210f22844c6d..0000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - nim-unwrapped-2, -}: - -nim-unwrapped-2.overrideAttrs ( - finalAttrs: prevAttrs: { - version = "1.6.20"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k="; - }; - - patches = - builtins.filter ( - p: - builtins.elem (baseNameOf p) [ - "NIM_CONFIG_DIR.patch" - "nixbuild.patch" - ] - ) nim-unwrapped-2.patches - ++ [ - ./extra-mangling.patch - # Mangle store paths of modules to prevent runtime dependence. - ] - ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch; - } -) diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped-2_0/extra-mangling.patch similarity index 100% rename from pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch rename to pkgs/by-name/ni/nim-unwrapped-2_0/extra-mangling.patch diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix index e459351c676dd..1ee2f017db527 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix @@ -1,7 +1,7 @@ { lib, fetchurl, - nim-unwrapped-1, + stdenv, nim-unwrapped-2_2, }: @@ -18,10 +18,10 @@ nim-unwrapped-2_2.overrideAttrs ( builtins.elem (baseNameOf p) [ "NIM_CONFIG_DIR.patch" "nixbuild.patch" - "extra-mangling.patch" + "extra-mangling.patch" # Mangle store paths of modules to prevent runtime dependence. "openssl.patch" ] - ) (nim-unwrapped-1.patches ++ nim-unwrapped-2_2.patches) + ) (lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch ++ nim-unwrapped-2_2.patches) ); } ) diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch b/pkgs/by-name/ni/nim-unwrapped-2_0/toLocation.patch similarity index 100% rename from pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch rename to pkgs/by-name/ni/nim-unwrapped-2_0/toLocation.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12eaaf2018228..3c5a7ae66c7f5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1115,6 +1115,11 @@ mapAliases { "; # Added 2025-09-25 nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25 nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25 + nim1 = throw "'nim1' has reached EOL, please use 'nim'"; # Added 2025-11-12 + nim-1_0 = throw "'nim-1_0' has reached EOL, please use 'nim'"; # Added 2025-11-12 + nim-unwrapped-1 = throw "'nim-unwrapped-1' has reached EOL, please use 'nim-unwrapped'"; # Added 2025-11-12 + nim-unwrapped_1_0 = throw "'nim-unwrapped_1_0' has reached EOL, please use 'nim-unwrapped'"; # Added 2025-11-12 + nim_1_0 = throw "'nim_1_0' has reached EOL, please use 'nim'"; # Added 2025-11-12 nix-direnv-flakes = throw "'nix-direnv-flakes' has been renamed to/replaced by 'nix-direnv'"; # Converted to throw 2025-10-27 nix-ld-rs = throw "'nix-ld-rs' has been renamed to/replaced by 'nix-ld'"; # Converted to throw 2025-10-27 nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aedb08df141e..333972193d122 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5153,10 +5153,8 @@ with pkgs; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; nim = nim2; - nim1 = nim-1_0; nim2 = nim-2_2; nim-unwrapped = nim-unwrapped-2_2; - nim-unwrapped-1 = nim-unwrapped-1_0; nim-unwrapped-2 = nim-unwrapped-2_2; buildNimPackage = callPackage ../build-support/build-nim-package.nix { }; From cb5cf9c30dda5444c57ea9f673396ddc8f3272d7 Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Thu, 13 Nov 2025 01:15:28 +1100 Subject: [PATCH 2/2] mosdepth: build using nim2 --- pkgs/by-name/mo/mosdepth/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index 9c17f0d1510b0..2aeaf5fe95ee9 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -9,8 +9,6 @@ buildNimPackage (finalAttrs: { pname = "mosdepth"; version = "0.3.11"; - requiredNimVersion = 1; - src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth";