public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update skarnet.org software for 2.0 release.

Browse Source 
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
This commit is contained in:
Patrick Mahoney
2014-12-23 10:06:27 -06:00
committed by Peter Simons
parent a0d62bf978
commit 06e523b7e8
11 changed files with 96 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/misc/execline/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv
, fetchurl
, gnumake40
, skalibs
, skarnetConfCompile
}:
let
version = "1.3.1.1";
version = "2.0.0.0";
in stdenv.mkDerivation rec {
@@ -14,12 +14,21 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://skarnet.org/software/execline/${name}.tar.gz";
sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg";
sha256 = "1g5v6icxsf7p2ccj9iq85iikkm12xph65ri86ydakihv6al3jw71";
};
buildInputs = [ skalibs skarnetConfCompile ];
dontDisableStatic = true;
sourceRoot = "admin/${name}";
buildInputs = [ gnumake40 ];
configureFlags = [
"--libdir=\${prefix}/lib"
"--includedir=\${prefix}/include"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib"
] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
meta = {
homepage = http://skarnet.org/software/execline/;

19
pkgs/tools/misc/s6-portable-utils/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv
, fetchurl
, gnumake40
, skalibs
, skarnetConfCompile
}:
let
version = "1.0.3.2";
version = "2.0.0.0";
in stdenv.mkDerivation rec {
@@ -14,16 +14,19 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl";
sha256 = "1vszqaqkyhz1v69pxls3c7y1qs8wjkdylpg0yz183xlirywimwwk";
};
buildInputs = [ skalibs skarnetConfCompile ];
dontDisableStatic = true;
sourceRoot = "admin/${name}";
buildInputs = [ gnumake40 ];
preInstall = ''
mkdir -p "$out/libexec"
'';
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib"
];
meta = {
homepage = http://www.skarnet.org/software/s6-portable-utils/;

19
pkgs/tools/networking/s6-dns/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv
, fetchurl
, gnumake40
, skalibs
, skarnetConfCompile
}:
let
version = "0.1.0.0";
version = "2.0.0.0";
in stdenv.mkDerivation rec {
@@ -14,12 +14,21 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.skarnet.org/software/s6-dns/${name}.tar.gz";
sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68";
sha256 = "07k6rzgsgcxr0bq209as79sjn2nrcjj9mlmk9vvy1hvsag0xnkcq";
};
buildInputs = [ skalibs skarnetConfCompile ];
dontDisableStatic = true;
sourceRoot = "web/${name}";
buildInputs = [ gnumake40 ];
configureFlags = [
"--includedir=\${prefix}/include"
"--libdir=\${prefix}/lib"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib"
] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
meta = {
homepage = http://www.skarnet.org/software/s6-dns/;

23
pkgs/tools/networking/s6-networking/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv
, execline
, fetchurl
, gnumake40
, s6Dns
, skalibs
, skarnetConfCompile
}:
let
version = "0.1.0.0";
version = "2.0.0.0";
in stdenv.mkDerivation rec {
@@ -16,12 +16,25 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz";
sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7";
sha256 = "0k2i0g5lsvh1gz90ixwdip1pngj9vd45d4fpmdg075vd8zhh7j37";
};
buildInputs = [ skalibs s6Dns execline skarnetConfCompile ];
dontDisableStatic = true;
sourceRoot = "net/${name}";
buildInputs = [ gnumake40 ];
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
"--with-include=${s6Dns}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
"--with-lib=${s6Dns}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6Dns}/lib"
];
meta = {
homepage = http://www.skarnet.org/software/s6-networking/;