From 6ae0c6821646e3e90474280ea72f765996ed0840 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 18 Nov 2019 09:38:49 +0300
Subject: [PATCH 1/3] unit: 1.12.0 -> 1.13.0
---
pkgs/servers/http/unit/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index f05d9c1ce8f..1e8999da8f2 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -14,14 +14,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "1.12.0";
+ version = "1.13.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
- sha256 = "1ylzfsajjfaxzn7mycjs69ms4x58r4szpk07kqrmbf03dp2cmxkq";
+ sha256 = "1b5il05isq5yvnx2qpnihsrmj0jliacvhrm58i87d48anwpv1k8q";
};
nativeBuildInputs = [ which ];
From d5f8c4b1d18b4c80b6dbaaa2df3420c65e91b5ee Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 18 Nov 2019 09:39:09 +0300
Subject: [PATCH 2/3] unit: update build configuration
---
pkgs/servers/http/unit/default.nix | 39 ++++++++++++++++++------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 1e8999da8f2..8711be4b5c0 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -1,11 +1,14 @@
{ stdenv, fetchFromGitHub, which
-, withPython ? true, python
-, withPHP72 ? true, php72
-, withPHP73 ? false, php73
-, withPerl ? true, perl
+, withPython2 ? false, python2
+, withPython3 ? true, python3, ncurses
+, withPHP72 ? false, php72
+, withPHP73 ? true, php73
+, withPerl528 ? false, perl528
+, withPerl530 ? true, perl530
, withPerldevel ? false, perldevel
, withRuby_2_4 ? false, ruby_2_4
-, withRuby ? true, ruby
+, withRuby_2_5 ? false, ruby_2_5
+, withRuby_2_6 ? true, ruby_2_6
, withSSL ? true, openssl ? null
, withIPv6 ? true
, withDebug ? false
@@ -27,13 +30,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which ];
buildInputs = [ ]
- ++ optional withPython python
+ ++ optional withPython2 python2
+ ++ optionals withPython3 [ python3 ncurses ]
++ optional withPHP72 php72
++ optional withPHP73 php73
- ++ optional withPerl perl
+ ++ optional withPerl528 perl528
+ ++ optional withPerl530 perl530
++ optional withPerldevel perldevel
++ optional withRuby_2_4 ruby_2_4
- ++ optional withRuby ruby
+ ++ optional withRuby_2_5 ruby_2_5
+ ++ optional withRuby_2_6 ruby_2_6
++ optional withSSL openssl;
configureFlags = [
@@ -46,13 +52,16 @@ stdenv.mkDerivation rec {
++ optional withDebug [ "--debug" ];
postConfigure = ''
- ${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"}
- ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"}
- ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
- ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
- ${optionalString withPerldevel "./configure perl --module=perl529 --perl=${perldevel}/bin/perl"}
- ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
- ${optionalString withRuby "./configure ruby --module=ruby --ruby=${ruby}/bin/ruby"}
+ ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"}
+ ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"}
+ ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"}
+ ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"}
+ ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"}
+ ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"}
+ ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
+ ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"}
+ ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"}
+ ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"}
'';
meta = {
From 7d0fcb8acc282577aa1bf5fb9bb91e9359f4d6b3 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 18 Nov 2019 09:39:33 +0300
Subject: [PATCH 3/3] ruby: build with soname tag
---
pkgs/development/interpreters/ruby/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 723a4978234..d70c7e70f33 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -111,7 +111,7 @@ let
cp ${config}/config.sub tool/
'';
- configureFlags = ["--enable-shared" "--enable-pthread"]
+ configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [