diff options
| author | Domen Kožar <domen@dev.si> | 2015-01-17 15:21:27 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-01-17 15:21:27 +0100 |
| commit | c222352cf8be59c891142d1de657b10ca62f1f9c (patch) | |
| tree | bf2f32010687cbdc1d4ea34ad98848b74a592d79 /pkgs/servers | |
| parent | afe7612e89369b028a90144b10ec699256d61518 (diff) | |
| parent | 1459600c36bc4e85e5a43bc1f9b25b8c92717e0a (diff) | |
| download | nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar.gz nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar.bz2 nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar.lz nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar.xz nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.tar.zst nixlib-c222352cf8be59c891142d1de657b10ca62f1f9c.zip | |
Merge pull request #5795 from pmahoney/skarnet-2015-01-14
Skarnet release 2015-01-14
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/s6/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 32d219bf4aaf..1452f82573e9 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,20 +1,23 @@ -{ stdenv, execline, fetchurl, skalibs }: +{ stdenv, execline, fetchgit, skalibs }: let - version = "2.0.0.0"; + version = "2.0.1.0"; in stdenv.mkDerivation rec { name = "s6-${version}"; - src = fetchurl { - url = "http://www.skarnet.org/software/s6/${name}.tar.gz"; - sha256 = "14x4l3xp152c9v34zs7nzxzacizfpp0k0lzwh40rxm0w5wz4x0ls"; + src = fetchgit { + url = "git://git.skarnet.org/s6"; + rev = "refs/tags/v${version}"; + sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d"; }; dontDisableStatic = true; + enableParallelBuilding = true; + configureFlags = [ "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" |