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

Merge branch 'master' into staging-next

Browse Source 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
This commit is contained in:
Vladimír Čunát
2019-07-06 13:40:38 +02:00
parent 8e97d0be6b d567c486ca
commit 0746c4dbb4
337 changed files with 11109 additions and 8836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/consul/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "consul-${version}";
version = "1.4.2";
version = "1.5.2";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "consul";
inherit rev;
sha256 = "1nprl9kcb98ikcmk7safji3hl4kfacx0gnh05k8m4ysfz6mr7zri";
sha256 = "1fn9xxdszil4zdal08cyq6gbs2larpr4zmjmv2w2ykiacbfhpa6h";
};
preBuild = ''

24
pkgs/servers/dns/knot-resolver/default.nix
View File

@@ -75,24 +75,36 @@ unwrapped = stdenv.mkDerivation rec {
};
};
wrapped-full = runCommand unwrapped.name
{
nativeBuildInputs = [ makeWrapper ];
buildInputs = with luajitPackages; [
# FIXME: revert this back after resolving
# https://github.com/NixOS/nixpkgs/pull/63108#issuecomment-508670438
wrapped-full =
with stdenv.lib;
with luajitPackages;
let
luaPkgs = [
luasec luasocket # trust anchor bootstrap, prefill module
luafilesystem # prefill module
http # for http module; brings lots of deps; some are useful elsewhere
cqueues fifo lpeg lpeg_patterns luaossl compat53 basexx binaryheap
];
in runCommand unwrapped.name
{
nativeBuildInputs = [ makeWrapper ];
preferLocalBuild = true;
allowSubstitutes = false;
}
''
mkdir -p "$out"/{bin,share}
makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
--set LUA_PATH "$LUA_PATH" \
--set LUA_CPATH "$LUA_CPATH"
--set LUA_PATH '${concatStringsSep ";" (map getLuaPath luaPkgs)}' \
--set LUA_CPATH '${concatStringsSep ";" (map getLuaCPath luaPkgs)}'
ln -sr '${unwrapped}/share/man' "$out"/share/
ln -sr "$out"/{bin,sbin}
echo "Checking that 'http' module loads, i.e. lua search paths work:"
echo "modules.load('http')" > test-http.lua
echo -e 'quit()' | env -i "$out"/bin/kresd -a 127.0.0.1#53535 -c test-http.lua
'';
in result

4
pkgs/servers/documize-community/default.nix
View File

@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "documize-community";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "documize";
repo = "community";
rev = "v${version}";
sha256 = "01q7yx35gp41lnm9zbwq0maf7wiv86mi6fww3hl1cddmgdlksss9";
sha256 = "1ghdmqcwvbp48dw2w0aka38wfi2a80rmprnaxrjn2j5aplgbkbc5";
};
goPackagePath = "github.com/documize/community";

2
pkgs/servers/http/couchdb/2.0.0.nix
View File

@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
homepage = http://couchdb.apache.org;
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/servers/http/couchdb/default.nix
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; [ ];
};
}

3
pkgs/servers/http/unit/default.nix
View File

@@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, which
, withPython ? true, python
, withPHP71 ? false, php71
, withPHP72 ? true, php72
, withPHP73 ? false, php73
, withPerl ? true, perl
@@ -30,7 +29,6 @@ stdenv.mkDerivation rec {
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"}

4
pkgs/servers/jackett/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jackett-${version}";
version = "0.11.420";
version = "0.11.457";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "12mskqmgvfy6m10x6chxpl30pv1prsq21rxdlmd4pgd6shkfz9gn";
sha256 = "139ga5qra6jrn3mkp08a5p495alxq78a8imfj4k8ywv1s05kw7dw";
};
buildInputs = [ makeWrapper ];

4
pkgs/servers/monitoring/prometheus/tor-exporter.nix
View File

@@ -2,7 +2,7 @@
python3Packages.buildPythonApplication rec {
name = "tor-exporter-${version}";
version = "0.3";
version = "0.4";
# Just a single .py file to use as the application's main entry point.
format = "other";
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
rev = "v${version}";
owner = "atx";
repo = "prometheus-tor_exporter";
sha256 = "0d7pk8s8ya2pm8b4ijbfdniqcbd3vqy15dlhnmaf4wgb51pmm5yv";
sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0";
};
propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ];

4
pkgs/servers/plex/raw.nix
View File

@@ -8,14 +8,14 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.16.0.1226-7eb2c8f6f";
version = "1.16.1.1291-158e5b199";
pname = "plexmediaserver";
name = "${pname}-${version}";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
sha256 = "1cav5lhpg5ma6s0hkpn8vrdgpy4b9q10qc1vb3j4w7ls9v160g3n";
sha256 = "0abmky8xvmmwvmpcxx7szdwlq07xb43sbvbv3k72y1yha0nsdqhp";
};
outputs = [ "out" "basedb" ];

2
pkgs/servers/varnish/default.nix
View File

@@ -32,7 +32,7 @@ let
description = "Web application accelerator also known as a caching HTTP reverse proxy";
homepage = https://www.varnish-cache.org;
license = licenses.bsd2;
maintainers = with maintainers; [ garbas fpletz ];
maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix;
};
};

33
pkgs/servers/web-apps/wordpress/default.nix
View File

@@ -1,13 +1,24 @@
# Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
{ fetchFromGitHub, lib } : fetchFromGitHub {
owner = "WordPress";
repo = "WordPress";
rev = "5.0.2";
sha256 = "1r8y62mdv6ji82hcn94gngi68mwilxh69gpx8r83k0cy08s99sln";
meta = {
homepage = https://wordpress.org;
description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.basvandijk ];
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.2.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq";
};
installPhase = ''
mkdir -p $out/share/wordpress
cp -r . $out/share/wordpress
'';
meta = with stdenv.lib; {
homepage = "https://wordpress.org";
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
license = [ licenses.gpl2 ];
maintainers = [ maintainers.basvandijk ];
platforms = platforms.all;
};
}