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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
This commit is contained in:
Eelco Dolstra
2012-05-02 13:19:07 +00:00
parent be901fa8be e0bd67afd7
commit 5bdea119d4
446 changed files with 4287 additions and 2692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/analysis/valgrind/default.nix
View File

@@ -59,21 +59,5 @@ stdenv.mkDerivation (rec {
sed -i coregrind/link_tool_exe_darwin.in \
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
'';
preConfigure =
# Shamelessly drag in MIG.
'' mkdir -p "$TMPDIR/impure-deps/bin"
# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
# let it see the impure directories.
cat > "$TMPDIR/impure-deps/bin/mig" <<EOF
#!/bin/sh
export PATH="/usr/bin:/bin:\$PATH"
exec /usr/bin/mig "\$@"
EOF
chmod +x "$TMPDIR/impure-deps/bin/mig"
export PATH="$TMPDIR/impure-deps/bin:$PATH"
'';
}
else {}))

3
pkgs/development/tools/build-managers/cmake/264.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c
, darwinInstallNameToolUtility }:
}:
with stdenv.lib;
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
optional (stdenv ? glibc) ./search-path-264.patch;
buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ]
++ optional stdenv.isDarwin darwinInstallNameToolUtility
++ optional useNcurses ncurses
++ optional useQt4 qt4;

3
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -1,6 +1,6 @@
{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
, useNcurses ? false, ncurses, useQt4 ? false, qt4
, darwinInstallNameToolUtility }:
}:
with stdenv.lib;
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
optional (stdenv ? glibc) ./search-path.patch;
buildInputs = [ curl expat zlib bzip2 libarchive ]
++ optional stdenv.isDarwin darwinInstallNameToolUtility
++ optional useNcurses ncurses
++ optional useQt4 qt4;

5
pkgs/development/tools/haskell/BNFC-meta/default.nix
View File

