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

Merge remote-tracking branch 'upstream/master' into gcc-8

Browse Source
This commit is contained in:
Robin Gloster
2019-08-25 18:55:46 +02:00
parent 45d6ccea33 48191315aa
commit 616b8343c4
5048 changed files with 266048 additions and 268080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+1 -1
View File
@@ -8,7 +8,7 @@
, luaSupport ? false, lua5
}:
let inherit (stdenv.lib) optional optionalString;
let inherit (stdenv.lib) optional;
in
assert sslSupport -> aprutil.sslSupport && openssl != null;
pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "mod_wsgi-${version}";
version = "4.6.5";
version = "4.6.7";
src = fetchurl {
url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw";
sha256 = "1j8pqn0xhd502ardlmkqx8y85s1npmk9nifqps60wjh29nny03f2";
};
buildInputs = [ apacheHttpd python2 ];
pkgs/servers/http/couchdb/2.0.0.nix
+8 -5
View File
@@ -1,17 +1,20 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
, coreutils, bash, makeWrapper }:
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
name = "couchdb-${version}";
version = "2.3.0";
version = "2.3.1";
# when updating this, please consider bumping the OTP version
# in all-packages.nix
src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";
sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ erlang icu openssl spidermonkey ];
buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))];
patches = [ ./jsapi.patch ];
postPatch = ''
@@ -49,6 +52,6 @@ stdenv.mkDerivation rec {
homepage = http://couchdb.apache.org;
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
};
}
pkgs/servers/http/couchdb/default.nix
+1 -1
View File
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://couchdb.apache.org;
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
};
}
pkgs/servers/http/h2o/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@ with builtins;
stdenv.mkDerivation rec {
name = "h2o-${version}";
version = "2.2.5";
version = "2.2.6";
src = fetchFromGitHub {
owner = "h2o";
repo = "h2o";
rev = "refs/tags/v${version}";
sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv";
sha256 = "0qni676wqvxx0sl0pw9j0ph7zf2krrzqc1zwj73mgpdnsr8rsib7";
};
# We have to fix up some function prototypes, because despite upstream h2o
pkgs/servers/http/nginx/generic.nix
+1 -1
View File
@@ -113,6 +113,6 @@ stdenv.mkDerivation {
homepage = http://nginx.org;
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ];
};
}
pkgs/servers/http/nginx/mainline.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.16.0";
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
version = "1.17.3";
sha256 = "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v";
})
pkgs/servers/http/nginx/stable.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.16.0";
sha256 = "0i8krbi1pc39myspwlvb8ck969c8207hz84lh3qyg5w7syx7dlsg";
version = "1.16.1";
sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i";
})
pkgs/servers/http/showoff/default.nix
+4 -2
View File
@@ -1,16 +1,18 @@
{ lib, bundlerApp }:
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp {
pname = "showoff";
gemdir = ./.;
exes = [ "showoff" ];
passthru.updateScript = bundlerUpdateScript "showoff";
meta = with lib; {
description = "A slideshow presentation tool with a twist";
longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode";
homepage = https://puppetlabs.github.io/showoff/;
license = with licenses; mit;
platforms = platforms.unix;
maintainers = with maintainers; [ mwilsoninsight ];
maintainers = with maintainers; [ mwilsoninsight nicknovitski ];
};
}
pkgs/servers/http/tengine/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "2.3.0";
version = "2.3.1";
name = "tengine-${version}";
src = fetchurl {
url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
sha256 = "09165sdzad8bjxhnwphbags6yvxnz2rkf14p0w3vgvzssj017kqp";
sha256 = "075blm2d62a0bdixc3vngrxpgr7ngl1s4y8hm20pbvc07f0kzn9x";
};
buildInputs =
pkgs/servers/http/tomcat/axis2/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "axis2-${version}";
version = "1.6.4";
version = "1.7.9";
src = fetchurl {
url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr";
sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
};
buildInputs = [ unzip apacheAnt jdk ];
pkgs/servers/http/tomcat/default.nix
+4 -4
View File
@@ -44,13 +44,13 @@ in {
tomcat85 = common {
versionMajor = "8";
versionMinor = "5.35";
sha256 = "0n6agr2wn8m5mv0asz73hy2194n9rk7mh5wsp2pz7aq0andbhh5s";
versionMinor = "5.42";
sha256 = "1d90abwwvl0ghr0g0drk48j37wr2zgw74vws9z2rshyzrwgbvgp3";
};
tomcat9 = common {
versionMajor = "9";
versionMinor = "0.13";
sha256 = "1rsrnmkkrbzrj56jk2wh8hrr79kfkk3fz1j0abk3midn1jnbgxxq";
versionMinor = "0.21";
sha256 = "0nsylbqvky4pf3wpsx3a29b85lvwk91ay37mljk9636qffjj1vjh";
};
}
pkgs/servers/http/unit/default.nix
+2 -5
View File
@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, which
, withPython ? true, python
, withPHP71 ? false, php71
, withPHP72 ? true, php72
, withPHP73 ? false, php73
, withPerl ? true, perl
@@ -16,21 +15,20 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.9.0";
version = "1.10.0";
name = "unit-${version}";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = "${version}";
sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1";
sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a";
};
nativeBuildInputs = [ which ];
buildInputs = [ ]
++ optional withPython python
++ optional withPHP71 php71
++ optional withPHP72 php72
++ optional withPHP73 php73
++ optional withPerl perl
@@ -51,7 +49,6 @@ stdenv.mkDerivation rec {
postConfigure = ''
${optionalString withPython "./configure python --module=python --config=${python}/bin/python-config --lib-path=${python}/lib"}
${optionalString withPHP71 "./configure php --module=php71 --config=${php71.dev}/bin/php-config --lib-path=${php71}/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"}