From 75f3bb55bed5c83b738e1df510963fbf48044025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Apr 2026 12:57:46 +0200 Subject: [PATCH] nixVersions.nix_2_30: remove Nix 2.30 is no longer maintained upstream and was the last consumer of the lowdown 3.0 backport patch. --- pkgs/tools/package-management/nix/default.nix | 23 ++-------------- .../lowdown-3.0-compat-2.28-2.30.patch | 27 ------------------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0ff19738b39c..8dfbd7f46bd2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -150,32 +150,11 @@ let test = "shebang.sh"; } ]; - - # Lowdown 3.0 compatibility patch for nix 2.28 and 2.30, which have a - # different markdown.cc layout (no LOWDOWN_TERM_NORELLINK branch) and - # never received an upstream backport. - lowdown30PatchOld = ./patches/lowdown-3.0-compat-2.28-2.30.patch; in lib.makeExtensible ( self: ( { - nixComponents_2_30 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.30.5"; - inherit teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_30"; - src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-tGiV71RxtCNcUNX86ZwmOIghG4pLwm5nlRKd89er7Gk="; - }); - }).appendPatches - [ lowdown30PatchOld ]; - - nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; - nixComponents_2_31 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.31.5"; @@ -245,6 +224,7 @@ lib.makeExtensible ( // { nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_31."; nixComponents_2_29 = throw "nixComponents_2_29 has been removed. use nixComponents_2_31."; + nixComponents_2_30 = throw "nixComponents_2_30 has been removed. use nixComponents_2_31."; nixComponents_2_32 = throw "nixComponents_2_32 has been removed. use nixComponents_2_34."; nixComponents_2_33 = throw "nixComponents_2_33 has been removed. use nixComponents_2_34."; nix_2_24 = throw "nix_2_24 has been removed. use nix_2_31."; @@ -253,6 +233,7 @@ lib.makeExtensible ( nix_2_25 = throw "nix_2_25 has been removed. use nix_2_31."; nix_2_28 = throw "nix_2_28 has been removed. use nix_2_31."; nix_2_29 = throw "nix_2_29 has been removed. use nix_2_31."; + nix_2_30 = throw "nix_2_30 has been removed. use nix_2_31."; nix_2_32 = throw "nix_2_32 has been removed. use nix_2_34."; nix_2_33 = throw "nix_2_33 has been removed. use nix_2_34."; diff --git a/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch b/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch deleted file mode 100644 index dd527f7f1cd6..000000000000 --- a/pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/libcmd/markdown.cc -+++ b/src/libcmd/markdown.cc -@@ -37,7 +37,13 @@ - .vmargin = 0, - # endif - .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES, -- .oflags = LOWDOWN_TERM_NOLINK, -+ .oflags = -+# if HAVE_LOWDOWN_3 -+ LOWDOWN_NOLINK -+# else -+ LOWDOWN_TERM_NOLINK -+# endif -+ , - }; - - auto doc = lowdown_doc_new(&opts); ---- a/src/libcmd/meson.build -+++ b/src/libcmd/meson.build -@@ -36,6 +36,7 @@ - configdata.set('HAVE_LOWDOWN', lowdown.found().to_int()) - # The API changed slightly around terminal initialization. - configdata.set('HAVE_LOWDOWN_1_4', lowdown.version().version_compare('>= 1.4.0').to_int()) -+configdata.set('HAVE_LOWDOWN_3', lowdown.version().version_compare('>= 3.0.0').to_int()) - - readline_flavor = get_option('readline-flavor') - if readline_flavor == 'editline'