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

Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs

Browse Source
This commit is contained in:
Moritz Ulrich
2014-10-27 01:14:13 +01:00
parent 3a0a389312 aec6d83c25
commit cdd2dd70aa
605 changed files with 9168 additions and 4205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/build-fhs-chrootenv/mount.sh.in
View File

@@ -23,4 +23,4 @@ mount --rbind /run $chrootenvDest/run
mount --bind /etc $chrootenvDest/host-etc
# Bind mount /tmp
mount --bind /tmp/chrootenv-@name@ /run/chrootenv/steam/tmp
mount --bind /tmp/chrootenv-@name@ $chrootenvDest/tmp

10
pkgs/build-support/cabal/default.nix
View File

@@ -57,6 +57,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
doCheck = enableCheckPhase && x.doCheck;
hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource;
# Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
meta = let meta = x.meta or {};
hydraPlatforms = meta.hydraPlatforms or meta.platforms or [];
noElem = p: ps: !stdenv.lib.elem p ps;
noDarwin = p: noElem p stdenv.lib.platforms.darwin;
in
meta // { hydraPlatforms = filter noDarwin hydraPlatforms; };
};
defaults =
@@ -210,9 +217,6 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
''}
${optionalString (versionOlder "7.8" ghc.version) ''
configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
''}
echo "configure flags: $extraConfigureFlags $configureFlags"
./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \

8
pkgs/build-support/fetchurl/mirrors.nix
View File

@@ -173,6 +173,7 @@ rec {
ftp://ftp.nl.debian.org/debian/
ftp://ftp.ru.debian.org/debian/
ftp://ftp.debian.org/debian/
http://ftp.debian.org/debian/
http://archive.debian.org/debian-archive/debian/
ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/
];
@@ -385,4 +386,11 @@ rec {
http://hdiff.luite.com/packages/archive/package/
];
# Roy marples mirrors
roy = [
http://roy.marples.name/downloads/
http://roy.aydogan.net/
http://cflags.cc/roy/
];
}

2
pkgs/build-support/grsecurity/default.nix
View File

@@ -32,7 +32,7 @@ let
grKernel = if cfg.stable
then mkKernel pkgs.linux_3_14 stable-patch
else mkKernel pkgs.linux_3_16 test-patch;
else mkKernel pkgs.linux_3_17 test-patch;
## -- grsecurity configuration ---------------------------------------------

22
pkgs/build-support/substitute-files/substitute-all-files.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv }:
args:
stdenv.mkDerivation ({
name = if args ? name then args.name else baseNameOf (toString args.src);
builder = with stdenv.lib; builtins.toFile "builder.sh" ''
source $stdenv/setup
set -o pipefail
eval "$preInstall"
args=
cd "$src"
echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do
mkdir -p "$out/$(dirname "$line")"
substituteAll "$line" "$out/$line"
done
'';
preferLocalBuild = true;
} // args)

4
pkgs/build-support/vm/default.nix
View File

@@ -1586,7 +1586,7 @@ rec {
fullName = "Debian 7.6 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3";
sha256 = "1j093d6dwixyrk87sdvaayh3ffcn5aqwik36blndiw5njw2qkzgj";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
@@ -1597,7 +1597,7 @@ rec {
fullName = "Debian 7.6 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17";
sha256 = "1n46fxq8a2dm1i7ysc80s5lg10z5dh0hyd8k3h532n5wzs44xqcc";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;