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

Merge pull request #12674 from phile314/master

Browse Source 
uhc: Use Stackage LTS 4.1 to build UHC
This commit is contained in:
Peter Simons 2016-01-29 20:43:03 +01:00
commit 0a13e4a2f3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/uhc/default.nix
View File

@ -1,3 +1,8 @@
# Note: The Haskell package set used for building UHC is
# determined in the file top-level/haskell-packages.nix.
# We are using Stackage LTS to avoid constant breakage.
# Bump the Stackage LTS release to the last release if possible
# when a new UHC version is released.
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
@ -50,8 +55,10 @@ in stdenv.mkDerivation rec {
# On Darwin, the GNU libtool is used, which does not
# support the -static flag and thus breaks the build.
platforms = ["x86_64-linux"];
broken = true; # https://github.com/UU-ComputerScience/uhc/issues/69
# Hydra currently doesn't build the Stackage LTS package set,
# and we don't want to build all our haskell dependencies
# from scratch just to build UHC.
hydraPlatforms = stdenv.lib.platforms.none;
};
}

5
pkgs/top-level/haskell-packages.nix
View File

@ -60,7 +60,10 @@ rec {
uhc = callPackage ../development/compilers/uhc/default.nix ({
stdenv = pkgs.clangStdenv;
inherit (pkgs.haskellPackages) ghcWithPackages;
# UHC 1.1.9.2 is incompatible with hashable 1.2.4.0,
# latest LTS with a compatible hashable is LTS 4.1
# See also https://github.com/UU-ComputerScience/uhc/issues/69
inherit (pkgs.haskell.packages.lts-4_1) ghcWithPackages;
});
};