Skip to content

Commit b278daf

Browse files
committed
buildNimPackage: warn of removal of requiredNimVersion & fix builder
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 670fceb commit b278daf

1 file changed

Lines changed: 24 additions & 11 deletions

File tree

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

Lines changed: 24 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,15 @@ let
1514
strictDeps = true;
1615
enableParallelBuilding = true;
1716
doCheck = true;
17+
18+
nativeBuildInputs = [
19+
nim
20+
];
21+
22+
buildInputs = [
23+
nim_builder
24+
];
25+
1826
configurePhase = ''
1927
runHook preConfigure
2028
export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
@@ -106,25 +114,30 @@ let
106114

107115
finalOverride =
108116
{
109-
depsBuildBuild ? [ ],
110-
nativeBuildInputs ? [ ],
111117
nimFlags ? [ ],
112-
requiredNimVersion ? defaultNimVersion,
113118
passthru ? { },
114119
...
115-
}:
120+
}@args:
116121
(
117-
if requiredNimVersion == 2 then
118-
{
119-
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
120-
nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
121-
}
122+
#TODO: Remove at 26.11
123+
if args ? requiredNimVersion then
124+
if args.requiredNimVersion == 2 then
125+
lib.warn ''
126+
`requiredNimVersion' is deprecated and will be removed in nixpkgs 26.11.
127+
Please update your package to remove this.
128+
''
129+
else
130+
throw ''
131+
`requiredNimVersion' ${toString args.requiredNimVersion} is not supported.
132+
Ensure your package supports nim 2, and remove `requiredNimVersion'.
133+
''
122134
else
123-
throw "requiredNimVersion ${toString requiredNimVersion} is not valid"
135+
{ }
124136
)
125137
// {
126138
nimFlags = lockFileNimFlags ++ nimFlags;
127139
passthru = passthru // {
140+
128141
# allow overriding the result of buildNimPackageArgs before this composition is applied
129142
# this allows overriding the lockFile for packages built using buildNimPackage
130143
# this is adapted from mkDerivationExtensible in stdenv.mkDerivation

0 commit comments

Comments
 (0)