ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32093
This commit is contained in:
Yury G. Kudryashov 2012-02-06 23:08:11 +00:00
parent 215a07c1a9
commit a41d989a1e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/scripts/test-eval-release.sh
View File

@ -3,4 +3,5 @@
if [[ -z "$VERBOSE" ]]; then 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" echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"
fi 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 nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null

6
pkgs/development/libraries/lcms2/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, libtiff, libjpeg, zlib}: {stdenv, fetchurl, libtiff, libjpeg, zlib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lcms2-2.0a"; name = "lcms2-2.3";
src = fetchurl { src = fetchurl {
url = "mirror://sf/lcms/${name}.tar.gz"; url = "mirror://sourceforge/lcms/${name}.tar.gz";
sha256 = "0kq5imagri0l964nnj06f7xny2q7rwvzqpm8ibsqz5zm263ggskd"; sha256 = "1r5gmzhginzm90y70dcbamycdfcaz4f7v0bb4nwyaywlvsxpg89y";
}; };
propagatedBuildInputs = [ libtiff libjpeg zlib ]; propagatedBuildInputs = [ libtiff libjpeg zlib ];