diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 1d2ebf599f7d..936f58ebacf7 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -70,6 +70,8 @@ - `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0) - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. +- `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2). +- `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10). ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/build-support/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix index ade88ea9d3db..f5e093019935 100644 --- a/pkgs/build-support/build-nim-package.nix +++ b/pkgs/build-support/build-nim-package.nix @@ -3,8 +3,7 @@ buildPackages, callPackage, stdenv, - nim1, - nim2, + nim, nim_builder, defaultNimVersion ? 2, nimOverrides, @@ -38,7 +37,7 @@ let nim_builder --phase:install runHook postInstall ''; - meta = { inherit (nim2.meta) maintainers platforms; }; + meta = { inherit (nim.meta) maintainers platforms; }; }; fodFromLockEntry = @@ -116,15 +115,10 @@ let ... }: ( - if requiredNimVersion == 1 then + if requiredNimVersion == 2 then { depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs; - } - else if requiredNimVersion == 2 then - { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs; + nativeBuildInputs = [ nim ] ++ nativeBuildInputs; } else throw "requiredNimVersion ${toString requiredNimVersion} is not valid" diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index eabffa1117cb..9026c7ea42ca 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -799,7 +799,7 @@ rec { ## `pkgs.writers.writeNim` usage example ```nix - writeNim "hello-nim" { nim = pkgs.nim2; } '' + writeNim "hello-nim" { nim = pkgs.nim; } '' echo "hello nim" ''; ``` @@ -809,7 +809,7 @@ rec { name: { makeWrapperArgs ? [ ], - nim ? pkgs.nim2, + nim ? pkgs.nim, nimCompileOptions ? { }, strip ? true, }: 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 7195132e52f6..000000000000 --- 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 63df8623109e..000000000000 --- 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-2_0/package.nix b/pkgs/by-name/ni/nim-2_0/package.nix deleted file mode 100644 index 841bd71ec3e9..000000000000 --- a/pkgs/by-name/ni/nim-2_0/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nim-unwrapped-2_0, - nim-2_2, -}: - -nim-2_2.passthru.wrapNim { - nimUnwrapped = nim-unwrapped-2_0; - inherit (nim-2_2) patches; -} diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch deleted file mode 100644 index dc6bcebfaba1..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim -index fa8fab08a..63b0cb44d 100644 ---- a/compiler/modulepaths.nim -+++ b/compiler/modulepaths.nim -@@ -73,6 +73,17 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex = - else: - result = fileInfoIdx(conf, fullPath) - -+proc rot13(result: var string) = -+ # don't mangle .nim -+ let finalIdx = -+ if result.endsWith(".nim"): result.len - 4 -+ else: result.len -+ for i, c in result[0.. 0: -- result.add "(" -+ result.add ":" - addInt(result, line) - if col > 0: -- result.add ", " -+ result.add ":" - addInt(result, col) -- result.add ")" diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix deleted file mode 100644 index e459351c676d..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchurl, - nim-unwrapped-1, - nim-unwrapped-2_2, -}: - -nim-unwrapped-2_2.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "2.0.16"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o="; - }; - patches = lib.lists.unique ( - builtins.filter ( - p: - builtins.elem (baseNameOf p) [ - "NIM_CONFIG_DIR.patch" - "nixbuild.patch" - "extra-mangling.patch" - "openssl.patch" - ] - ) (nim-unwrapped-1.patches ++ nim-unwrapped-2_2.patches) - ); - } -) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch deleted file mode 100644 index cf384c95d5f6..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim -index 77762d23a..59dd8903a 100644 ---- a/compiler/modulegraphs.nim -+++ b/compiler/modulegraphs.nim -@@ -503,7 +503,11 @@ proc uniqueModuleName*(conf: ConfigRef; m: PSym): string = - for i in 0..