diff options
| author | Peter Simons <simons@cryp.to> | 2013-02-25 01:26:26 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-02-25 01:26:26 +0100 |
| commit | 04b2efff198596f72f9561aca7edff8822d2829c (patch) | |
| tree | 16ac826143ef513ac6a1c387896fa6f36ca23af4 /pkgs | |
| parent | cd5f4eefa63cbdd640f1f112be57d69e574d38ff (diff) | |
| parent | 7aad2ce1013b7bbe5c4dca02d720c08aba982d42 (diff) | |
| download | nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar.gz nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar.bz2 nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar.lz nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar.xz nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.tar.zst nixpkgs-04b2efff198596f72f9561aca7edff8822d2829c.zip | |
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/haskell/cabal2nix/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index e3b6378e3d9..ed26e335870 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,12 +1,14 @@ -{ cabal, Cabal, filepath, hackageDb, HTTP, mtl, regexPosix }: +{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix +}: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.43"; - sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068"; + version = "1.44"; + sha256 = "1j2w5g75nir0ax9pvn1fyj5l1c4s84mbj400any9v0bpv624mffm"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; + testDepends = [ doctest ]; meta = { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 85499e893f8..e68e4cab349 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -12,7 +12,7 @@ } # Then you can install it by: - # $ nix-env -i sdl-env + # $ nix-env -i env-sdl # And you can load it simply calling: # $ load-env-sdl # and this will update your env vars to have 'make' and 'gcc' finding the SDL diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a03f0a6fe46..f99e790de94 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -85,6 +85,7 @@ deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; }; ghc6121Prefs = @@ -95,6 +96,7 @@ deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -108,6 +110,7 @@ deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; + cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_14_0; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; |