Skip to content

Commit

Permalink
skaware: update tools & libraries to summer 2018 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Profpatsch committed Sep 6, 2018
1 parent 9a58565 commit ec7d4a8
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 16 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/skalibs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let

version = "2.6.4.0";
version = "2.7.0.0";

in stdenv.mkDerivation rec {

Expand All @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/skalibs";
rev = "refs/tags/v${version}";
sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm";
};

outputs = [ "lib" "dev" "doc" "out" ];
Expand Down
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/s6-linux-utils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@

let

version = "2.4.0.2";
version = "2.5.0.0";

in stdenv.mkDerivation rec {

name = "s6-linux-utils-${version}";

src = fetchurl {
url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq";
};

outputs = [ "bin" "dev" "doc" "out" ];

dontDisableStatic = true;

# TODO: nsss support
configureFlags = [
"--enable-absolute-paths"
"--bindir=\${bin}/bin"
Expand Down
5 changes: 3 additions & 2 deletions pkgs/tools/misc/execline/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let

version = "2.5.0.0";
version = "2.5.0.1";

in stdenv.mkDerivation rec {

Expand All @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/execline";
rev = "refs/tags/v${version}";
sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn";
sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q";
};

outputs = [ "bin" "lib" "dev" "doc" "out" ];
Expand All @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

# TODO: nsss support
configureFlags = [
"--enable-absolute-paths"
"--libdir=\${lib}/lib"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/misc/s6-portable-utils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "s6-portable-utils-${version}";
version = "2.2.1.1";
version = "2.2.1.2";

src = fetchurl {
url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka";
sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih";
};

outputs = [ "bin" "dev" "doc" "out" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/networking/s6-dns/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let

version = "2.3.0.0";
version = "2.3.0.1";

in stdenv.mkDerivation rec {

Expand All @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-dns";
rev = "refs/tags/v${version}";
sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb";
sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
};

outputs = [ "bin" "lib" "dev" "doc" "out" ];
Expand Down
5 changes: 3 additions & 2 deletions pkgs/tools/networking/s6-networking/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
let
inherit (stdenv) lib;

version = "2.3.0.2";
version = "2.3.0.3";

sslSupportEnabled = sslSupport != false;
sslLibs = {
Expand All @@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-networking";
rev = "refs/tags/v${version}";
sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42";
sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc";
};

outputs = [ "bin" "lib" "dev" "doc" "out" ];
Expand All @@ -35,6 +35,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

# TODO: nsss support
configureFlags = [
"--enable-absolute-paths"
"--libdir=\${lib}/lib"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/system/s6-rc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let

version = "0.4.0.1";
version = "0.4.1.0";

in stdenv.mkDerivation rec {

Expand All @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw";
sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805";
};

outputs = [ "bin" "lib" "dev" "doc" "out" ];
Expand Down
5 changes: 3 additions & 2 deletions pkgs/tools/system/s6/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let

version = "2.7.1.1";
version = "2.7.2.0";

in stdenv.mkDerivation rec {

Expand All @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav";
sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az";
};

# NOTE lib: cannot split lib from bin at the moment,
Expand All @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

# TODO: nsss support
configureFlags = [
"--enable-absolute-paths"
"--libdir=\${out}/lib"
Expand Down

0 comments on commit ec7d4a8

Please sign in to comment.