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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-07 00:09:37 +02:00
parent 4b2ce84872 46a9e805ef
commit a85dcf4a00
1001 changed files with 20043 additions and 5648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
patchFlags = "-p0";
patches =
let
(let
patch = nr: sha256:
fetchurl {
url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}";
inherit sha256;
};
in
import ./bash-4.2-patches.nix patch;
import ./bash-4.2-patches.nix patch);
crossAttrs = {
configureFlags = baseConfigureFlags +

4
pkgs/shells/dash/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dash-0.5.7";
name = "dash-0.5.8";
src = fetchurl {
url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
sha256 = "0fafpbpq6jghs0fr392x525dybym9kq1s3kly2679ds526gzm2df";
sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6";
};
meta = {

12
pkgs/shells/zsh/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ncurses, coreutils }:
{ stdenv, fetchurl, ncurses, coreutils, pcre }:
let
version = "5.0.5";
version = "5.0.6";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
sha256 = "1wljqii2lkz5kc4y3xs65isnahvnlj678b9zv31bn444mapjpwp4";
sha256 = "1mngi85q56szzlrdzv60vg7wl03lih8vlnl800gwr0i6d1laawxj";
};
in
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936";
sha256 = "0ic86y35v82d87ixjzdb6zrnzf002b7gn573jnva6cqm2jdm1jl4";
};
buildInputs = [ ncurses coreutils ];
buildInputs = [ ncurses coreutils pcre ];
preConfigure = ''
configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp"
configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
'';
# XXX: think/discuss about this, also with respect to nixos vs nix-on-X