From 3f8ed79a5a5e7ecba335e72e0a736a3b6390fb82 Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 2 Mar 2017 20:22:54 -0600 Subject: [PATCH 1/7] s6-portable-utils: 2.0.5.3 -> 2.1.0.0 --- pkgs/tools/misc/s6-portable-utils/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 70b36222cca..357600e8d4f 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, skalibs }: - -let - - version = "2.0.5.3"; - -in stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, skalibs }: +stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; + version = "2.1.0.0"; - src = fetchurl { - url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7"; + src = fetchFromGitHub { + owner = "skarnet"; + repo = "s6-portable-utils"; + rev = "v${version}"; + sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9"; }; dontDisableStatic = true; @@ -23,12 +21,12 @@ in stdenv.mkDerivation rec { ] ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); - meta = { + meta = with stdenv.lib; { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney ]; + platforms = platforms.all; + license = licenses.isc; + maintainers = with maintainers; [ pmahoney ]; }; } From 4c42fac49368cbc15e21b9ed2464766470a32dcc Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 16:52:20 -0600 Subject: [PATCH 2/7] s6-portable-utils: Retry of Darwin gcc --- pkgs/tools/misc/s6-portable-utils/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 357600e8d4f..0b92b543f84 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, skalibs }: +{ stdenv, fetchFromGitHub, skalibs, gcc }: stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { }; dontDisableStatic = true; - + + # Darwin Support, optional isDarwin failed + nativeBuildInputs = [ gcc ]; + configureFlags = [ "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" From c4733c3350e7f0bc79e5d35cc04a7046aa86f653 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 18:00:50 -0600 Subject: [PATCH 3/7] s6-portable-utils: Trying again for gcc support --- pkgs/tools/misc/s6-portable-utils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 0b92b543f84..7e81a37cc36 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, skalibs, gcc }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; version = "2.1.0.0"; @@ -13,8 +15,8 @@ stdenv.mkDerivation rec { dontDisableStatic = true; - # Darwin Support, optional isDarwin failed - nativeBuildInputs = [ gcc ]; + nativeBuildInputs = [] + ++ optional stdenv.isDarwin gcc; configureFlags = [ "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" @@ -22,9 +24,10 @@ stdenv.mkDerivation rec { "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (optional stdenv.isDarwin "--target=${stdenv.system}") + ++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin"); - meta = with stdenv.lib; { + meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; platforms = platforms.all; From 237e6dccb2a09ebe28aa7feed72b7061b4ef6cd7 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 18:25:40 -0600 Subject: [PATCH 4/7] s6-portable-utils: removed cross, may be causing issue for Darwin --- pkgs/tools/misc/s6-portable-utils/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 7e81a37cc36..d0855f24f3a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, skalibs, gcc }: with stdenv.lib; +let + cross = ""; +in stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; @@ -17,7 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [] ++ optional stdenv.isDarwin gcc; - + + preConfigure = '' + substituteInPlace configure \ + "${cross}" " " + ''; + configureFlags = [ "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" @@ -25,8 +33,7 @@ stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (optional stdenv.isDarwin "--target=${stdenv.system}") - ++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin"); - + ; meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; From e18816ff6a11db490ffb40fb575195602002b943 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 18:44:57 -0600 Subject: [PATCH 5/7] s6-portable-utils: removed cross, may be causing issue for Darwin --- pkgs/tools/misc/s6-portable-utils/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index d0855f24f3a..d227c86466d 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [] ++ optional stdenv.isDarwin gcc; - preConfigure = '' - substituteInPlace configure \ - "${cross}" " " - ''; + #preConfigure = '' + #substituteInPlace configure \ + # "${cross}" " " + # ''; - configureFlags = [ - "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - "--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" - ] - ++ (optional stdenv.isDarwin "--target=${stdenv.system}") - ; + # configureFlags = [ + #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" + #"--with-include=${skalibs}/include" + #"--with-lib=${skalibs}/lib" + #"--with-dynlib=${skalibs}/lib" + #] + #++ (optional stdenv.isDarwin "--target=${stdenv.system}") + meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; From 384bc23beef5da1754f51e292821812a99892745 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 18:53:27 -0600 Subject: [PATCH 6/7] s6-portable-utils: setting of config flags --- pkgs/tools/misc/s6-portable-utils/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index d227c86466d..06ea8a406f9 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -21,18 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [] ++ optional stdenv.isDarwin gcc; - #preConfigure = '' - #substituteInPlace configure \ - # "${cross}" " " - # ''; - - # configureFlags = [ - #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - #"--with-include=${skalibs}/include" - #"--with-lib=${skalibs}/lib" - #"--with-dynlib=${skalibs}/lib" - #] - #++ (optional stdenv.isDarwin "--target=${stdenv.system}") + 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/; From 5c18f3760d1f7daaff910225bccb40faa28364ee Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 19:35:53 -0600 Subject: [PATCH 7/7] s6-portable-utils: readded config flags --- pkgs/tools/misc/s6-portable-utils/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 06ea8a406f9..b16806139b4 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchFromGitHub, skalibs, gcc }: with stdenv.lib; -let - cross = ""; -in stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; @@ -17,18 +14,18 @@ stdenv.mkDerivation rec { }; dontDisableStatic = true; - + nativeBuildInputs = [] - ++ optional stdenv.isDarwin gcc; - + ++ optional stdenv.isDarwin gcc; + configureFlags = [ - #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - #"--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" - ]; - - + "--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/; description = "A set of tiny general Unix utilities optimized for simplicity and small size";