@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "BNFC-meta";
version = "0.3";
sha256 = "17vmszgq9cyayqlykjbwzvm8mim641vhpzcrdr3l6zb84hr29xgs";
version = "0.3.0.1";
sha256 = "1qp6aanryrmmip45wgiaf62p842lgc1yqdr8qqn3ljmszxw591ak";
buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
noHaddock = true;
meta = {
description = "Deriving Quasi-Quoters from BNF Grammars";
license = self.stdenv.lib.licenses.gpl2;

12
pkgs/development/tools/haskell/SourceGraph/default.nix
View File

@@ -1,16 +1,16 @@
{ cabal, Cabal, extensibleExceptions, fgl, filepath, Graphalyze
, graphviz, haskellSrcExts, mtl, multiset, random
{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts
, mtl, multiset, random
}:
cabal.mkDerivation (self: {
pname = "SourceGraph";
version = "0.7.0.1";
sha256 = "0f6h240a72cxa65cwjrp34cx80c6frzhgl9dpv3krc8xzhxssk78";
version = "0.7.0.2";
sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal extensibleExceptions fgl filepath Graphalyze graphviz
haskellSrcExts mtl multiset random
Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset
random
];
meta = {
description = "Static code analysis using graph-theoretic techniques";

5
pkgs/development/tools/haskell/alex-meta/default.nix
View File

@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "alex-meta";
version = "0.3.0.2";
sha256 = "0kbscnax236qhr18ix9rnfl70z5rgl9zysx5mzd2vrp7h2dymigg";
version = "0.3.0.3";
sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48";
buildDepends = [ haskellSrcMeta QuickCheck ];
noHaddock = true;
meta = {
description = "Quasi-quoter for Alex lexers";
license = self.stdenv.lib.licenses.bsd3;

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.30";
sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b";
version = "1.31";
sha256 = "04qc74h6w3mvb3h3mv0hb3bbwk22ifl29hg3dcq1d5bg4y21j1vr";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

4
pkgs/development/tools/haskell/happy-meta/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happy-meta";
version = "0.2.0.3";
sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9";
version = "0.2.0.4";
sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54";
buildDepends = [ haskellSrcMeta mtl ];
meta = {
description = "Quasi-quoter for Happy parsers";

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

@@ -1,44 +1,34 @@
{ fetchurl, stdenv, perl, python, ncurses, makeWrapper
, ocaml, ocamlPackages }:
{ fetchurl, stdenv, python, ncurses, ocamlPackages, makeWrapper }:
stdenv.mkDerivation rec {
name = "coccinelle-1.0.0-rc9";
let
name = "coccinelle-1.0.0-rc12";
sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
sha256 = "75d5354e76500b627ccc33b8a929305e5a815ebf08027a8dc094f75ece241697";
inherit sha256;
};
buildInputs = [
ocaml ocamlPackages.findlib
ocamlPackages.menhir ocamlPackages.ocaml_batteries
ocamlPackages.ocaml_pcre ocamlPackages.ocaml_sexplib
ocamlPackages.ocaml_extlib ocamlPackages.pycaml
python ncurses makeWrapper perl
];
buildInputs = with ocamlPackages; [
ocaml findlib menhir
ocaml_pcre ocaml_sexplib pycaml
python ncurses makeWrapper
];
preConfigure =
'' sed -i "configure" -e's|/usr/bin/perl|${perl}/bin/perl|g'
sed -i "globals/config.ml.in" \
-e"s|/usr/local/share|$out/share|g"
'';
buildPhase = "make depend && make all && make all.opt";
# Note: The tests want $out/share/coccinelle/standard.h so they must be run
# after "make install".
doCheck = false;
configureFlagsArray = [ "--enable-release" ];
postInstall =
'' wrapProgram "$out/bin/spatch" \
--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
# On non-NixOS systems, Coccinelle would end up looking up Python modules
# in the wrong directory.
'' for p in "$out/bin/"*
do
wrapProgram "$p" \
--prefix "PYTHONPATH" ":" "${python}/lib/python${python.majorVersion}"
done
'';
meta = {

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

@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "cppi-1.15";
name = "cppi-1.16";
src = fetchurl {
url = "mirror://gnu/cppi/${name}.tar.xz";
sha256 = "1avwwpcwx6rvk9j4id8jq58n5kk756dwnd0wqw4a4p3smvby7gw2";
sha256 = "16i4j80wam7p189xc9i2ijrcgjn684296rym6ja3nlqv8rv90lm8";
};
doCheck = true;

2
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -75,8 +75,6 @@ stdenv.mkDerivation rec {
rm -v $out/share/info/{standards,configure,bfd}.info
'';
enableParallelBuilding = true;
# TODO: Investigate & fix the test failures.
doCheck = false;

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

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libtool, ncurses }:
stdenv.mkDerivation rec {
name = "global-6.1";
name = "global-6.2.2";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
sha256 = "1q305isw1hy2zxcg10jk1g9rmpl8x2r3nkla52jdl4dbydsg6z39";
sha256 = "0a41d3wc22f05fqi5zpx1r22annsi4whdkjdmw50nidjca1vq5pj";
};
buildInputs = [ libtool ncurses ];

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
stdenv.mkDerivation rec {
name = "help2man-1.40.5";
name = "help2man-1.40.8";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.gz";
sha256 = "1d1wn9krvf9mp97c224710n1pcfh73p7w7na65zn2a06124rln8k";
sha256 = "0s6phazn8jgvpbsby8kj2m58rj1zjghi1aipvamh8af226ssqfzj";
};
buildInputs = [ makeWrapper perl gettext LocaleGettext ];

3
pkgs/development/tools/misc/xxdiff/default.nix
View File

@@ -5,8 +5,9 @@ stdenv.mkDerivation {
src = fetchhg {
name = "xxdiff";
tag = "fdc247a7d9e5";
url = https://hg.furius.ca/public/xxdiff;
sha256 = "0ahx80vdf67vq9w0g66dx39y27gvz6v1aybqj9554n6vxvg1zk5n";
sha256 = "7ae7d81becc25b1adabc9383bb5b9005dddb31510cdc404ce8a0d6ff6c3dc47e";
};
buildNativeInputs = [ flex bison qt4 ];