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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-12 18:32:29 +00:00
committed by GitHub
parent a605e0318d f214722172
commit b057978bb2
48 changed files with 373 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/dns/knot-dns/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.0.5";
version = "3.0.6";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802";
sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86";
};
outputs = [ "bin" "out" "dev" ];
pkgs/servers/gemini/agate/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "agate";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [
# Username and Password use the same ports and causes collision
pkgs/servers/home-assistant/component-packages.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.5.2";
version = "2021.5.3";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
pkgs/servers/home-assistant/default.nix
+2 -2
View File
@@ -114,7 +114,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.5.2";
hassVersion = "2021.5.3";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1v1ah0kdkhx0pkma2qnk56iv00r2lb4i3sfpwlcr64gfkpzpakv8";
sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba";
};
# leave this in, so users don't have to constantly update their downstream patch handling
pkgs/servers/http/apache-modules/mod_python/default.nix
+6 -4
View File
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, apacheHttpd, python2 }:
{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }:
stdenv.mkDerivation rec {
name = "mod_python-3.5.0";
pname = "mod_python";
version = "3.5.0";
src = fetchurl {
url = "http://dist.modpython.org/dist/${name}.tgz";
url = "http://dist.modpython.org/dist/${pname}-${version}.tgz";
sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f";
};
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
passthru = { inherit apacheHttpd; };
buildInputs = [ apacheHttpd python2 ];
buildInputs = [ apacheHttpd python2 ]
++ lib.optional stdenv.isDarwin libintl;
meta = {
homepage = "http://modpython.org/";
pkgs/servers/mail/exim/default.nix
+1 -1
View File
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1:
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/:
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/:
''}
${lib.optionalString enableAuthDovecot ''
s:^# \(AUTH_DOVECOT\)=.*:\1=yes: