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

Merge commit staging+systemd into closure-size

Browse Source 
Many non-conflict problems weren't (fully) resolved in this commit yet.
This commit is contained in:
Vladimír Čunát
2015-10-03 13:33:13 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708456 additions and 130039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/shells/bash/bash-4.3-patches.nix
View File

@@ -34,4 +34,13 @@ patch: [
(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd")
(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8")
(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv")
(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi")
(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p")
(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc")
(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k")
(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd")
(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")
(patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4")
(patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f")
(patch "042" "1bwhssay66n75fy0pxcrwbm032s6fvfg7dblzbrzzn5k38a56nmp")
]

1393
pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch Normal file
View File

File diff suppressed because it is too large Load Diff

29
pkgs/shells/bash/default.nix
View File

@@ -1,10 +1,14 @@
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }:
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
assert interactive -> readline != null;
assert stdenv.isDarwin -> binutils != null;
let
realName = "bash-4.3";
version = "4.3";
realName = "bash-${version}";
shortName = "bash43";
baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
in
stdenv.mkDerivation rec {
@@ -12,9 +16,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/bash/${realName}.tar.gz";
sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
inherit sha256;
};
outputs = [ "out" "doc" ];
NIX_CFLAGS_COMPILE = ''
-DSYS_BASHRC="/etc/bashrc"
-DSYS_BASH_LOGOUT="/etc/bash_logout"
@@ -30,15 +36,23 @@ stdenv.mkDerivation rec {
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}";
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
inherit sha256;
};
in
import ./bash-4.3-patches.nix patch);
import ./bash-4.3-patches.nix patch)
++ stdenv.lib.optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
crossAttrs = {
configureFlags = baseConfigureFlags +
" bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing";
" bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
stdenv.lib.optionalString stdenv.isCygwin ''
--without-libintl-prefix --without-libiconv-prefix
--with-installed-readline
bash_cv_dev_stdin=present
bash_cv_dev_fd=standard
bash_cv_termcap_lib=libncurses
'';
};
configureFlags = baseConfigureFlags;
@@ -46,7 +60,8 @@ stdenv.mkDerivation rec {
# Note: Bison is needed because the patches above modify parse.y.
nativeBuildInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive readline;
++ stdenv.lib.optional interactive readline
++ stdenv.lib.optional stdenv.isDarwin binutils;
# Bash randomly fails to build because of a recursive invocation to
# build `version.h'.