diff options
| author | Patrick Mahoney <pat@polycrystal.org> | 2015-03-28 23:13:45 -0500 |
|---|---|---|
| committer | Patrick Mahoney <pat@polycrystal.org> | 2015-03-28 23:13:45 -0500 |
| commit | 00b57f47c7272693a5272dd5d384ec99560d4b22 (patch) | |
| tree | 2ed5f228ef4f9d8c83a11f12edb94b2344856f46 /pkgs/servers | |
| parent | 6a2ec766fc45befc8867dd09d2bbd0be53185952 (diff) | |
| download | nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar.gz nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar.bz2 nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar.lz nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar.xz nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.tar.zst nixpkgs-00b57f47c7272693a5272dd5d384ec99560d4b22.zip | |
Update versions of skarnet.org packages
skalibs 2.3.2.0 execline 2.1.1.0 s6 2.1.3.0 st-portable-utils 2.0.4.0 s6-linux-utils 2.0.2.0 s6-networking 2.1.0.0 Also change path to s6 static library in s6-networking build.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/s6/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 1452f82573e..73843b8c114 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.1.0"; + version = "2.1.3.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d"; + sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; }; dontDisableStatic = true; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { "--with-lib=${execline}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ]; + ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ |