diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-01 22:22:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-01 22:22:24 +0000 |
| commit | 11d1104a885bebce1b4ec226cfad648422d9669d (patch) | |
| tree | 60295aae3769bc57d6984e4fabff56c32a2fe50d /pkgs/tools | |
| parent | a55fac1a8704d20acf8eccc6fb9d86beae02f400 (diff) | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/openresolv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index b2831fd4d7b62..3aa818db72816 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LIBEXECDIR=$out/libexec/resolvconf VARDIR=/var/run/resolvconf MANDIR=$out/share/man - RESTARTCMD="initctl restart \1" + RESTARTCMD="false \1" EOF ''; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 7ad69e8353a9d..235f85dc51a45 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,12 +4,12 @@ , stateDir ? "/nix/var" }: -stdenv.mkDerivation (rec { - name = "nix-1.0pre31851"; +stdenv.mkDerivation rec { + name = "nix-1.0pre2606_8afd28a"; src = fetchurl { - url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; - sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; + url = "http://hydra.nixos.org/build/2183656/download/4/${name}.tar.bz2"; + sha256 = "4f21d01563ab9e949e09997ddaa89066c40a13b27e028a6fdffc67b97dd90dcb"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -46,11 +46,13 @@ stdenv.mkDerivation (rec { 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 = { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; -}) +} |