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

Merge pull request #5795 from pmahoney/skarnet-2015-01-14

Browse Source 
Skarnet release 2015-01-14
This commit is contained in:
Domen Kožar 2015-01-17 15:21:27 +01:00
commit c222352cf8
5 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/skalibs/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, fetchurl }: { stdenv, fetchgit }:
let let
version = "2.0.0.0"; version = "2.2.0.0";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "skalibs-${version}"; name = "skalibs-${version}";
src = fetchurl { src = fetchgit {
url = "http://skarnet.org/software/skalibs/${name}.tar.gz"; url = "git://git.skarnet.org/skalibs";
sha256 = "0cz30wqg8fnkwjlacs4s3sjs3l34sa91xgci95fmb187zhiq693n"; rev = "refs/tags/v${version}";
sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn";
}; };
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--enable-force-devr" # assume /dev/random works "--enable-force-devr" # assume /dev/random works
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"

13
pkgs/servers/s6/default.nix
View File

@ -1,20 +1,23 @@
{ stdenv, execline, fetchurl, skalibs }: { stdenv, execline, fetchgit, skalibs }:
let let
version = "2.0.0.0"; version = "2.0.1.0";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "s6-${version}"; name = "s6-${version}";
src = fetchurl { src = fetchgit {
url = "http://www.skarnet.org/software/s6/${name}.tar.gz"; url = "git://git.skarnet.org/s6";
sha256 = "14x4l3xp152c9v34zs7nzxzacizfpp0k0lzwh40rxm0w5wz4x0ls"; rev = "refs/tags/v${version}";
sha256 = "1x7za0b1a2i6xn06grpb5j361s9bl4524bp5mz3zcdg8s9nil50d";
}; };
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include" "--with-include=${skalibs}/include"

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

@ -1,20 +1,23 @@
{ stdenv, fetchurl, skalibs }: { stdenv, fetchgit, skalibs }:
let let
version = "2.0.0.0"; version = "2.0.1.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "execline-${version}"; name = "execline-${version}";
src = fetchurl { src = fetchgit {
url = "http://skarnet.org/software/execline/${name}.tar.gz"; url = "git://git.skarnet.org/execline";
sha256 = "1g5v6icxsf7p2ccj9iq85iikkm12xph65ri86ydakihv6al3jw71"; rev = "refs/tags/v${version}";
sha256 = "06fn4fb8hp68pffgfc55l5raph3bk9v0gngbgxfyzkmwbb1gxhll";
}; };
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"
"--includedir=\${prefix}/include" "--includedir=\${prefix}/include"

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

@ -1,20 +1,23 @@
{ stdenv, fetchurl, skalibs }: { stdenv, fetchgit, skalibs }:
let let
version = "2.0.0.0"; version = "2.0.0.2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "s6-dns-${version}"; name = "s6-dns-${version}";
src = fetchurl { src = fetchgit {
url = "http://www.skarnet.org/software/s6-dns/${name}.tar.gz"; url = "git://git.skarnet.org/s6-dns";
sha256 = "07k6rzgsgcxr0bq209as79sjn2nrcjj9mlmk9vvy1hvsag0xnkcq"; rev = "refs/tags/v${version}";
sha256 = "0y76gvgvg2y3hhr3pk2nkki1idjj6sxxcnvd29yd79v0419p2dl3";
}; };
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--includedir=\${prefix}/include" "--includedir=\${prefix}/include"
"--libdir=\${prefix}/lib" "--libdir=\${prefix}/lib"

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

@ -1,30 +1,36 @@
{ stdenv, execline, fetchurl, s6Dns, skalibs }: { stdenv, execline, fetchgit, s6, s6Dns, skalibs }:
let let
version = "2.0.0.0"; version = "2.0.1.0";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "s6-networking-${version}"; name = "s6-networking-${version}";
src = fetchurl { src = fetchgit {
url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz"; url = "git://git.skarnet.org/s6-networking";
sha256 = "0k2i0g5lsvh1gz90ixwdip1pngj9vd45d4fpmdg075vd8zhh7j37"; rev = "refs/tags/v${version}";
sha256 = "1q094x8x99cy0kkq74kfw1rd9kmp6ynpz9ahx0lviz05n9paq7ya";
}; };
dontDisableStatic = true; dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include" "--with-include=${skalibs}/include"
"--with-include=${execline}/include" "--with-include=${execline}/include"
"--with-include=${s6}/include"
"--with-include=${s6Dns}/include" "--with-include=${s6Dns}/include"
"--with-lib=${skalibs}/lib" "--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib" "--with-lib=${execline}/lib"
"--with-lib=${s6}/lib"
"--with-lib=${s6Dns}/lib" "--with-lib=${s6Dns}/lib"
"--with-dynlib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib" "--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
"--with-dynlib=${s6Dns}/lib" "--with-dynlib=${s6Dns}/lib"
]; ];