ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:21:57 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons 2013-02-25 01:26:26 +01:00
commit 04b2efff19
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -1,12 +1,14 @@
{ cabal, Cabal, filepath, hackageDb, HTTP, mtl, regexPosix }: { cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix
}:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cabal2nix"; pname = "cabal2nix";
version = "1.43"; version = "1.44";
sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068"; sha256 = "1j2w5g75nir0ax9pvn1fyj5l1c4s84mbj400any9v0bpv624mffm";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
testDepends = [ doctest ];
meta = { meta = {
homepage = "http://github.com/NixOS/cabal2nix"; homepage = "http://github.com/NixOS/cabal2nix";
description = "Convert Cabal files into Nix build instructions"; description = "Convert Cabal files into Nix build instructions";

2
pkgs/misc/my-env/default.nix
View File

@ -12,7 +12,7 @@
} }
# Then you can install it by: # Then you can install it by:
# $ nix-env -i sdl-env # $ nix-env -i env-sdl
# And you can load it simply calling: # And you can load it simply calling:
# $ load-env-sdl # $ load-env-sdl
# and this will update your env vars to have 'make' and 'gcc' finding the SDL # and this will update your env vars to have 'make' and 'gcc' finding the SDL

3
pkgs/top-level/haskell-defaults.nix
View File

@ -85,6 +85,7 @@
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably statistics) compile # deviating from Haskell platform here, to make some packages (notably statistics) compile
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; 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 = ghc6121Prefs =
@ -95,6 +96,7 @@
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; 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 # deviating from Haskell platform here, to make some packages (notably statistics) compile
}; };
@ -108,6 +110,7 @@
deepseq = self.deepseq_1_1_0_2; deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3; monadPar = self.monadPar_0_1_0_3;
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; 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 # deviating from Haskell platform here, to make some packages (notably statistics) compile
}; };