idris-lang/Idris2
1
1
Fork 0
mirror of https://github.com/idris-lang/Idris2.git synced 2024-11-23 14:18:02 +03:00
Code Issues Projects Releases Wiki Activity

allow buildIdris output to be used as a dependency in other buildIdris calls more directly

Browse Source
This commit is contained in:
Mathew Polzin 2024-06-25 23:23:16 -05:00
parent 5f27842cbc
commit 0ea7c599cb
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -36,11 +36,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1710854652,
"narHash": "sha256-fKaaZQgVIK3+3G6SWOAMms3XKIPMYs/ErOXLT7iWCW0=",
"lastModified": 1719371271,
"narHash": "sha256-G3tm/ttP6PxnrrpCYIi4VBpJdGrwqr2pqRKuZlvTg2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dbdb1f1b8b37ea37793eb596f4081dc0920821f8",
"rev": "267d115a04e93a3487d3c2c26e3af5704a0144cc",
"type": "github"
},
"original": {

15
nix/buildIdris.nix
View File

@ -17,11 +17,24 @@
, ... }@attrs:
let
# loop over idrisLibraries and normalize them by turning any that are
# direct outputs of the buildIdris function into the `.library {}`
# property.
idrisLibraryLibs = map (idrisLib:
if lib.isDerivation idrisLib
then idrisLib
else if builtins.isFunction idrisLib
then idrisLib {}
else if (builtins.isAttrs idrisLib && idrisLib ? "library")
then idrisLib.library {}
else throw "Found an Idris2 library dependency that was not the result of the buildIdris function"
) idrisLibraries;
propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs);
ipkgFileName = ipkgName + ".ipkg";
idrName = "idris2-${idris2Version}";
libSuffix = "lib/${idrName}";
propagatedIdrisLibraries = propagate idrisLibraries;
propagatedIdrisLibraries = propagate idrisLibraryLibs;
libDirs =
lib.strings.makeSearchPath libSuffix propagatedIdrisLibraries;
drvAttrs = builtins.removeAttrs attrs [