diff options
author | Philipp Hausmann <ph_git@314.ch> | 2016-02-26 08:54:33 +0100 |
---|---|---|
committer | Philipp Hausmann <ph_git@314.ch> | 2016-02-26 12:12:53 +0100 |
commit | fbd857ab7235676731370f92c31e380b0a6aedff (patch) | |
tree | 1bb6c63630e5887bab6e00f9effdd623493d38b4 /pkgs/development/compilers | |
parent | e08dd09c254cb31216c4e3bc946a8c5b73ab5645 (diff) | |
download | nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar.gz nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar.bz2 nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar.lz nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar.xz nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.tar.zst nixlib-fbd857ab7235676731370f92c31e380b0a6aedff.zip |
uhc: 1.1.9.2 -> 1.1.9.3
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/uhc/default.nix | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 93aa7811449a..df79b0ba70ee 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -1,23 +1,17 @@ # 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 }: +{ stdenv, coreutils, m4, libtool, clang, ghcWithPackages, fetchFromGitHub }: 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 { - # 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.2"; + version = "1.1.9.3"; name = "uhc-${version}"; - src = fetchgit { - url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "292d259113b98c32154a5be336875751caa5edbc"; - sha256 = "1f462xq9ilkp9mnxm8hxhh1cdwps5d0hxysyibxryk32l7hh53cz"; + src = fetchFromGitHub { + owner = "UU-ComputerScience"; + repo = "uhc"; + rev = "v${version}"; + sha256 = "1r3mja77dqj2ncgp1d9nnc7dhp3gzrb1b1qvml3rq2321mn3m2ad"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -55,10 +49,5 @@ 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"]; - # 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; - }; } |