summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-06-15 20:29:56 +0200
committerPeter Simons <simons@cryp.to>2015-06-15 20:29:56 +0200
commit953d8674375744beb2aeab8815593106874fdb93 (patch)
tree846c911397db395406df9fb7cbad74d3af6698c3 /pkgs
parent553ce28bc296c8f51cf2605e58abaa14d4bb41b2 (diff)
parentd95fba37460d1a727e06b4df0e3dec659b67eafa (diff)
downloadnixlib-953d8674375744beb2aeab8815593106874fdb93.tar
nixlib-953d8674375744beb2aeab8815593106874fdb93.tar.gz
nixlib-953d8674375744beb2aeab8815593106874fdb93.tar.bz2
nixlib-953d8674375744beb2aeab8815593106874fdb93.tar.lz
nixlib-953d8674375744beb2aeab8815593106874fdb93.tar.xz
nixlib-953d8674375744beb2aeab8815593106874fdb93.tar.zst
nixlib-953d8674375744beb2aeab8815593106874fdb93.zip
Merge pull request #8341 from phile314/master
haskell-uhc: Use newer version with relaxed cabal constraints.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/uhc/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 64d51f971b9b..1dbfb039f909 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -2,13 +2,17 @@
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
-  version = "1.1.9.1";
+  # Important:
+  # The commits "Fixate/tag v..." are the released versions.
+  # Ignore the "bumped version to ...." commits, they do not
+  # correspond to releases.
+  version = "1.1.9.1.20150611";
   name = "uhc-${version}";
 
   src = fetchgit {
     url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b";
-    sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3";
+    rev = "b80098e07d12900f098ea964b1d2b3f38e5c9900";
+    sha256 = "14qg1fd9pgbczcmn5ggkd9674qadx1izmz8363ps7c207dg94f9x";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";