pyrox.dev
Merge pull request #13480 from phile314/master
uhc: 1.1.9.2 -> 1.1.9.3
+7
-18
pkgs/development/compilers/uhc/default.nix
+7
-18
pkgs/development/compilers/uhc/default.nix
···
1
1
# Note: The Haskell package set used for building UHC is
2
2
# determined in the file top-level/haskell-packages.nix.
3
-
# We are using Stackage LTS to avoid constant breakage.
4
-
# Bump the Stackage LTS release to the last release if possible
5
-
# when a new UHC version is released.
6
-
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
3
+
{ stdenv, coreutils, m4, libtool, clang, ghcWithPackages, fetchFromGitHub }:
7
4
8
5
let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
9
6
in stdenv.mkDerivation rec {
10
-
# Important:
11
-
# The commits "Fixate/tag v..." are the released versions.
12
-
# Ignore the "bumped version to ...." commits, they do not
13
-
# correspond to releases.
14
-
version = "1.1.9.2";
7
+
version = "1.1.9.3";
15
8
name = "uhc-${version}";
16
9
17
-
src = fetchgit {
18
-
url = "https://github.com/UU-ComputerScience/uhc.git";
19
-
rev = "292d259113b98c32154a5be336875751caa5edbc";
20
-
sha256 = "1f462xq9ilkp9mnxm8hxhh1cdwps5d0hxysyibxryk32l7hh53cz";
10
+
src = fetchFromGitHub {
11
+
owner = "UU-ComputerScience";
12
+
repo = "uhc";
13
+
rev = "v${version}";
14
+
sha256 = "1r3mja77dqj2ncgp1d9nnc7dhp3gzrb1b1qvml3rq2321mn3m2ad";
21
15
};
22
16
23
17
postUnpack = "sourceRoot=\${sourceRoot}/EHC";
···
55
49
# On Darwin, the GNU libtool is used, which does not
56
50
# support the -static flag and thus breaks the build.
57
51
platforms = ["x86_64-linux"];
58
-
# Hydra currently doesn't build the Stackage LTS package set,
59
-
# and we don't want to build all our haskell dependencies
60
-
# from scratch just to build UHC.
61
-
hydraPlatforms = stdenv.lib.platforms.none;
62
-
63
52
};
64
53
}
+1
-4
pkgs/top-level/haskell-packages.nix
+1
-4
pkgs/top-level/haskell-packages.nix
···
65
65
66
66
uhc = callPackage ../development/compilers/uhc/default.nix ({
67
67
stdenv = pkgs.clangStdenv;
68
-
# UHC 1.1.9.2 is incompatible with hashable 1.2.4.0,
69
-
# latest LTS with a compatible hashable is LTS 4.1
70
-
# See also https://github.com/UU-ComputerScience/uhc/issues/69
71
-
inherit (pkgs.haskell.packages.lts-4_1) ghcWithPackages;
68
+
inherit (pkgs.haskellPackages) ghcWithPackages;
72
69
});
73
70
74
71
};