Merge pull request #10398 from phile314/master

uhc: Update to 1.1.9.1
This commit is contained in:
Peter Simons 2015-10-15 15:17:45 +02:00
commit 81d959c08d

View File

@ -1,18 +1,18 @@
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }: { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
# Important: # Important:
# The commits "Fixate/tag v..." are the released versions. # The commits "Fixate/tag v..." are the released versions.
# Ignore the "bumped version to ...." commits, they do not # Ignore the "bumped version to ...." commits, they do not
# correspond to releases. # correspond to releases.
version = "1.1.9.1.20150611"; version = "1.1.9.1";
name = "uhc-${version}"; name = "uhc-${version}";
src = fetchgit { src = fetchgit {
url = "https://github.com/UU-ComputerScience/uhc.git"; url = "https://github.com/UU-ComputerScience/uhc.git";
rev = "b80098e07d12900f098ea964b1d2b3f38e5c9900"; rev = "ce93d01486972c994ea2bbbd3d43859911120c39";
sha256 = "14qg1fd9pgbczcmn5ggkd9674qadx1izmz8363ps7c207dg94f9x"; sha256 = "1y670sc6ky74l3msayzqjlkjv1kpv3g35pirsq3q79klzvnpyj2x";
}; };
postUnpack = "sourceRoot=\${sourceRoot}/EHC"; postUnpack = "sourceRoot=\${sourceRoot}/EHC";
@ -50,6 +50,5 @@ in stdenv.mkDerivation rec {
# On Darwin, the GNU libtool is used, which does not # On Darwin, the GNU libtool is used, which does not
# support the -static flag and thus breaks the build. # support the -static flag and thus breaks the build.
platforms = ["x86_64-linux"]; platforms = ["x86_64-linux"];
broken = true; # https://github.com/UU-ComputerScience/uhc/issues/60
}; };
} }