gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixVersions.nix_2_30: remove

Browse Source 
Nix 2.30 is no longer maintained upstream and was the last consumer of
the lowdown 3.0 backport patch.
This commit is contained in:
Jörg Thalheim
2026-06-28 20:50:47 +03:00
committed by Sergei Zimmerman
parent 07253f1bed
commit 75f3bb55be
2 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/package-management/nix/default.nix
+2 -21
View File
@@ -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.";
pkgs/tools/package-management/nix/patches/lowdown-3.0-compat-2.28-2.30.patch
-27
View File
@@ -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'