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

haskell-uhc: Remove explicit dependency on binary

Browse Source
This commit is contained in:
Philipp Hausmann
2015-03-10 00:19:10 +01:00
parent 1ce75368f1
commit 2eacaa856b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/uhc/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages,
shuffle, shuffle,
binary, hashable, mtl, network, uhc-util, uulib hashable, mtl, network, uhc-util, uulib
}: }:
let wrappedGhc = ghcWithPackages ( self: [binary hashable mtl network uhc-util uulib] ); let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.1.8.7"; version = "1.1.8.7";
name = "uhc-${version}"; name = "uhc-${version}";
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -3514,7 +3514,7 @@ let
uhc = callPackage ../development/compilers/uhc/default.nix ({ uhc = callPackage ../development/compilers/uhc/default.nix ({
stdenv = clangStdenv; stdenv = clangStdenv;
ghcWithPackages = haskellngPackages.ghcWithPackages; ghcWithPackages = haskellngPackages.ghcWithPackages;
inherit (haskellngPackages) shuffle binary hashable mtl network uhc-util uulib; inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib;
}); });
gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {