From 04b8374667c8b6718e1879eb44e7487d23e57666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 18:32:09 +0000 Subject: [PATCH 01/30] 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 4a71acf24e1987af18e83c8a5ac8c55db60d1b18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 16 Mar 2022 09:17:46 +0800 Subject: [PATCH 02/30] 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 03/30] 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 04/30] 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 271f38b401cedd765edc084dfd382cd040dda0f9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 15 Mar 2022 23:30:02 -0300 Subject: [PATCH 05/30] 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 06/30] 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 07/30] 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 08/30] 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 126a61b6d6e9d036456a848bb8e93494e1561fb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 15:29:35 +0000 Subject: [PATCH 09/30] 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 f2ef762478397db7a869985167facecfdf2fb294 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 23:04:56 +0000 Subject: [PATCH 10/30] 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 309631843f2e92de39055ece753d36a8abdc363d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 04:06:37 +0000 Subject: [PATCH 11/30] 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 1e1ed42eea0e67fa4032644c3edd4654280506d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 07:21:39 +0000 Subject: [PATCH 12/30] 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 8512487f457dbe926fee5482b9ba8dcdfad3a74a Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 17 Mar 2022 11:42:08 +0100 Subject: [PATCH 13/30] 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 14/30] 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 15/30] 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 16/30] 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 17/30] 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 18/30] 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 19/30] 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 20/30] 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 21/30] 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 22/30] 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 23/30] 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 24/30] 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 25/30] 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 26/30] 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 27/30] 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 28/30] 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 29/30] 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 30/30] 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