alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'staging'

Browse source 
I don't like to wait for the expat-induced rebuild to happen yet another
time on staging.
This commit is contained in:
Vladimír Čunát 2017-06-19 07:28:10 +02:00
parent 359aff876c 66fdb94f50
commit 629e9c6dc7
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View file

@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null;
let inherit (stdenv.lib) optional optionals; in let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cairo-1.14.8"; name = "cairo-1.14.10";
src = fetchurl { src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.xz"; url = "http://cairographics.org/releases/${name}.tar.xz";
sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e"; sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
}; };
patches = [ patches = [

15
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -1,19 +1,28 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow { lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: , ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
stdenv.mkDerivation rec { let
name = "util-linux-${version}";
version = lib.concatStringsSep "." ([ majorVersion ] version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion); ++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.29"; majorVersion = "2.29";
patchVersion = "2"; patchVersion = "2";
fstrimPatch = fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543";
sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh";
};
in stdenv.mkDerivation rec {
name = "util-linux-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc"; sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc";
}; };
patches = [ ./rtcwake-search-PATH-for-shutdown.patch ]; patches = [
./rtcwake-search-PATH-for-shutdown.patch
fstrimPatch
];
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];

4
pkgs/tools/networking/curl/default.nix
View file

@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
assert c-aresSupport -> c-ares != null; assert c-aresSupport -> c-ares != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "curl-7.54.0"; name = "curl-7.54.1";
src = fetchurl { src = fetchurl {
url = "http://curl.haxx.se/download/${name}.tar.bz2"; url = "http://curl.haxx.se/download/${name}.tar.bz2";
sha256 = "01pz0air8xiwiww981z94980zgcbz8482jxy6b6afzsh7ksbl3pm"; sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x";
}; };
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];

12
pkgs/tools/text/gawk/default.nix
View file

@ -32,7 +32,17 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")]; ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
postInstall = "rm $out/bin/gawk-*"; postInstall =
if interactive then
''
rm "$out"/bin/gawk-*
ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
''
else # TODO: remove this other branch on a stdenv rebuild
''
rm $out/bin/gawk-*
ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/gawk/; homepage = http://www.gnu.org/software/gawk/;