pyrox.dev
Merge pull request #7065 from pmahoney/skarnet-2015-03-28
update s6, execline, other skarnet.org
+2
-2
pkgs/development/libraries/skalibs/default.nix
+2
-2
pkgs/development/libraries/skalibs/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.2.0.0";
5
+
version = "2.3.2.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
11
11
src = fetchgit {
12
12
url = "git://git.skarnet.org/skalibs";
13
13
rev = "refs/tags/v${version}";
14
-
sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn";
14
+
sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a";
15
15
};
16
16
17
17
dontDisableStatic = true;
+2
-2
pkgs/os-specific/linux/s6-linux-utils/default.nix
+2
-2
pkgs/os-specific/linux/s6-linux-utils/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.0.0.0";
5
+
version = "2.0.2.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
10
10
11
11
src = fetchurl {
12
12
url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
13
-
sha256 = "0lfgfwnk81vjlkvmr1gzknz9swgcrp5s7x19dfkw6shvi95fyirh";
13
+
sha256 = "0y6dq4wb5v1c6ps6a7jyq08r2pjksrvz6n3dnfa9c91gzm4m1dxb";
14
14
};
15
15
16
16
dontDisableStatic = true;
+3
-3
pkgs/servers/s6/default.nix
+3
-3
pkgs/servers/s6/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.0.1.0";
5
+
version = "2.1.3.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
11
11
src = fetchgit {
12
12
url = "git://git.skarnet.org/s6";
13
13
rev = "refs/tags/v${version}";
14
-
sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d";
14
+
sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3";
15
15
};
16
16
17
17
dontDisableStatic = true;
···
26
26
"--with-lib=${execline}/lib"
27
27
"--with-dynlib=${skalibs}/lib"
28
28
"--with-dynlib=${execline}/lib"
29
-
] ++ stdenv.lib.optional stdenv.isDarwin [ "--disable-shared" ];
29
+
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
30
30
31
31
preBuild = ''
32
32
substituteInPlace "src/daemontools-extras/s6-log.c" \
+2
-2
pkgs/tools/misc/execline/default.nix
+2
-2
pkgs/tools/misc/execline/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.0.1.1";
5
+
version = "2.1.1.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
11
11
src = fetchgit {
12
12
url = "git://git.skarnet.org/execline";
13
13
rev = "refs/tags/v${version}";
14
-
sha256 = "06fn4fb8hp68pffgfc55l5raph3bk9v0gngbgxfyzkmwbb1gxhll";
14
+
sha256 = "0yhxyih8p6p9135nifi655qk4gnhdarjzfp1lb4pxx9ar9ay5q7w";
15
15
};
16
16
17
17
dontDisableStatic = true;
+2
-2
pkgs/tools/misc/s6-portable-utils/default.nix
+2
-2
pkgs/tools/misc/s6-portable-utils/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.0.0.0";
5
+
version = "2.0.4.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
10
10
11
11
src = fetchurl {
12
12
url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
13
-
sha256 = "1vszqaqkyhz1v69pxls3c7y1qs8wjkdylpg0yz183xlirywimwwk";
13
+
sha256 = "0gl4v6hslqkxdfxj3qzi1xpiiw52ic8y8l9nkl2z5gp893qb6yvx";
14
14
};
15
15
16
16
dontDisableStatic = true;
+1
-1
pkgs/tools/networking/s6-dns/default.nix
+1
-1
pkgs/tools/networking/s6-dns/default.nix
+3
-3
pkgs/tools/networking/s6-networking/default.nix
+3
-3
pkgs/tools/networking/s6-networking/default.nix
···
2
2
3
3
let
4
4
5
-
version = "2.0.1.0";
5
+
version = "2.1.0.0";
6
6
7
7
in stdenv.mkDerivation rec {
8
8
···
11
11
src = fetchgit {
12
12
url = "git://git.skarnet.org/s6-networking";
13
13
rev = "refs/tags/v${version}";
14
-
sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya";
14
+
sha256 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c";
15
15
};
16
16
17
17
dontDisableStatic = true;
···
26
26
"--with-include=${s6Dns}/include"
27
27
"--with-lib=${skalibs}/lib"
28
28
"--with-lib=${execline}/lib"
29
-
"--with-lib=${s6}/lib"
29
+
"--with-lib=${s6}/lib/s6"
30
30
"--with-lib=${s6Dns}/lib"
31
31
"--with-dynlib=${skalibs}/lib"
32
32
"--with-dynlib=${execline}/lib"