Skip to content

Commit a360854

Browse files
committed
buildNimPackage: warn of removal of requiredNimVersion
Not used often and no more werid versioning in nixpkgs removed and upgraded nim versions. Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
1 parent ee3d455 commit a360854

1 file changed

Lines changed: 21 additions & 11 deletions

File tree

pkgs/build-support/build-nim-package.nix

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
stdenv,
66
nim,
77
nim_builder,
8-
defaultNimVersion ? 2,
98
nimOverrides,
109
buildNimPackage,
1110
}:
@@ -15,6 +14,12 @@ let
1514
strictDeps = true;
1615
enableParallelBuilding = true;
1716
doCheck = true;
17+
18+
nativeBuildInputs = [
19+
nim
20+
nim_builder
21+
];
22+
1823
configurePhase = ''
1924
runHook preConfigure
2025
export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
@@ -106,25 +111,30 @@ let
106111

107112
finalOverride =
108113
{
109-
depsBuildBuild ? [ ],
110-
nativeBuildInputs ? [ ],
111114
nimFlags ? [ ],
112-
requiredNimVersion ? defaultNimVersion,
113115
passthru ? { },
114116
...
115-
}:
117+
}@args:
116118
(
117-
if requiredNimVersion == 2 then
118-
{
119-
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
120-
nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
121-
}
119+
#TODO: Remove at 26.11
120+
if args ? requiredNimVersion then
121+
if args.requiredNimVersion == 2 then
122+
lib.warn ''
123+
`requiredNimVersion' is deprecated and will be removed in nixpkgs 26.11.
124+
Please update your package to remove this.
125+
''
126+
else
127+
throw ''
128+
`requiredNimVersion' ${toString args.requiredNimVersion} is not supported.
129+
Ensure your package supports nim 2, and remove `requiredNimVersion'.
130+
''
122131
else
123-
throw "requiredNimVersion ${toString requiredNimVersion} is not valid"
132+
{ }
124133
)
125134
// {
126135
nimFlags = lockFileNimFlags ++ nimFlags;
127136
passthru = passthru // {
137+
128138
# allow overriding the result of buildNimPackageArgs before this composition is applied
129139
# this allows overriding the lockFile for packages built using buildNimPackage
130140
# this is adapted from mkDerivationExtensible in stdenv.mkDerivation

0 commit comments

Comments
 (0)