diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2e88d6b41548f..68441ea9393ab 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1231,13 +1231,12 @@ echo @foo@
stripHash
path
Strips the directory and hash part of a store
- path, storing the name part in the environment variable
- strippedName. For example:
+ path, outputting the name part to stdout.
+ For example:
-stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
# prints coreutils-8.24
-echo $strippedName
+stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
If you wish to store the result in another variable, then the
@@ -1245,7 +1244,7 @@ echo $strippedName
name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
-someVar=$(stripHash $name; echo $strippedName)
+someVar=$(stripHash $name)
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index c1107977db791..21cea77f8768d 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -52,6 +52,15 @@ following incompatible changes:
but will need to start that process from gdb (so it is a child).
+
+
+
+ The stripHash bash function in stdenv
+ changed according to its documentation; it now outputs the stripped name to
+ stdout instead of putting it in the variable
+ strippedName.
+
+
diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh
index f2c92878a4dc4..38312210df251 100644
--- a/nixos/modules/services/networking/ircd-hybrid/builder.sh
+++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh
@@ -12,7 +12,7 @@ for i in $scripts; do
if test "$(echo $i | cut -c1-2)" = "=>"; then
subDir=$(echo $i | cut -c3-)
else
- dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
+ dst=$out/$subDir/$(stripHash $i | sed 's/\.in//')
doSub $i $dst
chmod +x $dst # !!!
fi
@@ -23,7 +23,7 @@ for i in $substFiles; do
if test "$(echo $i | cut -c1-2)" = "=>"; then
subDir=$(echo $i | cut -c3-)
else
- dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//')
+ dst=$out/$subDir/$(stripHash $i | sed 's/\.in//')
doSub $i $dst
fi
done
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index f96416b288f17..47f61ab64d61f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -538,8 +538,7 @@ rec {
# Hacky: RPM looks for .spec inside the tarball, so
# strip off the hash.
- stripHash "$src"
- srcName="$strippedName"
+ srcName="$(stripHash "$src")"
cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root
export HOME=/tmp/home
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
index 784dfe7100788..8051606632df5 100644
--- a/pkgs/data/fonts/droid/default.nix
+++ b/pkgs/data/fonts/droid/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
sourceRoot = "./";
unpackCmd = ''
- ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+ ttfName=$(basename $(stripHash $curSrc))
cp $curSrc ./$ttfName
'';
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index 451725a6d8029..e9eff414bc1d0 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
sourceRoot = "./";
unpackCmd = ''
- ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+ ttfName=$(basename $(stripHash $curSrc))
cp $curSrc ./$ttfName
'';
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index ade9fd2350e55..5a8a3f3c1201f 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sourceRoot = "./";
unpackCmd = ''
- ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
+ ttfName=$(basename $(stripHash $curSrc))
cp $curSrc ./$ttfName
'';
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
index 70fd729297c05..939305d486a77 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
@@ -3,5 +3,4 @@ source $stdenv/setup
mkdir -p $out/xml/dtd/docbook-ebnf
cd $out/xml/dtd/docbook-ebnf
cp -p $dtd dbebnf.dtd
-stripHash $catalog
-cp -p $catalog $strippedName
+cp -p $catalog $(stripHash $catalog)
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index c2bec3a7f1de8..41c7f8db6d26e 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
major = "3.0";
- minor = "18";
+ minor = "20";
name = "clutter-gst-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
- sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
+ sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index a126f77094494..ef2ac6f938539 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
major = "1.8";
- minor = "0";
+ minor = "2";
name = "clutter-gtk-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
- sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl";
+ sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94";
};
propagatedBuildInputs = [ clutter gtk3 ];
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 550ec2bf5c319..0130ee2a014b4 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -16,20 +16,14 @@ let
configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations
in
stdenv.mkDerivation rec {
- name = "fontconfig-2.11.1";
+ name = "fontconfig-2.12.1";
src = fetchurl {
url = "http://fontconfig.org/release/${name}.tar.bz2";
- sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw";
+ sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl";
};
patches = [
- (fetchpatch ({
- url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
- sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
- name = "fc-cache-bug-77252.patch";
- }
- ))
(substituteAll {
src = ./config-compat.patch;
inherit configVersion;
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 85446aae8ca9f..f3db9bf597762 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -2,7 +2,7 @@
, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
let
- ver_maj = "2.34";
+ ver_maj = "2.36";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
- sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm";
+ sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index c47a02ef5e476..710b65509959f 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
'';
ver_maj = "2.50";
- ver_min = "0";
+ ver_min = "1";
in
stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
- sha256 = "830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70";
+ sha256 = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 422fdebd9c863..119e3f77f6707 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,16 +1,14 @@
{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }:
stdenv.mkDerivation rec {
- name = "gtkmm-${minVer}.4";
+ name = "gtkmm-${minVer}.5";
minVer = "2.24";
src = fetchurl {
url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz";
- sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
+ sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72";
};
- patches = [ ./gtkmm-2.24.4-missing-operator.patch ];
-
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];
diff --git a/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch b/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch
deleted file mode 100644
index c1e8cf59dde13..0000000000000
--- a/pkgs/development/libraries/gtkmm/gtkmm-2.24.4-missing-operator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkmm-2.24.4/gtk/gtkmm/menushell.cc.orig 2016-08-26 21:55:08.858311055 +0000
-+++ gtkmm-2.24.4/gtk/gtkmm/menushell.cc 2016-08-26 21:55:33.206310578 +0000
-@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(Menu
- {
- const Glib::RefPtr item = element.get_child();
-
-- g_return_val_if_fail(item != 0, position);
-+ g_return_val_if_fail(!!item, position);
- g_return_val_if_fail(gparent() != 0, position);
-
- int pos = -1;
\ No newline at end of file
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 5ef8bbac5d161..f225f34c33644 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool
-, glib, dbus, udev, libgudev, udisks2, libgcrypt
+, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, samba, libmtp
-, gnomeSupport ? false, gnome, libgnome_keyring, makeWrapper }:
+, gnomeSupport ? false, gnome, makeWrapper }:
let
- ver_maj = "1.22";
- version = "${ver_maj}.4";
+ ver_maj = "1.30";
+ version = "${ver_maj}.1";
in
stdenv.mkDerivation rec {
name = "gvfs-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
- sha256 = "57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484";
+ sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b";
};
nativeBuildInputs = [ pkgconfig intltool libtool ];
@@ -21,13 +21,15 @@ stdenv.mkDerivation rec {
buildInputs =
[ makeWrapper glib dbus udev libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
- libxml2 libxslt docbook_xsl samba libmtp
+ libxml2 libxslt docbook_xsl samba libmtp libcap polkit
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
- gtk libsoup libgnome_keyring gconf
+ gtk libsoup libgnome_keyring gconf gcr
# ToDo: not working and probably useless until gnome3 from x-updates
]);
+ configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
+
enableParallelBuilding = true;
# ToDo: one probably should specify schemas for samba and others here
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 64cfb7d56cacf..f2174470becff 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.70";
+ name = "libdrm-2.4.71";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b";
+ sha256 = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 707129a16bb70..1489ab627742f 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,15 +4,15 @@
, libintlOrEmpty
, intltool, python }:
let
- majorVersion = "2.54";
- version = "${majorVersion}.1";
+ majorVersion = "2.56";
+ version = "${majorVersion}.0";
in
stdenv.mkDerivation {
name = "libsoup-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
- sha256 = "0cyn5pq4xl1gb8413h2p4d5wrn558dc054zhwmk4swrl40ijrd27";
+ sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5";
};
prePatch = ''
diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix
index 0de99ece5c43e..6850c13b44e98 100644
--- a/pkgs/development/libraries/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/default.nix
@@ -2,14 +2,14 @@
let
ver_maj = "2.40";
- ver_min = "0";
+ ver_min = "1";
in
stdenv.mkDerivation rec {
name = "pangomm-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz";
- sha256 = "03fpqdjp7plybf4zsgszbm8yhgl28vmajzfpmaqcsmyfvjlszl3x";
+ sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6cab8597869eb..d892135740c39 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -680,11 +680,11 @@ let
}) // {inherit windowswmproto libX11 libXext xextproto ;};
libX11 = (mkDerivation "libX11" {
- name = "libX11-1.6.3";
+ name = "libX11-1.6.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2;
- sha256 = "04c1vj53xq2xgyxx5vhln3wm2d76hh1n95fvs3myhligkz1sfcfg";
+ url = mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2;
+ sha256 = "0hg46i6h92pmb7xp1cis2j43zq3fkdz89p0yv35w4vm17az4iixp";
};
buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -779,11 +779,11 @@ let
}) // {inherit libX11 xextproto xproto ;};
libXfixes = (mkDerivation "libXfixes" {
- name = "libXfixes-5.0.1";
+ name = "libXfixes-5.0.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2;
- sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
+ url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2;
+ sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv";
};
buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -823,11 +823,11 @@ let
}) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (mkDerivation "libXi" {
- name = "libXi-1.7.6";
+ name = "libXi-1.7.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2;
- sha256 = "1b5p0l19ynmd6blnqr205wyngh6fagl35nqb4v05dw60rr9aachz";
+ url = mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2;
+ sha256 = "0c70n4aq0ba628wr88ih4740nci9d9f6y3v96sx376vvlm7q6vwr";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -889,22 +889,22 @@ let
}) // {inherit presentproto libX11 xextproto xproto ;};
libXrandr = (mkDerivation "libXrandr" {
- name = "libXrandr-1.5.0";
+ name = "libXrandr-1.5.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2;
- sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg";
+ url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2;
+ sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z";
};
buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
libXrender = (mkDerivation "libXrender" {
- name = "libXrender-0.9.9";
+ name = "libXrender-0.9.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2;
- sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw";
+ url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2;
+ sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0";
};
buildInputs = [pkgconfig renderproto libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -933,33 +933,33 @@ let
}) // {inherit libICE kbproto libSM libX11 xproto ;};
libXtst = (mkDerivation "libXtst" {
- name = "libXtst-1.2.2";
+ name = "libXtst-1.2.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2;
- sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
+ url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2;
+ sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6";
};
buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
libXv = (mkDerivation "libXv" {
- name = "libXv-1.0.10";
+ name = "libXv-1.0.11";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2;
- sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
+ url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2;
+ sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j";
};
buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit videoproto libX11 libXext xextproto xproto ;};
libXvMC = (mkDerivation "libXvMC" {
- name = "libXvMC-1.0.9";
+ name = "libXvMC-1.0.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2;
- sha256 = "0mjp1b21dvkaz7r0iq085r92nh5vkpmx99awfgqq9hgzyvgxf0q7";
+ url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2;
+ sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5";
};
buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 2ee394faf02c9..5e7a9e81416fa 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -59,7 +59,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
@@ -67,24 +67,24 @@ mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
-mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
+mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
-mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
-mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2
+mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
+mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2
mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
-mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2
-mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2
-mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2
+mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
+mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
+mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2
mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index feb82fd922666..154fdefd789c7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -490,12 +490,14 @@ dumpVars() {
}
-# Utility function: return the base name of the given path, with the
+# Utility function: echo the base name of the given path, with the
# prefix `HASH-' removed, if present.
stripHash() {
- strippedName=$(basename $1);
+ local strippedName="$(basename "$1")";
if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
- strippedName=$(echo "$strippedName" | cut -c34-)
+ echo "$strippedName" | cut -c34-
+ else
+ echo "$strippedName"
fi
}
@@ -506,12 +508,10 @@ _defaultUnpack() {
if [ -d "$fn" ]; then
- stripHash "$fn"
-
# We can't preserve hardlinks because they may have been
# introduced by store optimization, which might break things
# in the build.
- cp -pr --reflink=auto "$fn" $strippedName
+ cp -pr --reflink=auto "$fn" "$(stripHash "$fn")"
else
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix
index b049e0706e9a6..9c1dabc758441 100644
--- a/pkgs/tools/misc/man-db/default.nix
+++ b/pkgs/tools/misc/man-db/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
+{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }:
stdenv.mkDerivation rec {
name = "man-db-2.7.5";
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
outputMan = "out"; # users will want `man man` to work
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libpipeline db groff ];
- troff="${groff}/bin/groff";
postPatch = ''
substituteInPlace src/man_db.conf.in \
@@ -27,14 +26,14 @@ stdenv.mkDerivation rec {
# Don't try /etc/man_db.conf by default, so we avoid error messages.
"--with-config-file=\${out}/etc/man_db.conf"
"--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
- "--with-eqn=${groff}/bin/eqn"
- "--with-neqn=${groff}/bin/neqn"
- "--with-nroff=${groff}/bin/nroff"
- "--with-pic=${groff}/bin/pic"
- "--with-refer=${groff}/bin/refer"
- "--with-tbl=${groff}/bin/tbl"
];
+ postInstall = ''
+ for i in "$out/bin/"*; do
+ wrapProgram "$i" --prefix PATH : "${groff}/bin"
+ done
+ '';
+
enableParallelBuilding = true;
doCheck = true;
diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh
index 46a2c515e03ae..f038b83ff7ad9 100644
--- a/pkgs/tools/typesetting/tex/nix/animatedot.sh
+++ b/pkgs/tools/typesetting/tex/nix/animatedot.sh
@@ -4,6 +4,6 @@ mkdir -p $out
for ((i = 1; i <= $nrFrames; i++)); do
echo "producing frame $i...";
- targetName=$out/$(basename $(stripHash $dotGraph; echo $strippedName) .dot)-f-$i.dot
+ targetName=$out/$(basename $(stripHash $dotGraph) .dot)-f-$i.dot
cpp -DFRAME=$i < $dotGraph > $targetName
done
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index ce5c025475a0b..0566e5118705f 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -185,7 +185,7 @@ rec {
if test -d $postscript; then
input=$(ls $postscript/*.ps)
else
- input=$(stripHash $postscript; echo $strippedName)
+ input=$(stripHash $postscript)
ln -s $postscript $input
fi
diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
index c416bf235a14a..71cf601dfac04 100644
--- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
+++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh
@@ -4,7 +4,7 @@ mkdir -p $out
dot2pdf() {
sourceFile=$1
- targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).pdf
+ targetName=$out/$(basename $(stripHash $sourceFile) .dot).pdf
echo "converting $sourceFile to $targetName..."
export FONTCONFIG_FILE=$fontsConf
dot -Tpdf $sourceFile > $targetName
diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh
index c70e76ce4c734..dd8de4a23dbc4 100644
--- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh
+++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh
@@ -4,7 +4,7 @@ mkdir -p $out
dot2ps() {
sourceFile=$1
- targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).ps
+ targetName=$out/$(basename $(stripHash $sourceFile) .dot).ps
echo "converting $sourceFile to $targetName..."
dot -Tps $sourceFile > $targetName
}
diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
index f34b3944c8ef1..bfef3df6b0e1f 100644
--- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
+++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh
@@ -10,7 +10,7 @@ cd $startDir
lhstex() {
sourceFile=$1
- targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .lhs).tex
+ targetName=$out/$(basename $(stripHash $sourceFile) .lhs).tex
echo "converting $sourceFile to $targetName..."
lhs2TeX -o "$targetName" $flags "$sourceFile"
}
diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh
index fa27520d11cd9..3941fdcac4a48 100644
--- a/pkgs/tools/typesetting/tex/nix/run-latex.sh
+++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh
@@ -16,11 +16,11 @@ for i in $extraFiles; do
if test -d $i; then
ln -s $i/* .
else
- ln -s $i $(stripHash $i; echo $strippedName)
+ ln -s $i $(stripHash $i)
fi
done
-rootName=$(basename $(stripHash "$rootFile"; echo $strippedName))
+rootName=$(basename $(stripHash "$rootFile"))
rootNameBase=$(echo "$rootName" | sed 's/\..*//')