File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212 {
1313 packages = eachSystem ( pkgs :
1414 let
15- inherit ( builtins ) elemAt split fetchurl attrNames foldl' listToAttrs ;
15+ inherit ( builtins ) elemAt split attrNames foldl' listToAttrs ;
1616 inherit ( pkgs . ocamlPackages ) buildDunePackage ;
1717 inherit ( pkgs . lib ) cleanSource getLicenseFromSpdxId ;
18- cmdliner = pkgs . ocamlPackages . cmdliner . overrideAttrs ( old :
19- let
20- version = "2.1.0" ;
21- in
22- {
23- inherit version ;
24- src = fetchurl {
25- url = "https://erratique.ch/software/${ old . pname } /releases/${ old . pname } -${ version } .tbz" ;
26- sha256 = "sha256:1s9lhkzrblaf1rk0b9lg95622p0jv4qmmby8xg8jzma3rlacc548" ;
27- } ;
28- } ) ;
2918 dune-project = pkgs . importDuneProject ./dune-project ;
30- depends = let depends = listToAttrs ( map ( dep : { name = dep ; value = pkgs . ocamlPackages . ${ dep } ; } ) ( attrNames ( foldl' ( acc : dep : acc // dep ) { } dune-project . package . depends ) ) ) ; in removeAttrs depends [ "dune" "ocaml" "cmdliner" ] ;
19+ depends = let depends = listToAttrs ( map ( dep : { name = dep ; value = pkgs . ocamlPackages . ${ dep } ; } ) ( attrNames ( foldl' ( acc : dep : acc // dep ) { } dune-project . package . depends ) ) ) ; in removeAttrs depends [ "dune" "ocaml" ] ;
3120 in
3221 {
3322 default = buildDunePackage ( finalAttrs : {
3423 inherit ( dune-project ) version ;
3524 pname = dune-project . package . name ;
3625 src = cleanSource ./. ;
37- buildInputs = attrValues ( depends // {
38- inherit cmdliner ;
39- } ) ;
26+ buildInputs = attrValues depends ;
4027 doCheck = true ;
4128 nativeCheckInputs = attrValues {
4229 inherit ( pkgs ) ocamlformat ;
7360 fi
7461 '' ;
7562 postInstall = ''
76- ${ cmdliner } /bin/cmdliner install tool-support $out/bin/ns $out
77- ${ cmdliner } /bin/cmdliner install generic-completion $out/share
63+ ${ depends . cmdliner } /bin/cmdliner install tool-support $out/bin/ns $out
64+ ${ depends . cmdliner } /bin/cmdliner install generic-completion $out/share
7865 '' ;
7966 meta =
8067 let
You can’t perform that action at this time.
0 commit comments