From 17659bb4ccbdf2cc4d0f8a9d696478b1f4580c40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 22:42:13 +0000 Subject: [PATCH 001/198] shadowsocks-v2ray-plugin: 1.3.1 -> 1.3.2 --- pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 1642bb2944d4..ae6c495b6c87 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "shadowsocks-v2ray-plugin"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk="; }; - vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + vendorSha256 = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8="; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; From 632584f5bd7a54c4b9fca4445fe42c5b57c43dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 30 Dec 2022 22:52:31 +1100 Subject: [PATCH 002/198] rbspy: 0.12.1 -> 0.15.0 --- pkgs/development/tools/rbspy/default.nix | 31 +++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4e7135233baa..1dc10747ddcb 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -2,43 +2,36 @@ , stdenv , rustPlatform , fetchFromGitHub -, fetchpatch , ruby , which }: rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "FnUUX7qQWVZMHtWvneTLzBL1YYwF8v4e1913Op4Lvbw="; + hash = "sha256-e6ZCRIJVKl3xbJym+h+ah/J4c+s7wf1laF7p63ubE4A="; }; - cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; + cargoHash = "sha256-yhZ0QM9vZxyFCjTShbV7+Rn8w4lkPW7E7zKhrK4qa1E="; doCheck = true; - patches = [ - # Backport rust 1.62 support. Should be removed in the next rbspy release. - (fetchpatch { - name = "rust-1.62.patch"; - url = "https://github.com/rbspy/rbspy/commit/f5a8eecfbf2ad0b3ff9105115988478fb760d54d.patch"; - sha256 = "sha256-+04rvEXU7/lx5IQkk3Bhe+KLN8PwxZ0j4nH5ySnS154="; - }) - ]; - - # Tests in initialize.rs rely on specific PIDs being queried and attaching - # tracing to forked processes, which don't work well with the isolated build. + # The current implementation of rbspy fails to detect the version of ruby + # from nixpkgs during tests. preCheck = '' substituteInPlace src/core/process.rs \ --replace /usr/bin/which '${which}/bin/which' substituteInPlace src/sampler/mod.rs \ - --replace /usr/bin/which '${which}/bin/which' - substituteInPlace src/core/initialize.rs \ - --replace 'fn test_initialize_with_disallowed_process(' '#[ignore] fn test_initialize_with_disallowed_process(' \ - --replace 'fn test_get_exec_trace(' '#[ignore] fn test_get_exec_trace(' \ + --replace /usr/bin/which '${which}/bin/which' \ + --replace 'fn test_sample_single_process_with_time_limit(' '#[ignore] fn test_sample_single_process_with_time_limit(' \ + --replace 'fn test_sample_single_process(' '#[ignore] fn test_sample_single_process(' \ + --replace 'fn test_sample_subprocesses(' '#[ignore] fn test_sample_subprocesses(' + substituteInPlace src/core/ruby_spy.rs \ + --replace 'fn test_get_trace(' '#[ignore] fn test_get_trace(' \ + --replace 'fn test_get_trace_when_process_has_exited(' '#[ignore] fn test_get_trace_when_process_has_exited(' ''; nativeBuildInputs = [ ruby which ]; From d4d75b86d2d93be281501ea231d5662fcbba9cd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 21:34:33 +0000 Subject: [PATCH 003/198] yder: 1.4.17 -> 1.4.19 --- pkgs/development/libraries/yder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 43b181fc348f..286b34379dc2 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.17"; + version = "1.4.19"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; + sha256 = "sha256-KP79i1yYJ6jrsdtS85fHOmJV+oAL/MNgc9On4RfOTwo="; }; patches = [ From 3010a420d6d86028d47360b55a11453ca027922f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Feb 2023 14:27:38 +0000 Subject: [PATCH 004/198] python310Packages.s3fs: 2022.11.0 -> 2023.1.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d295c73b2fe2..b212af78a26c 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.11.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EMWsKDpPW2f/rW0fJf9+4CYUJ1DFxdyGh0bNkE9hfDM="; + hash = "sha256-iy4oNyQj6T8mMSIIqScuIqli3dCnnWP5poaTtq9f8Yc="; }; postPatch = '' From ac49f34fe85a02110ba38ccd8798207e52ea150a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Feb 2023 16:16:28 +0000 Subject: [PATCH 005/198] llvmPackages_rocm.llvm: 5.4.2 -> 5.4.3 --- pkgs/development/compilers/llvm/rocm/llvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index f014676a1809..272a1209b492 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -48,7 +48,7 @@ let else throw "Unsupported ROCm LLVM platform"; in stdenv.mkDerivation (finalAttrs: { pname = "rocm-llvm-${targetName}"; - version = "5.4.2"; + version = "5.4.3"; outputs = [ "out" @@ -65,7 +65,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-iyr3cstC8CB1YaACadNqBs/oI8lh4bJzK0WtEB0wZvg="; + hash = "sha256-BDvC6QFDFtahA9hmJDLiM6K4mrO3j9E9rEXm7KulcuA="; }; nativeBuildInputs = [ From 4422fe05ed938c5ce6ba11390dc7de93e8ee1357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Feb 2023 06:05:26 +0000 Subject: [PATCH 006/198] streamlit: 1.16.0 -> 1.18.1 --- .../science/machine-learning/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 9479011d5f14..ad22d57882ed 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -26,12 +26,12 @@ buildPythonApplication rec { pname = "streamlit"; - version = "1.16.0"; + version = "1.18.1"; format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-TBNWIe3m646dbnOMxUltkNZr23g0Dqsestvxl4zHr4A="; + hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g="; }; propagatedBuildInputs = [ From 5a2d41f70c4b9b82114ba287a61bd8f4e91ac165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 15 Feb 2023 14:41:41 +0100 Subject: [PATCH 007/198] python3Packages.reproject: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/reproject/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 2bc59b553507..10c104e768f2 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.9.1"; - format = "setuptools"; + version = "0.10.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pXSUVeTrxtSqKTa286xdCAAFipg38iR4XSO6CRfWXtc="; + hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; }; nativeBuildInputs = [ From 90698f7c7063ab22b0cec1c49847dd0ff8d27db1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Feb 2023 20:59:08 +0000 Subject: [PATCH 008/198] asterisk-module-sccp: 4.3.4 -> 4.3.5 --- pkgs/servers/asterisk/sccp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/servers/asterisk/sccp/default.nix index 756699e5adb9..5d60d4278137 100644 --- a/pkgs/servers/asterisk/sccp/default.nix +++ b/pkgs/servers/asterisk/sccp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, binutils-unwrapped, patchelf, asterisk }: stdenv.mkDerivation rec { pname = "asterisk-module-sccp"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "chan-sccp"; repo = "chan-sccp"; rev = "v${version}"; - sha256 = "sha256-YGHK4A03Ba/tnVTnu9VuhIy/xQ5C/7ZX8h9mxqKsnZI="; + sha256 = "sha256-Lonsh7rx3C17LU5pZpZuFxlki0iotDt+FivggFJbldU="; }; nativeBuildInputs = [ patchelf ]; From f908963cd09d0dbb19d2528a6cb79bb46e0b3523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Feb 2023 16:59:48 +0000 Subject: [PATCH 009/198] python310Packages.ansible-later: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/ansible-later/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 37a97121b034..f51a1bd3ec6b 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI="; + hash = "sha256-5TV9cTMTx8R6jf9HypieinCyNgHC4LSHTRQd9RXApG4="; }; postPatch = '' From 02e1012cae21c4f162cf96c6460b3f5d333d2dc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Feb 2023 17:50:14 +0000 Subject: [PATCH 010/198] vttest: 20221229 -> 20230201 --- pkgs/tools/misc/vttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index a2bd46321b74..96915f5c9fdf 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221229"; + version = "20230201"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; + sha256 = "sha256-J/QwB5Hny8+dFfiEIfmONdOu5mMRNoQwYk4sGlqL5oM="; }; meta = with lib; { From 1978d0ff6f74adadaed6a6aa58089428b181aa9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Feb 2023 21:57:00 +0000 Subject: [PATCH 011/198] libmysqlconnectorcpp: 8.0.31 -> 8.0.32 --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index d8948b08672c..5429dd62c802 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.31"; + version = "8.0.32"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-HSF7yEybmzzDQvl1cwUZ/mlXqVXxnIHqg2a/HfJtELA="; + hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM="; }; nativeBuildInputs = [ From 84f012d56cf66535425aa6bbdead32f78aa7be4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Feb 2023 22:21:27 +0000 Subject: [PATCH 012/198] lombok: 1.18.24 -> 1.18.26 --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f7f2a619a1c9..45f030270152 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.24"; + version = "1.18.26"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k="; + sha256 = "sha256-KvH6g2hIdhtuUUQOxii0ncOAgOmHG7NScB+4yDWAh88="; }; nativeBuildInputs = [ makeWrapper ]; From 8de374b132bd577556ee990e168cfe3716fc5efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Feb 2023 22:46:35 +0000 Subject: [PATCH 013/198] morgen: 2.6.4 -> 2.6.6 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d06d4d776a11..a6bb64bbdf7c 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.6.4"; + version = "2.6.6"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY="; + sha256 = "sha256-hmZeXQneKh3Kca/Goct3KP5q+Ce6lpYWDqFfqbcT644="; }; nativeBuildInputs = [ From bda4edd5be336924b8fe29fa662cd3215cb21d41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Feb 2023 00:48:02 +0000 Subject: [PATCH 014/198] python310Packages.trimesh: 3.19.3 -> 3.20.0 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d09b5e7824f9..a0d41a3e839b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.19.3"; + version = "3.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-03C6BPjVmsSTsJSIUnhyxonSqvTEc3ZkBw8xQeAIwWw="; + sha256 = "sha256-JZl3I1X0bdQ2alz2zozPo6AyIvCLHDlklNRb9clYGNE="; }; propagatedBuildInputs = [ numpy ]; From f66b21731df425ab1d8b42f632b53bf0e370f19f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Feb 2023 05:43:39 +0000 Subject: [PATCH 015/198] python310Packages.datashader: 0.14.3 -> 0.14.4 --- pkgs/development/python-modules/datashader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index f526438afafc..d9c5b1b4464d 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.3"; + version = "0.14.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zHbo03Ll40H8okBIaqrWSJby4aQAg7ukETNHerUPX28="; + hash = "sha256-AkHmEflRvjJFlycI5adpuxg6+/zu7Dzy7vbYCvd1b70="; }; propagatedBuildInputs = [ From 0faf4834e91ddb66a92ec3ace34f90773f89235a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Feb 2023 06:21:08 +0000 Subject: [PATCH 016/198] python310Packages.radish-bdd: 0.14.2 -> 0.15.0 --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 8e84f1e2fd8b..4aa36b38735d 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; rev = "refs/tags/v${version}"; - hash = "sha256-Xyj9yA4Rif3/BWEBnFubXQxwMM0IkHQ1koFZ+HWYQcI="; + hash = "sha256-SEW10ka0aQAXtW2UNCVJHMVhhZ9JTTj4IbskL87/Dn4="; }; propagatedBuildInputs = [ From c48011ec4672ee7781227eddf866e7618043304c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Feb 2023 08:54:55 +0000 Subject: [PATCH 017/198] jellyfin-mpv-shim: 2.3.1 -> 2.4.2 --- pkgs/applications/video/jellyfin-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index b1bf0dac39ba..c1e0488c0142 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -18,11 +18,11 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.3.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v5enaNcZ0aoyEcOFfkAsOIwEpVZ2oqYGMkLlDepBY7c="; + sha256 = "sha256-hz6uIzlVuocSZRDYLnJ3/OZ4UDNlavJFky4CuyggANI="; }; nativeBuildInputs = [ From d57bfa7e1eb43d4c0c7578c2d66957b5cc9fb2c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 00:21:45 +0000 Subject: [PATCH 018/198] heimer: 3.6.4 -> 3.7.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index c3571e01dbcd..970ddf7660be 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-hKVBPSWIbKXMEmk9C7k+3NBqLwYybN6Jql9qigIx4jE="; + hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A="; }; nativeBuildInputs = [ From 968983558f682e302e93fb1f7392f3db0b4ac95c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 01:44:39 +0000 Subject: [PATCH 019/198] python310Packages.azure-mgmt-cognitiveservices: 13.3.0 -> 13.4.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index a2d260339aca..b72ffdd4ea50 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.3.0"; + version = "13.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; + hash = "sha256-GQXDIWOiKGqZqrzpNfvDR8hTU4KnpjZQKrLivcD0tsA="; }; propagatedBuildInputs = [ From 6a9fdab47e59a759b2c07d897572964cef201c2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 04:59:25 +0000 Subject: [PATCH 020/198] python310Packages.iminuit: 2.19.0 -> 2.20.0 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 97c224a39ac8..97dec9cf66f3 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.19.0"; + version = "2.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9NHLrM8RXNxIZpaPZJ8qN3lKXA3gGN6BVqp0VWNQpUw="; + hash = "sha256-pz/m4C814xgPwBvFwXlO32Yv8XJcO8Kk9DNWd5nadQQ="; }; nativeBuildInputs = [ From 1c26aaab3a2f674f5bdb47fcb249d06e36321ef9 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 15 Feb 2023 15:13:42 +0100 Subject: [PATCH 021/198] base16-schemes: init at unstable-2022-12-16 --- pkgs/data/themes/base16-schemes/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/data/themes/base16-schemes/default.nix diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/data/themes/base16-schemes/default.nix new file mode 100644 index 000000000000..b4e3b1c87d6f --- /dev/null +++ b/pkgs/data/themes/base16-schemes/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation (finalAttrs: { + pname = "base16-schemes"; + version = "unstable-2022-12-16"; + + src = fetchFromGitHub { + owner = "tinted-theming"; + repo = "base16-schemes"; + rev = "cf6bc892a24af19e11383adedc6ce7901f133ea7"; + sha256 = "sha256-U9pfie3qABp5sTr3M9ga/jX8C807FeiXlmEZnC4ZM58="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes/ + install *.yaml $out/share/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "All the color schemes for use in base16 packages"; + homepage = finalAttrs.src.meta.homepage; + maintainers = [ maintainers.DamienCassou ]; + license = licenses.mit; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8670703eaa05..c82048ffd0b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26978,6 +26978,8 @@ with pkgs; barlow = callPackage ../data/fonts/barlow { }; + base16-schemes = callPackage ../data/themes/base16-schemes { }; + bgnet = callPackage ../data/documentation/bgnet { }; bibata-cursors = callPackage ../data/icons/bibata-cursors { attrs = python3Packages.attrs; }; From 388f6fb60d8f330e45601ab51491eaa6416e49f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 14:45:09 +0000 Subject: [PATCH 022/198] python310Packages.azure-mgmt-reservations: 2.1.0 -> 2.2.0 --- .../python-modules/azure-mgmt-reservations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index fc4d923f4ca6..e100b35ee643 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-CtTOw6cC9fkL+2XgfG/r/LXpzhQoYXLjrwlI6Q5XpP4="; + hash = "sha256-P6GLB5+2p9sS9XSwSykQXHXw5YrJNNSgs5d7sy5jHTk="; }; propagatedBuildInputs = [ From acde7b8e9f137a8a0274853e826228ecceeb343b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 17:39:01 +0000 Subject: [PATCH 023/198] sasutils: 0.3.13 -> 0.4.0 --- pkgs/os-specific/linux/sasutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix index 743a3ed95540..d30e7f608c77 100644 --- a/pkgs/os-specific/linux/sasutils/default.nix +++ b/pkgs/os-specific/linux/sasutils/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "sasutils"; - version = "0.3.13"; + version = "0.4.0"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; + sha256 = "sha256-9JRw+UoxU0I5RHuimzYrM/3j8UWHuicVpoOdRRrj2Wc="; }; nativeBuildInputs = [ installShellFiles ]; From 4e59c7b2b6e0f0d5fde71449619a7e911c6595a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 04:10:05 +0000 Subject: [PATCH 024/198] python310Packages.ipympl: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/ipympl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index b15bb53e2c29..c70fe92b5dfc 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.9.2"; + version = "0.9.3"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "sha256-ZVYE8L9tJkz1mXZpUKWybiktEHzCPhl1A2R+dUF5gcw="; + sha256 = "sha256-0RPNVYkbr+myfvmbbdERqHvra7KuVQxAQpInIQO+gBM="; }; From e20d1c56cf25bd041b2b3ade4dca26e7f58cdbfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 04:52:37 +0000 Subject: [PATCH 025/198] python310Packages.mcstatus: 10.0.1 -> 10.0.2 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 8cd113972a24..0985ec581f15 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "10.0.1"; + version = "10.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rwEZhN/CbIw5lZ1AGorsagr4RlvCMlCK/M0XzQBCvh8="; + hash = "sha256-8RdJarRoBOkHZfFAKnDgqu8dANQLwKAoY2g8SwbuDeE="; }; nativeBuildInputs = [ From 986a6c6e16cf304bbc3e7873207da02607f65332 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 19 Feb 2023 10:55:14 +0100 Subject: [PATCH 026/198] =?UTF-8?q?ocamlPackages.paf:=200.3.0=20=E2=86=92?= =?UTF-8?q?=200.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/paf/default.nix | 4 ++-- pkgs/development/ocaml-modules/paf/le.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index e75efeb2ade7..974c981f57c6 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -25,11 +25,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "sha256-+RkrmWJJREHg8BBdNe92vYhd2/Frvs7l5qOr9jBwymU="; + hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix index 28345a6cdc56..429cd0a4d8d7 100644 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ b/pkgs/development/ocaml-modules/paf/le.nix @@ -1,6 +1,7 @@ { lib , buildDunePackage , paf +, dns-client , duration , emile , httpaf @@ -23,6 +24,7 @@ buildDunePackage { propagatedBuildInputs = [ paf + dns-client duration emile httpaf From be4d5cb0edd434d9522b9acd57f6118e6f762c58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 03:00:44 +0000 Subject: [PATCH 027/198] python310Packages.dvc-render: 0.0.17 -> 0.2.0 --- pkgs/development/python-modules/dvc-render/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 2ccc61cf97ca..73494ae5a374 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.17"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GDfrkcKP/EZZ/ONZ2Afoxj4Q8sp8mRmtZf93kXcNQcg="; + hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 7be7a41d47196da7b72db0b00acdcf2d3a433b3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 08:01:35 +0000 Subject: [PATCH 028/198] python310Packages.pytest-check: 1.3.0 -> 2.1.4 --- pkgs/development/python-modules/pytest-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 9e85ceb51ce0..dbbf42c9b6a0 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.3.0"; + version = "2.1.4"; format = "flit"; src = fetchPypi { inherit pname version; - hash = "sha256-o4eWjWJSVzjNnzalKAEzFtfZFc8Mz1vhRqOOf/+gu6k="; + hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; buildInputs = [ From 25f5fe3200056478564968d49c810d6df59275e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 08:54:24 +0000 Subject: [PATCH 029/198] iosevka-bin: 19.0.0 -> 19.0.1 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 5baa9374a544..c8f9a44c2e51 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "19.0.0"; + version = "19.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 7c5525c85d00..2193c0832263 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0m8z67daj1gwb3yiw8qw3n1nxp96xb11fvb5183bh02r7ncym0da"; - iosevka-aile = "02jhyzk3bpsjng3b1jfffwvr2inhhjsm4jdahzj05j381fp717c4"; - iosevka-curly = "1si2kzv7qhlpyaaa954vnjmfk1c5rjxjimvckinpkjz30cnvg1bl"; - iosevka-curly-slab = "1ngk3r6kdqngksga3s3m615jkqrxdcplj8srvlb6642vcc38w6vh"; - iosevka-etoile = "1yg38x8dk5nyyjyy71v5j4x2x701hmp8gjwvphf5scf6vn52lvxz"; - iosevka-slab = "1bw6lyy8lg4vpalnrsrnkrm9dlyl6vm6faigy2y9bfvh7nxrd8qa"; - iosevka-ss01 = "1p02d8mdqx6mbnycs9d2r0qwqsxjrlgbl7skf8y66dsmjn6xxd0y"; - iosevka-ss02 = "0ds8ad38h7h8250hdm89v2imya6jdzgk1h5jgsf983ls1gqjikhc"; - iosevka-ss03 = "1s6rc4qhlfgvr7g8ywmlmsl58hfrqx0w24ivx5zz4jr5zqj70j7l"; - iosevka-ss04 = "1lc8kx0p8m8nm4ql6ylcw9g4iq0j65hv6x48273cclqqcmqdn4qj"; - iosevka-ss05 = "1wx02ysbj0rpr623jp1jy64ywrj8rm3n2fqzq05f4qv996bij11k"; - iosevka-ss06 = "1bf0qnpvbq94d42gvbzikfkk20d788cicsyk8kz1vsf5xbg37kla"; - iosevka-ss07 = "1ybl5gfyz4dnarimamshf002p9k6148wbbrbarpswb85kab502hd"; - iosevka-ss08 = "1llp8iryr5dixdarwls9iw8mmnhzhlr7q8fzq969p64ygk76rkn4"; - iosevka-ss09 = "14b49k0zv49xybdwrbf0p1krrga3jjviwzy0alxrwn0zf7vlbnbi"; - iosevka-ss10 = "1xs1dkq62pml17dii2lhsianhzr22059i17sw2b334wbszc00j7y"; - iosevka-ss11 = "0mrjzmk74vlq69ih4gm2iza4qdzyznn42bk3jwlvpd67z5vq36ag"; - iosevka-ss12 = "0z16a8wrydi0ch9zj0lcz6cxbvawkr0ck03bzdbb81waggk4fxin"; - iosevka-ss13 = "1rv8n3vbhwqv7bks6v86v4w13fr4a015xpvprzfz76xp98hb9dmc"; - iosevka-ss14 = "0m7kpvy8bknmrfsql9b24w7n15hybnkisjxzzmrxkf8a60jrydni"; - iosevka-ss15 = "006jkgww0hdb0c1wgby0y5535xapjpk1w8vm51d3yyrp04pwr1r1"; - iosevka-ss16 = "1mmc7cyyk64lcavb2gib64b64zcr7qcn0m3cmlwnr1zgm6nb3w64"; - iosevka-ss17 = "0wanv1h8qg5jyx7w380h7jkbc22slg9566pzw7dv7dg1nw0h2v3k"; - iosevka-ss18 = "1y1daxghw3jbfn785935906j76l0230yixdmwlrzyra2svyaql3w"; - sgr-iosevka = "182nzxxrxfz8xc3w8g9bsr0can71671w4xplyvyi7b1v9f62g9f5"; - sgr-iosevka-aile = "1arjiwx5qf8j6pzb8mpd1g46z0kn80341wvcmsnx42d97b2m64jx"; - sgr-iosevka-curly = "1lyh0rh2pswbaxsqyxicyknhla4gm2h0jb2rg0wx9vib9h53lazn"; - sgr-iosevka-curly-slab = "0h2j7dwcyd5v1acpwjsz9li5g4r1ssx715x5pj4gdvskq4calff4"; - sgr-iosevka-etoile = "15ag0w6sv24rc91mxh4c89gq6jwnq37bxml6a41rvn54fy0h1jnd"; - sgr-iosevka-fixed = "0935zbk5x0mk06al11nig74b2rv1x8zc3waxs8hvbri0ryzykzk4"; - sgr-iosevka-fixed-curly = "1i8cqfwcdsaxdlh87kaya8bp33fwlyz984r757122qnqbywcfm30"; - sgr-iosevka-fixed-curly-slab = "0ba77jxn8n5dssjpwj4iyvwxw3mxqizrvsz5jyv9a4f3gfvwi18k"; - sgr-iosevka-fixed-slab = "0qfhc7pg30ashpx504lln4h2w36icrbgij7fga07z2a715qxmfq9"; - sgr-iosevka-fixed-ss01 = "1597hn4vzh0r8j22k7866blj3kw2bhp70z7msfr2hbszpscwxwqg"; - sgr-iosevka-fixed-ss02 = "1ygrsvamgp6f26zg5qysk6dn4fa1im02dzsrlpgpv3sl4gh0cv44"; - sgr-iosevka-fixed-ss03 = "0936ggnzaavqn4d7fsmmf54bwp0v31sz0n1w15ky7c5bsqp9h8ja"; - sgr-iosevka-fixed-ss04 = "1xjslygh3f5nv0k8fiby0cgg22wr0a9jh79fbzallx3zh4d60a2a"; - sgr-iosevka-fixed-ss05 = "0vnm398zdvkzymhw41gljpf9jq52wq3vawiyw5xsdr75d4n63fpb"; - sgr-iosevka-fixed-ss06 = "1pnk8ijb193h85sk702ar0m0wk03xz1xcnvx8iq4k52q3a3vdd40"; - sgr-iosevka-fixed-ss07 = "0qfcf6r2gzc5zwjfrcq1hjp9c5s13fc34lwwmxkj8224d42543jn"; - sgr-iosevka-fixed-ss08 = "1ram9wm14k2sncfqpak23vss3pyqbwd1ndhm1i4ib7bpq8skd3wi"; - sgr-iosevka-fixed-ss09 = "0r8zy1fwih42clxm2rsjqks5rxgy1qxirz396r25gvwxng2503y4"; - sgr-iosevka-fixed-ss10 = "1v44s7n1gwz7mcybjsi1amv6xc8z47k20miycngjcy1cccrds2da"; - sgr-iosevka-fixed-ss11 = "1fdclqvzq45shpj97awc7636ymgrnfd69iaizwxy49y2krpa7dx9"; - sgr-iosevka-fixed-ss12 = "07f7i0qh9z6hlgy0ak3myxmiy4rbrixcap52lhk8wwapbnf21r7l"; - sgr-iosevka-fixed-ss13 = "07z3hfi5vynwl15dqfsldwjj5i9fldmm6i1nypm28cxbya3izj60"; - sgr-iosevka-fixed-ss14 = "1r001yna7ydf24bkgygld2kh47pvsz1yr9s57ssvdql37q24wzf1"; - sgr-iosevka-fixed-ss15 = "1757lzbp9payykcdywdbfilhgm1yij8gsnazc7bywpc4sv806vhz"; - sgr-iosevka-fixed-ss16 = "18mr7wvz5q60kgz0h2k05ahd0krz3ng7wgg1amd3292cji61vxvw"; - sgr-iosevka-fixed-ss17 = "1bykqwspssv1vbx2nns8dfckijqmd633g57glmlhjmxlavv5gxnw"; - sgr-iosevka-fixed-ss18 = "034w2yv2ihybkz03zalcsixrmjs7as62v8jhk8xkyckqc3bk0kc7"; - sgr-iosevka-slab = "04b1w9ij6dgy5gyvi7d47g9xadpb230mlgbdrk36fyhvfyw048y1"; - sgr-iosevka-ss01 = "077d4dan7f41ydi64xv0z0784j5vcj98vmqagmy1c1xyr0p68dac"; - sgr-iosevka-ss02 = "1hmy2cwnsb3f60yp66lznas78432518xkj2jmpqy8ad05d2zmmc8"; - sgr-iosevka-ss03 = "1bs1hb6magmbc2zh4fzx7h6j6bdllbvv85fv5krs3b888w3fzjw1"; - sgr-iosevka-ss04 = "1c3wb8nz0xz57crwn151b5sgzm320jkirsajyjf0srdaid1gkjkx"; - sgr-iosevka-ss05 = "1dx33y8rk3nzgdfikz262javq4v3n76hvv5b7rx7kxlkxycpy8ya"; - sgr-iosevka-ss06 = "1s54xx4w3zvbz2w7f5sl5vlqazwsm033jsq8ljrdh4c2l88mpcq3"; - sgr-iosevka-ss07 = "03zfq3jib2df6dhj1pbmw8hq57i0fx98gkawxzk13sfgrzz1zv47"; - sgr-iosevka-ss08 = "09k220gha919lv18bs6y2zlcjqa5j7jsq8mfqx8xddcwq1v9v094"; - sgr-iosevka-ss09 = "0plvxhqwkr52sich4kwzqs3xq5s5x61hq7n423ar2zaskx007sjv"; - sgr-iosevka-ss10 = "0c42h417sir120cp6fbnbhv3s1ys8pxky56v6f44h50w7p6qhlx1"; - sgr-iosevka-ss11 = "03sp7z0s5sb9bnhxb9liainpiqmq1r0lpmigscl6wr1rpaxq2l7i"; - sgr-iosevka-ss12 = "0y2xs0qv3b1k4s4my9c69j94ql2kwmqmm3f626vjj8rar8r0wab0"; - sgr-iosevka-ss13 = "1pyv3i1972n5gxr16fl68gydjsxndh7kbba3d15bmkankahgll6c"; - sgr-iosevka-ss14 = "1c7y8h8jv937wnlxkgdswb0ixa5v747z598pd0yhvwid3ksxb1px"; - sgr-iosevka-ss15 = "08wzzkr0l0xz4l7qk9kbhvybr4favl0qz0cjr7raw0hibqkw17sp"; - sgr-iosevka-ss16 = "0q63x71mq19gqqiaqbqsp0lvf3knhckx5d17caq6ipv5gs3xxmzr"; - sgr-iosevka-ss17 = "04054qbvyfvp1aqs3likyh85kqyckkg2ac83s65lvkj3f46r50sg"; - sgr-iosevka-ss18 = "1ckrfx3f4mncm1hbc2bcsbk97kkzsi524wfgvhz10jw1yk5yyd60"; - sgr-iosevka-term = "1ygfsc86fihkxpwm2q3j2y3ibpb7lkrjwrld7dg9ymb83hah29xm"; - sgr-iosevka-term-curly = "1qz8x2z23m5yvdpf0055a7xb5z77dabwbf3hkmh4r77rp1h6idv4"; - sgr-iosevka-term-curly-slab = "011n7qpcx2abvp5i9z6picy5bcjvvfx7pjqy8m7sf02fdm14s2jl"; - sgr-iosevka-term-slab = "1iwgcqnxbjf25k6bbx3iwcqy2ghwnnxvfinjp5slwr7bhjjjbl9y"; - sgr-iosevka-term-ss01 = "09s813a8ywqpncmq0iqkjjnh1sb5zn267fzp2dz92cmw5929627s"; - sgr-iosevka-term-ss02 = "1yyvnxdwi6caq6b6pgviad5l7b7znx4xkxdg1np23a7imr94vb1c"; - sgr-iosevka-term-ss03 = "1hrdipmf54z2hrl7g8m8z17aq3lp5v66xy24f58qsm4c1pfab3i7"; - sgr-iosevka-term-ss04 = "1h54glwrzblg61y4f1sxm78mci47wjry4h4gdrbpx96snf31ynbb"; - sgr-iosevka-term-ss05 = "1xzzj36817nsw15s3a1f740d89gc4634dnczjjj6vrddli8ilann"; - sgr-iosevka-term-ss06 = "0c07i831bmfz6y7jqaip6il4cvqzc51d0w17s2dnjrnj4x3ndgmx"; - sgr-iosevka-term-ss07 = "0x9wzf0w4pzjmzzbmzj56nkhhz5834chvxqn9519fbq1md4pfl3b"; - sgr-iosevka-term-ss08 = "1gf1l17d8hrf1aq4pq9ai05kan8m86z8s2d7masjkvg1zaw2lb4s"; - sgr-iosevka-term-ss09 = "1nnhciib413ll2h7ps3vyghiayz9iwniwr7byyn9pdimm0j5vq07"; - sgr-iosevka-term-ss10 = "0qvficwhpya5sy5myxsjjfmrn9z2d9lpzyi88l8dhz3dfvyr1yzs"; - sgr-iosevka-term-ss11 = "0ml6swvyddhz2nvq14skfh1d9d98c3d6ir0qgf97pc0qxyqbcfp2"; - sgr-iosevka-term-ss12 = "01nxs1m2iif6lswx22h58i45zxab0nbqpf0rzlp6v3wnb8ylpbi5"; - sgr-iosevka-term-ss13 = "0zadj9fakpqmibnxz883hwbcgqfssjvsi6kcvzik5cnamlk2jz8c"; - sgr-iosevka-term-ss14 = "1dwfm8lcbgf8rfw11i2alrv98f9332cqyk9zvzfrjrdp9camr7j0"; - sgr-iosevka-term-ss15 = "0z7ad7vy2faq33kpbl1x2w6i3s4af8v8fzj05rdyadws35ra3idd"; - sgr-iosevka-term-ss16 = "1fzzkmk7ppcbmg7s50nknc7nwavfpqsja12af8qidzba9z535w2g"; - sgr-iosevka-term-ss17 = "1rcpfgf5blg3nbf6prw9h2ylc2ji8vl6cxqlck482kncz8ph9swk"; - sgr-iosevka-term-ss18 = "1nksii5xyi97lsrf1hxl06m0pdlk8rnsbg1s81amkzz8fxlyhzlc"; + iosevka = "0h763gicj32dcwwcq976w81qyw5602vgybmicz0z6ryggm3r03bm"; + iosevka-aile = "13ihigp432jvlwgh3bb4nfv6yfav2dc0rc70l17dcirp746mw7ak"; + iosevka-curly = "1wx46yls9h179mlxcdhjbxl3s9w0pgrkr48mp97yg8dhpnpfckiv"; + iosevka-curly-slab = "0knqx70b1hhrvmwq72b199ql3gcby3cal7qhwvzfd9p238pla2lv"; + iosevka-etoile = "0lmx2wq0kvh0agfznqlmh2wj4hyc2cysbf4f60jiys78i81q5r8b"; + iosevka-slab = "08x6q0al6w73kbjwpkp8zbd7sgsbwdy8pg2i2n27iid4p10hhrd9"; + iosevka-ss01 = "1vqznn97s981mfx943m7bdvnh3h7v5syp8xq39jjb884c67ar5rg"; + iosevka-ss02 = "0vp85rwxgv2z2v2zxgr7fbqjxmp1zyg2bp1mdxxli6pamfrjb4yq"; + iosevka-ss03 = "131m574ngna9zyiqjgvpr64d6n7lbxnf045vs9i01agiqh7acp7p"; + iosevka-ss04 = "04i48dgzzpjgwca691ccd914mrw2xnhak2pwgaanac5ag90w9zv0"; + iosevka-ss05 = "1db7yn0x4vyvd2v06rmll48a842zwwigwf9jhs3m0lskiya5glaz"; + iosevka-ss06 = "1ymad9kpl0prbj220rnw5gchicb4hi731cgjn3lgjmw737kpg183"; + iosevka-ss07 = "1ljxbdswglw60z54px6fvk185l2h0zabgn96lgncb5wqhnn4zmd5"; + iosevka-ss08 = "10wj07g4yss3d1d81qrm1hy8dkjn5bqym61w4innqpljficqc8da"; + iosevka-ss09 = "0wf57sdyppba1ja5rbjn71fxlf2jh4d6m572jqqnz3fim729cll0"; + iosevka-ss10 = "1apffjqcfs1vaj6gg3svcjfc7n1b370h0bgra489bm1xv23lsxsv"; + iosevka-ss11 = "1zyiias5v4m7i9b2za2apkh8k7lynvyhqaxv5zha599w0di7q1zl"; + iosevka-ss12 = "1mh8gl078f9clkimpizycj2m2bi8jx2ckidrq2p2xdwhji068wjv"; + iosevka-ss13 = "0dhqiwdg9ng78nsr397v4ri3h682wn8yzjpw9ax5yfx7h9r85afm"; + iosevka-ss14 = "03xslqdwm5jn3ld89nvy2lxvxh35wlwijzg0q0pvl16d4a6n6pnh"; + iosevka-ss15 = "03v5miyz49838s5862jj2ssn7sixni91pb88ddzw47dhlwxyf8fy"; + iosevka-ss16 = "1hs5rv8kf7sscmdvmdxszy9y1zk4bd355789gfcgznxmsd4240ig"; + iosevka-ss17 = "0mv7ilvppwbc018fv2a6ghj0v1jd22n8z3al0hbhkn9gr9xixdj2"; + iosevka-ss18 = "0kyl0qqpn7l87cv40vgplqw1i0qncgxq0k8yxzgaz74ski48rf4y"; + sgr-iosevka = "0r19pllpdw3wah81ic0vzqbbrfl45cq401zx175arsxi38hz3lqa"; + sgr-iosevka-aile = "1w2gqj5s3v11n9pzifjjy0z7bdw3qx7pwyajajamqw75zb3jh0rf"; + sgr-iosevka-curly = "1v1q4chckiwzddcnpprsyxvii2kiim69iiim9xqx2wf3qp7sficp"; + sgr-iosevka-curly-slab = "1dbw51i7vqga65l2i9x1vvc098nqdqi396anwzbxpz0q32lv5s0p"; + sgr-iosevka-etoile = "1xx1q1j16fzi8z7xddbm38pm9xj71g4jyjkijqwzzfx7xphr5sk6"; + sgr-iosevka-fixed = "1vbsg6563q4xrr0mqf94ykaz6vdi3ns4c0qaryv8m60pqidvb11h"; + sgr-iosevka-fixed-curly = "14c4k9kbxqrrrmivfjxcmmaicmwflqph2z106s6zr6ifc8qxhk48"; + sgr-iosevka-fixed-curly-slab = "0krlp00b4pwwnfsigjfpi5ixvsllvr6kqj8r7hwlrq6xcqkb5wxd"; + sgr-iosevka-fixed-slab = "0zw26ldz2g1lwzman85wggb4igq8sllsi514cbi42firr16sa91q"; + sgr-iosevka-fixed-ss01 = "09igz4ax75gbqhvckr3l6j8lna81pqnql0bii3v0f41fjqk19w2z"; + sgr-iosevka-fixed-ss02 = "06p278qk1dq3kdq0nqbwspnxvrnhvxqssx8sa2cpcs2rp120a247"; + sgr-iosevka-fixed-ss03 = "1ipvi2sj5prbd11f7ihcgss5yd00aqgymzxqa6njh1j3c4hwacnr"; + sgr-iosevka-fixed-ss04 = "1pwx5r9avv97pcgsdpx5lw7lf19vg5kncn6viwrg659q0bar9bih"; + sgr-iosevka-fixed-ss05 = "0qmak7zdqmycbf3bndbhmkifcxy818w5vsp0pl2qnkklvq2y0v4r"; + sgr-iosevka-fixed-ss06 = "1b163h34h0yxh1jmpimjhjvj97dk2wvzcl7vnbiqwxvandlk6xrn"; + sgr-iosevka-fixed-ss07 = "0i4rc8424vjlqp38cj8h0c168419i0b5dxklsapbwahryzh1d1gp"; + sgr-iosevka-fixed-ss08 = "03kgjhin6cahbxgclckq8w05ax0nz4y392hwsxmvcz21p0cyglan"; + sgr-iosevka-fixed-ss09 = "1xbr1y8izvl36s7k0wbh1a9h5dlgn3dlpyjz3mic4a60xbf7l97d"; + sgr-iosevka-fixed-ss10 = "1kpi03gf30sfryvmi5syig7x0bcz0k2hpms0afrhaz0gprnnv2ap"; + sgr-iosevka-fixed-ss11 = "1v3yybp1aslp811ssjiglxknnnk7p1hymaa1lxdc5hn2hawxmzzn"; + sgr-iosevka-fixed-ss12 = "12yqrv9lvzwzps3zvhhyzdkf01j8h1abhgwnq1abma5h8mlydwkl"; + sgr-iosevka-fixed-ss13 = "08v2zjil62i01r3nqnvpbq51jsx3fxrcqzd1s625hbcywy4x6dvb"; + sgr-iosevka-fixed-ss14 = "1j97971kczdlkvwhcxj55yhqq5q4n1pk5k04pqffh2pl8zdzlj4h"; + sgr-iosevka-fixed-ss15 = "10l56ypqjnnxw33vgd8ajlwiyrvcglx0yh8faxj18if77pfsk82l"; + sgr-iosevka-fixed-ss16 = "0zfjld1s45ipwrxm1sv7kw2vs3f9lbs52zsgm31k8im6zr88rp0i"; + sgr-iosevka-fixed-ss17 = "0b0849jmbq8ync56bn6x7gld6sciyb72ffw95xjlsnfbx2gqyp8h"; + sgr-iosevka-fixed-ss18 = "0yyzc95b65427knjwas5yf4qsd831xz1fbwnvd0c6ngj9dc5xns0"; + sgr-iosevka-slab = "156n7pc9va263c4rg73cv8bizimkv6sabpk7784r423vahwv1s3v"; + sgr-iosevka-ss01 = "0bj0l93hgia8js7ikalm4ij3aa9yii1psnbymi9m5k3qxx8z4i2a"; + sgr-iosevka-ss02 = "0nrvx3grbf0j72gm749j3bpv92qd0g2riywflwa2nxdi9zgprwvh"; + sgr-iosevka-ss03 = "0a9k02r1fwb72dkvihm94s5fhgblz3lkjfwsywr81i5if3v7xnap"; + sgr-iosevka-ss04 = "04yd8zwibjqwc6ml52wwbg52aya2cxm2qk6czjb0rryvb7rx7bjy"; + sgr-iosevka-ss05 = "1syv7vigqzr42535fav2m945z4011xsnhm4sayxqkr4nx1vfx16i"; + sgr-iosevka-ss06 = "1qj2jf9550m37ssp4djmgqd5gk76kz15vxjaiyf2wmvwbl41iwl9"; + sgr-iosevka-ss07 = "1cx2lgqjy29wgb4a77j0ipy0ya3v8b6ipsdrdiqzpbl4j4bn0hbr"; + sgr-iosevka-ss08 = "005vzpcqwbgj4m8c8rd7qvjgjnzwh7napxxp9np5abwv4w6alnav"; + sgr-iosevka-ss09 = "0akhfl78fm8hxdhl4rd6d7bk7gin3hnk2y5cigxki403k415rwqc"; + sgr-iosevka-ss10 = "1aqw31vm4l5840nzg9dghkh33l8grsi7632qh9pm6rcj1x2vsqg4"; + sgr-iosevka-ss11 = "0gvc5rhb4291zy2zdp04ksqs65il3bwgdb4jkc8xq4v62h34i7cw"; + sgr-iosevka-ss12 = "0kra3lgzfbf2cf5p48djay22mwzgz604x9hxkmzq0h4r5rf41lfw"; + sgr-iosevka-ss13 = "1az0ficcg8i1fy37s8svrqi8fcqjz0rzqcprs5rz8m4qrhym0m9b"; + sgr-iosevka-ss14 = "1xg9is9l0dhzqaxq9dpkvdi4rsfkw5nr5jzccjvpvmw3d16kzjm2"; + sgr-iosevka-ss15 = "08r22a314aaqvsjca80k87kyi5nxwn0r63yvar6wn03sgay9hvlz"; + sgr-iosevka-ss16 = "1nqsf9y91llvsc5z1xhwlcnw499fl4n4zvmmsrp3l1gdcg7jcvyl"; + sgr-iosevka-ss17 = "1k5n0i2pffm403ra071ydyzvp5kiqj6q96yfwasqj2p39gjccp3j"; + sgr-iosevka-ss18 = "0kqdggh51x3djmmag485a0mygxckly3vxnzfi659fxfb8p6n0r1n"; + sgr-iosevka-term = "1k836142pkpwn3wnjxv329rbcycm66p24a7a0grnim9i8nsdq64g"; + sgr-iosevka-term-curly = "1sjz4xdvdxxd1d82mgrpafi081d13pvg2csl1g8hgv38x6n2s7j2"; + sgr-iosevka-term-curly-slab = "1vb7ccphwwl1rcb4xarigyj7jqfaglrxxa5p39vc0y3qa7rmjml6"; + sgr-iosevka-term-slab = "14l465qi0ap8qjyzydwda7zzw4xp5gvj6234hqr7p5g7wp8fv1nn"; + sgr-iosevka-term-ss01 = "0b0m1aa7mq0n8yv3m6bchjh50ixl32z1247vkfa7gi53qhprr4zn"; + sgr-iosevka-term-ss02 = "08cdlhgi6sidm62yw6v2n89bmwrgqx1rdwwx72lxhm1qmgzha7yz"; + sgr-iosevka-term-ss03 = "076vpwn8yzgx8r49fpcmbz2djqpr4wa4m6mfcfr5n733pczfnfj4"; + sgr-iosevka-term-ss04 = "13hyzzwhcsk7hsx8yn84zh2z1d6kzx7p7c820cfbgz2h6d6sag8j"; + sgr-iosevka-term-ss05 = "1j3wbf35h1f7qiypbw55fpq38qmp9z4wkvbzs4rhavhjihiw9jfs"; + sgr-iosevka-term-ss06 = "1cdphl4m1khjsi4a740jn7qcl2f7qqsbsngvpyvym1h6jxq8nm34"; + sgr-iosevka-term-ss07 = "1in8zdy791c9ghifgy0wrvsmkw6368h5kzgnqriy6rrabrrib8sq"; + sgr-iosevka-term-ss08 = "1ddxyz4s5rq5l9d1f1cazgcbgzbjzga1szm50l21vl5q11k8080i"; + sgr-iosevka-term-ss09 = "03rb552pqrzkki1xiqy4c06cbj7igdgi0sh8x6myycfikn8xjy32"; + sgr-iosevka-term-ss10 = "1cs03craw089c19wk1ia82i1461fyhxlrknk0bajqd5g1snl60by"; + sgr-iosevka-term-ss11 = "1l81kf1aq7i2lxas98i4xwzy71kjpx84l7gciwc18h41f3x2cs59"; + sgr-iosevka-term-ss12 = "1svp9v04m4v1njg89qjwxvarlvnxpfibxq40izig2gzimq534iyj"; + sgr-iosevka-term-ss13 = "0s9l2h3q6hazi9wrgf9xl9l9g38bb60k99dy219vzyfkl3y7vin4"; + sgr-iosevka-term-ss14 = "1ffmyh2sfnwrfn66x1wd8r00fnmm6v7mvzs3shigz971adgk61si"; + sgr-iosevka-term-ss15 = "12xygrna1g7jaz9hzkl0bnzxaky3gjmvbgy67fi65qk0fwhjb2yf"; + sgr-iosevka-term-ss16 = "13bnl8kg2dj7yr96ngm1y8hm5w56s4mgqpq1gi11667p95wil2sy"; + sgr-iosevka-term-ss17 = "07nh459pmfdcx6pcpzixr8d472zjqkp7122dxp6ifh0kmxnzys15"; + sgr-iosevka-term-ss18 = "0f4fg4sbvh35sf41z5lhg0af4rkm03vrgnkral5kdvvpabxznwwq"; } From f2445f305d1f889655388897ef7f60bd9c8a2b97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 Feb 2023 12:03:00 +0100 Subject: [PATCH 030/198] python310Packages.mcstatus: add changelog to meta --- pkgs/development/python-modules/mcstatus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 0985ec581f15..bbd364267549 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for checking the status of Minecraft servers"; homepage = "https://github.com/py-mine/mcstatus"; + changelog = "https://github.com/py-mine/mcstatus/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From e12c28553181183686812f0c58e7464807e1008b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 13:58:25 +0000 Subject: [PATCH 031/198] prospector: 1.8.4 -> 1.9.0 --- pkgs/development/tools/prospector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index e53760f54afa..598b2570600e 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -9,14 +9,14 @@ in python3.pkgs.buildPythonApplication rec { pname = "prospector"; - version = "1.8.4"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g7tyn6pj5I/+b28wIitqDapR5ffk1xDEAtcYs2TpIUk="; + hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM="; }; pythonRelaxDeps = [ From 0fae3035a1910b6bdbc35a5359f589f08ffc566e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 17:32:17 +0000 Subject: [PATCH 032/198] lilypond: 2.24.0 -> 2.24.1 --- pkgs/misc/lilypond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index ac18998130a6..759ecdc68e4d 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.24.0"; + version = "2.24.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-PO2+O5KwJWnjpvLwZ0hYlns9onjXCqPpiu9b3Nf3i2k="; + sha256 = "sha256-1cWQh1ZKXNbwilK6gOfWUJuRxYXkQ4XcwPo5Jl0YFQk="; }; postInstall = '' From 05946318dd3cc95d2e60ffd94097b908f08e140a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 20:40:02 +0000 Subject: [PATCH 033/198] fldigi: 4.1.23 -> 4.1.25 --- pkgs/applications/radio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 549df5d9b5dd..f6c7531ab3c7 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.23"; + version = "4.1.25"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-42bh/J/DQ/V9ORKKZgOmlvhyNR7UjbqPPD0Wi9ofyo0="; + sha256 = "sha256-TsS/OS2mXwqsk+E+9MEoETIHRWks8Hg/qw8WRmAxB2M="; }; nativeBuildInputs = [ pkg-config ]; From b68a2fc6d4b2725513e67ddd10b21cc8b59d60b3 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 20 Feb 2023 22:50:57 +0000 Subject: [PATCH 034/198] iosevka-comfy: pin iosevka Pins the version of iosevka used to build iosevka-comfy to the commit listed on iosevka-comfy's README. Other iosevka versions may have breaking changes or stylistic regressions. --- pkgs/data/fonts/iosevka/comfy.nix | 59 +++++++++++++++++++------------ 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index d544c1624bca..8f4e0464032d 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, fetchFromSourcehut }: +{ lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }: let sets = [ @@ -23,25 +23,40 @@ let sha256 = "1h72my1s9pvxww6yijrvhy7hj9dspnshya60i60p1wlzr6d18v3p"; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; - overrideAttrs = (attrs: { - inherit version; - - meta = with lib; { - inherit (src.meta) homepage; - description = '' - Customised build of the Iosevka typeface, with a consistent - rounded style and overrides for almost all individual glyphs - in both roman (upright) and italic (slanted) variants. - ''; - license = licenses.ofl; - platforms = attrs.meta.platforms; - maintainers = [ maintainers.DamienCassou ]; - }; - }); makeIosevkaFont = set: - (callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs - overrideAttrs; -in builtins.listToAttrs (builtins.map (set: { - name = set; - value = makeIosevkaFont set; -}) sets) + let superBuildNpmPackage = buildNpmPackage; in + (iosevka.override rec { + inherit set privateBuildPlan; + buildNpmPackage = args: superBuildNpmPackage + (args // { + inherit version; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "ad1e247a3fb8d2e2561122e8e57dcdc86a23df77"; + hash = "sha256-sfItIMl9HOUykoZPsNKRGKwgkSWvNGUe3czHE8qFG5w="; + }; + + npmDepsHash = "sha256-HaO2q1f+hX3LjccuVCQaqQZCdUH9r7+jiFOR+3m8Suw="; + + meta = with lib; { + inherit (src.meta) homepage; + description = '' + Customised build of the Iosevka typeface, with a consistent + rounded style and overrides for almost all individual glyphs + in both roman (upright) and italic (slanted) variants. + ''; + license = licenses.ofl; + platforms = iosevka.meta.platforms; + maintainers = [ maintainers.DamienCassou ]; + }; + }); + }); +in +builtins.listToAttrs (builtins.map + (set: { + name = set; + value = makeIosevkaFont set; + }) + sets) From eb3fc41f913087e80026c3401b828e6e4f61a083 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 00:00:27 +0000 Subject: [PATCH 035/198] zef: 0.16.0 -> 0.17.0 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 6602a6484f73..3edbebd7cc05 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo="; + sha256 = "sha256-ekryYPSuBhK+0BvzGxtQVkWDIsfpqbWLc/WXjhPcFYw="; }; nativeBuildInputs = [ makeWrapper ]; From 25f36be02dd41675cf3cb85e4eef08c36778b057 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 00:05:00 +0000 Subject: [PATCH 036/198] kics: 1.6.9 -> 1.6.10 --- pkgs/tools/admin/kics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 1471f039d395..7f5ee05fe3cc 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-So6S/AyuuHpezu4FMDOXDOdJqvEexbgpmLhDnDbbUuM="; + sha256 = "sha256-tff/L/rNkZXl7Ublg4MckDPul/BhdNJVUXGtPcdi3Fk="; }; - vendorHash = "sha256-wFKQv/9GtXMnTP+HkmmHO0RgQ98jm1GZeIGIJiqWx1I="; + vendorHash = "sha256-4Zt+1spcUR04NU7Pl3ImnOnwtj9Rsgz2aLYqaFDLvyU="; subPackages = [ "cmd/console" ]; From 4b4604a07eeab8e5eccf97539b899f3849a7a4e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 00:48:05 +0000 Subject: [PATCH 037/198] jellyfin-ffmpeg: 5.1.2-7 -> 5.1.2-8 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 537ab60fda1c..2637ababbdd7 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-7"; + version = "5.1.2-8"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-OWSixz1QjWthykO55wMAlywe2ihFLugzLH1qg4Qbe3I="; + sha256 = "sha256-0ne9Xj9MnB5WOkPRtPX7W30qG1osHd0tyua+5RMrnQc="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; From 97bf025ccfdd5948048e306e0af2c646a683d0f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 01:03:38 +0000 Subject: [PATCH 038/198] waypoint: 0.10.5 -> 0.11.0 --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index e6f6bc151175..d13e13ca2420 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUzWBFoBRwQynWubBzR9xNIyqRXTsH0R+OCyIDz0a9s="; + sha256 = "sha256-FI6QXQ0n/vvzUJTBbPDh9nMyAdcfTzpX79RxQEbFDUs="; }; - vendorSha256 = "sha256-rmDxO1tfpCUh5TXsSmf3DMIqB0NQHuCyizZmnaoZox0="; + vendorHash = "sha256-t8PzimNW7JWvWU3lZHo+b5K3R6he35HhBQPu1hxK51U="; nativeBuildInputs = [ go-bindata installShellFiles ]; From 946b9d5f549f03c8796a2ad5901b7d510500f5d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 01:31:40 +0000 Subject: [PATCH 039/198] cargo-make: 0.36.4 -> 0.36.5 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index a56cca2ca0b5..bcb23392cdd8 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.4"; + version = "0.36.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-motvwMacwqD6MMWxehCV/Eb+8EN9XthcEr0e5DFlvOg="; + sha256 = "sha256-PQ59WTBRUwLM6/35ocnryp+hR8YKmgh3EkOSZ7OCYWs="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-/hgCYgWx7hDAUTrDT9ndlk7t/bGXTtDS9Eth3OWkbKM="; + cargoHash = "sha256-6M4KUvTKifEUEJLMyVU8F1Ler6IK5TEUNHfUNMkJ09s="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 127d50d4e01dbdfc5bba824ef89a42cb67693f08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 02:18:09 +0000 Subject: [PATCH 040/198] python310Packages.pyspark: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index b436eecbcb12..ca25ce6d7064 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6Z+n3pK+QGiEv9gxwyuTBqOpneRM/Dmi7vtu0HRF1fo="; + hash = "sha256-Df1dtDAMH2zJwW2NvfuC2IG0sXKYTacTRO3hqdSJPag="; }; # pypandoc is broken with pandoc2, so we just lose docs. From 43c7956e6dabdc40bf1fcc01895b1467eed131c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 13:53:23 +0000 Subject: [PATCH 041/198] ablog: 0.10.33 -> 0.10.33.post1 --- pkgs/applications/misc/ablog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index 48541402d4bc..4142814cf021 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.33"; + version = "0.10.33.post1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; + sha256 = "sha256-+vrVQ4sItCXrSCzNXyKk6/6oDBOyfyD7iNWzmcbE/BQ="; }; propagatedBuildInputs = [ From 80df9ff90d35bed552946fbe1d4ff8a6cdc28765 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 18 Nov 2022 16:31:49 +0100 Subject: [PATCH 042/198] nextcloud-notify-push: init at 0.5.0 --- pkgs/servers/nextcloud/notify_push.nix | 41 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/servers/nextcloud/notify_push.nix diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix new file mode 100644 index 000000000000..737e5d7debaa --- /dev/null +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -0,0 +1,41 @@ +{ lib, fetchFromGitHub, fetchpatch, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "notify_push"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "nextcloud"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LkC2mD3klMQRF3z5QuVPcRHzz33VJP+UcN6LxsQXq7Q="; + }; + + cargoHash = "sha256-GZikXM3AvhC2gtwE2wYbGV+aRV+QKothWQG17Vzi2Lc="; + + passthru = { + test_client = rustPlatform.buildRustPackage { + pname = "${pname}-test_client"; + inherit src version; + + cargoPatches = [ + # fix test client not being able to connect + (fetchpatch { + url = "https://github.com/nextcloud/notify_push/commit/03aa38d917bfcba4d07f72b6aedac6a5057cad81.patch"; + hash = "sha256-dcN62tA05HH1RTvG0puonJjKMQn1EouA8iuz82vh2aU="; + }) + ]; + + buildAndTestSubdir = "test_client"; + + cargoHash = "sha256-RALqjI6DlWmfgKvyaH4RiSyqWsIqUyY9f709hOi2ldc="; + }; + }; + + meta = with lib; { + description = "Update notifications for nextcloud clients"; + homepage = "https://github.com/nextcloud/notify_push"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ ajs124 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42895e8977ad..d966dfd8f167 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10128,6 +10128,8 @@ with pkgs; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { }; + ndstool = callPackage ../tools/archivers/ndstool { }; nfs-ganesha = callPackage ../servers/nfs-ganesha { }; From 3b2a768f0fd7ca0f4276350c21fbf32b91c4c506 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 13 Dec 2022 21:59:45 +0100 Subject: [PATCH 043/198] nextcloudPackages.notify_push: init --- pkgs/servers/nextcloud/packages/24.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/25.json | 10 ++++++++++ pkgs/servers/nextcloud/packages/nextcloud-apps.json | 1 + 3 files changed, 21 insertions(+) diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 0b775a81e88a..33b306121e7f 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -129,6 +129,16 @@ "agpl" ] }, + "notify_push": { + "sha256": "1raxkzdcd9mixg30ifv22lzf10j47n79n05yqbf6mjagrgj0rr7f", + "url": "https://github.com/nextcloud/notify_push/releases/download/v0.5.0/notify_push.tar.gz", + "version": "0.5.0", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "sha256": "6117b7b8c5c7133975e4ebf482814cdcd3f94a1b3c76ea1b5eed47bdd1fbfcbb", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.5.8/onlyoffice.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 98ab7ebe3e24..d3c157de44be 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -109,6 +109,16 @@ "agpl" ] }, + "notify_push": { + "sha256": "1raxkzdcd9mixg30ifv22lzf10j47n79n05yqbf6mjagrgj0rr7f", + "url": "https://github.com/nextcloud/notify_push/releases/download/v0.5.0/notify_push.tar.gz", + "version": "0.5.0", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "onlyoffice": { "sha256": "0gy4n86q7b5qmy609ncibp94v1b3z9msc0129572qz2zyxfqxq3i", "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.6.8/onlyoffice.tar.gz", diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index a83757890236..ba55e92332c9 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -12,6 +12,7 @@ , "mail" , "news" , "notes" +, "notify_push" , "onlyoffice" , "polls" , "registration" From 1f0aa74c8f83fe589688844e932688dd540c18a6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 13 Dec 2022 21:08:00 +0100 Subject: [PATCH 044/198] nixos/nextcloud-notify_push: init --- nixos/modules/module-list.nix | 1 + .../web-apps/nextcloud-notify_push.nix | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 nixos/modules/services/web-apps/nextcloud-notify_push.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4a0e52f483c2..e5e5b72c318d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1166,6 +1166,7 @@ ./services/web-apps/moodle.nix ./services/web-apps/netbox.nix ./services/web-apps/nextcloud.nix + ./services/web-apps/nextcloud-notify_push.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix new file mode 100644 index 000000000000..d66750fc460c --- /dev/null +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.nextcloud.notify_push; +in +{ + options.services.nextcloud.notify_push = { + enable = lib.mkEnableOption (lib.mdDoc "Notify push"); + package = lib.mkOption { + type = lib.types.package; + default = pkgs.nextcloud-notify_push; + defaultText = lib.literalMD "pkgs.nextcloud-notify_push"; + description = lib.mdDoc "Which package to use for notify_push"; + }; + socketPath = lib.mkOption { + type = lib.types.str; + default = "/run/nextcloud-notify_push/sock"; + description = lib.mdDoc "Socket path to use for notify_push"; + }; + logLevel = lib.mkOption { + type = lib.types.enum [ "error" "warn" "info" "debug" "trace" ]; + default = "error"; + description = lib.mdDoc "Log level"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.nextcloud-notify_push = let + nextcloudUrl = "http${lib.optionalString config.services.nextcloud.https "s"}://${config.services.nextcloud.hostName}"; + in { + description = "Push daemon for Nextcloud clients"; + documentation = [ "https://github.com/nextcloud/notify_push" ]; + after = [ "phpfpm-nextcloud.service" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + NEXTCLOUD_URL = nextcloudUrl; + SOCKET_PATH = cfg.socketPath; + LOG = cfg.logLevel; + }; + postStart = '' + ${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push + ''; + serviceConfig = { + ExecStart = "${cfg.package}/bin/notify_push --glob-config ${config.services.nextcloud.datadir}/config/config.php"; + User = "nextcloud"; + Group = "nextcloud"; + RuntimeDirectory = [ "nextcloud-notify_push" ]; + }; + }; + + services.nginx.virtualHosts.${config.services.nextcloud.hostName}.locations."^~ /push/" = { + proxyPass = "http://unix:${cfg.socketPath}"; + proxyWebsockets = true; + recommendedProxySettings = true; + }; + }; +} From 8a5596adedaf930c696577c4326762abc84e5fa8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 15 Dec 2022 22:22:00 +0100 Subject: [PATCH 045/198] nixosTests.nextcloud.with-postgresql-and-redis*: also test notify_push --- nixos/tests/nextcloud/with-postgresql-and-redis.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 1ef848cfb121..d28c1bdfd6e1 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -13,7 +13,7 @@ in { # The only thing the client needs to do is download a file. client = { ... }: {}; - nextcloud = { config, pkgs, ... }: { + nextcloud = { config, pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; services.nextcloud = { @@ -34,6 +34,15 @@ in { adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} ''); + trustedProxies = [ "::1" ]; + }; + notify_push = { + enable = true; + logLevel = "debug"; + }; + extraAppsEnable = true; + extraApps = { + inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push; }; }; @@ -94,8 +103,10 @@ in { "${withRcloneEnv} ${copySharedFile}" ) client.wait_for_unit("multi-user.target") + client.execute("${pkgs.nextcloud-notify_push.passthru.test_client}/bin/test_client http://nextcloud ${adminuser} ${adminpass} >&2 &") client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) + nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"") ''; })) args From 671bd1ef7a64714c51d294a83c76200e570d12de Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 2 Jan 2023 18:30:38 +0100 Subject: [PATCH 046/198] nixos/nextcloud-notify_push: add database options --- .../web-apps/nextcloud-notify_push.nix | 45 +++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix index d66750fc460c..e86f21207a73 100644 --- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: let cfg = config.services.nextcloud.notify_push; @@ -6,23 +6,43 @@ in { options.services.nextcloud.notify_push = { enable = lib.mkEnableOption (lib.mdDoc "Notify push"); + package = lib.mkOption { type = lib.types.package; default = pkgs.nextcloud-notify_push; defaultText = lib.literalMD "pkgs.nextcloud-notify_push"; description = lib.mdDoc "Which package to use for notify_push"; }; + socketPath = lib.mkOption { type = lib.types.str; default = "/run/nextcloud-notify_push/sock"; description = lib.mdDoc "Socket path to use for notify_push"; }; + logLevel = lib.mkOption { type = lib.types.enum [ "error" "warn" "info" "debug" "trace" ]; default = "error"; description = lib.mdDoc "Log level"; }; - }; + } // ( + lib.listToAttrs ( + map ( + opt: lib.nameValuePair opt (options.services.nextcloud.config.${opt} // { + default = config.services.nextcloud.config.${opt}; + defaultText = lib.mdDoc "config.services.nextcloud.config.${opt}"; + }) + ) [ + "dbtype" + "dbname" + "dbuser" + "dbpassFile" + "dbhost" + "dbport" + "dbtableprefix" + ] + ) + ); config = lib.mkIf cfg.enable { systemd.services.nextcloud-notify_push = let @@ -35,13 +55,32 @@ in environment = { NEXTCLOUD_URL = nextcloudUrl; SOCKET_PATH = cfg.socketPath; + DATABASE_PREFIX = cfg.dbtableprefix; LOG = cfg.logLevel; }; postStart = '' ${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push ''; + script = let + dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype; + dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser; + dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD"; + isSocket = lib.hasPrefix "/" (toString cfg.dbhost); + dbHost = lib.optionalString (cfg.dbhost != null) (if + isSocket then + if dbType == "postgresql" then "?host=${cfg.dbhost}" else + if dbType == "mysql" then "?socket=${cfg.dbhost}" else throw "unsupported dbtype" + else + "@${cfg.dbhost}"); + dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}"; + dbUrl = "${dbType}://${dbUser}${dbPass}${lib.optionalString (!isSocket) dbHost}${dbName}${lib.optionalString isSocket dbHost}"; + in lib.optionalString (dbPass != "") '' + export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")" + '' + '' + export DATABASE_URL="${dbUrl}" + ${cfg.package}/bin/notify_push --glob-config '${config.services.nextcloud.datadir}/config/config.php' + ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/notify_push --glob-config ${config.services.nextcloud.datadir}/config/config.php"; User = "nextcloud"; Group = "nextcloud"; RuntimeDirectory = [ "nextcloud-notify_push" ]; From 6c24a28ea63a277e8c040bd2c2611067351f1279 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 20 Feb 2023 12:19:05 +0100 Subject: [PATCH 047/198] nixos/nextcloud-notify_push: add some restart config to the service --- nixos/modules/services/web-apps/nextcloud-notify_push.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix index e86f21207a73..ccfea499c188 100644 --- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -84,6 +84,8 @@ in User = "nextcloud"; Group = "nextcloud"; RuntimeDirectory = [ "nextcloud-notify_push" ]; + Restart = "on-failure"; + RestartSec = "5s"; }; }; From bdb0566f8b7816408d2012786c1000ccff00e3a4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 21 Feb 2023 13:26:33 +0100 Subject: [PATCH 048/198] nixos/nextcloud-notify_push: use lib.genAttrs --- .../web-apps/nextcloud-notify_push.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud-notify_push.nix b/nixos/modules/services/web-apps/nextcloud-notify_push.nix index ccfea499c188..e36631b6093c 100644 --- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix +++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix @@ -26,21 +26,19 @@ in description = lib.mdDoc "Log level"; }; } // ( - lib.listToAttrs ( - map ( - opt: lib.nameValuePair opt (options.services.nextcloud.config.${opt} // { - default = config.services.nextcloud.config.${opt}; - defaultText = lib.mdDoc "config.services.nextcloud.config.${opt}"; - }) - ) [ - "dbtype" - "dbname" - "dbuser" - "dbpassFile" - "dbhost" - "dbport" - "dbtableprefix" - ] + lib.genAttrs [ + "dbtype" + "dbname" + "dbuser" + "dbpassFile" + "dbhost" + "dbport" + "dbtableprefix" + ] ( + opt: options.services.nextcloud.config.${opt} // { + default = config.services.nextcloud.config.${opt}; + defaultText = "config.services.nextcloud.config.${opt}"; + } ) ); From 4e62a7d01638218e88e0382c3aab6b3614a102b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Feb 2023 19:21:52 +0000 Subject: [PATCH 049/198] grpc_cli: 1.46.6 -> 1.52.1 --- pkgs/tools/networking/grpc_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index b68ff100b70b..8abb1fcfce57 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.46.6"; + version = "1.52.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-UPenQh6+FBryQiOoeijsXkCZjlMzYljkg2aUtSFJFL4="; + hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; From 1d9a8291340ae36491886927a1c79f6c0c1bd1d7 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 16 Feb 2023 19:33:24 +0100 Subject: [PATCH 050/198] Cardinal: 22.11 -> 22.12 --- pkgs/applications/audio/cardinal/default.nix | 36 ++++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 68eb295c4852..358c1f0e7900 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -2,6 +2,9 @@ stdenv , fetchFromGitHub , fetchurl +, cmake +, dbus +, file , freetype , jansson , lib @@ -11,32 +14,44 @@ , libXext , libXrandr , libarchive +, libjack2 , liblo , libsamplerate -, mesa +, libsndfile +, makeWrapper , pkg-config , python3 , speexdsp +, libglvnd }: stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.11"; + version = "22.12"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; + sha256 = "sha256-fyko5cWjBNNaw8qL9uyyRxW5MFXKmOsBoR5u05AWxWY="; }; prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; + strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + file + pkg-config + makeWrapper + python3 + ]; buildInputs = [ + dbus freetype jansson libGL @@ -44,18 +59,25 @@ stdenv.mkDerivation rec { libXcursor libXext libXrandr - libXrandr libarchive liblo libsamplerate - mesa - python3 + libsndfile speexdsp + libglvnd ]; hardeningDisable = [ "format" ]; makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/Cardinal \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + + # this doesn't work and is mainly just a test tool for the developers anyway. + rm -f $out/bin/CardinalNative + ''; + meta = { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; From 4310eb5b9dee9ab120328f924236b61424bb1bc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 01:00:11 +0100 Subject: [PATCH 051/198] python310Packages.pysnmp-pyasn1: 1.1.2 -> 1.1.3 Diff: https://github.com/pysnmp/pyasn1/compare/v1.1.2...v1.1.3 --- pkgs/development/python-modules/pysnmp-pyasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 5da547e5ebfa..639b14307753 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysnmp-pyasn1"; - version = "1.1.2"; + version = "1.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pyasn1"; rev = "v${version}"; - hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA="; + hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI="; }; nativeBuildInputs = [ From 6581ed578a89a60e306c51a87f967e05e7bcf249 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 01:02:59 +0100 Subject: [PATCH 052/198] python310Packages.pysnmp-pyasn1: add changelog to meta --- pkgs/development/python-modules/pysnmp-pyasn1/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 639b14307753..d962615e7adb 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysnmp"; repo = "pyasn1"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI="; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python ASN.1 encoder and decoder"; homepage = "https://github.com/pysnmp/pyasn1"; + changelog = "https://github.com/pysnmp/pyasn1/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; From 650580885a9f6adbd4986735380e06b14de8ea8c Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 21 Feb 2023 20:01:00 -0500 Subject: [PATCH 053/198] cargo-generate: 0.17.6 -> 0.18.0 Diff: https://github.com/cargo-generate/cargo-generate/compare/v0.17.6...v0.18.0 Changelog: https://github.com/cargo-generate/cargo-generate/blob/v0.18.0/CHANGELOG.md --- .../tools/rust/cargo-generate/default.nix | 12 ++++++------ .../tools/rust/cargo-generate/no-vendor.patch | 11 ----------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/rust/cargo-generate/no-vendor.patch diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index da90015752a0..84d768e5f720 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,19 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.6"; + version = "0.18.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM="; + sha256 = "sha256-OPbDxUNqHGyTMokDayyJjS1GAekGP7LLJDUwQFjyVUM="; }; - # patch Cargo.toml to not vendor libgit2 and openssl - cargoPatches = [ ./no-vendor.patch ]; - - cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU="; + cargoSha256 = "sha256-skgSFVxHa6DBm6qLbk6MUK4jaVdC8GQBGl1HgHRnxX0="; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +30,9 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git ]; + # disable vendored libgit2 and openssl + buildNoDefaultFeatures = true; + preCheck = '' export HOME=$(mktemp -d) USER=nixbld git config --global user.name Nixbld diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch deleted file mode 100644 index c8233cd5dd3d..000000000000 --- a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"] - - [dependencies] - clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false } --git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } -+git2 = { version = "0.16", features = ["ssh", "https"], default-features = false } - console = "0.15" - dialoguer = "0.10" - dirs = "4.0" From fc08dbd086244dd087480c9fe15693b401be971a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 22:16:34 -0800 Subject: [PATCH 054/198] corrosion: 0.3.0 -> 0.3.3 Diff: https://github.com/corrosion-rs/corrosion/compare/v0.3.0...v0.3.3 Changelog: https://github.com/corrosion-rs/corrosion/blob/v0.3.3/RELEASES.md --- pkgs/development/tools/build-managers/corrosion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 886db356cfa1..bee465fbfd88 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo="; + hash = "sha256-dXUjQmKk+UdgYqdMuNh9ALaots1t0xwg6hEWwAbGPJc="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q="; + hash = "sha256-f+n/bjjdKar5aURkPNYKkHUll6lqNa/dlzq3dIFh+tc="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; From 80c641d7df8e4c4731dba3fce8176dcd5ca2ecb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Feb 2023 22:25:03 -0800 Subject: [PATCH 055/198] corrosion: remove old patch --- .../corrosion/cmake-install-full-dir.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch diff --git a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch b/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch deleted file mode 100644 index da5e923e0fa5..000000000000 --- a/pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in -index c042a00..491f53c 100644 ---- a/cmake/CorrosionConfig.cmake.in -+++ b/cmake/CorrosionConfig.cmake.in -@@ -4,11 +4,11 @@ if (Corrosion_FOUND) - return() - endif() - --list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake") -+list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake") - - add_executable(Corrosion::Generator IMPORTED GLOBAL) - set_property( - TARGET Corrosion::Generator -- PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator") -+ PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator") - - include(Corrosion) From 49e3db1c608a8d29c10dd856771c3a36e6e42488 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 06:29:57 +0000 Subject: [PATCH 056/198] fizz: 2023.02.06.00 -> 2023.02.13.00 --- pkgs/development/libraries/fizz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index f00980cdd9be..5733fd2b275d 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.02.06.00"; + version = "2023.02.13.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "v${version}"; - sha256 = "sha256-JwRoIiSumT1jw5/VX/TkxpTJbrmLLke27xH8UHtrs2c="; + sha256 = "sha256-E7gyj+Yt4NINDJ3sYZ78Rq5PJVf/NiAmo+NpuFc3kH8="; }; nativeBuildInputs = [ cmake ]; From 5c7ac3d933d89dfb4a0b156417f0c799532d5005 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 07:47:19 +0000 Subject: [PATCH 057/198] python310Packages.azure-mgmt-datafactory: 2.10.0 -> 3.0.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 3027d54531ac..8104cfd34029 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.10.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-IT1LQfdNpvc1yNX4Z/qMK2sL2MkaOA4krRFWz1SAz3s="; + hash = "sha256-aVfH65fJnsTSr0MR0Fr5yamxIOv2+aST953uCr7QXOk="; }; propagatedBuildInputs = [ From c4b83df38ab4fd47ed5549bfa0b29a4b70e94f38 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 22 Feb 2023 11:53:51 +0100 Subject: [PATCH 058/198] mkShell: set preferLocalBuild by default Before this change, `nix develop` would often result in all the shell's dependencies being copied to a remote builder, only for the remote builder to run a trivial derivation build. This change makes `nix develop` much faster on systems with remote builders configured. --- pkgs/build-support/mkshell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index 39b02a47141a..3517e949f67a 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -53,4 +53,6 @@ stdenv.mkDerivation ({ export; } >> "$out" ''; + + preferLocalBuild = true; } // rest) From 7022603b404ee0abc8e75ac781666af6ca1add87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Feb 2023 13:28:40 +0000 Subject: [PATCH 059/198] davix: 0.8.3 -> 0.8.4 --- pkgs/tools/networking/davix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9087e1864bf5..68a9a8c19ff2 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -26,7 +26,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.8.4"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "sha256-fjC1VB4I0y2/WuA8a8q+rsBjrsEKZkd4eCIie0VBrj4="; + sha256 = "sha256-UZ1W90bobqP9YVvEnlWbUg3wfgUeHKPYwJIGeVjzsrc="; }; preConfigure = '' From 988df29a681f084d7bd76fcb751201ff038b74c4 Mon Sep 17 00:00:00 2001 From: Konstantin vz'One Enchant Date: Wed, 22 Feb 2023 19:26:04 +0300 Subject: [PATCH 060/198] edgedb: 2.0.1 -> 2.3.1 --- pkgs/tools/networking/edgedb/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 80d68c7ccd7d..9043c37b2495 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -4,7 +4,7 @@ , patchelf , fetchFromGitHub , rustPlatform -, makeWrapper +, makeBinaryWrapper , pkg-config , curl , Security @@ -13,22 +13,25 @@ , xz , perl , substituteAll +# for passthru.tests: +, edgedb +, testers }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "2.0.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "v${version}"; - sha256 = "sha256-U+fF0t+dj8wUfCviNu/zcoz3lhMXcQlDgz8B3gB+EJI="; + sha256 = "sha256-iL8tD6cvFVWqsQAk6HBUqdz7MJ3lT2XmExGQvdQdIWs="; }; - cargoSha256 = "sha256-Pm3PBg7sbFwLHaozfsbQbPd4gmcMUHxmGT4AsQRDX0g="; + cargoSha256 = "sha256-dGeRTo6pFwDKd/nTaA3R9DWGiAL0Dm6jEVR1zhF6/BQ="; - nativeBuildInputs = [ makeWrapper pkg-config perl ]; + nativeBuildInputs = [ makeBinaryWrapper pkg-config perl ]; buildInputs = [ curl @@ -46,6 +49,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; + passthru.tests.version = testers.testVersion { + package = edgedb; + command = "edgedb --version"; + }; + meta = with lib; { description = "EdgeDB cli"; homepage = "https://www.edgedb.com/docs/cli/index"; From d120c5307788c4d984ef6705bde80daa5015a084 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 22 Feb 2023 18:08:41 +0100 Subject: [PATCH 061/198] linuxPackages_6_2.nvidia_x11: disable ibt --- nixos/modules/hardware/video/nvidia.nix | 4 +++- pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 2eff322d9601..434931ccae5a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -461,7 +461,9 @@ in # If requested enable modesetting via kernel parameter. boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"; + ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + # proprietary driver is not compiled with support for X86_KERNEL_IBT + ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; services.udev.extraRules = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 74addc6c5010..ea9dbcabd0e9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -127,8 +127,7 @@ let platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2 - broken = broken || (kernel != null && kernel.kernelAtLeast "6.2"); + inherit broken; }; }; From 28187cbbed60b626acb11e0683629bc0353a4d8f Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Wed, 22 Feb 2023 13:06:24 -0800 Subject: [PATCH 062/198] python3Packages.cloudpickle: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 37678b93d195..2acfe17327b6 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; + hash = "sha256-2JaEuN6eNKKkOzRg+8oH0J1uJc6FjfTVpEJAQDthePU="; }; nativeCheckInputs = [ From 8027d195af52900eabaf5b70cfe363a08fdc54cb Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Wed, 22 Feb 2023 13:07:12 -0800 Subject: [PATCH 063/198] python3Packages.apache-beam: 2.44.0 -> 2.45.0 Fix https://github.com/NixOS/nixpkgs/issues/217266 --- .../development/python-modules/apache-beam/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index e204d816dc0d..2fb7d3efcdc2 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.44.0"; + version = "2.45.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-5fnZxv2ZkFlv8vGDIt/6EL41v9P1iKa1tEd1nezq+PU="; + hash = "sha256-e+6Vt+SlOxi16udsdx7WFoDWYupuXhggpoEZPe4tPr0="; }; patches = [ @@ -76,11 +76,15 @@ buildPythonPackage rec { # See https://github.com/NixOS/nixpkgs/issues/193613 "protobuf" - # As of apache-beam v2.44.0, the requirement is httplib2>=0.8,<0.21.0, but + # As of apache-beam v2.45.0, the requirement is httplib2>=0.8,<0.21.0, but # the current (2023-02-08) nixpkgs's httplib2 version is 0.21.0. This can be # removed once beam is upgraded since the current requirement on master is # for httplib2>=0.8,<0.22.0. "httplib2" + + # As of apache-beam v2.45.0, the requirement is pyarrow<10.0.0,>=0.15.1, but + # the current (2023-02-22) nixpkgs's pyarrow version is 11.0.0. + "pyarrow" ]; sourceRoot = "source/sdks/python"; From 83827e077077985343e658c82c8cf322371ae2cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 02:29:52 +0000 Subject: [PATCH 064/198] python310Packages.types-protobuf: 4.21.0.5 -> 4.21.0.7 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 967d08fc0d7a..4455ab8ffcff 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.21.0.5"; + version = "4.21.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gZp8Z+aUduOcPwyYcbu57oIxNkXTF7ba62CslaMJ29M="; + sha256 = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug="; }; propagatedBuildInputs = [ From 21ac7fb438d621e2e0cb7cad65cc6ba92c1d4a4d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Feb 2023 04:20:00 +0000 Subject: [PATCH 065/198] ytarchive: 0.3.2 -> 2023-02-21 --- pkgs/tools/misc/ytarchive/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix index 968a280dae82..cf3652fbec60 100644 --- a/pkgs/tools/misc/ytarchive/default.nix +++ b/pkgs/tools/misc/ytarchive/default.nix @@ -2,24 +2,16 @@ buildGoModule rec { pname = "ytarchive"; - version = "0.3.2"; + version = "unstable-2023-02-21"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "v${version}"; - hash = "sha256-fBYwLGg1h5pn8ZP5vZmzzIEvuXlBJ27p4tv7UVMwOEw="; + rev = "90aaf17b5e86eec52a95752e3c2dba4f54ee1068"; + hash = "sha256-JRjQRbMqtd04/aO6NkInoDqfOrHnDrXj4C4/URiU6yo="; }; - patches = [ - # Increase the Go version required. See https://github.com/Kethsar/ytarchive/pull/127 - (fetchpatch { - url = "https://github.com/Kethsar/ytarchive/commit/2a995ead4448d03c975378a1932ad975da1a6383.patch"; - sha256 = "sha256-Y+y/Sp/xOS9tBT+LQQ9vE+4n/2RH10umFEEEEVXgtuc="; - }) - ]; - - vendorHash = "sha256-8uTDcu8ucPzck+1dDoySGtc3l1+1USxCfUvdS+ncsnU="; + vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY="; nativeBuildInputs = [ makeBinaryWrapper ]; From e6d5de6b53e7af8d0de2b8578e9dbc4f5648203c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Feb 2023 04:20:00 +0000 Subject: [PATCH 066/198] twilio-cli: 5.4.0 -> 5.4.1 https://github.com/twilio/twilio-cli/releases/tag/5.4.1 --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 97178734deb7..3187fb28eef0 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.4.0"; + version = "5.4.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-DSYZUYC4WJiVOtxBWWGV3x/4wxpiJRQsfQYjgfNIj/4="; + sha256 = "sha256-UEfnwYMiYE+DAENwf3cfSE20ctAxVjbko428rDNIMzI="; }; buildInputs = [ nodejs ]; From bee6421d79b12e3e423fb2a89ba44e8d13d45a40 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Feb 2023 04:20:00 +0000 Subject: [PATCH 067/198] fizz: 2023.02.13.00 -> 2023.02.20.00 --- pkgs/development/libraries/fizz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 5733fd2b275d..182f4fba56e3 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.02.13.00"; + version = "2023.02.20.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "v${version}"; - sha256 = "sha256-E7gyj+Yt4NINDJ3sYZ78Rq5PJVf/NiAmo+NpuFc3kH8="; + hash = "sha256-qgp0E/xCbvMIndwUkqsvZuFY7333NviOkljqiMOhKtw="; }; nativeBuildInputs = [ cmake ]; From 6a58de545bd863a9744972b574f236dfba4c4039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 05:39:15 +0000 Subject: [PATCH 068/198] glbinding: 3.1.0 -> 3.3.0 --- pkgs/development/libraries/glbinding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index bdb72b5d542a..6cbc5e99b1c3 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "glbinding"; - version = "3.1.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "cginternals"; repo = pname; rev = "v${version}"; - sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08"; + sha256 = "sha256-xmEXZ1ssXzrElqd6D1zooFxLEyspsF4Dau3d9+1/2yw="; }; nativeBuildInputs = [ cmake ]; From 621c9b038cddf00cbc581ecd205614e0c8b14127 Mon Sep 17 00:00:00 2001 From: Korny666 Date: Thu, 23 Feb 2023 07:56:27 +0100 Subject: [PATCH 069/198] smartgithg: 22.1.3 -> 22.1.4 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a9aabd7a87da..32dc11d4527d 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.3"; + version = "22.1.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; + sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 1320d26ed626f62421cb2284cd26c538b713ae5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 09:14:11 +0000 Subject: [PATCH 070/198] wiki-tui: 0.6.3 -> 0.6.4 --- pkgs/misc/wiki-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 332577489faf..bb5fef313fa3 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - hash = "sha256-vBfD5SQnVx/UqRoyGJc4PINW/wKuHjpiUEz3WiRCR9A="; + hash = "sha256-pjNXDU1YgzaH4vtdQnnfRCSmbhIgeAiOP/uyhBNG/7s="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-xbjUdQs2t+cjplAlNVRN1Zw5CeAYv4+ir4Pvrt+/n9k="; + cargoHash = "sha256-RWj1QCHYEtw+QzdX+YlFiMqMhvCfxYzj6SUzfhqrcM8="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; From de5e4190ad41473ea4ffaf0d737e4a527d83e72b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 09:34:59 +0000 Subject: [PATCH 071/198] eksctl: 0.129.0 -> 0.130.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 433b4240640d..6c090a11b346 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.129.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-p9haEozDc1ZTGar89Clm7eEFFLJCYcw+gBN40Zg5vi8="; + sha256 = "sha256-SJI9EB0k45SJmWQ/pivlZMQdiE237vpLwNB2Y33ntrw="; }; - vendorHash = "sha256-Vb0sgOOIQI0rTJDITFoMbXJcnN7BondbFTm3AF1JTLo="; + vendorHash = "sha256-wrt8Mtek74ljCgp1Sxi/jKxCv61H7HqCLHXKrwS7ex4="; doCheck = false; From 0a09a0459e46ed0a32e6715ba5f75d01be16d004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 09:47:12 +0000 Subject: [PATCH 072/198] jbang: 0.103.0 -> 0.103.2 --- pkgs/development/tools/jbang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 0eeeba6fa767..53d769837797 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.103.0"; + version = "0.103.2"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-81Le1xVftyQkt5Jm2JXRxID/ySNS1Tcl+BRIsDYeg1k="; + sha256 = "sha256-lG2ABjhVGa+Cj7wkWq8u/uCNki+QgF4pX8+0ZdamB00="; }; nativeBuildInputs = [ makeWrapper ]; From 51b7d85fa1a3c3f0d6bafef6c9f48a7cb9231846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 10:06:23 +0000 Subject: [PATCH 073/198] saml2aws: 2.36.2 -> 2.36.3 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index d4b6cacc64db..afd41660390d 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.2"; + version = "2.36.3"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-87s9lcI3URQOfl1zStSVOwmRonC740pZKAqZhDDdMaE="; + sha256 = "sha256-xNOID8/xdC4vkq8TAocvBVu2jVMDwioFBqlmFcMmMII="; }; - vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI="; + vendorHash = "sha256-APwtLd8+Imy4cBSlm4sHPdA/DQCN4pDFSM/R5ib3k4E="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From f165ce37c0dde1c89b09bcf09406bbb975889aad Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 22 Feb 2023 21:46:23 +0100 Subject: [PATCH 074/198] molly-guard: Reduce closure size by stripping unneeded dependeicies --- pkgs/os-specific/linux/molly-guard/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index de396e4f5c76..1100751f451e 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - sourceRoot = "."; - unpackCmd = '' - dpkg-deb -x "$src" . + dpkg-deb -x "$src" source ''; installPhase = '' From 36c8cb2406c8300a659b4b8ae01b999f26a0104b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 10:19:06 +0000 Subject: [PATCH 075/198] dcap: 2.47.12 -> 2.47.14 --- pkgs/tools/networking/dcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix index 3a19bf627a13..4045748fc447 100644 --- a/pkgs/tools/networking/dcap/default.nix +++ b/pkgs/tools/networking/dcap/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "dcap"; - version = "2.47.12"; + version = "2.47.14"; src = fetchFromGitHub { owner = "dCache"; repo = "dcap"; rev = version; - sha256 = "sha256-pNLEN1YLQGMJNuv8n6bec3qONbwNOYbYDDvkwuP5AR4="; + sha256 = "sha256-hn4nkFTIbSUUhvf9UfsEqVhphAdNWmATaCrv8jOuC0Y="; }; nativeBuildInputs = [ autoconf automake libtool ]; From cc900aace3837cb3dadb41a1654f343cfd67937f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 11:03:23 +0000 Subject: [PATCH 076/198] python310Packages.dsmr-parser: 1.0.0 -> 1.2.0 --- pkgs/development/python-modules/dsmr-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 7b5a8aa1f611..39dd9719f6bb 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.0.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UjwrlNPnv/iBFiX65tcOZjkdC7gZsJzxxCtPdYTdl6Q="; + sha256 = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg="; }; propagatedBuildInputs = [ From 2275649fd6a18f1e326c821e04b774e1b07a11e4 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 23 Feb 2023 06:33:32 -0600 Subject: [PATCH 077/198] desmume: add wrapGAppsHook --- pkgs/applications/emulators/desmume/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 2b3deaba653b..63ebe0720287 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -6,6 +6,7 @@ , agg , alsa-lib , desktop-file-utils +, wrapGAppsHook , gtk3 , intltool , libGLU @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + wrapGAppsHook desktop-file-utils intltool libtool From ed7fbb5516167f0897062ac3c0c3916778bbc7bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 14:06:50 +0100 Subject: [PATCH 078/198] python310Packages.dsmr-parser: add changelog to meta --- pkgs/development/python-modules/dsmr-parser/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 39dd9719f6bb..89b6c23caf31 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - sha256 = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg="; + hash = "sha256-giWchaiNuEN2m2XOpDigZKd0p0gOxp6RrIxPLHEvYOg="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; homepage = "https://github.com/ndokter/dsmr_parser"; + changelog = "https://github.com/ndokter/dsmr_parser/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 66164bded0b5420cb98b2071673f4ede4bb711cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Feb 2023 08:57:40 -0800 Subject: [PATCH 079/198] nextcloud25: 25.0.3 -> 25.0.4 Changelog: https://nextcloud.com/changelog/#25-0-4 --- pkgs/servers/nextcloud/default.nix | 5 +++-- ...remove-custom-dbuser-creation-behavior.patch | 17 ++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 391644379ef3..c8f80dd233eb 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -27,6 +27,7 @@ let ''; meta = with lib; { + changelog = "https://nextcloud.com/changelog/#${lib.replaceStrings [ "." ] [ "-" ] version}"; description = "Sharing solution for files, calendars, contacts and more"; homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin ma27 ]; @@ -55,8 +56,8 @@ in { }; nextcloud25 = generic { - version = "25.0.3"; - sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; + version = "25.0.4"; + sha256 = "sha256-wyUeAIOpQwPi1piLNS87Mwgqeacmsw/3RnCbD+hpoaY="; }; # tip: get the sha with: diff --git a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch index 1d22c927f387..5aa71c58bfec 100644 --- a/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ b/pkgs/servers/nextcloud/patches/v25/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -1,4 +1,4 @@ -From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001 +From 1adc542ca1d7f60067febd692596eb6e8f334f9c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 10 Sep 2022 15:18:05 +0200 Subject: [PATCH] Setup: remove custom dbuser creation behavior @@ -25,15 +25,15 @@ user to operate Nextcloud (which is a good thing in fact). [1] https://github.com/nextcloud/server/pull/33513 --- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 37 ---------------------- - 2 files changed, 90 deletions(-) + lib/private/Setup/MySQL.php | 56 -------------------------------- + lib/private/Setup/PostgreSQL.php | 37 --------------------- + 2 files changed, 93 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index e3004c269bc..bc958e84e44 100644 +index caa73edccec..bc958e84e44 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php -@@ -141,59 +141,6 @@ class MySQL extends AbstractDatabase { +@@ -141,62 +141,6 @@ class MySQL extends AbstractDatabase { $rootUser = $this->dbUser; $rootPassword = $this->dbPassword; @@ -79,6 +79,9 @@ index e3004c269bc..bc958e84e44 100644 - $i++; - } - } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; - } - } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ @@ -142,5 +145,5 @@ index af816c7ad04..e49e5508e15 100644 $this->config->setValues([ 'dbuser' => $this->dbUser, -- -2.38.1 +2.39.1 From 4816e023d1a9894707c9b192e1874135c8842582 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Thu, 23 Feb 2023 12:16:40 -0600 Subject: [PATCH 080/198] nsc: add shell completion --- pkgs/tools/system/nsc/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 69f16d65c576..ef56a9ea1d6b 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -24,6 +25,15 @@ buildGoModule rec { vendorHash = "sha256-gDwppx0ORG+pXzTdGtUVbiFyTD/P7avt+/V89Gl0QYY="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd nsc \ + --bash <($out/bin/nsc completion bash) \ + --fish <($out/bin/nsc completion fish) \ + --zsh <($out/bin/nsc completion zsh) + ''; + preCheck = '' # Tests attempt to write to the home directory. export HOME=$(mktemp -d) From 131e92858a32b0360eb8a1d3312e3b3bdfa1a3cb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:25:04 +0200 Subject: [PATCH 081/198] phodav_2_0, spice-gtk_libsoup2: drop --- .../libraries/spice-gtk/default.nix | 7 +-- pkgs/tools/networking/phodav/2.0.nix | 59 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 pkgs/tools/networking/phodav/2.0.nix diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 2111b23a6f75..d54ffa3bd19b 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -17,8 +17,6 @@ , libdrm , libjpeg_turbo , libopus -, withLibsoup2 ? false -, libsoup , libsoup_3 , libusb1 , lz4 @@ -27,7 +25,6 @@ , ninja , openssl , perl -, phodav_2_0 , phodav , pixman , pkg-config @@ -120,11 +117,11 @@ stdenv.mkDerivation rec { libcacard libjpeg_turbo libopus - (if withLibsoup2 then libsoup else libsoup_3) + libsoup_3 libusb1 lz4 openssl - (if withLibsoup2 then phodav_2_0 else phodav) + phodav pixman spice-protocol usbredir diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/tools/networking/phodav/2.0.nix deleted file mode 100644 index fa809d059591..000000000000 --- a/pkgs/tools/networking/phodav/2.0.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, libsoup -, meson -, ninja -}: - -stdenv.mkDerivation rec { - pname = "phodav"; - version = "2.5"; - - outputs = [ "out" "dev" "lib" ]; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; - sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; - sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; - }) - ]; - - mesonFlags = [ - "-Davahi=disabled" - "-Dsystemd=disabled" - "-Dgtk_doc=disabled" - "-Dudev=disabled" - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; - - nativeBuildInputs = [ - pkg-config - meson - ninja - ]; - - buildInputs = [ - libsoup - ]; - - meta = with lib; { - description = "WebDav server implementation and library using libsoup 2"; - homepage = "https://wiki.gnome.org/phodav"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a4d2fbb189c..180db96ab8ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1149,6 +1149,7 @@ mapAliases ({ phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 + phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15 phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24 @@ -1462,6 +1463,7 @@ mapAliases ({ speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 + spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011"; # added 2021-05-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e10d2ee250f5..1a86446bf530 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10912,8 +10912,6 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -23413,8 +23411,6 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; - spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; From bd4d42a93dd29539287ea294e46bba56a57b9e36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 19:10:54 +0000 Subject: [PATCH 082/198] python310Packages.bugsnag: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/bugsnag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 23a31e389acb..cf4e3d68453c 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-9q6Cp/reUJJ3XGMT9BV+4z5AxJdP8izfzgjOpS84/Tc="; + hash = "sha256-1vtoDmyulfH3YDdMoT9qBFaRd48nnTBCt0iWuQtk3iw="; }; propagatedBuildInputs = [ From a6be4eab6cf7a72087633dcc176ee1a1d0c510f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Feb 2023 11:06:01 -0800 Subject: [PATCH 083/198] nextcloud24: 24.0.9 -> 24.0.10 Changelog: https://nextcloud.com/changelog/#24-0-10 --- pkgs/servers/nextcloud/default.nix | 4 ++-- ...move-custom-dbuser-creation-behavior.patch | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c8f80dd233eb..33a1825cde36 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,8 +51,8 @@ in { ''; nextcloud24 = generic { - version = "24.0.9"; - sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e"; + version = "24.0.10"; + sha256 = "sha256-B6+0gO9wn39BpcR0IsIuMa81DH8TWuDOlTZR9O1qRbk="; }; nextcloud25 = generic { diff --git a/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch index 328288b39c0d..f8ff9b7c553c 100644 --- a/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch +++ b/pkgs/servers/nextcloud/patches/v24/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -1,4 +1,4 @@ -From 045f33745f863ba20acfc3fe335c575d9cd87884 Mon Sep 17 00:00:00 2001 +From e01014a745b7f4dbdde2ee0e293c25c4e5eeaabb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 10 Sep 2022 15:18:05 +0200 Subject: [PATCH] Setup: remove custom dbuser creation behavior @@ -25,15 +25,15 @@ user to operate Nextcloud (which is a good thing in fact). [1] https://github.com/nextcloud/server/pull/33513 --- - lib/private/Setup/MySQL.php | 53 -------------------------------- - lib/private/Setup/PostgreSQL.php | 26 ---------------- - 2 files changed, 79 deletions(-) + lib/private/Setup/MySQL.php | 56 -------------------------------- + lib/private/Setup/PostgreSQL.php | 26 --------------- + 2 files changed, 82 deletions(-) diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php -index 2c16cac3d2..9b2265091f 100644 +index fbce31b0f57..9b2265091f0 100644 --- a/lib/private/Setup/MySQL.php +++ b/lib/private/Setup/MySQL.php -@@ -142,59 +142,6 @@ class MySQL extends AbstractDatabase { +@@ -142,62 +142,6 @@ class MySQL extends AbstractDatabase { $rootUser = $this->dbUser; $rootPassword = $this->dbPassword; @@ -79,6 +79,9 @@ index 2c16cac3d2..9b2265091f 100644 - $i++; - } - } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; - } - } catch (\Exception $ex) { - $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ @@ -94,7 +97,7 @@ index 2c16cac3d2..9b2265091f 100644 'dbuser' => $this->dbUser, 'dbpassword' => $this->dbPassword, diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php -index bc24909dc3..e49e5508e1 100644 +index bc24909dc3d..e49e5508e15 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -45,32 +45,6 @@ class PostgreSQL extends AbstractDatabase { @@ -131,5 +134,5 @@ index bc24909dc3..e49e5508e1 100644 $this->config->setValues([ 'dbuser' => $this->dbUser, -- -2.36.2 +2.39.1 From 7b35b6a996e40749edfd6f7053125fb08375e570 Mon Sep 17 00:00:00 2001 From: Maxim Ianoglo Date: Thu, 23 Feb 2023 21:43:08 +0200 Subject: [PATCH 084/198] mysql-workbench: Syntax error in GCC flag --- pkgs/applications/misc/mysql-workbench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 4ba4d992835c..37171d1214e4 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -148,7 +148,7 @@ in stdenv.mkDerivation rec { "-Wno-error=narrowing" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but problematic with some old GCCs - "-Wno-error=maybe-uninitalized" + "-Wno-error=maybe-uninitialized" ]); cmakeFlags = [ From b57c3b765ed461f3849004ca451ef094a029d6f0 Mon Sep 17 00:00:00 2001 From: Maxim Ianoglo Date: Thu, 23 Feb 2023 21:52:19 +0200 Subject: [PATCH 085/198] mysql-workbench: 8.0.30 -> 8.0.32 --- pkgs/applications/misc/mysql-workbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 37171d1214e4..b4c169b36d8b 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -46,11 +46,11 @@ let inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.30"; + version = "8.0.32"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185"; + sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI="; }; patches = [ From 1fd48dffcf6d37bcca0e523e68fa6d64fd4392a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 20:13:31 +0000 Subject: [PATCH 086/198] python310Packages.oslo-serialization: 5.1.0 -> 5.1.1 --- .../development/python-modules/oslo-serialization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index bb2cfbea90ad..3cede81560b6 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "sha256-pIR98yaBwahL0TotunpuydW0SITeYyUhGS9tx1DOCYQ="; + sha256 = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; }; postPatch = '' From 07a6fb6a7c78ea2a75da745569cb24b2afa8a211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Feb 2023 12:18:48 -0800 Subject: [PATCH 087/198] nextcloud25Packages: update --- pkgs/servers/nextcloud/packages/25.json | 72 ++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/25.json b/pkgs/servers/nextcloud/packages/25.json index 98ab7ebe3e24..43ff7d5b6d66 100644 --- a/pkgs/servers/nextcloud/packages/25.json +++ b/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz", - "version": "4.2.1", + "sha256": "0m0ixj4gaaqgnlk492ihkcxrxbww91jyalh40hdgnsryb9wrpkfp", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.0-alpha1/calendar-v4.3.0-alpha1.tar.gz", + "version": "4.3.0-alpha.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz", - "version": "5.0.2", + "sha256": "1m00r6cpqyrg2b0p8hg4wqkb3wn643fy63ax7qksp39rn18smrwk", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.1.0/contacts-v5.1.0.tar.gz", + "version": "5.1.0", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "forms": { - "sha256": "1400gfgmqyrhakb5p8csb794cap9f9gn385mrsgw2i241lfv8iqw", - "url": "https://github.com/nextcloud/forms/releases/download/v3.0.3/forms.tar.gz", - "version": "3.0.3", + "sha256": "0b2qvrnhsxdknlc8bpr4hmxqdk18f9vy8ry6nm49k4lbrsfg97nq", + "url": "https://github.com/nextcloud/forms/releases/download/v3.1.0/forms.tar.gz", + "version": "3.1.0", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -60,9 +60,9 @@ ] }, "groupfolders": { - "sha256": "0g9czmhh5pvs120827b1cbzk58kq30s4269c4y79lx1k07jssq88", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.0/groupfolders-v13.1.0.tar.gz", - "version": "13.1.0", + "sha256": "1khzwqlzndkcpmwcv841l0fl3bg469ify0kcdgz9i5x2l2m5b5l9", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v13.1.1/groupfolders-v13.1.1.tar.gz", + "version": "13.1.1", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -80,9 +80,9 @@ ] }, "mail": { - "sha256": "09ymxs6g9p2398k4aff5f1iq5a0r5mid83yg9y9k1k0msqac94zg", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz", - "version": "2.2.2", + "sha256": "161ksx7g32fkpwxq3vij2vw6sxblv7xrxggsxnx2wj14ik3wxclv", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.3.0-alpha.4/mail-v2.3.0-alpha.4.tar.gz", + "version": "2.3.0-alpha.4", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -90,9 +90,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "17kz5499jkv43w8wcd1p982hpkw2akgzpv9cjj8qqjhvzv4qr171", + "url": "https://github.com/nextcloud/news/releases/download/21.0.0-beta1/news.tar.gz", + "version": "21.0.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -120,9 +120,9 @@ ] }, "polls": { - "sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq", - "url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz", - "version": "4.1.0-beta4", + "sha256": "0mqc9zmxrm98byy6v13si3hwii8hx85998c4kv91vk6ad0sfxjhb", + "url": "https://github.com/nextcloud/polls/releases/download/v4.1.2/polls.tar.gz", + "version": "4.1.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -130,9 +130,9 @@ ] }, "registration": { - "sha256": "0gx5hr2k42bj5mxfnkx0ny8p6nbdy84hzq2cg106w0lj4d7kgkl5", - "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.0.0/registration-v2.0.0.tar.gz", - "version": "2.0.0", + "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", + "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", + "version": "2.1.0", "description": "User registration\n\nThis app allows users to register a new account.\n\n# Features\n\n- Add users to a given group\n- Allow-list with email domains (including wildcard) to register with\n- Administrator will be notified via email for new user creation or require approval\n- Supports Nextcloud's Client Login Flow v1 and v2 - allowing registration in the mobile Apps and Desktop clients\n\n# Web form registration flow\n\n1. User enters their email address\n2. Verification link is sent to the email address\n3. User clicks on the verification link\n4. User is lead to a form where they can choose their username and password\n5. New account is created and is logged in automatically", "homepage": "https://github.com/nextcloud/registration", "licenses": [ @@ -140,9 +140,9 @@ ] }, "spreed": { - "sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz", - "version": "15.0.2", + "sha256": "0pav5xcnj55vs04fm1fc2kpaz46k0rdlvv7xn6idwgh860anzp4g", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.4/spreed-v15.0.4.tar.gz", + "version": "15.0.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -160,9 +160,9 @@ ] }, "twofactor_nextcloud_notification": { - "sha256": "0941h1l8clrb4brmrn214r33m49iqzanahm1d2gx171f5hbr7bp0", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.5.0/twofactor_nextcloud_notification-v3.5.0.tar.gz", - "version": "3.5.0", + "sha256": "13afyhiy7yk0fcf32792dwabjcixnw5b4hkxykw0xby3hnh0m3l2", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.6.0/twofactor_nextcloud_notification-v3.6.0.tar.gz", + "version": "3.6.0", "description": "Allows using any of your logged in devices as second factor", "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", "licenses": [ @@ -180,9 +180,9 @@ ] }, "twofactor_webauthn": { - "sha256": "06ip0ks2ngpxirfybkc6j7nlnwsx2kf7f0rl855j648zf1y369hp", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.0.0/twofactor_webauthn-v1.0.0.tar.gz", - "version": "1.0.0", + "sha256": "00nll7jfrmqw537r0g07yq7g9lh1kckiiigxgwyd4nh5j6f56v15", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.1.1/twofactor_webauthn-v1.1.1.tar.gz", + "version": "1.1.1", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -190,9 +190,9 @@ ] }, "unsplash": { - "sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8", - "url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz", - "version": "2.1.1", + "sha256": "0zakbrgjc3i6rl0nqwxfsfwybbqpr50c8c10d6s7r9m4gck0y2bm", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.2.0/unsplash.tar.gz", + "version": "2.2.0", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ From 47e8ca4c43b6f4609c81a005369d3f590bf6d8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Feb 2023 12:19:00 -0800 Subject: [PATCH 088/198] nextcloud24Packages: update --- pkgs/servers/nextcloud/packages/24.json | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/24.json b/pkgs/servers/nextcloud/packages/24.json index 0b775a81e88a..b0439db114ae 100644 --- a/pkgs/servers/nextcloud/packages/24.json +++ b/pkgs/servers/nextcloud/packages/24.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "0zlpm7vgsh96wn7pnya04ylfhakvywwdq4605i6vssbw96ibg18d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.4/calendar-v3.5.4.tar.gz", - "version": "3.5.4", + "sha256": "1gf1gn8n85dya47y286hwknms2pj0lhgj09c29gkzgzb4wipa3ww", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.5/calendar-v3.5.5.tar.gz", + "version": "3.5.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", - "version": "4.2.3", + "sha256": "1r0z0ldywzaw7a87hlsbn1f9pxqndqpxxa6khn70yh02cjrzh03m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.5/contacts-v4.2.5.tar.gz", + "version": "4.2.5", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -60,9 +60,9 @@ ] }, "forms": { - "sha256": "1cwf3445qivig293m6yqr92r25hwjyif5sgw0b6nvccqqpyk6vdd", - "url": "https://github.com/nextcloud/forms/releases/download/v2.5.1/forms.tar.gz", - "version": "2.5.1", + "sha256": "1payxppd2j0n67kcswb3dkk2a467fahwakxs7wqsfqgqgr9mcbl4", + "url": "https://github.com/nextcloud/forms/releases/download/v2.5.2/forms.tar.gz", + "version": "2.5.2", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -70,9 +70,9 @@ ] }, "groupfolders": { - "sha256": "0i7jp351lpxx7jv5rj47gkfrs2915nj6fwni919nniqqnz4yml7p", - "url": "https://github.com/nextcloud/groupfolders/releases/download/v12.0.2/groupfolders.tar.gz", - "version": "12.0.2", + "sha256": "09lz63n9i040lndzmpm6rdlpviaa8m9skpjw98m18miamdmqbf0d", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v12.0.3/groupfolders-v12.0.3.tar.gz", + "version": "12.0.3", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -100,9 +100,9 @@ ] }, "mail": { - "sha256": "10wbi0q23a5qqc7a0ppqi71qrimczay2s5pzl7r94z5c715ag0yv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.1/mail-v1.15.1.tar.gz", - "version": "1.15.1", + "sha256": "1agpdxf8lnsdxpk1nmypxam5p8i8xiyzsyb34cv2lksd2ziirmp5", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.2/mail-v1.15.2.tar.gz", + "version": "1.15.2", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "17kz5499jkv43w8wcd1p982hpkw2akgzpv9cjj8qqjhvzv4qr171", + "url": "https://github.com/nextcloud/news/releases/download/21.0.0-beta1/news.tar.gz", + "version": "21.0.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -140,9 +140,9 @@ ] }, "polls": { - "sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11", - "url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz", - "version": "3.8.3", + "sha256": "0qdm0hnljkv0df1s929awyjj1gsp3d6xv9llr52cxv66kkfx086y", + "url": "https://github.com/nextcloud/polls/releases/download/v3.8.4/polls.tar.gz", + "version": "3.8.4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -160,9 +160,9 @@ ] }, "spreed": { - "sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz", - "version": "14.0.7", + "sha256": "1wih7gr2dxl69fdvarkgnxcwq47vbhwdmdvs8h70pqwrgss950hs", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.9/spreed-v14.0.9.tar.gz", + "version": "14.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ From 933b93f8189dca6fdbfb9d1193be28c494e55805 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Feb 2023 22:27:10 +0200 Subject: [PATCH 089/198] gvm-libs: fix runtime dir --- pkgs/development/libraries/gvm-libs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index ba08fc61f568..a35a256b5505 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGVM_RUN_DIR=$out/run/gvm" + "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; meta = with lib; { From dddc103fdbf1a8a72a9560aec73114cb1fbb9423 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 16 Feb 2023 14:50:24 -0500 Subject: [PATCH 090/198] cudaFlags: rewrite to capture all architechtures and fix #215436 --- .../science/math/mxnet/default.nix | 2 +- .../compilers/cudatoolkit/flags.nix | 161 ++++++++++++------ .../compilers/cudatoolkit/gpus.nix | 110 ++++++++++++ .../libraries/science/math/magma/default.nix | 2 +- .../python-modules/jaxlib/default.nix | 2 +- .../python-modules/tensorflow/default.nix | 2 +- .../python-modules/torch/default.nix | 47 ++++- .../python-modules/torchvision/default.nix | 6 +- 8 files changed, 272 insertions(+), 60 deletions(-) create mode 100644 pkgs/development/compilers/cudatoolkit/gpus.nix diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index a5c0ebc85b13..c1a329c60886 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" - "-DMXNET_CUDA_ARCH=${cudaFlags.cudaCapabilitiesSemiColonString}" + "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.cudaRealArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix index 24f653ded29b..8e1e54723b2e 100644 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ b/pkgs/development/compilers/cudatoolkit/flags.nix @@ -2,7 +2,18 @@ , lib , cudatoolkit }: + +# Type aliases +# Gpu = { +# archName: String, # e.g., "Hopper" +# computeCapability: String, # e.g., "9.0" +# minCudaVersion: String, # e.g., "11.8" +# maxCudaVersion: String, # e.g., "12.0" +# } + let + inherit (lib) attrsets lists strings trivial versions; + cudaVersion = cudatoolkit.version; # Flags are determined based on your CUDA toolkit by default. You may benefit # from improved performance, reduced file size, or greater hardware suppport by @@ -13,66 +24,116 @@ let # # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 - defaultCudaCapabilities = rec { - cuda9 = [ - "3.0" - "3.5" - "5.0" - "5.2" - "6.0" - "6.1" - "7.0" - ]; + # gpus :: List Gpu + gpus = builtins.import ./gpus.nix; - cuda10 = cuda9 ++ [ - "7.5" - ]; + # isVersionIn :: Gpu -> Bool + isSupported = gpu: + let + inherit (gpu) minCudaVersion maxCudaVersion; + lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; + upperBoundSatisfied = !(strings.versionOlder maxCudaVersion cudaVersion); + in + lowerBoundSatisfied && upperBoundSatisfied; - cuda11 = [ - "3.5" - "5.0" - "5.2" - "6.0" - "6.1" - "7.0" - "7.5" - "8.0" - "8.6" - ]; + # supportedGpus :: List Gpu + # GPUs which are supported by the provided CUDA version. + supportedGpus = builtins.filter isSupported gpus; - }; + # cudaArchNameToVersions :: AttrSet String (List String) + # Maps the name of a GPU architecture to different versions of that architecture. + # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. + cudaArchNameToVersions = + lists.groupBy' + (versions: gpu: versions ++ [ gpu.computeCapability ]) + [ ] + (gpu: gpu.archName) + supportedGpus; - cudaMicroarchitectureNames = { - "3" = "Kepler"; - "5" = "Maxwell"; - "6" = "Pascal"; - "7" = "Volta"; - "8" = "Ampere"; - "9" = "Hopper"; - }; + # cudaArchNames :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaArchNameToVersions here; + # otherwise, we'll get the names sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + cudaArchNames = lists.unique (lists.map (gpu: gpu.archName) supportedGpus); - defaultCudaArchList = defaultCudaCapabilities."cuda${lib.versions.major cudatoolkit.version}"; - cudaRealCapabilities = config.cudaCapabilities or defaultCudaArchList; - capabilitiesForward = "${lib.last cudaRealCapabilities}+PTX"; + # cudaComputeCapabilityToName :: AttrSet String String + # Maps the version of a GPU architecture to the name of that architecture. + # For example, "8.0" maps to "Ampere". + cudaComputeCapabilityToName = builtins.listToAttrs ( + lists.map + (gpu: { + name = gpu.computeCapability; + value = gpu.archName; + }) + supportedGpus + ); - dropDot = ver: builtins.replaceStrings ["."] [""] ver; + # cudaComputeCapabilities :: List String + # NOTE: It's important that we don't rely on builtins.attrNames cudaComputeCapabilityToName here; + # otherwise, we'll get the versions sorted in alphabetical order. The JSON array we read them + # from is already sorted, so we'll preserve that order here. + # Use the user-provided list of CUDA capabilities if it's provided. + cudaComputeCapabilities = config.cudaCapabilities + or (lists.map (gpu: gpu.computeCapability) supportedGpus); - archMapper = feat: map (ver: "${feat}_${dropDot ver}"); - gencodeMapper = feat: map (ver: "-gencode=arch=compute_${dropDot ver},code=${feat}_${dropDot ver}"); - cudaRealArchs = archMapper "sm" cudaRealCapabilities; - cudaPTXArchs = archMapper "compute" cudaRealCapabilities; - cudaArchs = cudaRealArchs ++ [ (lib.last cudaPTXArchs) ]; + # cudaForwardComputeCapability :: String + cudaForwardComputeCapability = (lists.last cudaComputeCapabilities) + "+PTX"; - cudaArchNames = lib.unique (map (v: cudaMicroarchitectureNames.${lib.versions.major v}) cudaRealCapabilities); - cudaCapabilities = cudaRealCapabilities ++ lib.optional (config.cudaForwardCompat or true) capabilitiesForward; - cudaGencode = gencodeMapper "sm" cudaRealCapabilities ++ lib.optionals (config.cudaForwardCompat or true) (gencodeMapper "compute" [ (lib.last cudaPTXArchs) ]); + # cudaComputeCapabilitiesAndForward :: List String + # The list of supported CUDA architectures, including the forward compatibility architecture. + # If forward compatibility is disabled, this will be the same as cudaComputeCapabilities. + cudaComputeCapabilitiesAndForward = cudaComputeCapabilities + ++ lists.optional (config.cudaForwardCompat or true) cudaForwardComputeCapability; - cudaCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaCapabilities; - cudaCapabilitiesSemiColonString = lib.strings.concatStringsSep ";" cudaCapabilities; - cudaRealCapabilitiesCommaString = lib.strings.concatStringsSep "," cudaRealCapabilities; + # dropDot :: String -> String + dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; + + # archMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of architectures. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ]. + archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}"); + + # gencodeMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of gencode arguments. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80" + # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ]. + gencodeMapper = feat: lists.map ( + computeCapability: + "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" + ); + + # cudaRealArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # For example, "sm_80". + cudaRealArches = archMapper "sm" cudaComputeCapabilities; + + # cudaVirtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # For example, "compute_80". + cudaVirtualArches = archMapper "compute" cudaComputeCapabilities; + + # cudaArches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + cudaArches = cudaRealArches ++ + lists.optional (config.cudaForwardCompat or true) (lists.last cudaVirtualArches); + + # cudaGencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + cudaGencode = + let + base = gencodeMapper "sm" cudaComputeCapabilities; + forwardCompat = gencodeMapper "compute" [ (lists.last cudaComputeCapabilities) ]; + in + base ++ lists.optionals (config.cudaForwardCompat or true) forwardCompat; in { - inherit cudaArchs cudaArchNames cudaCapabilities cudaCapabilitiesCommaString cudaCapabilitiesSemiColonString - cudaRealCapabilities cudaRealCapabilitiesCommaString cudaGencode cudaRealArchs cudaPTXArchs; + inherit + cudaArchNames + cudaArchNameToVersions cudaComputeCapabilityToName + cudaRealArches cudaVirtualArches cudaArches + cudaGencode; + cudaCapabilities = cudaComputeCapabilitiesAndForward; } diff --git a/pkgs/development/compilers/cudatoolkit/gpus.nix b/pkgs/development/compilers/cudatoolkit/gpus.nix new file mode 100644 index 000000000000..e938e9129747 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/gpus.nix @@ -0,0 +1,110 @@ +[ + { + archName = "Kepler"; + computeCapability = "3.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Kepler"; + computeCapability = "3.7"; + minCudaVersion = "10.0"; + maxCudaVersion = "11.8"; + } + { + archName = "Maxwell"; + computeCapability = "5.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Maxwell"; + computeCapability = "5.3"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.1"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Pascal"; + computeCapability = "6.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.0"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Volta"; + computeCapability = "7.2"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Turing"; + computeCapability = "7.5"; + minCudaVersion = "10.0"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.0"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.6"; + minCudaVersion = "11.2"; + maxCudaVersion = "12.0"; + } + { + archName = "Ampere"; + computeCapability = "8.7"; + minCudaVersion = "11.5"; + maxCudaVersion = "12.0"; + } + { + archName = "Ada"; + computeCapability = "8.9"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } + { + archName = "Hopper"; + computeCapability = "9.0"; + minCudaVersion = "11.8"; + maxCudaVersion = "12.0"; + } +] diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b7223690f435..f70cbbcff5d8 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/gcc" "-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/g++" "-DMAGMA_ENABLE_CUDA=ON" - "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArchs}" + "-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" ] ++ lib.optionals useROCM [ "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index baa9a0dc1abf..2c13defe4383 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -164,7 +164,7 @@ let build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${cudaFlags.cudaRealCapabilitiesCommaString}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.cudaRealArches}" '' + '' CFG ''; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index d41526552f4b..f7d920c37221 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -301,7 +301,7 @@ let TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; - TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArchs; + TF_CUDA_COMPUTE_CAPABILITIES = builtins.concatStringsSep "," cudaFlags.cudaRealArches; postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 8fe9e1fed629..86889be4ee16 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -41,6 +41,7 @@ }: let + inherit (lib) lists strings trivial; inherit (cudaPackages) cudatoolkit cudaFlags cudnn nccl; in @@ -54,6 +55,45 @@ assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let setBool = v: if v then "1" else "0"; + + # https://github.com/pytorch/pytorch/blob/v1.13.1/torch/utils/cpp_extension.py#L1751 + supportedTorchCudaCapabilities = + let + real = ["3.5" "3.7" "5.0" "5.2" "5.3" "6.0" "6.1" "6.2" "7.0" "7.2" "7.5" "8.0" "8.6"]; + ptx = lists.map (x: "${x}+PTX") real; + in + real ++ ptx; + + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements + # of the first list *from* the second list. That means: + # lists.subtractLists a b = b - a + + # For CUDA + supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities; + unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities; + + # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified. + gpuArchWarner = supported: unsupported: + trivial.throwIf (supported == [ ]) + ( + "No supported GPU targets specified. Requested GPU targets: " + + strings.concatStringsSep ", " unsupported + ) + supported; + + # Create the gpuTargetString. + gpuTargetString = strings.concatStringsSep ";" ( + if gpuTargets != [ ] then + # If gpuTargets is specified, it always takes priority. + gpuTargets + else if cudaSupport then + gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities + else if rocmSupport then + hip.gpuTargets + else + throw "No GPU targets specified" + ); + cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs @@ -146,14 +186,14 @@ in buildPythonPackage rec { ''; preConfigure = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' export CUDNN_INCLUDE_DIR=${cudnn}/include '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} - export PYTORCH_ROCM_ARCH="${lib.strings.concatStringsSep ";" (if gpuTargets == [ ] then hip.gpuTargets else gpuTargets)}" + export PYTORCH_ROCM_ARCH="${gpuTargetString}" export CMAKE_CXX_FLAGS="-I${rocmtoolkit_joined}/include -I${rocmtoolkit_joined}/include/rocblas" python tools/amd_build/build_amd.py ''; @@ -320,7 +360,8 @@ in buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; passthru = { - inherit cudaSupport cudaPackages; + inherit cudaSupport cudaPackages gpuTargetString; + cudaCapabilities = supportedCudaCapabilities; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index de8852035c90..d36beb6575e0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -15,13 +15,13 @@ }: let - inherit (torch.cudaPackages) cudatoolkit cudaFlags cudnn; + inherit (torch) gpuTargetString; + inherit (torch.cudaPackages) cudatoolkit cudnn; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; }; - cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; version = "0.14.1"; @@ -45,7 +45,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy pillow torch scipy ]; preBuild = lib.optionalString cudaSupport '' - export TORCH_CUDA_ARCH_LIST="${cudaFlags.cudaCapabilitiesSemiColonString}" + export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export FORCE_CUDA=1 ''; From fa38fcc130151871680efb1595c7ad1ac5434b10 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Feb 2023 22:41:26 +0100 Subject: [PATCH 091/198] chromium: 110.0.5481.100 -> 110.0.5481.177 https://chromereleases.googleblog.com/2023/02/stable-channel-desktop-update_22.html This update includes 10 security fixes. CVEs: CVE-2023-0941 CVE-2023-0927 CVE-2023-0928 CVE-2023-0929 CVE-2023-0930 CVE-2023-0931 CVE-2023-0932 CVE-2023-0933 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f933a704c211..0333b78e571b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "110.0.5481.100", - "sha256": "0czn47gbyp91z6jfgssr2izhg096fm4h26q1i2i42b0z1ilhv1vd", - "sha256bin64": "11g71rr7fcp2bybd9z19lb8pb29yqscffkzn4ybjbhbvd74s4pjr", + "version": "110.0.5481.177", + "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", + "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", "deps": { "gn": { "version": "2022-12-12", From d3962e5ee6ae33f33096de3ed8e787e63a95e165 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 17 Feb 2023 23:40:39 +0100 Subject: [PATCH 092/198] chromiumBeta: 111.0.5563.19 -> 111.0.5563.33 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index f933a704c211..74713d5c1cb7 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "111.0.5563.19", - "sha256": "0hrapzi45jpkb1b87nzlb896jd2h2jbz1mq91md5r2y6ag6fc55w", - "sha256bin64": "1mjrp13xf913xhm9hz6yg595g0jg2afmwvzxzpw79y4snaf2ihza", + "version": "111.0.5563.33", + "sha256": "19qgmhws90z11mg2vniq9qkppp10qw30hbj9b0nw7n8ca2pm3a71", + "sha256bin64": "1lv4ixcjcdwzjv5q1iys55lfhiha4vn6609kdxnhr9jamksp827g", "deps": { "gn": { "version": "2022-12-12", From 7ee4504af23d53560a11fccba8ad8f45ef3bee80 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Feb 2023 22:41:26 +0100 Subject: [PATCH 093/198] chromiumBeta: 111.0.5563.33 -> 111.0.5563.41 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 74713d5c1cb7..e90b6f306b3f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "111.0.5563.33", - "sha256": "19qgmhws90z11mg2vniq9qkppp10qw30hbj9b0nw7n8ca2pm3a71", - "sha256bin64": "1lv4ixcjcdwzjv5q1iys55lfhiha4vn6609kdxnhr9jamksp827g", + "version": "111.0.5563.41", + "sha256": "0yx5zywbkvdp589906hbwhc2ivzfzd9zvahaxhh8zrh2ar7vqxay", + "sha256bin64": "0vnj0422dvpp42w8vgmip4k8c8k6hpvc84cdfvyhipas47dxvh6w", "deps": { "gn": { "version": "2022-12-12", From 17b49de5b82e436d47e1b014aa233b573bbbece1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 22:00:56 +0000 Subject: [PATCH 094/198] yamlfix: 1.6.0 -> 1.9.0 --- pkgs/development/python-modules/yamlfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 96a5c74aec2a..35eb9ea1ae42 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.6.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OXo9PkvKn+XPxfXUObwps62lwNo6lE4Ot5L0lZPIYPw="; + hash = "sha256-av3QNfyPo/4GzFzQ60OrtPK6CV5AkN4FbbqgeBz4rY0="; }; nativeBuildInputs = [ From ca8a28515ecc752501ff435e297652cf9ee99b2d Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 23 Feb 2023 17:13:44 -0500 Subject: [PATCH 095/198] brave: 1.48.158 -> 1.48.171 https://community.brave.com/t/release-channel-1-48-171/472389/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 77c626156427..b5528c31b430 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.48.158"; + version = "1.48.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY="; + sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; }; dontConfigure = true; From 3981699ec395e1b3302c873f5ef9e0598cbfb912 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:00:33 +0100 Subject: [PATCH 096/198] python310Packages.MDP: normalize pname --- pkgs/development/python-modules/mdp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 989e9e00aa47..211054573ae1 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -7,12 +7,13 @@ }: buildPythonPackage rec { - pname = "MDP"; + pname = "mdp"; version = "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; + pname = "MDP"; + inherit version; + hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4="; }; propagatedBuildInputs = [ future numpy ]; From ea6818a62c4788bc38bad9def9adb3dbf60d6a43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:06:25 +0100 Subject: [PATCH 097/198] python310Packages.MDP: update homepage and add changelog --- pkgs/development/python-modules/mdp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 211054573ae1..b80795463bdf 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -40,7 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = "https://mdp-toolkit.sourceforge.net"; + homepage = "https://mdp-toolkit.github.io/"; + changelog = "https://github.com/mdp-toolkit/mdp-toolkit/blob/MDP-${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ nico202 ]; }; From ea3a84b34d9c0c2e702de51dcca3a05886a312ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:07:57 +0100 Subject: [PATCH 098/198] python310Packages.MDP: disable on unsupported Python releases --- pkgs/development/python-modules/mdp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index b80795463bdf..91907825ceb3 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -4,11 +4,15 @@ , future , numpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "mdp"; version = "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "MDP"; From 224f14a3a1e7567ab820ff10fedc75e5c84a58d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:23:08 +0100 Subject: [PATCH 099/198] python310Packages.MDP: fix tests --- .../python-modules/mdp/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 91907825ceb3..40f57408703f 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , future +, joblib , numpy , pytest , pythonOlder +, scikit-learn }: buildPythonPackage rec { @@ -20,19 +22,32 @@ buildPythonPackage rec { hash = "sha256-rFKmUsy67RhX/xIJhi8Dv5sG0JOxJgb7QQeH2jqmWg4="; }; - propagatedBuildInputs = [ future numpy ]; - - nativeCheckInputs = [ pytest ]; - - doCheck = true; - - pythonImportsCheck = [ "mdp" "bimdp" ]; - postPatch = '' # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 - substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/utils/routines.py \ + --replace numx.typeDict numx.sctypeDict + substituteInPlace mdp/test/test_NormalizingRecursiveExpansionNode.py \ + --replace py.test"" "pytest" + substituteInPlace mdp/test/test_RecursiveExpansionNode.py \ + --replace py.test"" "pytest" ''; + propagatedBuildInputs = [ + future + numpy + ]; + + nativeCheckInputs = [ + joblib + pytest + scikit-learn + ]; + + pythonImportsCheck = [ + "mdp" + "bimdp" + ]; + checkPhase = '' runHook preCheck From 33645f8482f2ac31b4bb076cf6369c27de6b4221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:46:13 +0100 Subject: [PATCH 100/198] python310Packages.reolink-aio: 0.5.0 -> 0.5.1 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.0...0.5.1 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.1 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 61392cdbf497..aa1ebb430d9a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-6fG7wKanw/ECsO7tqT69iTRjhhUpS2lKXMvW9FiqSi8="; + hash = "sha256-twfFPtTR2LIAbd5YuOgTG/j/xktLkTD3/9fjo514eXI="; }; postPatch = '' From b684608d471bee8e07be9bdc47cb219a4c362eb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 23:18:48 +0000 Subject: [PATCH 101/198] uxplay: 1.62 -> 1.63 --- pkgs/servers/uxplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index 76aa73c0b0df..ad87c63fe2cb 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.62"; + version = "1.63"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-+IO+ITSa5LSFdCaU28B/MMBl4a+35957VlNxIQK5IqU="; + sha256 = "sha256-ZoeznQhao/inD3fxjhD8L7rLQGAQAEo3gRxw3Zi+Fbs="; }; postPatch = '' From 22bdb6850c5dcde5c1038847a002820c2c8dd8dc Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 24 Feb 2023 00:51:37 +0100 Subject: [PATCH 102/198] tengine: don't pin to openssl_1_1 anymore not needed after 2.4.0 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38a80f7eff43..0968df2e8898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35894,7 +35894,6 @@ with pkgs; }; tengine = callPackage ../servers/http/tengine { - openssl = openssl_1_1; modules = with nginxModules; [ rtmp dav moreheaders modsecurity ]; }; From a215bd483c0c316ad9def94c10070fdd9998519e Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Thu, 23 Feb 2023 17:19:03 -0700 Subject: [PATCH 103/198] scala-cli: 0.1.20 -> 0.2.0 --- .../tools/build-managers/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 85a3563f020c..f49972839a09 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "0.1.20", + "version": "0.2.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" + "sha256": "0fv4ph1pf924wf3vmzri68s79i4kxgmp2fl9qy9v14ff71bbnyv5" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" + "sha256": "1h5kvd1wf6x3xis15bdrsvrivs8zmbvggcaspr9brsjw38q13c7q" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" + "sha256": "1p4gkghbfs5cac4k7760nnsdf7m5i5d4f568m8xsyfx8nkhpyw1w" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" + "sha256": "0xk4n71lgg91kkjk0633sz04s2ypyjkig9vsxg60b16gzm7z4j22" } } } From 7fae1804619cac12e2053d3b2278ecd8d582c4f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:26:52 +0100 Subject: [PATCH 104/198] python310Packages.zha-quirks: 0.0.92 -> 0.0.93 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.92...0.0.93 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.93 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index ce35780dfcb9..d3353df4de38 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.92"; + version = "0.0.93"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-WKuME0OVNdNGv0nG40ctG2UAOmDXTkIr6mIh3+JE/uo="; + hash = "sha256-ilPwzQV4vucLV3QAR/otsVIDIxRw8iWPGXM8CvgtFxg="; }; propagatedBuildInputs = [ From 11e458b14ad3682eac89e2d6dca87cec8be784ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 00:47:35 +0000 Subject: [PATCH 105/198] python310Packages.rq: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index d0caa8741dc1..27893f4a1d26 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-hV9Rntgt1Y4TBWGlunoXDKy8A2/9tum8aII8kFIZznU="; + hash = "sha256-YbpH5Pt93nKYRZMb+MRFFGRxKcRITlvFTvbo574ruFs="; }; propagatedBuildInputs = [ From ba0d72abb9c8f948033f30dce1cda66916ae5f59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:51:33 +0100 Subject: [PATCH 106/198] python310Packages.hahomematic: 2023.2.9 -> 2023.2.10 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.2.9...2023.2.10 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.2.10 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 693f9b27dfb5..5a0ce432b652 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.9"; + version = "2023.2.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-JNsF8HKat5+yp7Q0l4IKysiJrJ0Q4fEQ+zLAT25hAb0="; + sha256 = "sha256-LyX/wHd4FnI9RrmwV6IDhz8gWJlBwG3Up64JYaIVdmM="; }; nativeBuildInputs = [ From bb46e6d646c6d776e5648e30a2d53884aa5feefd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:53:53 +0100 Subject: [PATCH 107/198] python310Packages.vt-py: 0.17.4 -> 0.17.5 Diff: https://github.com/VirusTotal/vt-py/compare/refs/tags/0.17.4...0.17.5 Changelog: https://github.com/VirusTotal/vt-py/releases/tag//0.17.5 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index e0f37922c00d..ea44c4b5a165 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.17.4"; + version = "0.17.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4CmSsSZqFhH3rwctCJUqU4JdDxBgIxFnUZ5FQCBZXqg="; + hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM="; }; propagatedBuildInputs = [ From 5af2160bc4f04e06027dd3f85fff2a325a0255c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:56:08 +0100 Subject: [PATCH 108/198] python310Packages.twilio: 7.16.3 -> 7.16.4 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/7.16.3...7.16.4 Changelog: https://github.com/twilio/twilio-python/blob/7.16.4/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f67448c62632..e3a8b36ec44c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.3"; + version = "7.16.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-qgsJ/i8gcuirLp8O6XShgdfxdmFyK2H+oWkiP2795rA="; + hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8="; }; propagatedBuildInputs = [ From 0290eaa6586a4ff3f900c5675647b00117b18d39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 02:00:47 +0100 Subject: [PATCH 109/198] python310Packages.mdp: normalize naming --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 46d3e6deecc3..7d749693e874 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -123,6 +123,7 @@ mapAliases ({ logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 + MDP = mdp; # added 2023-02-24 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c41bf30acb8c..cc7cfba5927d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5810,7 +5810,7 @@ self: super: with self; { mdutils = callPackage ../development/python-modules/mdutils { }; - MDP = callPackage ../development/python-modules/mdp { }; + mdp = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; From c74cc0d9cd2a0d78fe493248bb7134755412dc24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 01:14:01 +0000 Subject: [PATCH 110/198] python310Packages.dvc-objects: 0.19.3 -> 0.20.0 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index a0ab592eaa90..343e5705f401 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.19.3"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oKK+BhOgdRPZZAACgxgmr9rlzEH9yWmvbmx09d42u/Y="; + hash = "sha256-T7vcnxxN0YUHoDVc98f0QwiMqT88lx8NejTsDfBY5SY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From bbe73918dc4fbebdd1a4a1fe51b61262cbe7a781 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 14 Aug 2022 00:31:30 +0800 Subject: [PATCH 111/198] python3Packages.defcon: rework packaging properly handle optional-dependencies --- .../python-modules/defcon/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 4bb079e9be7a..0cdd6c58c49f 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,14 +1,11 @@ { lib , buildPythonPackage -, fetchPypi -, fontpens -, fonttools -, fs -, lxml -, pytestCheckHook , pythonOlder +, fetchPypi , setuptools-scm -, unicodedata2 +, fonttools +, fontpens +, pytestCheckHook }: buildPythonPackage rec { @@ -30,20 +27,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools - ]; + ] + ++ fonttools.optional-dependencies.ufo + ++ fonttools.optional-dependencies.unicode; nativeCheckInputs = [ - fontpens - fs - lxml pytestCheckHook - unicodedata2 ]; pythonImportsCheck = [ "defcon" ]; + passthru.optional-dependencies = { + pens = [ fontpens ]; + lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; + }; + meta = with lib; { description = "A set of UFO based objects for use in font editing applications"; homepage = "https://github.com/robotools/defcon"; From 73caa31b137cfe4c25bc8fb8d7793b1c6760ceba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 02:53:11 +0000 Subject: [PATCH 112/198] python310Packages.puremagic: 1.14 -> 1.15 --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index aac505dd8f39..7a5d291431b9 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.14"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw="; + sha256 = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; }; # test data not included on pypi From a4fc60cdef18839688a7c1910ae5364d6a621cd8 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Fri, 24 Feb 2023 03:44:50 +0100 Subject: [PATCH 113/198] rr: don't overwrite all of its C and CXX flags These CMake flags have been present ever since the package was added in 2014. There is no documentation on why these flags should be necessary. During local testing, rr built just fine without them. In fact, I stumbled upon this when rr from nixpkgs failed to record applications that use OpenGL, such as glxinfo or glxgears, whereas a manually built rr worked just fine. I tracked it down to these flags. I wasn't able to determine the relevant differences between the two builds of rr. --- pkgs/development/tools/analysis/rr/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index bc0fc26fc749..da180f0d4b7a 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -44,8 +44,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ gdb ]; # needs GDB to replay programs at runtime cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE:STRING=" - "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" "-Ddisable32bit=ON" ]; From 01830e7b6863e9f017f75c7c3b759b1d5a855ce8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 03:00:48 +0000 Subject: [PATCH 114/198] python310Packages.rebulk: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 570654dc7e15..cfd1b83d0633 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; + sha256 = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw="; }; # Some kind of trickery with imports that doesn't work. From 394f7208f076007161ce051f11688e1ae582c68f Mon Sep 17 00:00:00 2001 From: rubyowo Date: Fri, 3 Feb 2023 18:16:21 +0400 Subject: [PATCH 115/198] catppuccin-papirus-folders: init at unstable-2023-02-03 --- .../catppuccin-papirus-folders/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/data/icons/catppuccin-papirus-folders/default.nix diff --git a/pkgs/data/icons/catppuccin-papirus-folders/default.nix b/pkgs/data/icons/catppuccin-papirus-folders/default.nix new file mode 100644 index 000000000000..263ea1f37428 --- /dev/null +++ b/pkgs/data/icons/catppuccin-papirus-folders/default.nix @@ -0,0 +1,54 @@ +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk3, + papirus-icon-theme, + flavor ? "mocha", + accent ? "blue" +}: let + validAccents = ["blue" "flamingo" "green" "lavender" "maroon" "mauve" "peach" "pink" "red" "rosewater" "sapphire" "sky" "teal" "yellow"]; + validFlavors = ["latte" "frappe" "macchiato" "mocha"]; + pname = "catppuccin-papirus-folders"; +in + lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ] + lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ] + + stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2022-12-04"; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "papirus-folders"; + rev = "1a367642df9cf340770bd7097fbe85b9cea65bcb"; + sha256 = "sha256-mFDfRVDA9WyriyFVzsI7iqmPopN56z54FvLkZDS2Dv8="; + }; + + nativeBuildInputs = [ gtk3 ]; + + postPatch = '' + patchShebangs ./papirus-folders + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r --no-preserve=mode ${papirus-icon-theme}/share/icons/Papirus* $out/share/icons + cp -r src/* $out/share/icons/Papirus + for theme in $out/share/icons/*; do + USER_HOME=$HOME DISABLE_UPDATE_ICON_CACHE=1 \ + ./papirus-folders -t $theme -o -C cat-${flavor}-${accent} + gtk-update-icon-cache --force $theme + done + runHook postInstall + ''; + + meta = with lib; { + description = "Soothing pastel theme for Papirus Icon Theme folders"; + homepage = "https://github.com/catppuccin/papirus-folders"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rubyowo ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81dcaf9a9c9f..4546d2692664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -378,6 +378,8 @@ with pkgs; catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; + catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { }; + btdu = callPackage ../tools/misc/btdu { }; cereal = callPackage ../development/libraries/cereal { }; From 8fd81f13d14c2a41bec948b65e7dccaaff9c0dbc Mon Sep 17 00:00:00 2001 From: rubyowo Date: Fri, 3 Feb 2023 18:18:06 +0400 Subject: [PATCH 116/198] maintainers: add rubyowo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0fc7587677e6..6a45d141ec03 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12725,6 +12725,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rubyowo = { + name = "Rei Star"; + email = "perhaps-you-know@what-is.ml"; + github = "rubyowo"; + githubId = 105302757; + }; rumpelsepp = { name = "Stefan Tatschner"; email = "stefan@rumpelsepp.org"; From 6152eed6a5277d1e6b4c68592b8a9796615db438 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 24 Feb 2023 05:21:20 +0200 Subject: [PATCH 117/198] Revert "python310Packages.kiwisolver: fix NIX_CFLAGS_COMPILE definition" --- pkgs/development/python-modules/kiwisolver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3dee0..ba35537a866b 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + "-I${lib.getDev libcxx}/include/c++/v1" + ]; nativeBuildInputs = [ setuptools-scm From e1fe0fe490bf39bb12f7d84125a968eabfdfcbf8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Feb 2023 05:39:54 +0200 Subject: [PATCH 118/198] python310Packages.kiwisolver: move NIX_CFLAGS_COMPILE out of env this will be reapplied to staging because it causes rebuilds --- pkgs/development/python-modules/kiwisolver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index ba35537a866b..1481bc8699c0 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-I${lib.getDev libcxx}/include/c++/v1" ]; From 594a8df11a4f8b0b690468cb68c2656795128bfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 01:21:51 +0000 Subject: [PATCH 119/198] python310Packages.pydrive2: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/pydrive2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index 159679b0515f..75d25a885bfe 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw="; + hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o="; }; propagatedBuildInputs = [ From 1b511c16299838afe1afbb7ec75b9d9947abb92a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Feb 2023 04:20:00 +0000 Subject: [PATCH 120/198] fastlane: 2.212.0 -> 2.212.1 https://github.com/fastlane/fastlane/releases/tag/2.212.1 --- pkgs/tools/admin/fastlane/Gemfile.lock | 6 +++--- pkgs/tools/admin/fastlane/gemset.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 565f3b789f01..c441e996300a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,7 +8,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.714.0) + aws-partitions (1.716.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.212.0) + fastlane (2.212.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -160,7 +160,7 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.6.0) + plist (3.7.0) public_suffix (5.0.1) rake (13.0.6) representable (3.2.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 40fa2e8e9007..5bd70e1f6ad8 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpdx2l1h0nglxxd82khijyxdfa0p2v4s6b5fv2j33jd3k97da05"; + sha256 = "1dy4pxcblfl67gdw64ffjh9zxv10nnjszri861f8xa6cfqr3hqp1"; type = "gem"; }; - version = "1.714.0"; + version = "1.716.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7j1w0jyxn8gfk69s2h1v1pxfpk9s1hc8a9inblkj0zlba7cikl"; + sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml"; type = "gem"; }; - version = "2.212.0"; + version = "2.212.1"; }; gh_inspector = { groups = ["default"]; @@ -648,10 +648,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; public_suffix = { groups = ["default"]; From d424064658a487f0ce4f29d33f1fb67e5bbbb916 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:10:11 +0000 Subject: [PATCH 121/198] =?UTF-8?q?terraform-providers.exoscale:=200.45.0?= =?UTF-8?q?=20=E2=86=92=200.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 74d4e6b96728..c05dd21efded 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -364,11 +364,11 @@ "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=", + "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.45.0", + "rev": "v0.46.0", "spdx": "MPL-2.0", "vendorHash": null }, From 87ef2832997f827225ed541366e8d160641df79e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:11:42 +0000 Subject: [PATCH 122/198] =?UTF-8?q?terraform-providers.acme:=202.13.0=20?= =?UTF-8?q?=E2=86=92=202.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c05dd21efded..b9983fd7ba23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,14 +9,14 @@ "vendorHash": null }, "acme": { - "hash": "sha256-iAUbGLxeN2Ntsq0mOWEKuvorIy7u+0kffzIqg+wF9gM=", + "hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.13.0", + "rev": "v2.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-5gh3e5wPCBA87fHPXTT+hnrXIPVW5meKmT4pFP1ryOc=" + "vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", From 1e517bb98e00de24225013a1a5fe806d7a2aecaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:13:18 +0000 Subject: [PATCH 123/198] =?UTF-8?q?terraform-providers.nutanix:=201.7.1=20?= =?UTF-8?q?=E2=86=92=201.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b9983fd7ba23..2e1e0f21d30f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -802,11 +802,11 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.7.1", + "rev": "v1.8.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, From bd2f3e614645b7dd050a7cdf2f4bc02c3ff99d8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:14:14 +0000 Subject: [PATCH 124/198] =?UTF-8?q?terraform-providers.opentelekomcloud:?= =?UTF-8?q?=201.33.0=20=E2=86=92=201.33.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2e1e0f21d30f..a360996a8c41 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -856,13 +856,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=", + "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.33.0", + "rev": "v1.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU=" + "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, "opsgenie": { "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", From 6cdb034b3a43a213ae012f4778b2a1ce227fac0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:15:44 +0000 Subject: [PATCH 125/198] =?UTF-8?q?terraform-providers.thunder:=201.0.0=20?= =?UTF-8?q?=E2=86=92=201.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a360996a8c41..7444f78d503d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1117,11 +1117,11 @@ "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { - "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.0.0", + "rev": "v1.1.0", "spdx": "BSD-2-Clause", "vendorHash": null }, From c992e25a7d5d59675584a197af5a38e582a70b4b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:17:51 +0000 Subject: [PATCH 126/198] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?9.10=20=E2=86=92=201.79.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7444f78d503d..9e23db3aadd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" }, "tencentcloud": { - "hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=", + "hash": "sha256-f6GdDTezh1lDNppCLmjx/7jiKsq2yZoR92kYpGAAldQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.10", + "rev": "v1.79.11", "spdx": "MPL-2.0", "vendorHash": null }, From d06382a73b2c8d51e76348da90e045cb3198e11d Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Feb 2023 05:44:18 +0200 Subject: [PATCH 127/198] treewide: more manual fixups for treewide: move NIX_CFLAGS_COMPILE to the env attrset `nix-eval-jobs --flake ".#legacyPackages.x86_64-linux" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'` and `nix-eval-jobs --flake ".#legacyPackages.aarch64-darwin" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'` no longer has output so this could be all of the remaining issues --- pkgs/applications/misc/keepassxc/default.nix | 4 ++-- pkgs/development/interpreters/kerf/default.nix | 4 ++-- pkgs/development/libraries/liblastfm/default.nix | 5 +---- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/python-modules/py3exiv2/default.nix | 4 +--- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 1870c21bed13..3c74b6e91751 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" - ]; + ]); NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index e4fbc2bc6558..0987205f59d9 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { makeFlags = [ "kerf" "kerf_test" ]; # avoid a huge amount of warnings to make failures clearer - env.NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [ + env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [ "void-pointer-to-int-cast" "format" "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index cfd56b5091ee..7dcc3b0d0cc0 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - env.NIX_CFLAGS_COMPILE = - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-std=c++11" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; dontWrapQtApps = true; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 6b35bb423e3b..17e64cafb077 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -12,7 +12,7 @@ let param = rev = version; sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; }; - env.NIX_CFLAGS_COMPILE = null; + env = { }; buildInputs = [ camlp-streams ]; } else if check "3.12" then { version = "2.18.5"; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index a1951b5e1e71..de8cc23c8fb8 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -26,9 +26,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ - "-I${lib.getDev libcxx}/include/c++/v1" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2" From 7e91be2022ea32130af94138179caed47c84a272 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 23 Feb 2023 21:27:01 -0800 Subject: [PATCH 128/198] scala: fix updatescript evaluation --- pkgs/development/compilers/scala/2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 7bb69bde677c..7652d176230a 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { nixfmt ] } - versionSelect='v${versions.major version}.${versions.minor version}.*' + versionSelect='v${lib.versions.major version}.${lib.versions.minor version}.*' oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" if [ "$oldVersion" != "$latestTag" ]; then From d14728014d37d23bb5a8efa0b8a9b673ca617006 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 05:48:49 +0000 Subject: [PATCH 129/198] ghq: 1.3.0 -> 1.4.1 --- pkgs/applications/version-management/ghq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index 26632abe4694..b9bfc6f745ec 100644 --- a/pkgs/applications/version-management/ghq/default.nix +++ b/pkgs/applications/version-management/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY="; + sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84="; }; - vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM="; + vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs="; doCheck = false; From 9dd54bfe3d6504712627a634e3f83446b78e2de2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 03:17:28 +0000 Subject: [PATCH 130/198] python310Packages.asyncssh: 2.13.0 -> 2.13.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index a597c1bdf2c7..c5666af7c187 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-vn4ctHIl3JiZ5WRy/cTarANYSmhDZ1MpwM5nF5yyDik="; + hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic="; }; propagatedBuildInputs = [ From 004200ff3b7c9b11ac22560f6bb16d0396d7ec2d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Feb 2023 13:43:38 +0100 Subject: [PATCH 131/198] ocamlPackages.mirage-bootvar-xen: use Dune 3 --- .../ocaml-modules/mirage-bootvar-xen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix index c280853488de..1bf622714788 100644 --- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "mirage-bootvar-xen"; version = "0.8.0"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz"; - sha256 = "0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; + hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; }; propagatedBuildInputs = [ From 189b9d5e49977d570daa16a64dec8206300cce6b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Feb 2023 13:43:42 +0100 Subject: [PATCH 132/198] =?UTF-8?q?ocamlPackages.mirage-xen:=207.2.0=20?= =?UTF-8?q?=E2=86=92=208.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-xen/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix index a2b84e8fb5e4..8f174f01ccb9 100644 --- a/pkgs/development/ocaml-modules/mirage-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix @@ -17,14 +17,15 @@ buildDunePackage rec { pname = "mirage-xen"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz"; - sha256 = "sha256-5ZdzourQshHGtYPPdJtJLpH8P6ZLNbjQWy7TDxcY3OA="; + hash = "sha256-x8i2Kbz0EcifZK/lbDIFa9Kwtl1/xzbYV9h9E+EtGP4="; }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct From d680ff6cb90cda745c15fca5549ed3ea6bc54024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 06:43:30 +0000 Subject: [PATCH 133/198] kodiPackages.arteplussept: 1.1.1 -> 1.1.8 --- pkgs/applications/video/kodi/addons/arteplussept/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index bec74dd46a97..dad1f27eef5f 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.1.1"; + version = "1.1.8"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To="; + hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; }; propagatedBuildInputs = [ From 66e6bb3f2f5649881445e832311b4feea884f58c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:37:47 +0100 Subject: [PATCH 134/198] python310Packages.puremagic: add changelog to meta --- pkgs/development/python-modules/puremagic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 7a5d291431b9..04d94c7f09f8 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; + hash = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; }; # test data not included on pypi @@ -26,6 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; + changelog = "https://github.com/cdgriffith/puremagic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ globin ]; }; From cff718c9dcbf7788658b0aa307193af539ee8f43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:47:04 +0100 Subject: [PATCH 135/198] python310Packages.puremagic: enable tests --- .../python-modules/puremagic/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 04d94c7f09f8..ad4037a6c580 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder }: @@ -11,13 +12,16 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-bkaqeBE6Rmq8n2nm6KTOkOtX2Qja+4CVlwEmIQYUYr0="; + src = fetchFromGitHub { + owner = "cdgriffith"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WnqDrVPTlNxz3SDt1wLdZmxtj0Vh6gLHDJlYGEHHxsg="; }; - # test data not included on pypi - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "puremagic" From 80cfa1ecef185e6465a935a810f9b85a6e068d6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:51:11 +0100 Subject: [PATCH 136/198] python310Packages.rebulk: add changelog to meta --- pkgs/development/python-modules/rebulk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index cfd1b83d0633..49f12b9753c5 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -15,8 +15,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ six regex ]; meta = with lib; { - homepage = "https://github.com/Toilal/rebulk/"; - license = licenses.mit; description = "Advanced string matching from simple patterns"; + homepage = "https://github.com/Toilal/rebulk/"; + changelog = "https://github.com/Toilal/rebulk/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 499672e5979ad6376b6131a7d80e0922f0370e62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:52:19 +0100 Subject: [PATCH 137/198] python310Packages.rebulk: add pythonImportsCheck --- pkgs/development/python-modules/rebulk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 49f12b9753c5..f0162657f7b8 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ six regex ]; + pythonImportsCheck = [ + "rebulk" + ]; + meta = with lib; { description = "Advanced string matching from simple patterns"; homepage = "https://github.com/Toilal/rebulk/"; From 18964e09c99fdd9adb50766f9f8a1d4d1a9b8ade Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:53:43 +0100 Subject: [PATCH 138/198] python310Packages.rebulk: disable on unsupported Python releases --- pkgs/development/python-modules/rebulk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f0162657f7b8..4d2023ce2b44 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,8 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex, pythonOlder }: buildPythonPackage rec { pname = "rebulk"; version = "3.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From cae59a67b0defa2c35bfd556d66eb02d4e654422 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 08:56:53 +0100 Subject: [PATCH 139/198] python310Packages.rebulk: adjust inputs and enable tests --- .../python-modules/rebulk/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 4d2023ce2b44..cab55c3a29fe 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, regex +}: buildPythonPackage rec { pname = "rebulk"; @@ -9,13 +15,16 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw="; + hash = "sha256-DTC/gPygD6nGlxhaxHXarJveX2Rs4zOMn/XV3B69/rw="; }; - # Some kind of trickery with imports that doesn't work. - doCheck = false; - buildInputs = [ pytest pytest-runner ]; - propagatedBuildInputs = [ six regex ]; + propagatedBuildInputs = [ + regex + ]; + + buildInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "rebulk" From 982cd4075e6ac11512258450b7aaeb2ef9cb2805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 08:00:41 +0000 Subject: [PATCH 140/198] python310Packages.aiohomekit: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index b67d72cc672f..c2c625b4f408 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.1"; + version = "2.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-g/8vzd7ehPNVNzvymXU/i8NiYv7UR9uWfUPnVDQsFg0="; + hash = "sha256-FqZYJoNaRISuZ5m5ZeeregPdBT4fh8NdcgzEho0ZWd0="; }; nativeBuildInputs = [ From 8a10153e82ea0a675ea9ba16545381f4c4658849 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 24 Feb 2023 09:32:00 +0100 Subject: [PATCH 141/198] cryptominisat: 5.8.0 -> 5.11.4 https://github.com/msoos/cryptominisat/releases/tag/5.11.4 --- .../science/logic/cryptominisat/default.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 33de2d27dc90..cd04d612b529 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -1,32 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, boost +}: stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.8.0"; + version = "5.11.4"; src = fetchFromGitHub { - owner = "msoos"; - repo = "cryptominisat"; - rev = version; - sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50"; + owner = "msoos"; + repo = "cryptominisat"; + rev = version; + hash = "sha256-7JNfFKSYWgyyNnWNzXGLqWRwSW+5r6PBMelKeAmx8sc="; }; - patches = [ - (fetchpatch { - # https://github.com/msoos/cryptominisat/pull/621 - url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch"; - sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw"; - }) - ]; - buildInputs = [ python3 boost ]; - nativeBuildInputs = [ cmake xxd ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "An advanced SAT Solver"; - homepage = "https://github.com/msoos/cryptominisat"; - license = licenses.mit; + homepage = "https://github.com/msoos/cryptominisat"; + license = licenses.mit; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } From 847cae697f4c1773724c2b3e9aa6f4f2422e1d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:16:35 +0100 Subject: [PATCH 142/198] ubi_reader: init at 0.8.5 --- pkgs/tools/filesystems/ubi_reader/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/filesystems/ubi_reader/default.nix diff --git a/pkgs/tools/filesystems/ubi_reader/default.nix b/pkgs/tools/filesystems/ubi_reader/default.nix new file mode 100644 index 000000000000..0d2e059b78f0 --- /dev/null +++ b/pkgs/tools/filesystems/ubi_reader/default.nix @@ -0,0 +1,29 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ubi_reader"; + version = "0.8.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "jrspruitt"; + repo = pname; + rev = "v${version}-master"; + hash = "sha256-tjQs1F9kcFrC9FDkfdnax0C8O8Bg7blkpL7GU56eeWU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ python-lzo ]; + + # There are no tests in the source + doCheck = false; + + meta = with lib; { + description = "Collection of Python scripts for reading information about and extracting data from UBI and UBIFS images"; + homepage = "https://github.com/jrspruitt/ubi_reader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vlaci ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98fe56bb166e..682026eef3f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12911,6 +12911,8 @@ with pkgs; ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubi_reader = callPackage ../tools/filesystems/ubi_reader { }; + ubridge = callPackage ../tools/networking/ubridge { }; ubertooth = callPackage ../applications/radio/ubertooth { }; From 4dddf7d16e898172fe8f46c5f890b3020c915a20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 09:38:29 +0100 Subject: [PATCH 143/198] python3Packages.defcon: add changelog to meta --- pkgs/development/python-modules/defcon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 0cdd6c58c49f..8d5d9da29a02 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of UFO based objects for use in font editing applications"; homepage = "https://github.com/robotools/defcon"; + changelog = "https://github.com/robotools/defcon/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann ]; }; From a99cf0eeac09d15adbcd5c0dbd940dca48187c87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 09:47:26 +0100 Subject: [PATCH 144/198] python310Packages.bugsnag: add changelog to meta --- pkgs/development/python-modules/bugsnag/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index cf4e3d68453c..a04b19e9df21 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic error monitoring for Python applications"; homepage = "https://github.com/bugsnag/bugsnag-python"; + changelog = "https://github.com/bugsnag/bugsnag-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 3a4a25024122785dc2bb0f0d39136d371ffcaec4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Feb 2023 18:45:52 +1000 Subject: [PATCH 145/198] fd: 8.6.0 -> 8.7.0 Changelog: https://github.com/sharkdp/fd/blob/v8.7.0/CHANGELOG.md --- pkgs/tools/misc/fd/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 85bc47dab545..38055706004b 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -1,17 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, testers, fd }: rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.6.0"; + version = "8.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-RVGCSUYyWo2wKRIrnci+aWEAPW9jHhMfYkYJkCgd7f8="; + hash = "sha256-y7IrwMLQnvz1PeKt8BE9hbEBwQBiUXM4geYbiTjMymw="; }; - cargoSha256 = "sha256-PT95U1l+BVX7sby3GKktZMmbNNQoPYR8nL+H90EnqZY="; + cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; auditable = true; # TODO: remove when this is the default @@ -31,6 +31,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh contrib/completion/_fd ''; + passthru.tests.version = testers.testVersion { + package = fd; + }; + meta = with lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' From e6713c142eb519d1d855afade59a90f616cc8e5c Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Fri, 24 Feb 2023 17:02:33 +0800 Subject: [PATCH 146/198] MIDIVisualizer: Fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4aad7709039..42950cfdb971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22240,8 +22240,8 @@ with pkgs; micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = callPackage ../applications/audio/midi-visualizer { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; + MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; mimalloc = callPackage ../development/libraries/mimalloc { }; From 2924941c0ed50202d21a4afe794ed4db0d9ff1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Fri, 24 Feb 2023 10:42:28 +0100 Subject: [PATCH 147/198] python3Packages.reproject: fix tests --- pkgs/development/python-modules/reproject/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 10c104e768f2..3baf811140f9 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { "build/lib*" # Avoid failure due to user warning: Distutils was imported before Setuptools "-p no:warnings" + # Uses network + "--ignore build/lib*/reproject/interpolation/" ]; pythonImportsCheck = [ From 5d06e1f6568950180850497dc49f1788970791a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 10:46:58 +0100 Subject: [PATCH 148/198] python310Packages.flake8-length: add changelog to meta --- .../python-modules/flake8-length/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index d81a9765bb0c..1c227041f1f7 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -20,18 +20,19 @@ buildPythonPackage rec { flake8 ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "flake8_length" ]; - nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; - meta = { + meta = with lib; { description = "Flake8 plugin for a smart line length validation"; homepage = "https://github.com/orsinium-labs/flake8-length"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ sauyon ]; + changelog = "https://github.com/orsinium-labs/flake8-length/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ sauyon ]; }; } From 4e87222e18d11cfdbc142cc5c82620916dd1e8c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 10:50:56 +0100 Subject: [PATCH 149/198] python310Packages.flake8-length: adjust build system --- .../python-modules/flake8-length/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flake8-length/default.nix b/pkgs/development/python-modules/flake8-length/default.nix index 1c227041f1f7..348246a939ce 100644 --- a/pkgs/development/python-modules/flake8-length/default.nix +++ b/pkgs/development/python-modules/flake8-length/default.nix @@ -1,14 +1,17 @@ { lib , buildPythonPackage -, pythonOlder -, flake8 -, pytestCheckHook , fetchPypi +, flake8 +, flit-core +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "flake8-length"; version = "0.3.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { @@ -16,17 +19,25 @@ buildPythonPackage rec { sha256 = "sha256-Dr1hTCU2G1STczXJsUPMGFYs1NpIAk1I95vxXsRTtRA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ flake8 ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "flake8_length" ]; - pytestFlagsArray = [ "tests/" ]; + pytestFlagsArray = [ + "tests/" + ]; meta = with lib; { description = "Flake8 plugin for a smart line length validation"; From c495fe0ebd37bd96013878f3703139d6662b95c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 10:58:19 +0100 Subject: [PATCH 150/198] python310Packages.flask-admin: add changelog to meta --- pkgs/development/python-modules/flask-admin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 075cc2f7ec2a..6b6d9802cc6b 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -104,6 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Admin interface framework for Flask"; homepage = "https://github.com/flask-admin/flask-admin/"; + changelog = "https://github.com/flask-admin/flask-admin/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; From 5c49b0935ef8b60a82cd6a0bde002ee39dbd237e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 11:02:06 +0100 Subject: [PATCH 151/198] python310Packages.flask-admin: disable failing test --- pkgs/development/python-modules/flask-admin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 6b6d9802cc6b..d4b2f4d71dac 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { "flask_admin/tests/sqla/test_inlineform.py" "flask_admin/tests/sqla/test_postgres.py" "flask_admin/tests/sqla/test_translation.py" + # RuntimeError: Working outside of application context. + "flask_admin/tests/sqla/test_multi_pk.py" ]; pythonImportsCheck = [ From 5a0589593dd2719dcb4abe06a16e47ae86ff94c1 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 24 Feb 2023 13:00:01 +0200 Subject: [PATCH 152/198] teams: add an alternative download URL --- .../networking/instant-messengers/teams/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 0036ffc77ca5..177671f21c00 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -46,7 +46,11 @@ let version = versions.linux; src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb"; + urls = [ + "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + # NOTE: the archive.org timestamp must also be updated if the version changes. + "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" + ]; hash = hashes.linux; }; From 10801c1e45dcc312cb351eae456c7e25038c6438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 11:39:06 +0000 Subject: [PATCH 153/198] python310Packages.google-cloud-org-policy: 1.7.1 -> 1.8.0 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 43b5b09810e1..35066385a7d3 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ="; + hash = "sha256-ylUUxWLe5u1WVyz1rD64u9MJ7qKsLl3cLD4ELcZCI6Y="; }; propagatedBuildInputs = [ From f716af0cf4e2efab37c11daa42be90751824dec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 11:49:41 +0000 Subject: [PATCH 154/198] python310Packages.types-dateutil: 2.8.19.7 -> 2.8.19.8 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 12572eca0c81..ae2d30d9722f 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.19.7"; + version = "2.8.19.8"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-evWl0bgKsd+guk2Hn6yzgug2piwtQIwqUJvkaA/Yscg="; + hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY="; }; pythonImportsCheck = [ From 0edd6eb328a837c325fc48a7c8052fc68a47b4ce Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 23 Feb 2023 14:29:19 +0100 Subject: [PATCH 155/198] python3Packages.cstruct: init at 5.2 --- .../python-modules/cstruct/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/cstruct/default.nix diff --git a/pkgs/development/python-modules/cstruct/default.nix b/pkgs/development/python-modules/cstruct/default.nix new file mode 100644 index 000000000000..688fe787af2b --- /dev/null +++ b/pkgs/development/python-modules/cstruct/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cstruct"; + version = "5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "andreax79"; + repo = "python-cstruct"; + rev = "v${version}"; + hash = "sha256-Dwogf0mmxFyBV7tPsuKV6gMZLPSCm7YhzqgJNHpaPFA="; + }; + + pythonImportsCheck = [ + "cstruct" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "C-style structs for Python"; + homepage = "https://github.com/andreax79/python-cstruct"; + changelog = "https://github.com/andreax79/python-cstruct/blob/v${version}/changelog.txt"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2726985ad89c..652a9956577b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2122,6 +2122,8 @@ self: super: with self; { cssutils = callPackage ../development/python-modules/cssutils { }; + cstruct = callPackage ../development/python-modules/cstruct { }; + csvw = callPackage ../development/python-modules/csvw { }; cu2qu = callPackage ../development/python-modules/cu2qu { }; From c3aaa8fb5e9ddae0dc3de00cdba200e241ea0f9d Mon Sep 17 00:00:00 2001 From: 1000101 Date: Fri, 24 Feb 2023 12:57:13 +0100 Subject: [PATCH 156/198] postgresqlPackages.timescaledb: 2.9.3 -> 2.10.0 (#217529) --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 8015b3a2c3cb..045e381edd73 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.3"; + version = "2.10.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-eUn/sk2l/2aEGXupRPNDrbrIpUA3aNPo3tBJhmBoeXk="; + sha256 = "sha256-3Pne4L9P8mJv2ja6EpxtpCBCYvlCP6D5CzDtkkvE23c="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From 9b0ec1313b8f4c8bf30846cbca9fe6660263c029 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Feb 2023 19:21:13 +0000 Subject: [PATCH 157/198] =?UTF-8?q?gjs:=201.74.1=20=E2=86=92=201.74.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.74.1...1.74.2 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index a6824f121d39..045fa68e7641 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.74.1"; + version = "1.74.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-8h+c0zN6ZypEx+ZL+ajYrXfBuIuVKythhMevmx8+9Fk="; + sha256 = "sha256-pAb9ahZSz2bcqyKAYr0Wp19bM3gkjfu74BayEnRKMLY="; }; patches = [ From bf36f1c906b28c6a04c565fd50d6224411e7316d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 12:05:02 +0000 Subject: [PATCH 158/198] v2ray: 5.3.0 -> 5.4.0 --- pkgs/tools/networking/v2ray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index cad8c032271b..b8f358a53ead 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-LLvAoPA3rLGfhrWD37OVyWd4tC9mwgpE1WjK2pY27xU="; + hash = "sha256-dgWpfpJiPYQmVg7CHRE8f9hX5vgC2TuLpTfMAksDurs="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-xBNVyPN9PRkraPRzZXOguGemYPm+Jw8hl04vWV8TZaA="; + vendorSha256 = "sha256-BEMdh1zQdjVEu0GJt6KJyWN5P9cUHfs04iNZWxzZ0Yo="; ldflags = [ "-s" "-w" "-buildid=" ]; From 9248363f41be9e51c198fc19d9c570a4c2d1e4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 12:17:23 +0000 Subject: [PATCH 159/198] python310Packages.types-pytz: 2022.7.1.1 -> 2022.7.1.2 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 41b5baabd7fe..a3a67259beb7 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.7.1.1"; + version = "2022.7.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WAELsdb3unKE+6Jks7ycJICrWGIB4lEo7Sqt6kwpizM="; + sha256 = "sha256-SH0+jp9Ace7ICBdG1T+pgrvAWBLnGdy/Lr89VaGkzSg="; }; # Modules doesn't have tests From d9d3e617645b1268a150067e8aa38fc41af2ec46 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 24 Feb 2023 17:50:50 +0530 Subject: [PATCH 160/198] flyctl: 0.0.464 -> 0.0.465 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e66731b8d2c6..359b8a71fc67 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.464"; + version = "0.0.465"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-rfdxOhViYzL+tK4p+8deqLgk81HBFsD17j05mx0Xkrk="; + hash = "sha256-1+xlKRVFQuGDENWWtPYpNHroNp5jZZojsBPo9G2Aay8="; }; - vendorHash = "sha256-sJl6v57/Is3g5EQ6oU/CkoqkXL75U5oUsdLdo8ChfH4="; + vendorHash = "sha256-ExHzf4L0Ibb+tYfBV45hEaUJgSQhgpHk40QhHa5dpQ8="; subPackages = [ "." ]; From d630f6ad33d84349a6de2cb024434efebec8becb Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 23 Feb 2023 14:38:50 +0100 Subject: [PATCH 161/198] jefferson: init at 0.4.2 --- pkgs/tools/filesystems/jefferson/default.nix | 41 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/filesystems/jefferson/default.nix diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/tools/filesystems/jefferson/default.nix new file mode 100644 index 000000000000..f16e1d316882 --- /dev/null +++ b/pkgs/tools/filesystems/jefferson/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "jefferson"; + version = "0.4.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "onekey-sec"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zW38vcDw4Jz5gO9IHrWRlvUznKvUyPbxkYMxn7VSTpA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + cstruct + python-lzo + ]; + + pythonImportsCheck = [ + "jefferson" + ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "JFFS2 filesystem extraction tool"; + homepage = "https://github.com/onekey-sec/jefferson"; + license = licenses.mit; + maintainers = with maintainers; [ tnias ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e93b06df2183..dda5718f2d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20606,6 +20606,8 @@ with pkgs; jbigkit = callPackage ../development/libraries/jbigkit { }; + jefferson = callPackage ../tools/filesystems/jefferson { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jose = callPackage ../development/libraries/jose { }; From 19d6a0cecb0a494420942c1d786335004e392f25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 13:38:31 +0000 Subject: [PATCH 162/198] oh-my-zsh: 2023-02-16 -> 2023-02-23 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 29416b6357ed..879d89428351 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-02-16"; + version = "2023-02-23"; pname = "oh-my-zsh"; - rev = "8a68bf67720a6a5442ae947d10d74b1dd3558d91"; + rev = "8a008e1f51d451db21232edd6f1709e6c5ea334e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "n6gfuvzz62l9AvQqWOwNjecLnHj4tsa5FDpunUeHZ/k="; + sha256 = "GXrDcM3MMDLHJ64xyyiORK6UPepFPaNbaZ5rNmV4zlk="; }; strictDeps = true; From e23bd444d91b081a29940f6845efd20dac542aa1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:40:25 +0200 Subject: [PATCH 163/198] rizin: 0.4.1 -> 0.5.1 --- pkgs/development/tools/analysis/rizin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index dad7193dd25d..2e1a77eda918 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g="; + hash = "sha256-96EzipCd5GX1bkpZIXZp1ZUVO+Oe4t5bhthGZHUVmFk="; }; mesonFlags = [ From e6db6faabc132d47a5039554a0ec149f67ed5aa6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:40:34 +0200 Subject: [PATCH 164/198] cutter: 2.1.2 -> 2.2.0 --- pkgs/development/tools/analysis/rizin/cutter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 3eb953bd4803..5fcfb20147b0 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU="; + hash = "sha256-TgYX7FKTi5FBlCRDskGC/OUyh5yvS0nsLUtfCCC4S1w="; fetchSubmodules = true; }; From e051c40c92c401b7a2d38637b98a3efb574790f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 16:15:58 +0200 Subject: [PATCH 165/198] termusic: 0.7.8 -> 0.7.9 --- pkgs/applications/audio/termusic/default.nix | 33 +++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index c26ffd7e64af..85d829f765eb 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -1,23 +1,42 @@ { lib , stdenv -, fetchCrate , rustPlatform +, fetchCrate +, fetchpatch , pkg-config -, alsa-lib }: +, alsa-lib +, darwin +}: rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.8"; + version = "0.7.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1RlG1/2+NuMO9zqFHQaEkEX1YrYYMjnaNprjdl1ZnHQ="; + hash = "sha256-ytAKINcZwLyHWbzShxfxRKx4BepM0G2BYdLgwR48g7w="; }; - cargoHash = "sha256-SYk2SiFbp40/6Z0aBoX4MPnPLHjEfsJKCW4cErm0D78="; + cargoHash = "sha256-yxFF5Yqj+xTB3FAJUtgcIeAEHR44JA1xONxGFdG0yS0="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib ]; + patches = [ + (fetchpatch { + name = "fix-panic-when-XDG_AUDIO_DIR-not-set.patch"; + url = "https://github.com/tramhao/termusic/commit/b6006b22901f1f865a2e3acf7490fd3fa520ca5e.patch"; + hash = "sha256-1ukQ0y5IRdOndsryuqXI9/zyhCDQ5NIeTan4KCynAv0="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; meta = with lib; { description = "Terminal Music Player TUI written in Rust"; From b0b49878bc627f017b8c108e7e5778ecff6cca3e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 Feb 2023 07:20:50 +0100 Subject: [PATCH 166/198] ocamlPackages.mirage: use Dune 3 --- pkgs/development/ocaml-modules/mirage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 410475b6b5c0..98d96cf146f0 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; + duneVersion = "3"; outputs = [ "out" "dev" ]; From f7fe795ca0ec5163b5d592a0300942c3d8985ae0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 Feb 2023 07:20:55 +0100 Subject: [PATCH 167/198] =?UTF-8?q?ocamlPackages.functoria:=204.2.0=20?= =?UTF-8?q?=E2=86=92=204.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/functoria/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index cf364347fa44..346083ddadb3 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,13 +4,14 @@ buildDunePackage rec { pname = "functoria"; - version = "4.2.0"; + version = "4.3.4"; + duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - sha256 = "sha256-rZ9y8+wbDjqjY1sx+TmSoR42hUKRMGpehCCR2cEgbv8="; + hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY="; }; propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; From 01bf3b02f750b9402a1b4f531cf09b097d7efa47 Mon Sep 17 00:00:00 2001 From: Matthew McMillan Date: Thu, 23 Feb 2023 19:58:09 -0500 Subject: [PATCH 168/198] maintainers: add unsolvedcypher --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 30dc8443e949..b0dcafe12276 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15349,6 +15349,11 @@ github = "unrooted"; githubId = 30440603; }; + unsolvedcypher = { + name = "Matthew M"; + github = "UnsolvedCypher"; + githubId = 3170853; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; From 32a93b58b2eab85e31cff79662c4e6056f18d9fd Mon Sep 17 00:00:00 2001 From: Matthew McMillan Date: Thu, 23 Feb 2023 19:58:41 -0500 Subject: [PATCH 169/198] fishPlugins.plugin-git: init at 0.1 --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/plugin-git.nix | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/plugin-git.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 7c160803a9c0..718dbfec7a64 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -32,6 +32,8 @@ lib.makeScope newScope (self: with self; { pisces = callPackage ./pisces.nix { }; + plugin-git = callPackage ./plugin-git.nix { }; + puffer = callPackage ./puffer.nix { }; pure = callPackage ./pure.nix { }; diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/shells/fish/plugins/plugin-git.nix new file mode 100644 index 000000000000..7d1774b642df --- /dev/null +++ b/pkgs/shells/fish/plugins/plugin-git.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "plugin-git"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "jhillyerd"; + repo = "plugin-git"; + rev = "v0.1"; + sha256 = "sha256-MfrRQdcj7UtIUgtqKjt4lqFLpA6YZgKjE03VaaypNzE"; + }; + + meta = with lib; { + description = "Git plugin for fish (similar to oh-my-zsh git)"; + homepage = "https://github.com/jhillyerd/plugin-git"; + license = licenses.mit; + maintainers = with maintainers; [ unsolvedcypher ]; + }; +} From 5af6ce7c76ee724634eaa15f0299e5f510366c1f Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Thu, 23 Feb 2023 14:07:44 -0700 Subject: [PATCH 170/198] python3Packages.arpy: init at 2.3.0 --- .../python-modules/arpy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/arpy/default.nix diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix new file mode 100644 index 000000000000..229e15d24ff3 --- /dev/null +++ b/pkgs/development/python-modules/arpy/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "arpy"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "viraptor"; + repo = pname; + rev = version; + hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s="; + }; + + checkInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "arpy" ]; + + meta = with lib; { + description = "A library for accessing the archive files and reading the contents"; + homepage = "https://github.com/viraptor/arpy"; + license = licenses.bsd2; + maintainers = with maintainers; [ thornycrackers ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2726985ad89c..d717abccfe5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -600,6 +600,8 @@ self: super: with self; { ariadne = callPackage ../development/python-modules/ariadne { }; + arpy = callPackage ../development/python-modules/arpy { }; + arnparse = callPackage ../development/python-modules/arnparse { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; From f1cbb1fe63e3b3bf47fe508570a9cc57766b3ad9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 17:10:33 +0100 Subject: [PATCH 171/198] python310Packages.aioesphomeapi: 13.4.0 -> 13.4.1 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.4.0...v13.4.1 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.4.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 0be98209ca2e..7d8bdd5d3a3b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.4.0"; + version = "13.4.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-auqG+2Y+Dgwtkwbidi430n4t+GnZlBHIPUmsfl1aPa0="; + hash = "sha256-J0nhHJQkmcAPpkNRfyFyhJun54J3g18js47dSS3pvas="; }; propagatedBuildInputs = [ From 74020c8ca38499cab5d1434468b45c1c2fbde043 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 16:32:50 +0000 Subject: [PATCH 172/198] python310Packages.azure-mgmt-recoveryservices: 2.2.0 -> 2.3.0 --- .../python-modules/azure-mgmt-recoveryservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 2d994b93707a..a9158d8b581f 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss="; + hash = "sha256-4L6Tqgvqh+nJyeXMolSpQ/2knAED75RQqD/lUDOt5ek="; }; propagatedBuildInputs = [ From fb580219d6caab2848eb45a5fc751c8f1423237c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 19:21:20 +0200 Subject: [PATCH 173/198] kodiPackages.arteplussept: update homepage --- pkgs/applications/video/kodi/addons/arteplussept/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index bec74dd46a97..aa50167e2647 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -23,7 +23,7 @@ buildKodiAddon rec { }; meta = with lib; { - homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept"; + homepage = "https://github.com/thomas-ernest/plugin.video.arteplussept"; description = "Watch videos available on Arte+7"; license = licenses.mit; maintainers = teams.kodi.members; From c8c8db814492c723dabc2b11586c737ae030c42e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 19:36:42 +0200 Subject: [PATCH 174/198] discord-ptb: 0.0.38 -> 0.0.39 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 184000c6bf19..8777bd249545 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; - ptb = "0.0.38"; + ptb = "0.0.39"; canary = "0.0.148"; } else { stable = "0.0.264"; @@ -18,7 +18,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "bPg7ZNQQxEpRSpp8j5/XLBDEJyId8mDGxS6tqkzzI1s="; + sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 9fa55e44ce78e0be6850d835135e42b23ac9ebb8 Mon Sep 17 00:00:00 2001 From: Tristan Date: Fri, 24 Feb 2023 12:49:33 -0500 Subject: [PATCH 175/198] pgloader: not broken on Darwin I decided to build pgloader on `aarch64-darwin` after seeing it was marked broken and it built and runs fine, so it can be marked un-broken. --- pkgs/development/tools/pgloader/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index f12cf2a07c96..ab2e047264eb 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://pgloader.io/"; description = "Loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; From 2b8c56c12e6254d21ecfee2559fde828e4f58806 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 21:00:46 +0200 Subject: [PATCH 176/198] unciv: 4.4.13-gp -> 4.4.19 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 7849de17cf6d..244f317065cd 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.13-gp"; + version = "4.4.19"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk="; + hash = "sha256-+f/cl+a8AQ4VUui8ds8PhY9G9Xkag+qv7FuansXRd34="; }; dontUnpack = true; From 06afa6115de0108860cd5196fbfa1c3809416948 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 24 Feb 2023 19:19:21 +0000 Subject: [PATCH 177/198] quake3demo: fix binary paths in the wrapper https://github.com/NixOS/nixpkgs/pull/209008 moved quake3 binaries to $out/bin. This broke wrappers as: $ NIXPKGS_ALLOW_UNFREE=1 nix build -f. quake3demo -L ... quake3-demo> Builder called die: Cannot wrap '/nix/store/khlq2wa0i7rab4vkzvk4pl54lyi6c36d-quake3-demo-1.11-6-ioquake3-unstable-2022-11-24/bin/quake3' because it is not an executable file The change fixes wrapper to point to new locations. --- pkgs/games/quake3/wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3cb64641153a..3c777c5b27fb 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; From 0dc164866acb092f88003daadaa2b963cd8ec0d3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 24 Feb 2023 19:25:57 +0000 Subject: [PATCH 178/198] htop-vim: unstable-2022-05-24 -> unstable-2023-02-16 --- pkgs/tools/system/htop/htop-vim.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index c2ec5b9ddffb..7f020f54f9de 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -2,17 +2,17 @@ htop.overrideAttrs (oldAttrs: rec { pname = "htop-vim"; - version = "unstable-2022-05-24"; + version = "unstable-2023-02-16"; src = fetchFromGitHub { owner = "KoffeinFlummi"; repo = pname; - rev = "830ef7144940875d9d9716e33aff8651d164026e"; - sha256 = "sha256-ojStkpWvhb+W3dWyRev0VwjtCVL/I9L8FhtXcQ+ODLA="; + rev = "b2b58f8f152343b70c33b79ba51a298024278621"; + hash = "sha256-ZfdBAlnjoy8g6xwrR/i2+dGldMOfLlX6DRlNqB8pkGM="; }; meta = with lib; { - inherit (htop.meta) platforms license; + inherit (oldAttrs.meta) platforms license; description = "An interactive process viewer for Linux, with vim-style keybindings"; homepage = "https://github.com/KoffeinFlummi/htop-vim"; maintainers = with maintainers; [ thiagokokada ]; From b1551ebad1c9a73c741155b6a070c81973b488e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 19:30:19 +0000 Subject: [PATCH 179/198] python310Packages.google-cloud-asset: 3.17.1 -> 3.18.0 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index e32bcf970264..4e6c6aaae870 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.17.1"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; + hash = "sha256-BW+zYDmK9CPmzePAgQWXRQ8JrQNgEulPGtQgUdnrY4I="; }; propagatedBuildInputs = [ From beaa132a5f6cbf7b39913fb3347c1b29438ba4ca Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 24 Feb 2023 19:39:05 +0000 Subject: [PATCH 180/198] rar: 6.12 -> 6.21 --- pkgs/tools/archivers/rar/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 6b4a77fdb058..a1c22835752b 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -1,24 +1,26 @@ { lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: let - version = "6.12"; + version = "6.21"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; + # Use `nix store prefetch-file ` to generate the hashes for the other systems + # TODO: create update script srcUrl = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-Vh8Hyd3Y2tDapXY+xZ+6W+X7SQGDsy1x61L28sieYKw="; + hash = "sha256-mDeRmLTjF0ZLv4JoLrgI8YBFFulBSKfOPb6hrxDZIkU="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-ZaGn5OzqVzDojJn8bTrbRh1wvYXM7SK91jl96mbNAeA="; + hash = "sha256-3fr5aVkh/r6OfBEcZULJSZp5ydakJOLRPlgzMdlwGTM="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-SR80VxKgLrJqO0JGWMMGUuIuIgGgxcVH+5fCWnVqJks="; + hash = "sha256-OR9HBlRteTzuyQ06tyXTSrFTBHFwmZ41kUfvgflogT4="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-9gfKEr3DE4hMWm9QT79mKgURvzn+BKmyppTJhs00u2c="; + hash = "sha256-UN3gmEuIpCXwmw3/l+KdarAYLy1DxGoPAOB2bfJTGbw="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); manSrc = fetchurl { From 3dccc7c3659fbccc3ecdbf32c510c72c2fc7c0f2 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 24 Feb 2023 22:45:28 +0300 Subject: [PATCH 181/198] r-modules: fix eval Not sure how this worked before. Now it at least evals. --- pkgs/development/r-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 8a4b279179af..7cfb8e54f275 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -154,8 +154,8 @@ let overrideRDepends = overrides: old: lib.mapAttrs (name: value: (builtins.getAttr name old).overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ value; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs ++ value; + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ value; + propagatedNativeBuildInputs = (attrs.propagatedNativeBuildInputs or []) ++ value; }) ) overrides; From a7781990069a5e4a6a0e2dc427fe56f540b6bc11 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:37:31 +0200 Subject: [PATCH 182/198] python310Packages.dvc-render: fix build on darwin --- pkgs/development/python-modules/dvc-render/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 73494ae5a374..58b409741f15 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , funcy @@ -50,6 +51,10 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/test_vega.py" + ]; + pythonImportsCheck = [ "dvc_render" ]; From 8df4a5b6d27e421083a68aae25169105044aaab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 20:38:46 +0000 Subject: [PATCH 183/198] python310Packages.google-cloud-os-config: 1.14.1 -> 1.15.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 9948b7243c94..021d9533b445 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.14.1"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM="; + hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo="; }; propagatedBuildInputs = [ From 9a275e7d8eee3afbe7ac8622b6d84f0daa7d9065 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:53:30 +0200 Subject: [PATCH 184/198] Revert "python310Packages.dvc-objects: 0.19.3 -> 0.20.0" --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 343e5705f401..a0ab592eaa90 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.20.0"; + version = "0.19.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-T7vcnxxN0YUHoDVc98f0QwiMqT88lx8NejTsDfBY5SY="; + hash = "sha256-oKK+BhOgdRPZZAACgxgmr9rlzEH9yWmvbmx09d42u/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e945582899510aa46d1748a5862e890073fd1f04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Feb 2023 20:56:22 +0000 Subject: [PATCH 185/198] evcc: 0.112.5 -> 0.113.0 https://github.com/evcc-io/evcc/releases/tag/0.113.0 --- pkgs/servers/home-automation/evcc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 7c826efbf4cf..094c29c6e306 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,22 +14,22 @@ , stdenv }: -buildGoModule rec { +buildGo120Module rec { pname = "evcc"; - version = "0.112.5"; + version = "0.113.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-UoBepu+9A4nuv9HdjYacMXzXqdS24KU4hYuRlEhsdKQ="; + hash = "sha256-ikpcuOihkghRMsSj1gy4FxqZ/ojH4bk218O3LUkEHIQ="; }; - vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g="; + vendorHash = "sha256-xzD/CKecRG0qKICVwuUGh8wTgVCz0iwYzcXmUZFLLso="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-bUdyRrrU+lWGouGHweNHRhHe3/jEb4nSviU1t4AriMU="; + hash = "sha256-LGlM+itulqtlwyVKfVGiZtTpcCmx+lVvE3JOFkYRHXk="; }; nativeBuildInputs = [ From aaf6b00b5d9e0ab17680eb403c2abb31c33733dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 21:01:17 +0000 Subject: [PATCH 186/198] python310Packages.marshmallow-sqlalchemy: 0.28.1 -> 0.28.2 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 100298e0fc0b..b1cdd875aa0b 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.28.1"; + version = "0.28.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qjdnRylngKVjVeMGe5yL9DoqHET/mF3oKzpdnhYcorg="; + sha256 = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; }; propagatedBuildInputs = [ From 9cb4d27cf42049309491e2745aedc723f05133ce Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 24 Feb 2023 23:01:25 +0200 Subject: [PATCH 187/198] python310Packages.dvc-data: 0.38.1 -> 0.40.3 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 316e20f91d0e..3c03a9e0fdcf 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.38.1"; + version = "0.40.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xuNxsG8wMpdwyA0BkEYepnGjIZGmUzTivN5paLtM68Q="; + hash = "sha256-kJABNVUFoaN8Q7IVJKW/LF2kJwB4HcsvMEDmE6eTAxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9893156710d5d62fdc52dd231554cc7ee30f5351 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 22:45:37 +0100 Subject: [PATCH 188/198] python310Packages.pykakasi: add changelog to meta --- pkgs/development/python-modules/pykakasi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 859564e1d13d..4046bfba83ff 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python converter for Japanese Kana-kanji sentences into Kana-Roman"; homepage = "https://github.com/miurahr/pykakasi"; + changelog = "https://github.com/miurahr/pykakasi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From b51dac4ae85db004bc64f3fd72dfbd54afcd88d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 22:54:00 +0100 Subject: [PATCH 189/198] python310Packages.pykakasi: add missing input --- pkgs/development/python-modules/pykakasi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 4046bfba83ff..385239b5ad52 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , importlib-metadata , jaconv +, py-cpuinfo , pytest-benchmark , pytestCheckHook , pythonOlder @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miurahr"; repo = pname; - rev = "v${version}"; - sha256 = "ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + py-cpuinfo pytest-benchmark pytestCheckHook ]; From 8ee7baca653f6eb2855d97cc563321dc4de6dbcf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Feb 2023 13:57:16 -0800 Subject: [PATCH 190/198] python310Packages.owslib: 0.27.2 -> 0.28.0 Co-authored-by: Fabian Affolter --- .../python-modules/owslib/default.nix | 74 +++++++++++++++---- 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index c2783642b514..5369d7b08b8d 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,28 +1,70 @@ -{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : -buildPythonPackage rec { - pname = "OWSLib"; - version = "0.27.2"; +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyproj +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, requests +, python +}: - src = fetchPypi { - inherit pname version; - sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s="; +buildPythonPackage rec { + pname = "owslib"; + version = "0.28.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "geopython"; + repo = "OWSLib"; + rev = "refs/tags/${version}"; + hash = "sha256-o/sNhnEZ9e0BsftN9AhJKuUjKHAHNRPe0grxdAWRVao="; }; - # as now upstream https://github.com/geopython/OWSLib/pull/824 postPatch = '' - substituteInPlace requirements.txt \ - --replace 'pyproj ' 'pyproj #' + substituteInPlace tox.ini \ + --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" "" ''; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ + pyproj + python-dateutil + pytz + pyyaml + requests + ]; - # 'tests' dir not included in pypy distribution archive. - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "owslib" + ]; + + preCheck = '' + # _pytest.pathlib.ImportPathMismatchError: ('owslib.swe.sensor.sml', '/build/source/build/... + export PY_IGNORE_IMPORTMISMATCH=1 + ''; + + disabledTests = [ + # Tests require network access + "test_ows_interfaces_wcs" + "test_wfs_110_remotemd" + "test_wfs_200_remotemd" + "test_wms_130_remotemd" + "test_wmts_example_informatievlaanderen" + ]; meta = with lib; { - description = "client for Open Geospatial Consortium web service interface standards"; - license = licenses.bsd3; + description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; + changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 1715ced3444aa50f5a36b6e32dba75bc0f939669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Feb 2023 14:29:51 -0800 Subject: [PATCH 191/198] python310Packages.mat2: 0.13.2 -> 0.13.3 Diff: https://0xacab.org/jvoisin/mat2/-/compare/0.13.2...0.13.3 Changelog: https://0xacab.org/jvoisin/mat2/-/blob/0.13.3/CHANGELOG.md --- pkgs/development/python-modules/mat2/default.nix | 7 +++++-- pkgs/development/python-modules/mat2/paths.patch | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index e467023a8793..3737bea08243 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,16 +23,18 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.2"; + version = "0.13.3"; disabled = pythonOlder "3.5"; + format = "setuptools"; + src = fetchFromGitLab { domain = "0xacab.org"; owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk="; + hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; }; patches = [ @@ -56,6 +58,7 @@ buildPythonPackage rec { ]; postPatch = '' + rm pyproject.toml substituteInPlace dolphin/mat2.desktop \ --replace "@mat2@" "$out/bin/mat2" \ --replace "@mat2svg@" "$out/share/icons/hicolor/scalable/apps/mat2.svg" diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 53f72ce94637..c2c156885c19 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -13,7 +13,7 @@ index 41c8de4..11df258 100644 +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py -index cdfce3d..1e83520 100644 +index 2b91ac2..5fcf6e5 100644 --- a/libmat2/exiftool.py +++ b/libmat2/exiftool.py @@ -1,8 +1,6 @@ @@ -23,13 +23,13 @@ index cdfce3d..1e83520 100644 import os -import shutil import subprocess - from typing import Union + from typing import Union, Set, Dict @@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): return False return True --@functools.lru_cache +-@functools.lru_cache(maxsize=None) def _get_exiftool_path() -> str: # pragma: no cover - which_path = shutil.which('exiftool') - if which_path: @@ -42,7 +42,7 @@ index cdfce3d..1e83520 100644 - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' diff --git a/libmat2/video.py b/libmat2/video.py -index 4d33aa4..6388664 100644 +index 39059c5..82fe1e7 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@ @@ -51,12 +51,12 @@ index 4d33aa4..6388664 100644 -import shutil import logging - from typing import Union + from typing import Union, Dict @@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): } --@functools.lru_cache() +-@functools.lru_cache(maxsize=None) def _get_ffmpeg_path() -> str: # pragma: no cover - which_path = shutil.which('ffmpeg') - if which_path: From d01f11256dfb4f2086e928d70ab078d1990a784b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:02:24 +0100 Subject: [PATCH 192/198] python310Packages.marshmallow-sqlalchemy: add changelog to meta --- .../python-modules/marshmallow-sqlalchemy/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index b1cdd875aa0b..ce92fbd864f3 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; + hash = "sha256-KrDxKAx5Plrsgd6rPmPsI2iN3+BeXzislgNooQeVIKE="; }; propagatedBuildInputs = [ @@ -33,9 +33,10 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; description = "SQLAlchemy integration with marshmallow"; + homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; + changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 0014ae62f36bbe5fa170758ee200ef0d5247e785 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:04:15 +0100 Subject: [PATCH 193/198] python310Packages.marshmallow-sqlalchemy: update disabled --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ce92fbd864f3..064fc2fd402e 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; version = "0.28.2"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 5f46b8ef05156436a1e74b08058d09c12af7467a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:05:06 +0100 Subject: [PATCH 194/198] python310Packages.marshmallow-sqlalchemy: add missing input --- .../python-modules/marshmallow-sqlalchemy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 064fc2fd402e..c648ec9fed6b 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , marshmallow +, packaging , sqlalchemy , pytest-lazy-fixture , pytestCheckHook @@ -22,6 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ marshmallow + packaging sqlalchemy ]; From 2611a7fdc00e77b01c0b159f25a33a6b8d480dec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:23:24 +0100 Subject: [PATCH 195/198] python310Packages.peaqevcore: 12.0.2 -> 12.1.6 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f171d211a688..6880c5d7c1e7 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.0.2"; + version = "12.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TfIzTbVXhS+DxroxBqfodS4HAQBPJQ4/Vo4Jh8VjYfM="; + hash = "sha256-6DuvA1HAMr4A9mNH9jFKH9IWOt4010iZewldCDWWmPE="; }; postPatch = '' From e07accff8b94ff4e8801dd0731593584dbdf9c8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:26:17 +0100 Subject: [PATCH 196/198] python310Packages.yalexs-ble: 2.0.2 -> 2.0.3 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.0.3/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 6dd20021b743..34dec9ee0b6a 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ev2m3YWiTWOBgK3dr7Gv8Od4tm5Rh4hmB5VJdL7MEOg="; + hash = "sha256-ka1CkDm8ahyj0VaxfRIHOt5rqrVWj2EZa2LXE2gqXlI="; }; nativeBuildInputs = [ From be0a9753aa3bb7b252e923497793d1a08d209b30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 23:28:47 +0100 Subject: [PATCH 197/198] python310Packages.zamg: 0.2.2 -> 0.2.3 Diff: https://github.com/killer0071234/python-zamg/compare/refs/tags/v0.2.2...v0.2.3 Changelog: https://github.com/killer0071234/python-zamg/releases/tag/v0.2.3 --- pkgs/development/python-modules/zamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 791dfd87798a..9f363bd150c5 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-pBXt7t7Cs7F0bxvB8N67XaY/uvYhZPw10+bei/3QSfw="; + hash = "sha256-4q6/+/neWw0BFPjhCPXuLiCwyGqQn96D2pSyK/Yl6U8="; }; postPatch = '' From bf816a54cf7dc356c1b611b91bc0e5de051eb707 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Feb 2023 08:21:45 +1000 Subject: [PATCH 198/198] podman: 4.4.1 -> 4.4.2 Diff: https://github.com/containers/podman/compare/v4.4.1...v4.4.2 Changelog: https://github.com/containers/podman/blob/v4.4.2/RELEASE_NOTES.md --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d8bfa140fa87..8f206666e408 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "podman"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-Uha5ueOGNmG2f+1I89uFQKA3pSSp1d02FGy86Fc2eWE="; + hash = "sha256-337PFsPGm7pUgnFeNJKwT+/7AdbWSfCx4kXyAvHyWJQ="; }; patches = [