diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-07-19 13:49:24 +0900 |
|---|---|---|
| committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-07-24 21:13:41 +0900 |
| commit | aca8a4e36d48d6fb2e1af8718930721002de7f27 (patch) | |
| tree | 657b7fa5a68afc3329d1c3e83295e54fdf1a79ac /pkgs/top-level/release-haskell.nix | |
| parent | f8592f6ba511ecc75c8b51ea84c41d4d2f688591 (diff) | |
| download | nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar.gz nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar.bz2 nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar.lz nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar.xz nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.tar.zst nixpkgs-aca8a4e36d48d6fb2e1af8718930721002de7f27.zip | |
release-haskell: move back to using accumulateDerivations for staticHaskellPackages
Diffstat (limited to 'pkgs/top-level/release-haskell.nix')
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9ae66ab4414..636f0f2b15e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -18,18 +18,22 @@ let }; inherit (releaseLib) - pkgs - packagePlatforms + lib 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 # it to a list of derivations suitable to be passed # 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: lib.concatMap ( attrs: @@ -383,25 +387,10 @@ let lib.maintainers.rnhmjoj ]; }; - constituents = [ - # aarch64-linux - # - # TODO: Times out on Hydra - # 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 + constituents = accumulateDerivations [ + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random ]; }; } |