svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32093

Changed files
+4 -3
maintainers
pkgs
development
libraries
lcms2
+1
maintainers/scripts/test-eval-release.sh
···
if [[ -z "$VERBOSE" ]]; then
echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"
fi
nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null
···
if [[ -z "$VERBOSE" ]]; then
echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"
fi
+
unset HOME NIXPKGS_CONFIG # Force empty config
nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null
+3 -3
pkgs/development/libraries/lcms2/default.nix
···
{stdenv, fetchurl, libtiff, libjpeg, zlib}:
stdenv.mkDerivation rec {
-
name = "lcms2-2.0a";
src = fetchurl {
-
url = "mirror://sf/lcms/${name}.tar.gz";
-
sha256 = "0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd";
};
propagatedBuildInputs = [ libtiff libjpeg zlib ];
···
{stdenv, fetchurl, libtiff, libjpeg, zlib}:
stdenv.mkDerivation rec {
+
name = "lcms2-2.3";
src = fetchurl {
+
url = "mirror://sourceforge/lcms/${name}.tar.gz";
+
sha256 = "1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y";
};
propagatedBuildInputs = [ libtiff libjpeg zlib ];