diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-02 21:41:13 +0100 |
| commit | f08e3e38d4bf983480fcde77911136bab70d8e80 (patch) | |
| tree | 6286ff43b53a5df79fcfcf31d22443a18f0455ee /pkgs/servers/http | |
| parent | bdfb1bd01b2da393a3cdf567764a79e418f2b62e (diff) | |
| parent | 129c73802fdddacb20cf194bd2968d73ebced590 (diff) | |
| download | nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.gz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.bz2 nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.lz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.xz nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.tar.zst nixpkgs-f08e3e38d4bf983480fcde77911136bab70d8e80.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index d68c37e02d9..d210fcefc85 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -9,6 +9,7 @@ , withRuby_2_4 ? false, ruby_2_4 , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 +, withRuby_2_7 ? true, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 + ++ optional withRuby_2_7 ruby_2_7 ++ optional withSSL openssl; configureFlags = [ @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ${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"} + ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; meta = { |