tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

svn merge ^/nixpkgs/trunk

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

Yury G. Kudryashov a41d989a 215a07c1

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