public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
This commit is contained in:
Eelco Dolstra 2012-03-01 22:22:24 +00:00
parent a55fac1a87
commit 11d1104a88
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod"; pname = "yesod";
version = "0.10.1.1"; version = "0.10.1.3";
sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6"; sha256 = "01r9b88gsj7f1mn56nm5dyzj2s46l9pg9p7fjwkf0l8zdfmrbflw";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

8
pkgs/development/libraries/zlib/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, static ? false }: { stdenv, fetchurl, static ? false }:
let version = "1.2.6"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zlib-1.2.6"; name = "zlib-${version}";
src = fetchurl { src = fetchurl {
urls = urls =
[ "http://www.zlib.net/${name}.tar.gz" [ "http://www.zlib.net/${name}.tar.gz" # old versions vanish from here
"http://gentoo.netnitco.net/distfiles/${name}.tar.gz" "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz"
]; ];
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1"; sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
}; };

2
pkgs/tools/networking/openresolv/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
LIBEXECDIR=$out/libexec/resolvconf LIBEXECDIR=$out/libexec/resolvconf
VARDIR=/var/run/resolvconf VARDIR=/var/run/resolvconf
MANDIR=$out/share/man MANDIR=$out/share/man
RESTARTCMD="initctl restart \1" RESTARTCMD="false \1"
EOF EOF
''; '';

16
pkgs/tools/package-management/nix/unstable.nix
View File

@ -4,12 +4,12 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
}: }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "nix-1.0pre31851"; name = "nix-1.0pre2606_8afd28a";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/2183656/download/4/${name}.tar.bz2";
sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; sha256 = "4f21d01563ab9e949e09997ddaa89066c40a13b27e028a6fdffc67b97dd90dcb";
}; };
buildNativeInputs = [ perl pkgconfig ]; buildNativeInputs = [ perl pkgconfig ];
@ -46,11 +46,13 @@ stdenv.mkDerivation (rec {
doCheck = true; doCheck = true;
# Hack to get the check to succeed on Darwin.
phases = stdenv.lib.optionalString stdenv.isDarwin
"$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
meta = { meta = {
description = "The Nix Deployment System"; description = "The Nix Deployment System";
homepage = http://nixos.org/; homepage = http://nixos.org/;
license = "LGPLv2+"; license = "LGPLv2+";
}; };
} // stdenv.lib.optionalAttrs stdenv.isDarwin { }
phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
})