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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source
This commit is contained in:
Peter Simons 2013-03-21 16:26:34 +01:00
commit a28ff44c76
17 changed files with 82 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/interpreters/ruby/patches.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
, zlib, libuuid, gems, jdk, python }:
, zlib, libuuid, gems, jdk, python, stdenv }:
let
@ -15,7 +15,32 @@ in
{
sup = { buildInputs = [ gems.ncursesw ]; };
libv8 = { buildInputs = [ python ]; };
libv8 = {
# This fix is needed to fool scons, which clears the environment by default.
# It's ugly, but it works.
#
# We create a gcc wrapper wrapper, which reexposes the environment variables
# that scons hides. Furthermore, they treat warnings as errors causing the
# build to fail, due to an unused variable.
#
# Finally, we must set CC and AR explicitly to allow scons to find the
# compiler and archiver
preBuild = ''
cat > $TMPDIR/g++ <<EOF
#! ${stdenv.shell}
$(export)
g++ \$(echo \$@ | sed 's/-Werror//g')
EOF
chmod +x $TMPDIR/g++
export CXX=$TMPDIR/g++
export AR=$(type -p ar)
'';
buildInputs = [ python ];
};
sqlite3 = { propagatedBuildInputs = [ sqlite ]; };

22
pkgs/development/libraries/glibc/2.17/common.nix
View File

@ -3,7 +3,7 @@
cross:
{ name, fetchurl, stdenv, installLocales ? false
{ name, fetchurl, fetchgit ? null, stdenv, installLocales ? false
, gccCross ? null, kernelHeaders ? null
, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
, mig ? null
@ -118,16 +118,26 @@ stdenv.mkDerivation ({
# Remove the `gccCross' attribute so that the *native* glibc store path
# doesn't depend on whether `gccCross' is null or not.
// (removeAttrs args [ "gccCross" "fetchurl" ]) //
// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
{
name = name + "-${version}" +
stdenv.lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
};
src =
if hurdHeaders != null
then fetchgit {
# Shamefully the "official" glibc won't build on GNU, so use the one
# maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
url = "git://git.sv.gnu.org/hurd/glibc.git";
sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3";
};
# Remove absolute paths from `configure' & co.; build out-of-tree.
preConfigure = ''

8
pkgs/development/libraries/glibc/2.17/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernelHeaders
{ stdenv, fetchurl, fetchgit ? null, kernelHeaders
, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
, mig ? null
, installLocales ? true
@ -18,8 +18,8 @@ in
+ stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
+ stdenv.lib.optionalString debugSymbols "-debug";
inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
gccCross;
inherit fetchurl fetchgit stdenv kernelHeaders installLocales
profilingLibraries gccCross;
builder = ./builder.sh;
@ -56,7 +56,7 @@ in
(if hurdHeaders != null
then rec {
inherit machHeaders hurdHeaders libpthreadHeaders mig;
inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];

5
pkgs/development/libraries/haskell/active/default.nix
View File

@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "active";
version = "0.1.0.3";
sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi";
version = "0.1.0.4";
sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
testDepends = [
newtype QuickCheck semigroupoids semigroups vectorSpace
];
jailbreak = true;
meta = {
description = "Abstractions for animation";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/bytestring-lexing/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bytestring-lexing";
version = "0.4.0";
sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr";
version = "0.4.2";
sha256 = "0s9rip1ik7f29n2i88277vhy7dqhc2bb5bb9l6fd47disb78ic9h";
buildTools = [ alex ];
meta = {
homepage = "http://code.haskell.org/~wren/";

4
pkgs/development/libraries/haskell/diagrams/contrib.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "0.6.0.3";
sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5";
version = "0.6.0.4";
sha256 = "190wn56bmrpbijsxf793xbjy1a4rci3vj40ri6i2dv3an6p0ka0q";
buildDepends = [
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
];

12
pkgs/development/libraries/haskell/filestore/default.nix
View File

@ -4,14 +4,10 @@
cabal.mkDerivation (self: {
pname = "filestore";
version = "0.6";
sha256 = "1bmsqxrkiqw791h0xwasry3jm56rjsyvl9l5r78209bhiv5v6xk0";
isLibrary = true;
isExecutable = true;
buildDepends = [
Diff filepath HUnit mtl parsec split time utf8String xml
];
jailbreak = true;
version = "0.6.0.1";
sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
buildDepends = [ Diff filepath parsec split time utf8String xml ];
testDepends = [ Diff filepath HUnit mtl time ];
doCheck = false;
meta = {
description = "Interface for versioning file stores";

4
pkgs/development/libraries/haskell/gitit/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.10.3";
sha256 = "1hz4ddym2vn01nd22gb995dya48fzc7nsmsqywdc8hjczmn93qyg";
version = "0.10.3.1";
sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/libxml-sax/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "libxml-sax";
version = "0.7.3";
sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
version = "0.7.4";
sha256 = "1vbxrmxxb6a58hd6dd81kz8fh198jkvwv4gxzbbfw44170946c0z";
buildDepends = [ text xmlTypes ];
extraLibraries = [ libxml2 ];
pkgconfigDepends = [ libxml2 ];

4
pkgs/development/libraries/haskell/persistent-template/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.3";
sha256 = "1jvr71qfjv2f4vx4xbz78x5a325zkdpg2qvcbglizz10xwrm5j9d";
version = "1.1.3.1";
sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p";
buildDepends = [ aeson monadControl persistent text transformers ];
testDepends = [ aeson hspec persistent QuickCheck text ];
meta = {

6
pkgs/development/libraries/haskell/transformers-compat/default.nix
View File

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "transformers-compat";
version = "0.1";
sha256 = "100xw00h2l6iipg6lq5bbncpil3bl6w3frak99klpi8gn6ihd8ah";
version = "0.1.1.1";
sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
buildDepends = [ transformers ];
noHaddock = true;
meta = {
homepage = "http://github.com/ekmett/transformers-compat/";
description = "Lenses, Folds and Traversals";
description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

5
pkgs/development/mobile/androidenv/build-app.nix
View File

@ -13,7 +13,8 @@ let
androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
in
stdenv.mkDerivation {
inherit name src;
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
@ -39,6 +40,6 @@ stdenv.mkDerivation {
mv bin/*-${if release then "release" else "debug"}.apk $out
mkdir -p $out/nix-support
echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
'';
}

8
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@ -110,13 +110,17 @@ stdenv.mkDerivation {
if target == "android" then
''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
else if target == "iphone" && release then
"cp -av build/iphone/build/* $out"
''
cp -av build/iphone/build/* $out
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
''
else if target == "iphone" then ""
else throw "Target: ${target} is not supported!"}
${if target == "android" then ''
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
'' else ""}
'';

7
pkgs/development/mobile/xcodeenv/build-app.nix
View File

@ -44,7 +44,8 @@ let
deleteKeychain = "security delete-keychain $keychainName";
in
stdenv.mkDerivation {
inherit name src;
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
buildInputs = [ xcodewrapper ];
buildPhase = ''
${stdenv.lib.optionalString release ''
@ -79,11 +80,11 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString release ''
${stdenv.lib.optionalString generateIPA ''
# Produce an IPA file
xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa"
# Add IPA to Hydra build products
mkdir -p $out/nix-support
echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
''}
# Delete our temp keychain

4
pkgs/servers/http/mini-httpd/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, boostHeaders }:
stdenv.mkDerivation rec {
name = "mini-httpd-1.2";
name = "mini-httpd-1.3";
src = fetchurl {
url = "mirror://savannah/mini-httpd/${name}.tar.gz";
sha256 = "1547312rg2phxwny9vm1bkyid251n7wy4p1mgs6f5yq6ypwrsr6p";
sha256 = "16n33hyp3fcjvd71yrny3ym3kqvxr1jy2hh9wgf6b7zjri3gfak3";
};
buildInputs = [ boostHeaders ];

75
pkgs/tools/text/gawk/cygwin-identifiers.patch
View File

@ -1,75 +0,0 @@
This patch fixes compilation on Windows, where some of the identifiers
would clash.
commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Fri Jul 29 13:25:57 2011 +0300
Fix DJGPP problem with libsigsegv.
diff --git a/builtin.c b/builtin.c
index 4d87592..941f5ad 100644
--- a/builtin.c
+++ b/builtin.c
@@ -605,7 +605,7 @@ format_tree(
NODE *arg;
long fw, prec, argnum;
int used_dollar;
- int lj, alt, big, bigbig, small, have_prec, need_format;
+ int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format;
long *cur = NULL;
uintmax_t uval;
int sgn;
@@ -725,7 +725,7 @@ format_tree(
signchar = FALSE;
zero_flag = FALSE;
quote_flag = FALSE;
- lj = alt = big = bigbig = small = FALSE;
+ lj = alt = big_flag = bigbig_flag = small_flag = FALSE;
fill = sp;
cp = cend;
chbuf = lchbuf;
@@ -907,7 +907,7 @@ check_pos:
goto retry;
#endif
case 'l':
- if (big)
+ if (big_flag)
break;
else {
static short warned = FALSE;
@@ -921,10 +921,10 @@ check_pos:
goto out;
}
}
- big = TRUE;
+ big_flag = TRUE;
goto retry;
case 'L':
- if (bigbig)
+ if (bigbig_flag)
break;
else {
static short warned = FALSE;
@@ -938,10 +938,10 @@ check_pos:
goto out;
}
}
- bigbig = TRUE;
+ bigbig_flag = TRUE;
goto retry;
case 'h':
- if (small)
+ if (small_flag)
break;
else {
static short warned = FALSE;
@@ -955,7 +955,7 @@ check_pos:
goto out;
}
}
- small = TRUE;
+ small_flag = TRUE;
goto retry;
case 'c':
need_format = FALSE;

2
pkgs/tools/text/gawk/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "04vd0axif762mf781pj3days6ilv2333b9zi9c50y5mma66g5q91";
};
patches = stdenv.lib.optional stdenv.isCygwin [ ./cygwin-identifiers.patch ];
patches = [];
doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1