JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release-haskell: move back to using accumulateDerivations for staticHaskellPackages

Browse Source
This commit is contained in:
(cdep)illabout 2021-07-19 13:49:24 +09:00
parent f8592f6ba5
commit aca8a4e36d
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/top-level/release-haskell.nix
View File

@ -18,18 +18,22 @@ let
}; };
inherit (releaseLib) inherit (releaseLib)
pkgs lib
packagePlatforms
mapTestOn mapTestOn
aggregate packagePlatforms
pkgs
; ;
inherit (pkgs) lib; # Helper function which traverses a (nested) set
# helper function which traverses a (nested) set
# of derivations produced by mapTestOn and flattens # of derivations produced by mapTestOn and flattens
# it to a list of derivations suitable to be passed # it to a list of derivations suitable to be passed
# to `releaseTools.aggregate` as constituents. # to `releaseTools.aggregate` as constituents.
# Removes all non derivations from the input jobList.
#
# accumulateDerivations :: [ Either Derivation AttrSet ] -> [ Derivation ]
#
# > accumulateDerivations [ drv1 "string" { foo = drv2; bar = { baz = drv3; }; } ]
# [ drv1 drv2 drv3 ]
accumulateDerivations = jobList: accumulateDerivations = jobList:
lib.concatMap ( lib.concatMap (
attrs: attrs:
@ -383,25 +387,10 @@ let
lib.maintainers.rnhmjoj lib.maintainers.rnhmjoj
]; ];
}; };
constituents = [ constituents = accumulateDerivations [
# aarch64-linux jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens
# TODO: Times out on Hydra jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux
# x86_64-darwin
#
# TODO: reenable darwin builds if static libiconv works
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-darwin
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-darwin
# jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-darwin
# x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux
]; ];
}; };
} }