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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-08-16 12:01:50 +00:00
committed by GitHub
parent a1583fcb15 01066edddd
commit c30d1d56fe
65 changed files with 219 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/tasks/network-interfaces-systemd.nix
-3
View File
@@ -32,9 +32,6 @@ in
assertions = [ {
assertion = cfg.defaultGatewayWindowSize == null;
message = "networking.defaultGatewayWindowSize is not supported by networkd.";
} {
assertion = cfg.vswitches == {};
message = "networking.vswitches are not supported by networkd.";
} {
assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null;
message = "networking.defaultGateway.interface is not supported by networkd.";
nixos/tests/all-tests.nix
+1
View File
@@ -259,6 +259,7 @@ in
miniflux = handleTest ./miniflux.nix {};
minio = handleTest ./minio.nix {};
misc = handleTest ./misc.nix {};
mod_perl = handleTest ./mod_perl.nix {};
moinmoin = handleTest ./moinmoin.nix {};
mongodb = handleTest ./mongodb.nix {};
moodle = handleTest ./moodle.nix {};
nixos/tests/kernel-generic.nix
-1
View File
@@ -31,7 +31,6 @@ with pkgs; {
linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19;
linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12;
linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13;
linux_testing = makeKernelTest "testing" linuxPackages_testing;
nixos/tests/mod_perl.nix
+53
View File
@@ -0,0 +1,53 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "mod_perl";
meta = with pkgs.lib.maintainers; {
maintainers = [ sgo ];
};
machine = { config, lib, pkgs, ... }: {
services.httpd = {
enable = true;
adminAddr = "admin@localhost";
virtualHosts."modperl" =
let
inc = pkgs.writeTextDir "ModPerlTest.pm" ''
package ModPerlTest;
use strict;
use Apache2::RequestRec ();
use Apache2::RequestIO ();
use Apache2::Const -compile => qw(OK);
sub handler {
my $r = shift;
$r->content_type('text/plain');
print "Hello mod_perl!\n";
return Apache2::Const::OK;
}
1;
'';
startup = pkgs.writeScript "startup.pl" ''
use lib "${inc}",
split ":","${with pkgs.perl.pkgs; makeFullPerlPath ([ mod_perl2 ])}";
1;
'';
in
{
extraConfig = ''
PerlRequire ${startup}
'';
locations."/modperl" = {
extraConfig = ''
SetHandler perl-script
PerlResponseHandler ModPerlTest
'';
};
};
enablePerl = true;
};
};
testScript = { ... }: ''
machine.wait_for_unit("httpd.service")
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/modperl")
assert "Hello mod_perl!" in response, "/modperl handler did not respond"
'';
})
pkgs/applications/editors/texmaker/default.nix
+4 -4
View File
@@ -1,15 +1,15 @@
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qmake, zlib, pkg-config, poppler }:
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler }:
mkDerivation rec {
pname = "texmaker";
version = "5.0.4";
version = "5.1.0";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx";
sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6";
};
buildInputs = [ qtbase qtscript poppler zlib ];
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
nativeBuildInputs = [ pkg-config poppler qmake ];
NIX_CFLAGS_COMPILE="-I${poppler.dev}/include/poppler";
pkgs/development/libraries/boost/1.67.nix
-39
View File
@@ -1,39 +0,0 @@
{ lib, stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // {
version = "1.67.0";
patches = [
(fetchpatch {
url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
stripLen = 1;
})
] ++ lib.optionals stdenv.cc.isClang [
# Fixes https://github.com/boostorg/atomic/issues/15
(fetchpatch {
url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch";
sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a";
stripLen = 1;
})
# Needed for the next patch
(fetchpatch {
url = "https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch";
sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n";
stripLen = 1;
})
# Fixes https://github.com/boostorg/asio/pull/91
(fetchpatch {
url = "https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch";
sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is";
stripLen = 1;
})
];
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba";
};
})
pkgs/development/libraries/enchant/2.x.nix
+2
View File
@@ -5,6 +5,7 @@
, glib
, hunspell
, hspell
, nuspell
, unittest-cpp
}:
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
hunspell
nuspell
];
checkInputs = [
pkgs/development/libraries/libtins/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
postPatch = ''
rm -rf googletest
cp -r ${gtest.src}/googletest googletest
cp -r ${gtest.src} googletest
chmod -R a+w googletest
'';
pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch
+13
View File
@@ -0,0 +1,13 @@
From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont
--- a/src/modules/perl/modperl_perl.c
+++ a/src/modules/perl/modperl_perl.c
@@ -268,7 +268,7 @@
#ifdef MP_NEED_HASH_SEED_FIXUP
if (MP_init_hash_seed_set) {
#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
- memcpy(&PL_hash_seed, &MP_init_hash_seed,
+ memcpy(PL_hash_seed, &MP_init_hash_seed,
sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
PL_hash_seed_set = MP_init_hash_seed_set;
pkgs/development/python-modules/azure-servicebus/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.3.1";
version = "7.3.2";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dc162fc572087cdf53065a2ea9517b002a6702cf382f998d69903d68c16c731e";
sha256 = "6c9bef0bfb4ac2bb8158fdfb3938884cd42542be3162ac288fa8df4e254d3810";
};
propagatedBuildInputs = [
pkgs/development/python-modules/fastecdsa/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "fastecdsa";
version = "2.1.5";
version = "2.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa";
sha256 = "48d59fcd18d0892a6b76463d4c98caa217975414f6d853af7cfcbbb0284cb52d";
};
buildInputs = [ gmp ];
pkgs/development/python-modules/google-api-python-client/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
version = "2.9.0";
version = "2.15.0";
src = fetchPypi {
inherit pname version;
sha256 = "2b5274f06799d80222fd3f20fd4ebcd19f57c009703bd4cf7b00492e7e05e15a";
sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo=";
};
# No tests included in archive
pkgs/development/python-modules/google-auth-oauthlib/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-auth-oauthlib";
version = "0.4.4";
version = "0.4.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CYMsbnUDL5OBjt8a/+R0YSHWQMYlpb75tclq9nbpju4=";
sha256 = "sha256-SrWObD3GzPES+SH8ztQOVCb7omZ2iYbqUCIoSIJ26ro=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-auth/default.nix
+2 -2
View File
@@ -20,11 +20,11 @@
buildPythonPackage rec {
pname = "google-auth";
version = "1.31.0";
version = "1.34.0";
src = fetchPypi {
inherit pname version;
sha256 = "154f7889c5d679a6f626f36adb12afbd4dbb0a9a04ec575d989d6ba79c4fd65e";
sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-appengine-logging";
version = "0.1.0";
version = "0.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "0rkayy2qzsc70b0rdvzd2bxwp5f07rfqb95cyj57dkphq71mrrhw";
sha256 = "sha256-1E+3fXcGsIbTh7nXnBOcVT1UtY3cjulnu/MqU+e77lY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-asset/default.nix
+2 -2
View File
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "2.2.0";
version = "3.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w";
sha256 = "sha256-/iTpO1Y+v//ZzaXUpOfBOXDRfftpmUV4hxsFmMj3tM0=";
};
postPatch = ''
pkgs/development/python-modules/google-cloud-automl/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.3.0";
version = "2.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "523633496b4fe1ca74a7b22cdaa206581804863813bf461e2f437d0fb7ad21b6";
sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "3.1.1";
version = "3.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "9ac8cd06a60bfdc504f39fbcd086e5180c8684cffefe7745a9ff6a639c575629";
sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "0.1.0";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0s8vlw157z10yzzkrfyzfl31iad96wfl3ywk9g3gmmh0jfgy0gfj";
sha256 = "sha256-5ixj9MnJVVcU9NR4ZBe0TAp8ogJLAKrPlyGm5d/iQwA=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-bigquery/default.nix
+2 -2
View File
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.20.0";
version = "2.23.3";
src = fetchPypi {
inherit pname version;
sha256 = "ff728f9a4a64d6b4ec5beb7fd2f6ed550b49bfe2b8bb3755c00821716e0d1f91";
sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-bigtable/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "2.2.0";
version = "2.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-89fXmr3jHTtp8QOMFeueJwslHJ7Q6srQ/Kxsp0mLlKU=";
sha256 = "sha256-4rMnGnDQtuu55mzrYkeJjrU0ykQXd+pOYAw2yVcqJAQ=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-container/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.4.1";
version = "2.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "e7d93ca399dd6fb5fd0f99190248531c9c583d1a85e7cd2c9ee485495459ee78";
sha256 = "sha256-nMUMGFU383TC7cXkj6EHaEe4HHS5NzcLBIxp1xgWUzg=";
};
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
pkgs/development/python-modules/google-cloud-core/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-core";
version = "1.7.0";
version = "1.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "2ab0cf260c11d0cc334573301970419abb6a1f3909c6cd136e4be996616372fe";
sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U=";
};
propagatedBuildInputs = [ google-api-core ];
pkgs/development/python-modules/google-cloud-dataproc/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "2.4.0";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "6e5373febe420e2b2375d2252b272129f11a37ff1b88a7587322931063be8d38";
sha256 = "sha256-wRGIuut2mJ6RJh8fRUAT0JDmnUreQYXhgVgsfRxvyxo=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-datastore/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
version = "2.1.3";
version = "2.1.6";
src = fetchPypi {
inherit pname version;
sha256 = "e7a510759b9d55ff63c983e3c42cbf5c35f9b7310f4d611ebe3697da6576bcb4";
sha256 = "sha256-31PBHWnU0KbX8ymFh7+dP0uVbM6BWexdaumMVQbBO6o=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-dlp/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "3.1.1";
version = "3.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "0863e90f9a9cae70af7962dd17d99cb6dde44bf3a029ce5990cb8226557a9e95";
sha256 = "sha256-ZxGWTsqCIvpTSN+aThVgjPuMJE7hHMVn4zsidpXk7xk=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-dns/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-dns";
version = "0.32.3";
version = "0.33.0";
src = fetchPypi {
inherit pname version;
sha256 = "bbb1c855524bd3f0f2a3b3db883af0d3f618befb976aa694d7e507dd68fc7a71";
sha256 = "sha256-iPAJMzxefRjLA0tGUfjAs15ZJvcyBUJB1QCMfMBo96I=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core ];
pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-error-reporting";
version = "1.1.2";
version = "1.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-NT/+2mtIaEMyXnmM1fWX4kEV9pb1+aNas2lNobUPR14=";
sha256 = "sha256-LKESEpQLvjmyo8VcZ1fxMcPCbUE+mxvmnexoZEKramc=";
};
postPatch = ''
pkgs/development/python-modules/google-cloud-firestore/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "2.1.3";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "143a88ef2b90c98f16d2b0bc192631ca3e2b7c66a236d93ba9961de64e50870e";
sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-iam-logging";
version = "0.1.0";
version = "0.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "19a8s634w2m1b16zq8f185cpaw7k6d0c7c61g1vzm19jl213rhiw";
sha256 = "sha256-yX58Pq2+YB3ylN92RUIGlQKnvKYD7sabCKtZsDNV5sc=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-iot/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "2.1.0";
version = "2.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "f4d7c55636e8cb57a4dde41d933cd8663b1369ab3542b287957959ee59828559";
sha256 = "sha256-vMzq4ffA7877zRtdZ+VpFdEHU0BZhDdhgxuk5154hMU=";
};
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-kms/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.3.0";
version = "2.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "39c6aa1633e45dc0364397b24c83718bd63f833db41d8c93b76019c16208d0f1";
sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM=";
};
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-language/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.1.0";
version = "2.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "63ca2d772e16e4440858848e8c3298859b931b1652f663683fb5d7413b7c9a1b";
sha256 = "sha256-X8lh+90HyyktxgJiRaiJF9ExKHmgiVcQiYDotg3AqaQ=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-logging/default.nix
+2 -2
View File
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
version = "2.5.0";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "ab9d6ee1156cabe8c2483ca5a67bdf3a8582c596dd4e498a59781b6670b085f0";
sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
pkgs/development/python-modules/google-cloud-monitoring/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "2.3.0";
version = "2.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "fcbf644622709277d47b0dd8884efd1d62703bffda3c1030e06404709690c06c";
sha256 = "sha256-PQjTAqSzjCBPH58nZHAc6Oa12NSDVvt2E0ZHewTFZfY=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-os-config/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.2.0";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "2b828513c1cea481d03d0218516e5c5d8b53756db3637f02cd69ae3c171832dc";
sha256 = "sha256-sC80RGY4lDVebpoz2hDGH5WfyrAjaOKTSDp/BhGmZS0=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-pubsub/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.5.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "8706557b71532c76aec48409dcac189caac47cf2decb8850ae75694bf70326b2";
sha256 = "sha256-F4itJadl6oNJnY9EENTIugJll8uC20bS9yF/HCUlrWU=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-redis/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.1.1";
version = "2.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "d97fde9361026ab67f53557a8fe9f3db26121959ab586fe453f42a401d40fb4c";
sha256 = "sha256-lxjxkBK/7up+t2dF2hZz3QXeXLwo9L0Z78mH6aC4Icc=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "0.30.3";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm";
sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core ];
pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+2 -2
View File
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
version = "0.32.2";
version = "0.32.3";
src = fetchPypi {
inherit pname version;
sha256 = "5285aef98fdb9a691e7c54789e7c493c51674b6e77fe6c967172ae8eadbba026";
sha256 = "sha256-un5WZ2rxVXPKj9CPfhrojlA9ml6wfPIu0JD6p8WCY/A=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core ];
pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
version = "2.5.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "e99eb9f77373b97bfc1becb7d23fae5574a33fd9e44b44a3e700abcbfbc9f94d";
sha256 = "sha256-gfNoCfh2ssHgYcQ1kfQedcfhpqsu3x50hdYrm11SKGo=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.3.1";
version = "1.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "872507adad97f452e0998730cd1993c0433c05a0757c268f5c02fbfabe7720d4";
sha256 = "sha256-DrdzC7Oe/8cq41OLcN51Qm208L0zPa9cxscHqmYji04=";
};
propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-cloud-spanner/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.5.0";
version = "3.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "19656140f180aef84e023c3a8fd534ac964247a52199317ea33abc701d5a8c5a";
sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-speech/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
version = "2.4.0";
version = "2.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "991ee0601bc956110e873aee1a74441d66227b10cd581195575435884384f38b";
sha256 = "sha256-NkUgRYoli/ngoyJmuF9/va7Ao5ouw3cxsbwCrSIaOQc=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-storage/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
version = "1.38.0";
version = "1.41.1";
src = fetchPypi {
inherit pname version;
sha256 = "162011d66f64b8dc5d7936609a5daf0066cc521231546aea02c126a5559446c4";
sha256 = "sha256-qB7MDzgrjkQ3zH8VL3TXfvkXyCgKXRBA9dz70FAseQY=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-tasks/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "2.3.0";
version = "2.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "7cc24d389073c40af41e2fc091417dec6e58af07db9b1295853fc3d545c80cfe";
sha256 = "sha256-4QOKG7Forf3x5l1XQbbX4A8upIxe+eCiwhPily26du4=";
};
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
pkgs/development/python-modules/google-cloud-testutils/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-testutils";
version = "0.2.0";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "a23be7cc23bccb1ae6debb74a47dc5b51858b6322fcf034ca92fe7a4acb896f3";
sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs=";
};
propagatedBuildInputs = [ click google-auth six ];
pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "2.4.0";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "c50cc21b5df88b696680d8aac3ab6c86820c0e4d071d6a5dcd9b634a456cf59f";
sha256 = "sha256-LcX7qSGMBMU72ZTNBLKaDd+M/2En+mc7/IZsZg2dF9I=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-trace/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.2.0";
version = "1.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "3683477a5d747451332a38d6c8cea652b5991db1f6e4c39907fa3679708ac218";
sha256 = "sha256-N2Y/DZXyxMSw+S/s58iJvrK/p2FM/B5O467Pctr+tdQ=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
pkgs/development/python-modules/google-cloud-translate/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.2.0";
version = "3.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "8cd957f4b29a8c7a983e0a427c2712533c41bb7007b76a8cc88d6c65075c679a";
sha256 = "sha256-XkHNIu7KWPUpgBceIBqzWgYPCay+Ud1/nM0KbeRnHk0=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "2.2.0";
version = "2.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "08106ddeec90a27f4bc706f7267ec1c52f2bff745bafd4710bc6898460c8e9a6";
sha256 = "sha256-+2HwsRZM/h2eVmX6uVEb1s9etDggoGuQg3qj7hXj/AQ=";
};
propagatedBuildInputs = [ google-api-core proto-plus ];
pkgs/development/python-modules/google-cloud-vision/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "2.3.2";
version = "2.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "65ed06725377670fc1b21d474237922f29674d0f99a472b0c84683aa02af70a4";
sha256 = "sha256-BZiBSH2nZ2tnHi6K1+Ii5i/ZrGJyyH1+6hurmqVfYcM=";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus];
pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.3.0";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "632ac3c50eee704ed2a6e87d5a09379589841cf53459813c76f8bea01e77c49d";
sha256 = "sha256-oq7AMZ1so8IR7nn8fIhUr4oOJEJp1FQPxiJIh+1bMLA=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
pkgs/development/python-modules/google-resumable-media/default.nix
+2 -2
View File
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "1.3.1";
version = "1.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1a1eb743d13f782d1405437c266b2c815ef13c2b141ba40835c74a3317539d01";
sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE=";
};
propagatedBuildInputs = [ google-auth google-crc32c requests ];
pkgs/development/python-modules/proto-plus/default.nix
+2 -2
View File
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "proto-plus";
version = "1.18.1";
version = "1.19.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "cfc45474c7eda0fe3c4b9eca2542124f2a0ff5543242bec61e8d08bce0f5bd48";
sha256 = "sha256-zmaVzoBDg61vOSxLsYdMMjiWKQofZWVg3jZBa6gy2R4=";
};
propagatedBuildInputs = [ protobuf ];
pkgs/development/python-modules/pymyq/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pymyq";
version = "3.1.0";
version = "3.1.2";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "arraylabs";
repo = pname;
rev = "v${version}";
sha256 = "0nrsivgd3andlq9c0p72x06mz1s4ihhibbphccrm5v1fmbzj09zp";
sha256 = "sha256-DvwnbZa1/Y08rrxdXgffkjaGAVdRkPmYCD+Xkv0h7OE=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pyppeteer/default.nix
+2 -18
View File
@@ -2,7 +2,6 @@
, appdirs
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pyee
, pytest-xdist
@@ -16,7 +15,7 @@
buildPythonPackage rec {
pname = "pyppeteer";
version = "0.2.5";
version = "0.2.6";
disabled = pythonOlder "3.6";
format = "pyproject";
@@ -24,7 +23,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = version;
sha256 = "1hl4rw8j5yiak0d34vx1l1blr8125bscjd8m46a5m8xzm98csjc7";
sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4=";
};
nativeBuildInputs = [
@@ -45,21 +44,6 @@ buildPythonPackage rec {
pytestCheckHook
];
patches = [
# Switch to poetry-core, https://github.com/pyppeteer/pyppeteer/pull/262
(fetchpatch {
name = "switch-poetry-core.patch";
url = "https://github.com/pyppeteer/pyppeteer/commit/e248baebefcf262fd96f261d940e74ed49ba2df9.patch";
sha256 = "03g8n35kn2alqki37s0hf2231fk2zkr4nr1x1g2rfrhps9d6fyvw";
})
];
postPatch = ''
# https://github.com/pyppeteer/pyppeteer/pull/252
substituteInPlace pyproject.toml \
--replace 'websockets = "^8.1"' 'websockets = "*"'
'';
disabledTestPaths = [
# Requires network access
"tests/test_browser.py"
pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
+15 -8
View File
@@ -1,18 +1,25 @@
{ lib, fetchzip }:
{ stdenv
, lib
, fetchurl }:
let version = "3.1"; in
stdenv.mkDerivation rec {
pname = "intel2200BGFirmware";
version = "3.1";
fetchzip {
name = "intel2200BGFirmware-${version}";
url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
sha256 = "0zjyjndyc401pn5x5lgypxdal21n82ymi3vbb2ja1b89yszj432b";
src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0=";
};
installPhase = ''
runHook preInstall
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
install -D -m644 ipw2200-bss.fw $out/lib/firmware/ipw2200-bss.fw
install -D -m644 ipw2200-ibss.fw $out/lib/firmware/ipw2200-ibss.fw
install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw
install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
runHook postInstall
'';
meta = with lib; {
pkgs/os-specific/linux/kernel/hardened/patches.json
-6
View File
@@ -17,12 +17,6 @@
"sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
"name": "linux-hardened-5.12.19-hardened1.patch",
"sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.139-hardened1.patch",
pkgs/os-specific/linux/kernel/linux-5.12.nix
-20
View File
@@ -1,20 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.12.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
} // (args.argsOverride or {}))
pkgs/servers/home-assistant/component-packages.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.8.6";
version = "2021.8.7";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
pkgs/servers/home-assistant/default.nix
+15 -2
View File
@@ -88,6 +88,19 @@ let
});
})
# Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment
(self: super: {
total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec {
version = "0.58";
src = fetchFromGitHub {
owner = "craigjmidwinter";
repo = "total-connect-client";
rev = version;
sha256 = "1dqmgvgvwjh235wghygan2jnfvmn9vz789in2as3asig9cifix9z";
};
});
})
# home-assistant-frontend does not exist in python3.pkgs
(self: super: {
home-assistant-frontend = self.callPackage ./frontend.nix { };
@@ -121,7 +134,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.8.6";
hassVersion = "2021.8.7";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -138,7 +151,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1hahxvvlk32dbmv2lhn67w1ii5g24znvjqgsq318qv8c2qh5z5ws";
sha256 = "0f69jcpxyr0kzziwl6bfj2jbn23hrj1796ml6jsk9mnpfkdsd9vi";
};
# leave this in, so users don't have to constantly update their downstream patch handling
pkgs/servers/http/apache-modules/mod_perl/default.nix
+8 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheHttpd, perl }:
{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }:
stdenv.mkDerivation rec {
pname = "mod_perl";
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
buildInputs = [ apacheHttpd perl ];
buildPhase = ''
perl Makefile.PL \
@@ -23,4 +28,6 @@ stdenv.mkDerivation rec {
mv $out${perl}/* $out
rm $out/nix -rf
'';
passthru.tests = nixosTests.mod_perl;
}
pkgs/top-level/all-packages.nix
+1 -10
View File
@@ -14902,7 +14902,6 @@ with pkgs;
boost160 = callPackage ../development/libraries/boost/1.60.nix { };
boost165 = callPackage ../development/libraries/boost/1.65.nix { };
boost166 = callPackage ../development/libraries/boost/1.66.nix { };
boost167 = callPackage ../development/libraries/boost/1.67.nix { };
boost168 = callPackage ../development/libraries/boost/1.68.nix { };
boost169 = callPackage ../development/libraries/boost/1.69.nix { };
boost16x = boost169;
@@ -21180,13 +21179,6 @@ with pkgs;
];
};
linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -21510,7 +21502,6 @@ with pkgs;
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
# When adding to the list above:
@@ -21544,7 +21535,7 @@ with pkgs;
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
linux_latest_for_hardened = pkgs.linux_5_12;
linux_latest_for_hardened = pkgs.linux_5_10;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
pkgs/top-level/perl-packages.nix
+9
View File
@@ -9,6 +9,7 @@
, stdenv, lib, buildPackages, pkgs
, fetchurl, fetchgit, fetchpatch, fetchFromGitHub
, perl, overrides, buildPerl, shortenPerlShebang
, nixosTests
}:
# cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above
@@ -13721,6 +13722,12 @@ let
url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz";
sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
patches = [
# Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
../development/perl-modules/mod_perl2-PL_hash_seed.patch
];
makeMakerFlags = "MP_AP_DESTDIR=$out";
buildInputs = [ pkgs.apacheHttpd ];
doCheck = false; # would try to start Apache HTTP server
@@ -13728,6 +13735,8 @@ let
description = "Embed a Perl interpreter in the Apache HTTP server";
license = lib.licenses.asl20;
};
passthru.tests = nixosTests.mod_perl;
};
Mojolicious = buildPerlPackage {