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

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
This commit is contained in:
Yury G. Kudryashov
2012-02-17 13:43:31 +00:00
parent e5027e5b36 882b8ea871
commit 79d0d410cb
17 changed files with 84 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.26";
sha256 = "18gl75y1grhzyhlaz32800gxxfrcl01r7cpx1c63lzpwmdxvk01d";
version = "1.27";
sha256 = "1s9gbnzx2wcrp9gg0vdpcv61jmv44hmilb5rj4ighnbfv7kv365z";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
meta = {
homepage = "http://github.com/haskell4nix/cabal2nix";
homepage = "http://github.com/NixOS/cabal2nix";
description = "Convert Cabal files into Nix build instructions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/tools/misc/coccinelle/default.nix
View File

@@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
--prefix "LD_LIBRARY_PATH" ":" "$out/lib" \
--prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
wrapProgram "$out/bin/spatch.opt" \
--prefix "LD_LIBRARY_PATH" ":" "$out/lib" \
--prefix "PYTHONPATH" ":" "$out/share/coccinelle/python"
yes | make test
'';