diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 3db8b719f77d..7c0e36d40689 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-1.14.8"; + name = "cairo-1.14.10"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e"; + sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 01bd8beea3d9..79f63f8c27a3 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,19 +1,28 @@ { lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow , ncurses ? null, perl ? null, pam, systemd, minimal ? false }: -stdenv.mkDerivation rec { - name = "util-linux-${version}"; +let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); majorVersion = "2.29"; 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 { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc"; }; - patches = [ ./rtcwake-search-PATH-for-shutdown.patch ]; + patches = [ + ./rtcwake-search-PATH-for-shutdown.patch + fstrimPatch + ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 67c7e82b4ffb..d1f7c4112c61 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.54.0"; + name = "curl-7.54.1"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "01pz0air8xiwiww981z94980zgcbz8482jxy6b6afzsh7ksbl3pm"; + sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 3a504e9478ca..dec7af045251 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -32,7 +32,17 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}" ++ [(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; { homepage = http://www.gnu.org/software/gawk/;