File tree Expand file tree Collapse file tree 2 files changed +25
-25
lines changed
Expand file tree Collapse file tree 2 files changed +25
-25
lines changed Original file line number Diff line number Diff line change 2121
2222 crossPlatforms = p :
2323 lib . optionals ( pkgs . stdenv . hostPlatform . isLinux && config . compiler-nix-name == "ghc966" )
24- [ p . ucrt64 p . musl64 ] ;
24+ [ p . ucrt64 p . musl64 ] ;
2525
2626 modules = [ {
2727 packages = lib . mkIf pkgs . stdenv . hostPlatform . isMusl {
28- # ruby fails to build with musl, hence we disable cddl tests
29- dmq-node . components . tests . dmq-cddl . build-tools = lib . mkForce [ ] ;
30- dmq-node . components . tests . dmq-cddl . doCheck = lib . mkForce false ;
31- dmq-node . ghcOptions = with pkgs ; [
32- "-L${ lib . getLib static-gmp } /lib"
33- "-L${ lib . getLib static-libsodium-vrf } /lib"
34- "-L${ lib . getLib static-secp256k1 } /lib"
35- "-L${ lib . getLib static-libblst } /lib"
36- ] ;
28+ # ruby fails to build with musl, hence we disable cddl tests
29+ dmq-node . components . tests . dmq-cddl . build-tools = lib . mkForce [ ] ;
30+ dmq-node . components . tests . dmq-cddl . doCheck = lib . mkForce false ;
31+ dmq-node . ghcOptions = with pkgs ; [
32+ "-L${ lib . getLib static-gmp } /lib"
33+ "-L${ lib . getLib static-libsodium-vrf } /lib"
34+ "-L${ lib . getLib static-secp256k1 } /lib"
35+ "-L${ lib . getLib static-libblst } /lib"
36+ ] ;
3737 } ;
3838 } ] ;
3939 }
Original file line number Diff line number Diff line change 88 flatten ( if name == "" then name' else "${ name } ${ separator } ${ name' } " ) ;
99
1010 flatten = name' : value :
11- let
12- name = builtins . replaceStrings [ ":" ] [ separator ] name' ;
13- in
14- if lib . isDerivation value || lib . typeOf value != "set" then
15- [ { inherit name value ; } ]
16- else
17- lib . concatLists ( lib . mapAttrsToList ( recurse name ) value ) ;
11+ let
12+ name = builtins . replaceStrings [ ":" ] [ separator ] name' ;
13+ in
14+ if lib . isDerivation value || lib . typeOf value != "set" then
15+ [ { inherit name value ; } ]
16+ else
17+ lib . concatLists ( lib . mapAttrsToList ( recurse name ) value ) ;
1818 in
19- assert lib . typeOf set == "set" ;
20- lib . listToAttrs ( flatten "" set ) ;
19+ assert lib . typeOf set == "set" ;
20+ lib . listToAttrs ( flatten "" set ) ;
2121
2222
2323 mapAttrsValues = f : lib . mapAttrs ( _name : f ) ;
2424
2525
2626 makeHydraRequiredJob = hydraJobs :
2727 let
28- cleanJobs = lib . filterAttrsRecursive
28+ cleanJobs = lib . filterAttrsRecursive
2929 ( name : _ : name != "recurseForDerivations" )
3030 ( removeAttrs hydraJobs [ "required" ] ) ;
3131 in
32- pkgs . releaseTools . aggregate {
33- name = "required" ;
34- meta . description = "All jobs required to pass CI" ;
35- constituents = lib . collect lib . isDerivation cleanJobs ;
36- } ;
32+ pkgs . releaseTools . aggregate {
33+ name = "required" ;
34+ meta . description = "All jobs required to pass CI" ;
35+ constituents = lib . collect lib . isDerivation cleanJobs ;
36+ } ;
3737}
You can’t perform that action at this time.
0 commit comments