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-09-17 12:01:16 +00:00
committed by GitHub
parent 711a4065ab 8b0f315b76
commit dd2b1ebf25
25 changed files with 150 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/using/overlays.chapter.md
+2
View File
@@ -138,6 +138,8 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas
- [MPICH](https://www.mpich.org/), attribute name `mpich`
- [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich`
To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay:
```nix
maintainers/maintainer-list.nix
+6
View File
@@ -5472,6 +5472,12 @@
githubId = 39434424;
name = "Felix Springer";
};
junjihashimoto = {
email = "junji.hashimoto@gmail.com";
github = "junjihashimoto";
githubId = 2469618;
name = "Junji Hashimoto";
};
justinas = {
email = "justinas@justinas.org";
github = "justinas";
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+2 -2
View File
@@ -1056,8 +1056,8 @@ Superuser created successfully.
The wordpress module provides a new interface which allows to
use different webservers with the new option
<link xlink:href="options.html#opt-services.wordpress.webserver"><literal>services.wordpress.webserver</literal></link>.
Currently <literal>httpd</literal> and
<literal>nginx</literal> are supported. The definitions of
Currently <literal>httpd</literal>, <literal>caddy</literal>
and <literal>nginx</literal> are supported. The definitions of
wordpress sites should now be set in
<link xlink:href="options.html#opt-services.wordpress.sites"><literal>services.wordpress.sites</literal></link>.
</para>
nixos/doc/manual/release-notes/rl-2111.section.md
+1 -1
View File
@@ -317,7 +317,7 @@ To be able to access the web UI this port needs to be opened in the firewall.
- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package.
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd`, `caddy` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.
nixos/modules/services/web-apps/wordpress.nix
+28 -1
View File
@@ -278,7 +278,7 @@ in
};
options.webserver = mkOption {
type = types.enum [ "httpd" "nginx" ];
type = types.enum [ "httpd" "nginx" "caddy" ];
default = "httpd";
description = ''
Whether to use apache2 or nginx for virtual host management.
@@ -458,5 +458,32 @@ in
};
})
(mkIf (cfg.webserver == "caddy") {
services.caddy = {
enable = true;
virtualHosts = mapAttrs' (hostName: cfg: (
nameValuePair "http://${hostName}" {
extraConfig = ''
root * /${pkg hostName cfg}/share/wordpress
file_server
php_fastcgi unix/${config.services.phpfpm.pools."wordpress-${hostName}".socket}
@uploads {
path_regexp path /uploads\/(.*)\.php
}
rewrite @uploads /
@wp-admin {
path not ^\/wp-admin/*
}
rewrite @wp-admin {path}/index.php?{query}
'';
}
)) eachSite;
};
})
]);
}
nixos/tests/wordpress.nix
+17 -1
View File
@@ -45,6 +45,21 @@ import ./make-test-python.nix ({ pkgs, ... }:
networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
wp_caddy = { ... }: {
services.wordpress.webserver = "caddy";
services.wordpress.sites = {
"site1.local" = {
database.tablePrefix = "site1_";
};
"site2.local" = {
database.tablePrefix = "site2_";
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
};
testScript = ''
@@ -54,10 +69,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
wp_httpd.wait_for_unit("httpd")
wp_nginx.wait_for_unit("nginx")
wp_caddy.wait_for_unit("caddy")
site_names = ["site1.local", "site2.local"]
for machine in (wp_httpd, wp_nginx):
for machine in (wp_httpd, wp_nginx, wp_caddy):
for site_name in site_names:
machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")
pkgs/applications/networking/cluster/tanka/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tanka";
version = "0.17.2";
version = "0.17.3";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-a7utYYuCgFabKILUKnKF0fcrorlV1DYMOFMRkm5QMuU=";
sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y=";
};
vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";
pkgs/applications/video/mplayer/default.nix
+4 -4
View File
@@ -223,11 +223,11 @@ stdenv.mkDerivation rec {
fi
'';
meta = {
meta = with lib; {
description = "A movie player that supports many video formats";
homepage = "http://mplayerhq.hu";
license = "GPL";
maintainers = [ lib.maintainers.eelco ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
license = licenses.gpl2Only;
maintainers = with maintainers; [ eelco ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
pkgs/applications/window-managers/qtile/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@ let
unwrapped = pythonPackages.buildPythonPackage rec {
pname = "qtile";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "qtile";
repo = "qtile";
rev = "v${version}";
sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI=";
sha256 = "0ln0fxarin9liy9n76zywmbr31xrjw8f7d3nr1mphci7wkc9bqmm";
};
postPatch = ''
pkgs/development/python-modules/minidump/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
version = "0.0.19";
version = "0.0.20";
src = fetchPypi {
inherit pname version;
sha256 = "67b3327cb96e319633653a353c6281703772335dc84797d6fdce7daf0b3be077";
sha256 = "1rr91nnlzv7gnbcvv8qhbyx1kh2s4jdv7nv0qka5jya32rzjaigm";
};
# Upstream doesn't have tests
pkgs/development/python-modules/progressbar2/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "progressbar2";
version = "3.53.2";
version = "3.53.3";
src = fetchPypi {
inherit pname version;
sha256 = "8c150baaa33448c1e34a2cafa5108285d96f2c877bdf64fcbd77f26cb135435d";
sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d";
};
propagatedBuildInputs = [ python-utils ];
pkgs/development/python-modules/requests-pkcs12/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "requests-pkcs12";
version = "1.12";
version = "1.13";
src = fetchFromGitHub {
owner = "m-click";
repo = "requests_pkcs12";
rev = version;
sha256 = "sha256-fMmca3QNr9UBpSHcVf0nHmGmvkW99bnmigHcWj0D2g0=";
sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy";
};
propagatedBuildInputs = [
pkgs/development/python-modules/slack-sdk/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.10.1";
version = "3.11.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "1m9jbn5wn892f22lxkxgahlbnwflak50hfjrydblp4agsag94nsg";
sha256 = "0zwz36mpc7syrkslf1rf7c6sxfanw87mbr2758j01sph50m43g6m";
};
propagatedBuildInputs = [
pkgs/development/python-modules/slowapi/default.nix
+2 -12
View File
@@ -2,7 +2,6 @@
, buildPythonPackage
, fastapi
, fetchFromGitHub
, fetchpatch
, limits
, mock
, hiro
@@ -15,7 +14,7 @@
buildPythonPackage rec {
pname = "slowapi";
version = "0.1.4";
version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +22,7 @@ buildPythonPackage rec {
owner = "laurentS";
repo = pname;
rev = "v${version}";
sha256 = "0bnnzgv2wy145sdab54hljwv1b5029ndrr0y9rc2q0mraz8lf8lm";
sha256 = "1wjnlhjfgil86h6i5yij723ncg18rqdprs1q6i68w4msaspwpxg9";
};
nativeBuildInputs = [
@@ -49,15 +48,6 @@ buildPythonPackage rec {
"test_endpoint_response_param_invalid"
];
patches = [
# Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/laurentS/slowapi/commit/fe165f2d479f4f8e4b7dd9cd88ec0ae847b490c5.patch";
sha256 = "16vjxdjjiyg8zjrgfyg9q2ym2lmnms2zy5d2cg3ccg51cfl715fi";
})
];
pythonImportsCheck = [ "slowapi" ];
meta = with lib; {
pkgs/development/python-modules/torchvision/bin.nix
+2 -2
View File
@@ -15,7 +15,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
version = "0.9.1";
version = "0.10.0";
in buildPythonPackage {
inherit version;
@@ -54,6 +54,6 @@ in buildPythonPackage {
changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ junjihashimoto ];
};
}
pkgs/development/python-modules/torchvision/binary-hashes.nix
+19 -15
View File
@@ -3,20 +3,24 @@
# Precompiled wheels can be found at:
# https://download.pytorch.org/whl/torch_stable.html
version: {
x86_64-linux-37 = {
name = "torchvision-${version}-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw=";
};
x86_64-linux-38 = {
name = "torchvision-${version}-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA=";
};
x86_64-linux-39 = {
name = "torchvision-${version}-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8=";
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
"0.10.0" = {
x86_64-linux-37 = {
name = "torchvision-0.10.0-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-yMgRhp06/rYIIiDNehNrZYIrvIbPvusCxGJL0mL+Bs4=";
};
x86_64-linux-38 = {
name = "torchvision-0.10.0-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp38-cp38-linux_x86_64.whl";
hash = "sha256-p1bw+4KsdTuXle+AwXYQVL8elPMroAHV9lkXJGWbtPc=";
};
x86_64-linux-39 = {
name = "torchvision-0.10.0-cp39-cp39-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.0%2Bcu111-cp39-cp39-linux_x86_64.whl";
hash = "sha256-AOfhnHThVdJx5qxj2LTj+T9dPMFxQoxP3duxIm1y7KE=";
};
};
}
pkgs/development/python-modules/torchvision/prefetch.sh
Executable
+36
View File
@@ -0,0 +1,36 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-prefetch-scripts
version=$1
bucket="https://download.pytorch.org/whl/cu111"
url_and_key_list=(
"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"
"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
)
hashfile=binary-hashes-"$version".nix
rm -f $hashfile
echo " \"$version\" = {" >> $hashfile
for url_and_key in "${url_and_key_list[@]}"; do
key=$(echo "$url_and_key" | cut -d' ' -f1)
url=$(echo "$url_and_key" | cut -d' ' -f2)
name=$(echo "$url_and_key" | cut -d' ' -f3)
echo "prefetching ${url}..."
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
echo " $key = {" >> $hashfile
echo " name = \"$name\";" >> $hashfile
echo " url = \"$url\";" >> $hashfile
echo " hash = \"$hash\";" >> $hashfile
echo " };" >> $hashfile
echo
done
echo " };" >> $hashfile
echo "done."
pkgs/development/tools/dockle/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dockle";
version = "0.3.15";
version = "0.4.2";
src = fetchFromGitHub {
owner = "goodwithtech";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A=";
sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM=";
};
vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw=";
vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ btrfs-progs lvm2 ];
pkgs/development/tools/yq-go/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
version = "4.12.2";
version = "4.13.0";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
sha256 = "sha256-sd9S9aWilFrdxKnUaZBWYPDvC5mPCjqwBjpIRHgd98k=";
sha256 = "sha256-9yKCFEtGg6TiHo3PGobVzQSbqc27ptKhH+2WgbLKXRI=";
};
vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I=";
pkgs/os-specific/linux/zfs/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_13 ? pkgs.linuxKernel.packages.linux_5_13
, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14
}:
with lib;
pkgs/servers/samba/4.x.nix
+2 -2
View File
@@ -45,11 +45,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "samba";
version = "4.14.4";
version = "4.14.7";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "1fc9ix91hb1f35j69sk7rsi9pky2p0vsmw47s973bx801cm0kbw9";
sha256 = "sha256-b1A1P5YCqiAkXrGM6wDn5ex5PfCXSuvVJUw48W2PGQY=";
};
outputs = [ "out" "dev" "man" ];
pkgs/tools/misc/macchina/default.nix
+3 -3
View File
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "macchina";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "Macchina-CLI";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eZeS3lS/eKGvS7CoCnwhkX7jSwAqZOKLMWvLfZPzGtA=";
sha256 = "sha256-ZrBjpmyc9cHaaVzMAdksFVa3iEX/FWCCcdwyPH66E5s=";
};
cargoSha256 = "sha256-Ix+Zj5qj1So8Urobw+78yCdRAerFkPctIkousk266DU=";
cargoSha256 = "sha256-pINaBieDf+2GGid2vsgvNYy0zwjxXaPcBw0Yoy6KGi8=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
pkgs/tools/nix/nix-output-monitor/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
}:
mkDerivation rec {
pname = "nix-output-monitor";
version = "1.0.3.1";
version = "1.0.3.2";
src = fetchFromGitHub {
owner = "maralorn";
repo = "nix-output-monitor";
sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92";
sha256 = "0srfclmqrqcx8b756yxww24ya0xn2ajxbgj07mcvdvwbwl09pys8";
rev = "v${version}";
};
isLibrary = true;
pkgs/tools/security/cosign/default.nix
+4 -4
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI=";
sha256 = "sha256-KiXcAuww0dZ78ilRp7j0JX6VAbOvmfd9h+LrOjrKaJo=";
};
buildInputs =
@@ -17,9 +17,9 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk=";
vendorSha256 = "sha256-yrUfSRCwoxoH2sM5KuApaIj7YF7SPXx9vTlXS+pA5CY=";
excludedPackages = "\\(copasetic\\)";
excludedPackages = "\\(copasetic\\|sample\\|webhook\\)";
tags = lib.optionals pivKeySupport [ "pivkey" ];
pkgs/tools/security/exploitdb/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2021-09-14";
version = "2021-09-17";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-6VTJzR0kdQEFLW0aG3iZGthJF9nYd7NIkzSNhHpgF44=";
sha256 = "sha256-vpRthxgvDK2J9OnhF1AQR3yKxvrETLDM1APas8ZM8W8=";
};
installPhase = ''