From 12f9b166d738fd13c4da483bf3c0d27776b82a2e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 4 Mar 2022 15:25:54 +0800 Subject: [PATCH 01/68] mautrix-telegram: 0.11.1 -> 0.11.2 --- .../0002-Don-t-depend-on-pytest-runner.patch | 24 ------------------- pkgs/servers/mautrix-telegram/default.nix | 13 ++++------ 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch diff --git a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch b/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch deleted file mode 100644 index f1ec3e622cf8..000000000000 --- a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 29 Nov 2020 20:55:17 +0100 -Subject: [PATCH 2/2] Don't depend on pytest-runner - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 95dbf89..89ea2a7 100644 ---- a/setup.py -+++ b/setup.py -@@ -57,7 +57,6 @@ setuptools.setup( - ] - }, - -- setup_requires=["pytest-runner"], - tests_require=["pytest", "pytest-asyncio", "pytest-mock"], - - classifiers=[ --- -2.28.0 - diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 267f89182fb2..e96427f30f3a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -6,11 +6,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a3"; + version = "1.25.0a5"; pname = "tulir-telethon"; src = oldAttrs.src.override { inherit pname version; - sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk="; + sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8="; }; }); }; @@ -25,22 +25,17 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.11.1"; + version = "0.11.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc="; + sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "telethon>=1.22,<1.23" "telethon" - ''; - propagatedBuildInputs = with python.pkgs; ([ Mako From 6285a2ea52102ec59809303eb20414937592fdd2 Mon Sep 17 00:00:00 2001 From: derjohn Date: Tue, 8 Mar 2022 21:01:57 +0100 Subject: [PATCH 02/68] ferdi: 5.7.0 -> 5.8.0 --- .../networking/instant-messengers/ferdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 92e39f091b15..0a44a37cf4bc 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; + sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { From 04b8374667c8b6718e1879eb44e7487d23e57666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 18:32:09 +0000 Subject: [PATCH 03/68] kn: 1.3.0 -> 1.3.1 --- pkgs/applications/networking/cluster/kn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index d5faebdab3cc..93ccd873f777 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY="; + sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; }; vendorSha256 = null; From 36ad60841c59828f58c36d208d1150bac4bc67f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Mar 2022 08:58:41 +0100 Subject: [PATCH 04/68] python3Packages.meilisearch: init at 0.18.0 --- .../python-modules/meilisearch/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/meilisearch/default.nix diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix new file mode 100644 index 000000000000..aa40394dab67 --- /dev/null +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "meilisearch"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "meilisearch"; + repo = "meilisearch-python"; + rev = "v${version}"; + hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "meilisearch" + ]; + + # Tests spin up a local server and are not mocking the requests + doCheck = false; + + meta = with lib; { + description = "Client for the Meilisearch API"; + homepage = "https://github.com/meilisearch/meilisearch-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57c8e10d0b49..bd9c496a83b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5053,6 +5053,8 @@ in { mediafile = callPackage ../development/python-modules/mediafile { }; + meilisearch = callPackage ../development/python-modules/meilisearch { }; + meinheld = callPackage ../development/python-modules/meinheld { }; meld3 = callPackage ../development/python-modules/meld3 { }; From 72eac4c3d0c59d0b33e1abe7f03576e26a8b1dc3 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 15 Mar 2022 09:22:54 -0600 Subject: [PATCH 05/68] element-{desktop,}: 1.10.6 -> 1.10.7 --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../networking/instant-messengers/element/pin.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 6d3353c2515f..984a9cb501dd 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.6", + "version": "1.10.7", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index d1fb0fe1c622..f75dfc66ca90 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.10.6", - "desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=", + "version": "1.10.7", + "desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=", "desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0", - "webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r" + "webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1" } From a7262905c42c57d007a703c0745024c229caf051 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 14 Mar 2022 18:07:04 -0400 Subject: [PATCH 06/68] gitea: 1.16.3 -> 1.16.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 37000982d8e4..f08c88ab2fa5 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.3"; + version = "1.16.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys="; + sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg="; }; unpackPhase = '' From 4a71acf24e1987af18e83c8a5ac8c55db60d1b18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Mar 2022 09:17:46 +0800 Subject: [PATCH 07/68] gnome.gnome-settings-daemon338: fix build with meson 0.61 --- .../gnome/core/gnome-settings-daemon/3.38/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index aae01577a881..b043883a492c 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchpatch , substituteAll , fetchurl @@ -70,6 +71,14 @@ stdenv.mkDerivation rec { }) # Fix build with new meson + # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch"; + sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ="; + }) + # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True) + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; From 9aea52cf10323205c120a8ae2ca11ee9ad2a358c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:32:06 -0300 Subject: [PATCH 08/68] arcan: fixup clone-sources --- pkgs/desktops/arcan/arcan/clone-sources.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/arcan/clone-sources.nix b/pkgs/desktops/arcan/arcan/clone-sources.nix index 2ade63e70bfa..c7c6bebb704a 100644 --- a/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -11,7 +11,7 @@ rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; }; - libuvc-src = fetchgit { + libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; From df715ae164c4423333ca05147f59dcb4bed36f6e Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 14 Mar 2022 22:25:28 +0100 Subject: [PATCH 09/68] ydotool: unstable-2021-01-20 -> 1.0.1 --- pkgs/tools/wayland/ydotool/default.nix | 29 +++------- .../wayland/ydotool/fixup-cmakelists.patch | 58 ------------------- 2 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 pkgs/tools/wayland/ydotool/fixup-cmakelists.patch diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 4a75eac8c574..8d55233638ec 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,41 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }: stdenv.mkDerivation rec { pname = "ydotool"; - version = "unstable-2021-01-20"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; - rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37"; - sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g"; + rev = "v${version}"; + sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; }; - # upstream decided to use a cpp package manager called cpm. - # we need to disable that because it wants networking, furthermore, - # it does some system folder creating which also needs to be disabled. - # Both changes are to respect the sandbox. - patches = [ ./fixup-cmakelists.patch ]; - - - # cxxopts is a header only library. - # See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105 - postPatch = '' - substituteInPlace CMakeLists.txt --replace \ - "PUBLIC cxxopts" \ - "PUBLIC" - ''; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost libevdevplus libuinputplus iodash cxxopts + scdoc ]; meta = with lib; { inherit (src.meta) homepage; description = "Generic Linux command-line automation tool"; - license = licenses.mit; - maintainers = with maintainers; [ willibutz ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ willibutz kraem ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch b/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch deleted file mode 100644 index 965d5c38d83f..000000000000 --- a/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001 -From: Jappie Klooster -Date: Fri, 2 Apr 2021 14:04:14 -0400 -Subject: [PATCH] Fixup cmaklists - -We remove cpm, which is a package manager for c++, -which requires networking, so it's better just deleted. - -Furthermore we delete the adddirectory statements. -These want to modify directories outside of the sandbox. ---- - CMakeLists.txt | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5e8789..b797538 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,30 +13,6 @@ endif() - - include(${CPM_DOWNLOAD_LOCATION}) - --CPMAddPackage( -- NAME IODash -- GITHUB_REPOSITORY YukiWorkshop/IODash -- VERSION 0.1.0 --) -- --CPMAddPackage( -- NAME libevdevPlus -- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus -- VERSION 0.2.1 --) -- --CPMAddPackage( -- NAME libuInputPlus -- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus -- VERSION 0.2.1 --) -- --CPMAddPackage( -- NAME cxxopts -- GITHUB_REPOSITORY jarro2783/cxxopts -- VERSION 3.0.0 -- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3 --) - - set(SOURCE_FILES_LIBRARY - CommonIncludes.hpp -@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT}) - target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus) - install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR}) - --add_subdirectory(Daemon) --add_subdirectory(manpage) --- -2.29.2 - From 65f612c02bb6679f360f174db5808148211ada33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 10:31:27 +0100 Subject: [PATCH 10/68] python3Packages.adb-enhanced: 2.5.12 -> 2.5.14 --- pkgs/development/python-modules/adb-enhanced/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index c38851160c22..bf3f124b02e2 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.12"; + version = "2.5.14"; disabled = pythonOlder "3.4"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI="; + sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs="; }; propagatedBuildInputs = [ From 45fdf8e356b22968186cfbe22f1eb9561ffcf331 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 09:49:47 +0000 Subject: [PATCH 11/68] python310Packages.check-manifest: 0.47 -> 0.48 --- pkgs/development/python-modules/check-manifest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index d55f5155b451..6c91633e8af0 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.47"; + version = "0.48"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VtrdJgqcfVULFZeW0olLbQvMF2qUy8Qm2buT5eSNEs4="; + hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; }; propagatedBuildInputs = [ From 45dbad3ccca4632c8dcf9e38c93500f13a22ae73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 11:12:19 +0100 Subject: [PATCH 12/68] python3Packages.aioairzone: init at 0.1.0 --- .../python-modules/aioairzone/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/aioairzone/default.nix diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix new file mode 100644 index 000000000000..5a51661b8e1a --- /dev/null +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioairzone"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = pname; + rev = version; + hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioairzone" + ]; + + meta = with lib; { + description = "Module to control AirZone devices"; + homepage = "https://github.com/Noltari/aioairzone"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 720f463312ff..a0c9fbc4f9e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -244,6 +244,8 @@ in { aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; + aioairzone = callPackage ../development/python-modules/aioairzone { }; + aioambient = callPackage ../development/python-modules/aioambient { }; aioapns = callPackage ../development/python-modules/aioapns { }; From 271f38b401cedd765edc084dfd382cd040dda0f9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:30:02 -0300 Subject: [PATCH 13/68] arcan.prio: reformat expression --- pkgs/desktops/arcan/prio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 34443baa8017..406aea740fc4 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "prio"; - version = "0.pre+unstable=2018-09-13"; + version = "0.pre+date=2018-09-13"; src = fetchFromGitHub { owner = "letoram"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From 70e183ec070a0f550240f40c2a0428bd6b417e2a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:30:39 -0300 Subject: [PATCH 14/68] arcan.pipeworld: 0.pre+date=2021-11-26 -> 0.pre+date=2021-12-03 --- pkgs/desktops/arcan/pipeworld/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index fa1a09230d9d..09f809aa4718 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.pre+date=2021-11-26"; + version = "0.pre+date=2021-12-03"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d"; - hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw="; + rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; + hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From 546cad223d0a309e264ffb83046500521cd3039a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:31:37 -0300 Subject: [PATCH 15/68] arcan.durden: 0.6.1+date=2021-10-17 -> 0.6.1+date=2022-03-11 --- pkgs/desktops/arcan/durden/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index b5fc02127ece..46012d69d2dd 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+date=2021-10-17"; + version = "0.6.1+date=2022-03-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1"; - hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No="; + rev = "fec2a1051500df28becce188d932645743091efa"; + hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall From c0d91e28523d77abd3c86e14b16142125d810092 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:28:34 -0300 Subject: [PATCH 16/68] arcan.xarcan: 0.6.0+unstable=2021-06-14 -> 0.6.0+date=2021-08-26 --- pkgs/desktops/arcan/xarcan/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index d72bf4ad5bb3..0668754d6aa4 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -38,23 +38,15 @@ stdenv.mkDerivation rec { pname = "xarcan"; - version = "0.6.0+unstable=2021-06-14"; + version = "0.6.0+date=2021-08-26"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7"; - hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4="; + rev = "e40f0176e495ffdad6e7405c58378df6532eb70d"; + hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA="; }; - patches = [ - # fix build with meson 0.60 - (fetchpatch { - url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch"; - sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -122,6 +114,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + platforms = platforms.unix; }; } From 594b228a3472fa811addd4566c748bc95b78d20b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 13:51:14 +0000 Subject: [PATCH 17/68] python310Packages.pygmt: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 6f06065457ed..f7728cfa28db 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49"; + sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; }; postPatch = '' From 126a61b6d6e9d036456a848bb8e93494e1561fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 15:29:35 +0000 Subject: [PATCH 18/68] python310Packages.gaphas: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/gaphas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index c3541bcc30a0..0f23415fe6ee 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.5.0"; + version = "3.5.1"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1"; + sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E="; }; nativeBuildInputs = [ From ddffdde048fec3f78a026b173f928bbdc81972ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 18:39:03 +0000 Subject: [PATCH 19/68] python310Packages.boltztrap2: 20.7.1 -> 22.3.2 --- pkgs/development/python-modules/boltztrap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index f80a8deb9ab4..e697d97fea78 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.7.1"; + version = "22.3.2"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; + sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU="; }; dontUseCmakeConfigure = true; From ac18f4de89d10a257344aefa51521a88db96688d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 20:47:22 +0100 Subject: [PATCH 20/68] checkov: 2.0.962 -> 2.0.968 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f2f9ec46b6e8..6ebe03e2554c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.962"; + version = "2.0.968"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM="; + hash = "sha256-F+SMgNCL6qOOhfpZi0Gg/OWPjxzMDVVvXTrPOZCfrLU="; }; nativeBuildInputs = with py.pkgs; [ From 3bbf26b8abab458912932f3f0f3c9e50ed2790e6 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 16 Mar 2022 21:07:42 +0100 Subject: [PATCH 21/68] super-slicer: fix typo in meta.homepage --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 7a4d2ee1d254..c3037f0da8d2 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -45,7 +45,7 @@ let meta = with lib; { inherit description; - homepage = "https://github.com/supermerili/SuperSlicer"; + homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3; maintainers = with maintainers; [ cab404 moredread ]; mainProgram = "superslicer"; From 6eaadbe4c3bba6d9471c890faffa276b4e957088 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 16 Mar 2022 22:46:03 +0100 Subject: [PATCH 22/68] mautrix-whatsapp: 0.2.4 -> 0.3.0 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 92f6d1f15ac7..e26743b9edf8 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8="; + sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA="; }; buildInputs = [ olm ]; - vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ="; + vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc="; doCheck = false; From adcafc52a7714c84ab0a8aaa4162ce9953da5ccd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 22:59:34 +0100 Subject: [PATCH 23/68] python3Packages.hahomematic: 0.36.3 -> 0.37.1 --- 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 515d6ed8d950..046fc856f017 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.36.3"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig="; + sha256 = "sha256-ZENCcNppXOl0OHQDdybJV+SxOgtVzF2PPN0gAPIMjXM="; }; propagatedBuildInputs = [ From ea9b174c6febc6ac4564e8257e59854d3cbe8fc5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Wed, 16 Mar 2022 22:08:10 +0000 Subject: [PATCH 24/68] element-desktop: update electron_15 -> electron_17 https://github.com/vector-im/element-desktop/blob/v1.10.6/package.json#L64 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7663d3d9de2..d96f2d6454ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3038,7 +3038,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_15; + electron = electron_17; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From 27fba3b3ca246ff52d6bef4dd05b0b0319d194d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 23:16:55 +0100 Subject: [PATCH 25/68] python3Packages.yalexs: 1.1.22 -> 1.1.23 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 22440766fd03..2eb38dd0784e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.22"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qtJSGvvYcdGYUUHnRnKe+z+twFqLGAn1Zl47F4CGnvc="; + sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; }; propagatedBuildInputs = [ From 91b39c9ae562234e7e838ff1628818516e3eabbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Mar 2022 23:36:01 +0100 Subject: [PATCH 26/68] zdns: 20210327-8c53210 -> 2022-03-14-unstable --- pkgs/tools/security/zdns/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/tools/security/zdns/default.nix index 913735d4cb9f..354dd5b64475 100644 --- a/pkgs/tools/security/zdns/default.nix +++ b/pkgs/tools/security/zdns/default.nix @@ -5,19 +5,16 @@ buildGoModule rec { pname = "zdns"; - version = "20210327-${lib.strings.substring 0 7 rev}"; - rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2"; + version = "2022-03-14-unstable"; src = fetchFromGitHub { owner = "zmap"; repo = pname; - inherit rev; - sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck"; + rev = "d659a361f6d5165462c10e1c1243f420175e066b"; + hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw="; }; - vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78"; - - subPackages = [ "zdns" ]; + vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8="; meta = with lib; { description = "CLI DNS lookup tool"; From f2ef762478397db7a869985167facecfdf2fb294 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 23:04:56 +0000 Subject: [PATCH 27/68] velero: 1.8.0 -> 1.8.1 --- pkgs/applications/networking/cluster/velero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index e0042e43efba..88c3a31fd2d7 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40="; + sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; }; ldflags = [ From a96ff655369c140ac6231bb6c385ef4c746cd51f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 16 Mar 2022 23:15:57 +0000 Subject: [PATCH 28/68] guile_3_0: fix attribute for updater script Without the change updater script extracts location from `guile` (`guile_2_2`). I did not notice it initially as I use local override of `guile = guile_3_0`. --- pkgs/development/interpreters/guile/3.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 99f3f84829c7..d0f5aa5573b6 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -140,7 +140,7 @@ builder rec { # Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"' new_version="$(curl -s https://www.gnu.org/software/guile/download/ | pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')" - update-source-version ${pname} "$new_version" + update-source-version guile_3_0 "$new_version" ''; }; From 19afa75096d6a152a7b4347a2d49d709c678ea91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 23:17:36 +0000 Subject: [PATCH 29/68] python310Packages.pex: 2.1.71 -> 2.1.72 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 4a03d60f1eea..ee356f86500a 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.71"; + version = "2.1.72"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow="; + sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA="; }; nativeBuildInputs = [ From 398b99444ac5ef9446e18af44f7d2d3bec2cc4b2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 17 Mar 2022 07:31:37 +1000 Subject: [PATCH 30/68] terraform-providers.oci: 4.67.0 -> 4.68.0 fixes the provider-source-address --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8ff0628a6615..457b9d342cce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -772,12 +772,12 @@ }, "oci": { "owner": "oracle", - "provider-source-address": "registry.terraform.io/hashicorp/oci", + "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.67.0", - "sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=", + "rev": "v4.68.0", + "sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=", "vendorSha256": null, - "version": "4.67.0" + "version": "4.68.0" }, "okta": { "owner": "okta", From 6ea480daa5f8813a160d1c05257cf1e9cdfedc90 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 17 Mar 2022 09:29:59 +0800 Subject: [PATCH 31/68] monitor: 0.12.0 -> 0.13.0 --- pkgs/applications/system/monitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 653d727525e8..5de6e1165dc4 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; + sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc="; fetchSubmodules = true; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stsdc/monitor"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; mainProgram = "com.github.stsdc.monitor"; }; } From 7eca8aea9b94f5f1ee28768f9c6c642d97360d27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 01:49:07 +0000 Subject: [PATCH 32/68] python310Packages.pymavlink: 2.4.27 -> 2.4.29 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 8bf43a445437..361f8bff615d 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.27"; + version = "2.4.29"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY="; + sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0="; }; propagatedBuildInputs = [ future lxml ]; From 448ed088eb60d93fbef094d4b158be710d7c8423 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 Mar 2022 14:08:50 -0500 Subject: [PATCH 33/68] neochat: 1.2 -> 22.02 22.02: https://invent.kde.org/network/neochat/-/commit/dd4ef2e4ac63fc7f536d0a0dfeb80b16d860f329 21.12: https://invent.kde.org/network/neochat/-/commit/041a5ff590ae8faed37150c0b4d83a6c99bb8b71 --- .../networking/instant-messengers/neochat/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index 6de6922913fc..a8e73ad1098f 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -8,6 +8,7 @@ , kconfig , kdbusaddons , ki18n +, kio , kirigami2 , kitemmodels , knotifications @@ -16,23 +17,25 @@ , libquotient , libsecret , olm +, qcoro , qqc2-desktop-style , qtgraphicaleffects , qtkeychain , qtmultimedia , qtquickcontrols2 +, sonnet }: mkDerivation rec { pname = "neochat"; - version = "1.2"; + version = "22.02"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; + sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; @@ -41,6 +44,7 @@ mkDerivation rec { cmark kconfig kdbusaddons + kio ki18n kirigami2 kitemmodels @@ -50,11 +54,13 @@ mkDerivation rec { libquotient libsecret olm + qcoro qtgraphicaleffects qtkeychain qtmultimedia qtquickcontrols2 qqc2-desktop-style + sonnet ]; meta = with lib; { From 9cfedd0589cb727289b8d1c8e5b70d4eaae12c17 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 13 Mar 2022 20:20:09 +0800 Subject: [PATCH 34/68] gcompris: 2.1 -> 2.3 --- pkgs/games/gcompris/default.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index c4c737d228cc..5343bae4a6cb 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "2.1"; + version = "2.3"; src = fetchurl { - url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-ljOY/uybXzfwOFmhBXB4sC4Vn/C8BP1BeUUPpdHuQwo="; + url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; + sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI="; }; cmakeFlags = [ @@ -32,15 +32,24 @@ mkDerivation rec { nativeBuildInputs = [ cmake gettext ninja qttools ]; buildInputs = [ - qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns + qmlbox2d + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtsensors + qtxmlpatterns ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad ]); postInstall = '' - install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop - install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo + install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; @@ -49,6 +58,7 @@ mkDerivation rec { description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; homepage = "https://gcompris.net/"; license = licenses.gpl3Plus; + mainProgram = "gcompris-qt"; maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; }; From b2015415df0f694000a0b5645470fe8133e39bea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 02:26:33 +0000 Subject: [PATCH 35/68] python310Packages.pypandoc: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/pypandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index cd7a322a2aef..d2ff1aab1a47 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.2"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03"; + sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc="; }; patches = [ From 03aee6a526f963dfc6e7096bd9f8bb593de37185 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 03:09:27 +0000 Subject: [PATCH 36/68] bazel-remote: 2.3.5 -> 2.3.6 --- .../tools/build-managers/bazel/bazel-remote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index a53bdd4b0c8d..a133526514f7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ="; + sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw="; }; vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo="; From 309631843f2e92de39055ece753d36a8abdc363d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:06:37 +0000 Subject: [PATCH 37/68] bupstash: 0.10.3 -> 0.11.0 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 91876f68d4a6..0d3550c05bca 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI="; + sha256 = "sha256-9yWQQ8uzDkN3Pi2OiEn+oEazc3nH53dF2GswBCu8d3c="; }; - cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8="; + cargoSha256 = "sha256-JAclSUFuQk768cgDEvG1rxux2xBGHl1d/NAoxw161YU="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From bcf572638f3899d3a10c4437d84080e8fd9dc7b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:12:06 +0000 Subject: [PATCH 38/68] python310Packages.python-box: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/python-box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 52e17faa5cc9..30666ef47064 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = version; - hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs="; + hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; }; propagatedBuildInputs = [ From 3619ffaeb69c83bed903e0d78792a135656ff7fd Mon Sep 17 00:00:00 2001 From: sohalt Date: Tue, 15 Mar 2022 22:26:21 +0100 Subject: [PATCH 39/68] rust: fix importCargoLock for repositories without toplevel Cargo.toml Some crates do not have a Cargo.toml at the top-level, but only in nested directories. Before this change importCargoLock used to fail with: error: manifest path `/nix/store/some-store-path/Cargo.toml` does not exist --- pkgs/build-support/rust/import-cargo-lock.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index fd3608741ea3..e571c01f95c5 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -128,8 +128,13 @@ let # If the target package is in a workspace, or if it's the top-level # crate, we should find the crate path using `cargo metadata`. - crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \ + # Some packages do not have a Cargo.toml at the top-level, + # but only in nested directories. + # Only check the top-level Cargo.toml, if it actually exists + if [[ -f $tree/Cargo.toml ]]; then + crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \ ${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path') + fi # If the repository is not a workspace the package might be in a subdirectory. if [[ -z $crateCargoTOML ]]; then From 33611e53fff3cd446d797aedd0de06706b998934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:33:59 +0000 Subject: [PATCH 40/68] cfripper: 1.5.2 -> 1.5.3 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 822566b8d041..7df85144da52 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds="; + hash = "sha256-5TjKn7yE3g8/SyD2dVJeHnaLOTyyKpxeAeGuXbkGCeo="; }; propagatedBuildInputs = with python3.pkgs; [ From 1a29f2f45899969400d6403737d8ceab5f1e4203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 05:21:40 +0000 Subject: [PATCH 41/68] cfitsio: 4.0.0 -> 4.1.0 --- .../libraries/science/astronomy/cfitsio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 9f9545e52f3b..3be249531bbe 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfitsio"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4="; + sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo="; }; buildInputs = [ bzip2 zlib ]; From d56ccde39ad2a5f439d980a27d43cddcde7f4f4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 21:12:25 +0100 Subject: [PATCH 42/68] python38: 3.8.12 -> 3.8.13 https://www.python.org/downloads/release/python-3813/ --- .../interpreters/python/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a7d5e0854fba..12d27c4233b4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -120,15 +120,6 @@ with pkgs; }; sources = { - python38 = { - sourceVersion = { - major = "3"; - minor = "8"; - patch = "12"; - suffix = ""; - }; - sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi"; - }; python39 = { sourceVersion = { major = "3"; @@ -177,11 +168,18 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython ({ + python38 = callPackage ./cpython { self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "13"; + suffix = ""; + }; + sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c="; inherit (darwin) configd; inherit passthruFun; - } // sources.python38); + }; python39 = callPackage ./cpython ({ self = python39; From c91c73a714e34bb141e0ec7285783b9b34323e1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 21:12:50 +0100 Subject: [PATCH 43/68] python37: 3.7.12 -> 3.7.13 https://www.python.org/downloads/release/python-3713/ --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 12d27c4233b4..579e3a05c58a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -160,10 +160,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "12"; + patch = "13"; suffix = ""; }; - sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp"; + sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q="; inherit (darwin) configd; inherit passthruFun; }; From 1e1ed42eea0e67fa4032644c3edd4654280506d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 07:21:39 +0000 Subject: [PATCH 44/68] python310Packages.pywlroots: 0.15.10 -> 0.15.11 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 7dc17cf74ecd..b4f23f71d748 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.10"; + version = "0.15.11"; src = fetchPypi { inherit pname version; - sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k="; + sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8="; }; nativeBuildInputs = [ pkg-config ]; From 773a363bb5d49902a2c18a3b42f42e20abd6ed5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 07:53:24 +0000 Subject: [PATCH 45/68] python310Packages.renault-api: 0.1.9 -> 0.1.10 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 2ddd65790fa0..2312078c5fc6 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.9"; + version = "0.1.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I="; + sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; }; nativeBuildInputs = [ From a3a45d186ab9cc191f529aff4cbfdc3a4ecd1af3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:15:01 +0100 Subject: [PATCH 46/68] python3Packages.identify: 2.4.11 -> 2.4.12 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 9f2a066ebdf2..18a12fe9e198 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.11"; + version = "2.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY="; + sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI="; }; checkInputs = [ From bbb48bb6338f2fac8f27405436f7efc7478890bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:16:03 +0100 Subject: [PATCH 47/68] python3Packages.intellifire4py: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/intellifire4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 39fcec9af12e..b93b9b9c957b 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = pname; rev = version; - hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU="; + hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; }; propagatedBuildInputs = [ From 38d6b542322c3044cd643581cf1cac5dd2db406f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:20:44 +0100 Subject: [PATCH 48/68] python3Packages.types-requests: 2.27.12 -> 2.27.13 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index c62190ff5dab..d28f01b128b0 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.12"; + version = "2.27.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI="; + sha256 = "sha256-zwZGAx3WMHETs3gU90PATwcHozVzeMK7Eyb4SEEvW6k="; }; propagatedBuildInputs = [ From a3caaae54f0dec9e6ba8ba82b09420649d79952e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 17 Mar 2022 09:21:40 +0100 Subject: [PATCH 49/68] python3Packages.types-setuptools: 57.4.10 -> 57.4.11 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 46fe7da5d1c7..c59baea3c6e3 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.10"; + version = "57.4.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ="; + sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; }; # Module doesn't have tests From b785f9ea98b421322f12fd4a02bcb86f3f000ce4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 17 Mar 2022 03:20:52 -0700 Subject: [PATCH 50/68] cri-o: 1.23.1 -> 1.23.2 (#164563) --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 87b91196f882..b6d238d599ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c="; + sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; }; vendorSha256 = null; From 8512487f457dbe926fee5482b9ba8dcdfad3a74a Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 17 Mar 2022 11:42:08 +0100 Subject: [PATCH 51/68] moonlight-qt: set meta.mainProgram --- pkgs/applications/misc/moonlight-qt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 1a764dfaef30..c29813517496 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "moonlight"; }; } From d68960471091fbb4dafe369f8b3f082dab14c5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= Date: Thu, 17 Mar 2022 12:29:07 +0100 Subject: [PATCH 52/68] swayr: 0.13.0 -> 0.15.0 --- pkgs/tools/wayland/swayr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index c1bcf3b4e9f0..6237d1a88eeb 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go="; + sha256 = "sha256-GLOJjGr29v4oVNCWgjPWluIiSeLoIYeOw2HwmSfxA8Y="; }; - cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA="; + cargoSha256 = "sha256-gg/IHrgfDZT+3FNM/se5X1YMcHX127jMNI/WDEpMzy4="; patches = [ ./icon-paths.patch From 47b699fe6c417b77575eff93be4b21a8530cf9be Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 16 Mar 2022 14:47:45 +0100 Subject: [PATCH 53/68] Revert "nixos/modprobe: add boot.initrd.extraModprobeConfig option" This reverts commit 1c58cdbeed880e99d816c234a954d4cdfc073b6c, since this change was made redundant by 3dc6fab5c9362db2cf079ffa15f2b62b05001747 and in https://github.com/NixOS/nixpkgs/pull/145013 we decided to revert this commit. --- .../from_md/release-notes/rl-2205.section.xml | 8 -------- .../manual/release-notes/rl-2205.section.md | 2 -- nixos/modules/system/boot/modprobe.nix | 20 ------------------- nixos/modules/system/boot/stage-1.nix | 3 --- 4 files changed, 33 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index d91bad8042dc..cb88db67235f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1317,14 +1317,6 @@ files. - - - A new option - boot.initrd.extraModprobeConfig has been - added which can be used to configure kernel modules that are - loaded in the initrd. - - nixos-generate-config now puts the dhcp diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2e01297f15fa..27cca7158e03 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -491,8 +491,6 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. -- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd. - - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. - ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 27f78835adb2..e683d1817297 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -34,23 +34,6 @@ with lib; type = types.lines; }; - boot.initrd.extraModprobeConfig = mkOption { - default = ""; - example = - '' - options zfs zfs_arc_max=1073741824 - ''; - description = '' - Does exactly the same thing as - , except - that the generated modprobe.conf - file is also included in the initrd. - This is useful for setting module options for kernel - modules that are loaded during early boot in the initrd. - ''; - type = types.lines; - }; - }; @@ -67,9 +50,6 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; - environment.etc."modprobe.d/nixos-initrd.conf".text = '' - ${config.boot.initrd.extraModprobeConfig} - ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index a85a3675e03e..8b011d91563f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -338,9 +338,6 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source; - symlink = "/etc/modprobe.d/nixos-initrd.conf"; - } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; preferLocalBuild = true; From 7867b9506b76d5d1e71419c1b259c0990afff081 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 17 Mar 2022 10:17:51 +0100 Subject: [PATCH 54/68] nixos/doc/rl-22.05: add changelog entry for modprobe changes Add a changelog entry for the changes in 3dc6fab5c9362db2cf079ffa15f2b62b05001747. --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index cb88db67235f..7ef03b1f5e1c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1317,6 +1317,14 @@ files. + + + The options boot.extraModprobeConfig and + boot.blacklistedKernelModules now also take + effect in the initrd by copying the file + /etc/modprobe.d/nixos.conf into the initrd. + + nixos-generate-config now puts the dhcp diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 27cca7158e03..d592d6896116 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -491,6 +491,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. +- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd. + - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. - ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: From 3a201890dce02293ef20585395d45545ab479fd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 12:10:16 +0000 Subject: [PATCH 55/68] python310Packages.timetagger: 22.2.3 -> 22.3.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 1da2887a12f1..65b22f905ef9 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.2.3"; + version = "22.3.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98="; + sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU="; }; propagatedBuildInputs = with python3Packages; [ From 15770ad6cbe4ac9398504d876b8585208d857b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 13:18:18 +0000 Subject: [PATCH 56/68] python310Packages.types-dateutil: 2.8.9 -> 2.8.10 --- 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 4614a92ae64f..4cefc57ed594 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.9"; + version = "2.8.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kPlaa21Pq6NZKH8XosrlEczJ1KvImwGWm9rBGFgVwF0="; + sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM="; }; pythonImportsCheck = [ "dateutil-stubs" ]; From c41c6cbf99379483f4f13833d5944e786fbc37da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 13:22:42 +0000 Subject: [PATCH 57/68] python310Packages.types-freezegun: 1.1.6 -> 1.1.7 --- pkgs/development/python-modules/types-freezegun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index 687ddd1b17cc..a288a25fe5c9 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.6"; + version = "1.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8="; + hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4="; }; # Module doesn't have tests From 3295dd41598c9ac8015ff8d6babeb9a56607ad66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 13:27:05 +0000 Subject: [PATCH 58/68] python310Packages.types-paramiko: 2.8.16 -> 2.8.17 --- pkgs/development/python-modules/types-paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix index f43fc5ed507b..5b87e8079a5e 100644 --- a/pkgs/development/python-modules/types-paramiko/default.nix +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "types-paramiko"; - version = "2.8.16"; + version = "2.8.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI="; + sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY="; }; pythonImportsCheck = [ From 8876e507a8afd4086ddaf57ee6b35104996c55c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 11:07:26 +0000 Subject: [PATCH 59/68] python310Packages.stups-pierone: 1.1.50 -> 1.1.51 --- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index f627f0e7231e..3df2a3e2895b 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.50"; + version = "1.1.51"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw="; + hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE="; }; propagatedBuildInputs = [ From f63c2d1278a8bef29e39c5c5ffe229aa71d0dc09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 13:06:34 +0000 Subject: [PATCH 60/68] python310Packages.txtorcon: 21.1.0 -> 22.0.0 --- pkgs/development/python-modules/txtorcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 93c9c95a62ef..c5fc7e1c6a44 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "21.1.0"; + version = "22.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6"; + sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM="; }; # Based on what txtorcon tox.ini will automatically test, allow back as far From 2e31305d5d2a86a400ce1525dde2fdf82b6df1cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 12:46:43 +0000 Subject: [PATCH 61/68] python310Packages.trimesh: 3.10.2 -> 3.10.3 --- 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 de28f70bca00..f18b05e10717 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.10.2"; + version = "3.10.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo="; + sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno="; }; propagatedBuildInputs = [ numpy ]; From 4e6aa65c539ce5f1271c6d84a67d40bb2c94a32c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 00:05:54 +0000 Subject: [PATCH 62/68] python310Packages.protonvpn-nm-lib: 3.7.0 -> 3.8.0 --- pkgs/development/python-modules/protonvpn-nm-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 6680b19908e9..9f12f220cfe9 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY="; + sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4="; }; propagatedBuildInputs = [ From 554f3539f2322bc5dcf0d7633678db4881103422 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 11:51:23 +0000 Subject: [PATCH 63/68] python310Packages.thinc: 8.0.14 -> 8.0.15 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 417cd8e056c9..a25c8d235674 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.14"; + version = "8.0.15"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3MC8ao6BTiDyaCXj/X+DNCTpMYcTWVJFSl0X+sCc5J0="; + sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs="; }; postPatch = '' From c586cccd7cb90b479ecb7bc10585968bc3bda5bb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Mar 2022 01:27:11 +0100 Subject: [PATCH 64/68] lv2: format the expression --- .../libraries/audio/lv2/default.nix | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 616ad5b0c892..d905b499f61f 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: +{ stdenv +, lib +, fetchurl +, gtk2 +, libsndfile +, pkg-config +, python3 +, wafHook +}: stdenv.mkDerivation rec { pname = "lv2"; @@ -9,16 +17,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4="; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ gtk2 libsndfile python3 ]; + nativeBuildInputs = [ + pkg-config + wafHook + ]; - wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + buildInputs = [ + gtk2 + libsndfile + python3 + ]; + + wafConfigureFlags = lib.optionals stdenv.isDarwin [ + "--lv2dir=${placeholder "out"}/lib/lv2" + ]; meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; }; } From beefeab222118fe1c88afb6e8260eab71406fae7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 13 Feb 2022 10:25:05 -0800 Subject: [PATCH 65/68] lv2: drop GTK 2 dependency gtk2 is optional and only used for some example plug-ins. In particular, removing `gtk2` disables building UI module for `$out/lib/lv2/eg-sampler.lv2` (``) and the whole `$out/lib/lv2/eg-scope.lv2` (``). --- pkgs/development/libraries/audio/lv2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d905b499f61f..3a093ee3def8 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, gtk2 , libsndfile , pkg-config , python3 @@ -23,7 +22,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 libsndfile python3 ]; From 2dfe209c3e4b7fd31be3e66c7ea62bc2c3f61b5d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 13 Feb 2022 11:02:13 -0800 Subject: [PATCH 66/68] lv2: add pipewire test ; Conflicts: ; pkgs/development/libraries/audio/lv2/default.nix --- pkgs/development/libraries/audio/lv2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 3a093ee3def8..8acb43423727 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -5,6 +5,7 @@ , pkg-config , python3 , wafHook +, pipewire }: stdenv.mkDerivation rec { @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { "--lv2dir=${placeholder "out"}/lib/lv2" ]; + passthru.tests = { + inherit pipewire; + }; + meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; From 9858da4185cd83b6a00bbf737d6dd8ad8ac84a76 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 13 Feb 2022 11:02:44 -0800 Subject: [PATCH 67/68] lv2: add dev output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also put programs there since those are just development tools, that would bring unnecessary Python dependency into out’s runtime closure. --- pkgs/development/libraries/audio/lv2/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 8acb43423727..d0ef2e65c598 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { pname = "lv2"; version = "1.18.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4="; @@ -27,7 +29,10 @@ stdenv.mkDerivation rec { python3 ]; - wafConfigureFlags = lib.optionals stdenv.isDarwin [ + wafConfigureFlags = [ + "--includedir=${placeholder "dev"}/include" + "--bindir=${placeholder "dev"}/bin" + ] ++ lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; From dd8cebebbf0f9352501f251ac37b851d947f92dc Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 16 Mar 2022 16:44:44 +0100 Subject: [PATCH 68/68] haskellPackages.persistent-migration: disable integration tests No PostgreSQL db in the build sandbox. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b3cac2e3973e..038060a21366 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3703,7 +3703,6 @@ broken-packages: - persistent-discover - persistent-documentation - persistent-equivalence - - persistent-migration - persistent-mongoDB - persistent-mysql-haskell - persistent-odbc diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c8893a751fd1..b93dcb183442 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -163,6 +163,7 @@ self: super: builtins.intersectAttrs super { network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com + persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e08662a9de5..f0e6c84e6bce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -211081,8 +211081,6 @@ self: { ]; description = "Manual migrations for the persistent library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-mongoDB" = callPackage