From 657ab5d835d92453ebb5a935cd2c434e950b1846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 19 Oct 2022 01:10:23 +1100 Subject: [PATCH 01/44] libharu: 2.4.0 -> 2.4.3 --- pkgs/development/libraries/libharu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 5860d557407e..65e19b8715f7 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libharu"; - version = "2.4.0"; + version = "2.4.3"; src = fetchFromGitHub { owner = "libharu"; repo = pname; rev = "v${version}"; - hash = "sha256-85o9pb2zJVYbM0SHxCNgJuDkcsHuFuwFe6B6xivoUUg="; + hash = "sha256-v8eD1ZEFQFA7ceWOgOmq7hP0ZMPfxjdAp7ov4PBPaAE="; }; nativeBuildInputs = [ cmake ]; From 3f08dd7eeed2d0919964ce37891e1dc74824e085 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 22:33:55 +0000 Subject: [PATCH 02/44] openboardview: 9.0.3 -> 9.95.0 --- .../science/electronics/openboardview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 9fd9d56295d8..715a99cf4897 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "openboardview"; - version = "9.0.3"; + version = "9.95.0"; src = fetchFromGitHub { owner = "OpenBoardView"; repo = "OpenBoardView"; rev = version; - sha256 = "sha256-0vxWFNM9KQ5zs+VDDV3mVMfHZau4pgNxQ1HhH2vktCM="; + sha256 = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8="; fetchSubmodules = true; }; From 411c5684fd2f11a6764d228a479cf7e22953d834 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 4 Mar 2023 11:41:04 -0500 Subject: [PATCH 03/44] vtk: 9.2.5 -> 9.2.6 --- pkgs/development/libraries/vtk/9.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 7f7fc22f549b..3734c20f0e05 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { majorVersion = "9.2"; - minorVersion = "5"; - sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk="; + minorVersion = "6"; + sourceSha256 = "sha256-BvyNScTlb0mMQPyzilY+2NTsMTWNAQHomI8LtNU53RI="; } From bb1d5781e4b13d659c3cf087dcdd9c596a4f2d2d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Mar 2023 12:22:32 +0000 Subject: [PATCH 04/44] openjdk{15..19}: fix position location Before this change `ix edit -f. jdk` command pointed at shared metadata. --- pkgs/development/compilers/openjdk/15.nix | 1 + pkgs/development/compilers/openjdk/16.nix | 1 + pkgs/development/compilers/openjdk/17.nix | 1 + pkgs/development/compilers/openjdk/18.nix | 1 + pkgs/development/compilers/openjdk/19.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 5f9013198c7f..b0401b03face 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -149,6 +149,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; + pos = builtins.unsafeGetAttrPos "feature" version; meta = import ./meta.nix lib version; passthru = { diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index becf6d9b96ec..d00079376220 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -156,6 +156,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; + pos = builtins.unsafeGetAttrPos "feature" version; meta = import ./meta.nix lib version.feature; passthru = { diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 4714bf11c555..1b5d9489fa16 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -167,6 +167,7 @@ let disallowedReferences = [ openjdk17-bootstrap ]; + pos = builtins.unsafeGetAttrPos "feature" version; meta = import ./meta.nix lib version.feature; passthru = { diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix index 99ea75459def..0f15e4ededeb 100644 --- a/pkgs/development/compilers/openjdk/18.nix +++ b/pkgs/development/compilers/openjdk/18.nix @@ -165,6 +165,7 @@ let disallowedReferences = [ openjdk18-bootstrap ]; + pos = builtins.unsafeGetAttrPos "feature" version; meta = import ./meta.nix lib version.feature; passthru = { diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 41a630425e98..f96124ccdcd8 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -167,6 +167,7 @@ let disallowedReferences = [ openjdk19-bootstrap ]; + pos = builtins.unsafeGetAttrPos "feature" version; meta = import ./meta.nix lib version.feature; passthru = { From de6338094bd078019a0da89f74581c9fed198404 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:24:40 +0800 Subject: [PATCH 05/44] xfce.libxfce4ui: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/libxfce4ui/-/compare/libxfce4ui-4.18.1...libxfce4ui-4.18.2 Also don't quote NixOS in configureFlags since it is escaped and the about xfce window is showing this unnessary quote. --- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 56172917df7b..668d626f60b9 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,16 +4,16 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-1kzvFr/WeTl3HpVMJZRBgsvmG8VtYkdEbIQSniJIaHA="; + sha256 = "sha256-h9D0boBCCC4txnSRc6VcdNbrm8D21LwE63Q/LsExFNE="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ - "--with-vendor-info='NixOS'" + "--with-vendor-info=NixOS" ]; meta = with lib; { From bfde45b1df70fc5fff69ad2103d69b4e428b8414 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 06:25:56 +0000 Subject: [PATCH 06/44] xfce.mousepad: 0.5.10 -> 0.6.0 https://gitlab.xfce.org/apps/mousepad/-/compare/mousepad-0.5.10...mousepad-0.6.0 --- pkgs/desktops/xfce/applications/mousepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 884fffb35fd3..6bc0079a6706 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.10"; + version = "0.6.0"; odd-unstable = false; - sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM="; + sha256 = "sha256-VmpCjR8/3rsCGkVGhT+IdC6kaQkGz8G2ktFhJk32DeQ="; nativeBuildInputs = [ gobject-introspection ]; From 45e991cfb55e2293618ed92c664016e998ede7bf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:38:44 +0800 Subject: [PATCH 07/44] xfce.orage: 4.16.0 -> 4.18.0 https://gitlab.xfce.org/apps/orage/-/compare/orage-4.16.0...orage-4.18.0 The panel plugin has been removed. --- .../xfce/applications/orage/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 102f8e9c2128..00c2d5f85d91 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,44 +1,31 @@ { lib , mkXfceDerivation -, dbus-glib , gtk3 , libical , libnotify , libxfce4ui , popt , tzdata -, xfce4-panel -, withPanelPlugin ? true }: mkXfceDerivation { category = "apps"; pname = "orage"; - version = "4.16.0"; - odd-unstable = false; - sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw="; + version = "4.18.0"; + + sha256 = "sha256-vL9zexPbQKPqIzK5UqUIxkE9I7hEupkDOJehMgj2Leo="; buildInputs = [ - dbus-glib gtk3 libical libnotify libxfce4ui popt - ] - ++ lib.optionals withPanelPlugin [ - xfce4-panel ]; postPatch = '' substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; - - postConfigure = '' - # ensure pkgs.libical is used instead of one included in the orage sources - rm -rf libical ''; meta = with lib; { From 188962a0d0e8fe9a370b2d8c3aa91ada5b3cd271 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:42:24 +0800 Subject: [PATCH 08/44] xfce.parole: 4.16.0 -> 4.18.0 https://gitlab.xfce.org/apps/parole/-/compare/parole-4.16.0...parole-4.18.0 --- pkgs/desktops/xfce/applications/parole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 70d287dcdf4c..070ea4f7d0cb 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -7,9 +7,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "4.16.0"; + version = "4.18.0"; - sha256 = "sha256-9Rvhc8asFEb/+OU6uhuHKPl7w5mWBfzGP5ia0tiyDB4="; + sha256 = "sha256-TLH9ZUggjclJlbBg3EBVgbcrdiMZ8n+cGDgfNgYNiPI="; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ From 2a3a0d46d4c6cdc60b1be956963325662b80d660 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:50:02 +0800 Subject: [PATCH 09/44] xfce.ristretto: 0.12.4 -> 0.13.0 https://gitlab.xfce.org/apps/ristretto/-/compare/ristretto-0.12.4...ristretto-0.13.0 --- pkgs/desktops/xfce/applications/ristretto/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 10a75af99a3f..11add14332de 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -11,9 +11,10 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.4"; + version = "0.13.0"; + odd-unstable = false; - sha256 = "sha256-pspS9zRvDOMz4+Ud43uT4gsDQhB51bwmaXPXcGlOhsY="; + sha256 = "sha256-K1cC5NnRv/C5ZiwMAmaQ8qxvlxHRsJ4F1TgR9CN8Qgc="; buildInputs = [ glib From 406e7ad9fb57872667616f5d463c476af73b4482 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 14:52:38 +0800 Subject: [PATCH 10/44] xfce.thunar: 4.18.3 -> 4.18.4 https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.18.3...thunar-4.18.4 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index f4dfebb422f7..d5ff7b99f4d6 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.3"; + version = "4.18.4"; - sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc="; + sha256 = "sha256-tdk0sWUzTmYXk+dOPVOpjmODpqmhzQc9jAOCk2+yNKM="; nativeBuildInputs = [ docbook_xsl From 28de836c95c7292b703bb20c8300946371a2a9d2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:00:21 +0800 Subject: [PATCH 11/44] xfce.xfburn: 0.6.2 -> 0.7.0 https://gitlab.xfce.org/apps/xfburn/-/compare/xfburn-0.6.2...xfburn-0.7.0 --- pkgs/desktops/xfce/applications/xfburn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index e9fbd88894b3..3bd58caee9c0 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.6.2"; + version = "0.7.0"; + odd-unstable = false; - sha256 = "sha256-AUonNhMs2HBF1WBLdZNYmASTOxYt6A6WDKNtvZaGXQk="; + sha256 = "sha256-/CuV2tqja5fa2H2mmU9BP6tZHoCZZML5d2LL/CG3rno="; nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; From 351f24b3e0ec16432cb569b60379c08fe8ac961d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:04:11 +0800 Subject: [PATCH 12/44] xfce.xfce4-notifyd: 0.6.5 -> 0.8.2 https://gitlab.xfce.org/apps/xfce4-notifyd/-/compare/xfce4-notifyd-0.6.5...xfce4-notifyd-0.8.2 --- .../desktops/xfce/applications/xfce4-notifyd/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index b579e070076d..8d75389b079d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -2,9 +2,11 @@ , mkXfceDerivation , glib , gtk3 +, libcanberra-gtk3 , libnotify , libxfce4ui , libxfce4util +, sqlite , xfce4-panel , xfconf }: @@ -12,16 +14,18 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.5"; + version = "0.8.2"; - sha256 = "sha256-NUEqQk9EcDl23twbo+DUt7QYZrPmWpsRzmi5wIdolqw="; + sha256 = "sha256-M8L2HWTuQDl/prD7s6uptkW4XDscpk6fc+epoxjFNS8="; buildInputs = [ gtk3 glib + libcanberra-gtk3 libnotify libxfce4ui libxfce4util + sqlite xfce4-panel xfconf ]; @@ -30,6 +34,7 @@ mkXfceDerivation { configureFlags = [ "--enable-dbus-start-daemon" + "--enable-sound" ]; meta = with lib; { From 291f20b5cb436f5ed9222637b2bbbca6246ca4cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:21:48 +0800 Subject: [PATCH 13/44] xfce.xfce4-panel: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/xfce4-panel/-/compare/xfce4-panel-4.18.1...xfce4-panel-4.18.2 --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 155e3124207c..c5489cc88022 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE="; + sha256 = "sha256-kqc+5pClmAPEkyNWKj4uPgwFFKBDWrwFHqRDWjYrwa4="; nativeBuildInputs = [ gobject-introspection From f1a9f5302bc7f8e68849b6deb42f6a0c67829451 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:26:42 +0800 Subject: [PATCH 14/44] xfce.xfce4-power-manager: 4.18.0 -> 4.18.1 https://gitlab.xfce.org/xfce/xfce4-power-manager/-/compare/xfce4-power-manager-4.18.0...xfce4-power-manager-4.18.1 --- pkgs/desktops/xfce/core/xfce4-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index d14752fbab46..3a4285b33b77 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-vl0SfZyVGxZYnSa2nCnYlqT05Hm7PLzOxgAGzapkKVI="; + sha256 = "sha256-H9tu94ZQLLQhXIDtIWL3qZJo/ux2xC2Y9m7uwwey8M8="; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ]; From 4acaba28d3625ad6018cd13d74788eca586c4b15 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:28:54 +0800 Subject: [PATCH 15/44] xfce.xfce4-session: 4.18.0 -> 4.18.1 https://gitlab.xfce.org/xfce/xfce4-session/-/compare/xfce4-session-4.18.0...xfce4-session-4.18.1 --- pkgs/desktops/xfce/core/xfce4-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index ab30dc49c5f5..116d4d574ac6 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-eSQXVMdwxr/yE806Tly8CLimmJso6k4muuTR7RHPU3U="; + sha256 = "sha256-mG+tyQ319fvQpitT6sb46R+8AF+3gxqPHMiGMAaqnSo="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; From e5fdb2fce869bc2e337d2d8018ed96a9f451a195 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 15:36:18 +0800 Subject: [PATCH 16/44] xfce.xfce4-settings: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/xfce/xfce4-settings/-/compare/xfce4-settings-4.18.1...xfce4-settings-4.18.2 --- pkgs/desktops/xfce/core/xfce4-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 2c51baf4df7c..3e0a43624cba 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-Uy5dObnMV+fpt8RdyFOsYVPN8Dyx1zzOu0pDak01ipQ="; + sha256 = "sha256-u8xto4tP9fsaPaY6dzv4Bj/C6qvltT5wXJlV+TzP5uE="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do From 49ca01bf9d93907ef7255289ced1b99797eea79c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Mar 2023 16:37:31 +0800 Subject: [PATCH 17/44] nixosTests.xfce: silence a deprecation warning trace: warning: Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead. --- nixos/tests/xfce.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 31f00f77c40d..3758ccbccf42 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' machine.wait_for_x() machine.wait_for_file("${user.home}/.Xauthority") From c24a8ccc98ee98e23b24f7575049bad05608224d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 16 Mar 2023 16:17:04 +0200 Subject: [PATCH 18/44] solr: drop --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/search/solr.nix | 110 ------------------------- nixos/tests/all-tests.nix | 1 - nixos/tests/solr.nix | 56 ------------- pkgs/servers/search/solr/default.nix | 43 ---------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 2 - 8 files changed, 4 insertions(+), 216 deletions(-) delete mode 100644 nixos/modules/services/search/solr.nix delete mode 100644 nixos/tests/solr.nix delete mode 100644 pkgs/servers/search/solr/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 17ea04cb4ecb..bed50b81604d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -338,7 +338,7 @@ in lidarr = 306; slurm = 307; kapacitor = 308; - solr = 309; + # solr = 309; removed 2023-03-16 alerta = 310; minetest = 311; rss2email = 312; @@ -648,7 +648,7 @@ in lidarr = 306; slurm = 307; kapacitor = 308; - solr = 309; + # solr = 309; removed 2023-03-16 alerta = 310; minetest = 311; rss2email = 312; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 314d67419b7f..1228095e843d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1061,7 +1061,6 @@ ./services/search/meilisearch.nix ./services/search/opensearch.nix ./services/search/qdrant.nix - ./services/search/solr.nix ./services/security/aesmd.nix ./services/security/certmgr.nix ./services/security/cfssl.nix diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix deleted file mode 100644 index 05592e9fa247..000000000000 --- a/nixos/modules/services/search/solr.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.solr; - -in - -{ - options = { - services.solr = { - enable = mkEnableOption (lib.mdDoc "Solr"); - - package = mkOption { - type = types.package; - default = pkgs.solr; - defaultText = literalExpression "pkgs.solr"; - description = lib.mdDoc "Which Solr package to use."; - }; - - port = mkOption { - type = types.port; - default = 8983; - description = lib.mdDoc "Port on which Solr is ran."; - }; - - stateDir = mkOption { - type = types.path; - default = "/var/lib/solr"; - description = lib.mdDoc "The solr home directory containing config, data, and logging files."; - }; - - extraJavaOptions = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc "Extra command line options given to the java process running Solr."; - }; - - user = mkOption { - type = types.str; - default = "solr"; - description = lib.mdDoc "User under which Solr is ran."; - }; - - group = mkOption { - type = types.str; - default = "solr"; - description = lib.mdDoc "Group under which Solr is ran."; - }; - }; - }; - - config = mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - - systemd.services.solr = { - after = [ "network.target" "remote-fs.target" "nss-lookup.target" "systemd-journald-dev-log.socket" ]; - wantedBy = [ "multi-user.target" ]; - - environment = { - SOLR_HOME = "${cfg.stateDir}/data"; - LOG4J_PROPS = "${cfg.stateDir}/log4j2.xml"; - SOLR_LOGS_DIR = "${cfg.stateDir}/logs"; - SOLR_PORT = "${toString cfg.port}"; - }; - path = with pkgs; [ - gawk - procps - ]; - preStart = '' - mkdir -p "${cfg.stateDir}/data"; - mkdir -p "${cfg.stateDir}/logs"; - - if ! test -e "${cfg.stateDir}/data/solr.xml"; then - install -D -m0640 ${cfg.package}/server/solr/solr.xml "${cfg.stateDir}/data/solr.xml" - install -D -m0640 ${cfg.package}/server/solr/zoo.cfg "${cfg.stateDir}/data/zoo.cfg" - fi - - if ! test -e "${cfg.stateDir}/log4j2.xml"; then - install -D -m0640 ${cfg.package}/server/resources/log4j2.xml "${cfg.stateDir}/log4j2.xml" - fi - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart="${cfg.package}/bin/solr start -f -a \"${concatStringsSep " " cfg.extraJavaOptions}\""; - ExecStop="${cfg.package}/bin/solr stop"; - }; - }; - - users.users = optionalAttrs (cfg.user == "solr") { - solr = { - group = cfg.group; - home = cfg.stateDir; - createHome = true; - uid = config.ids.uids.solr; - }; - }; - - users.groups = optionalAttrs (cfg.group == "solr") { - solr.gid = config.ids.gids.solr; - }; - - }; - -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ee1f6bb8059f..9fa8f73ea5a5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -623,7 +623,6 @@ in { soapui = handleTest ./soapui.nix {}; sogo = handleTest ./sogo.nix {}; solanum = handleTest ./solanum.nix {}; - solr = handleTest ./solr.nix {}; sonarr = handleTest ./sonarr.nix {}; sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix deleted file mode 100644 index 33afe9d788f7..000000000000 --- a/nixos/tests/solr.nix +++ /dev/null @@ -1,56 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ - name = "solr"; - meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; - - nodes.machine = - { config, pkgs, ... }: - { - # Ensure the virtual machine has enough memory for Solr to avoid the following error: - # - # OpenJDK 64-Bit Server VM warning: - # INFO: os::commit_memory(0x00000000e8000000, 402653184, 0) - # failed; error='Cannot allocate memory' (errno=12) - # - # There is insufficient memory for the Java Runtime Environment to continue. - # Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory. - virtualisation.memorySize = 2000; - - services.solr.enable = true; - }; - - testScript = '' - start_all() - - machine.wait_for_unit("solr.service") - machine.wait_for_open_port(8983) - machine.succeed("curl --fail http://localhost:8983/solr/") - - # adapted from pkgs.solr/examples/films/README.txt - machine.succeed("sudo -u solr solr create -c films") - assert '"status":0' in machine.succeed( - """ - curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{ - "add-field" : { - "name":"name", - "type":"text_general", - "multiValued":false, - "stored":true - }, - "add-field" : { - "name":"initial_release_date", - "type":"pdate", - "stored":true - } - }' - """ - ) - machine.succeed( - "sudo -u solr post -c films ${pkgs.solr}/example/films/films.json" - ) - assert '"name":"Batman Begins"' in machine.succeed( - "curl http://localhost:8983/solr/films/query?q=name:batman" - ) - ''; -}) diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix deleted file mode 100644 index a3b75134107b..000000000000 --- a/pkgs/servers/search/solr/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, nixosTests }: - -stdenv.mkDerivation rec { - pname = "solr"; - version = "8.6.3"; - - src = fetchurl { - url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "0mbbmamajamxzcvdlrzx9wmv26kg9nhg9bzazk176dhhx3rjajf2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out $out/bin - - cp -r bin/solr bin/post $out/bin/ - cp -r contrib $out/ - cp -r dist $out/ - cp -r example $out/ - cp -r server $out/ - - wrapProgram $out/bin/solr --set JAVA_HOME "${jre}" - wrapProgram $out/bin/post --set JAVA_HOME "${jre}" - ''; - - passthru.tests = { - inherit (nixosTests) solr; - }; - - meta = with lib; { - homepage = "https://lucene.apache.org/solr/"; - description = "Open source enterprise search platform from the Apache Lucene project"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - knownVulnerabilities = [ - "Multiple security issues throughout 2021, see https://solr.apache.org/security.html" - "Package is outdated and has no maintainer" - ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd2c8c7735c1..88c47bac8efd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1439,7 +1439,8 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = solr; # Added 2021-01-30 + solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 + solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 # Added 2020-02-10 sourceHanSansPackages = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6df133869b1..756a68450c03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12264,8 +12264,6 @@ with pkgs; sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { }; - solr = callPackage ../servers/search/solr { }; - solvespace = callPackage ../applications/graphics/solvespace { }; sonarr = callPackage ../servers/sonarr { }; From d81364ce749040bc9660fb8e322efb54eaeed26f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 17 Mar 2023 10:44:27 +0100 Subject: [PATCH 19/44] mautrix-whatsapp: 0.8.2 -> 0.8.3 --- 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 9b5f2c813164..06821636099f 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.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-0hnBqYwFVVlqv+8Cx2qvytDU6I+MPWQIpG4nYd7mPLM="; + hash = "sha256-rSyKKWg9PiAZAdmUfWWxU4ZXGHP+LR1kcDXMbkB3wYA="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-n3DBPI1gjbmP9m+xkGVoTSBcA0ELSokNZb9i3cYmAqc="; + vendorSha256 = "sha256-eHY6YBPDA2uJyhvB/3bd+W2PEfGjyx3BEAlbJvVV0Yo="; doCheck = false; From 7d32101a66f68f13be396677830cf2ffc514dd66 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Fri, 17 Mar 2023 12:15:40 +0000 Subject: [PATCH 20/44] cista: init at 0.13 --- pkgs/development/libraries/cista/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/cista/default.nix diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/development/libraries/cista/default.nix new file mode 100644 index 000000000000..a7aae63ccb8f --- /dev/null +++ b/pkgs/development/libraries/cista/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "cista"; + version = "0.13"; + + src = fetchFromGitHub { + owner = "felixguendling"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dQOVmKRXfApN0QRx/PmLVzeCGppFJBnNWIOoLbDbrds="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DCISTA_INSTALL=ON" ]; + + meta = with lib; { + homepage = "https://cista.rocks"; + description = "A simple, high-performance, zero-copy C++ serialization & reflection library"; + license = licenses.mit; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd5b476b01fb..7a25a92d3a27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19447,6 +19447,8 @@ with pkgs; cimg = callPackage ../development/libraries/cimg { }; + cista = callPackage ../development/libraries/cista { }; + cjose = callPackage ../development/libraries/cjose { }; scmccid = callPackage ../development/libraries/scmccid { }; From 6da5fddeb5dff5c513e03be6e65cb5b0c4a0ab00 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 17 Mar 2023 17:27:01 +0100 Subject: [PATCH 21/44] netdata: add raitobezarius as a maintainer --- nixos/tests/netdata.nix | 2 +- pkgs/tools/system/netdata/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 0f26630da9d4..aea67c29d0d4 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; meta = with pkgs.lib.maintainers; { - maintainers = [ cransom ]; + maintainers = [ cransom raitobezarius ]; }; nodes = { diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index fb3d30174b18..6d2bc2c6e911 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -122,6 +122,6 @@ stdenv.mkDerivation rec { homepage = "https://www.netdata.cloud/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ raitobezarius ]; }; } From 9a0666a7d024e5ecc0db98493c9027c51e081a31 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 17 Mar 2023 17:28:02 +0100 Subject: [PATCH 22/44] zfs: add raitobezarius as a maintainer --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d92ccc346386..5e5ec6d79312 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -210,7 +210,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin ]; + maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin raitobezarius ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. From 798e414d3e11079b49f639dc6dd7de7515a56d60 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 17 Mar 2023 14:53:16 -0400 Subject: [PATCH 23/44] python310Packages.nbdev: unbreak Add missing pyyaml and quarto dependencies. --- pkgs/development/python-modules/nbdev/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index c47508918a8d..b2e97efa6538 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -8,6 +8,8 @@ , watchdog , execnb , ghapi +, pyyaml +, quarto , pythonOlder }: @@ -22,7 +24,18 @@ buildPythonPackage rec { sha256 = "sha256-ITMCmuAb1lXONbP5MREpk8vfNSztoTEmT87W1o+fbIU="; }; - propagatedBuildInputs = [ fastprogress fastcore asttokens astunparse watchdog execnb ghapi ]; + propagatedBuildInputs = [ + fastprogress + fastcore + asttokens + astunparse + watchdog + execnb + ghapi + pyyaml + quarto + ]; + # no real tests doCheck = false; pythonImportsCheck = [ "nbdev" ]; From 11cd8fcb704922b1e0c234b44e5cd162f203ac91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 17 Mar 2023 15:35:44 +0000 Subject: [PATCH 24/44] python310Packages.trainer: 0.0.22 -> 0.0.24 https://github.com/coqui-ai/Trainer/releases/tag/v0.0.23 https://github.com/coqui-ai/Trainer/releases/tag/v0.0.24 --- pkgs/development/python-modules/trainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index d27e80494c4f..cce979464a86 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -18,7 +18,7 @@ let pname = "trainer"; - version = "0.0.22"; + version = "0.0.24"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-iujRx/9HNHIUOuoTHvQM5EByKydLjoVwfsBn7XdM3ks="; + hash = "sha256-+Wr8kmHo3rWxknSN/jJVzXow95hNgth/j4OSj96gScE="; }; postPatch = '' From bbf45c9665bf997761499b83919464b2287a4f6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 17 Mar 2023 20:48:36 +0100 Subject: [PATCH 25/44] tts: 0.11.1 -> 0.12.0 https://github.com/coqui-ai/TTS/releases/tag/v0.12.0 --- pkgs/tools/audio/tts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index b588c7821a4f..1c3cc91616c7 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -38,14 +38,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-EVFFETiGbrouUsrIhMFZEex3UGCCWTI3CC4yFAcERyw="; + hash = "sha256-3t4JYEwQ+puGLhGl3nn93qsL8IeOwlYtHXTrnZ5Cf+w="; }; postPatch = let From 0a7667609f302632c9b5cd605659f75b4f938260 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 17 Mar 2023 23:50:16 +0200 Subject: [PATCH 26/44] samba: unbreak on darwin --- pkgs/servers/samba/4.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4828e613595a..3280cb3b6b75 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -103,15 +103,13 @@ stdenv.mkDerivation rec { libarchive zlib gnutls - ldb - talloc libtasn1 tdb - tevent libxcrypt ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optionals stdenv.isDarwin [ libiconv ] ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ] + ++ optionals (!enableLDAP && stdenv.isLinux) [ ldb talloc tevent ] ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ] @@ -149,6 +147,7 @@ stdenv.mkDerivation rec { ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" + ] ++ optionals (!enableLDAP && stdenv.isLinux) [ "--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb" ] ++ optional enableLibunwind "--with-libunwind" ++ optional enableProfiling "--with-profiling-data" From a5a292c7a82c694129c1045a4ee8a5078db37d71 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:58:24 +0300 Subject: [PATCH 27/44] treewide: clear out remaining qt5 conditionals --- pkgs/applications/kde/akonadi/default.nix | 3 +- pkgs/applications/kde/default.nix | 4 -- pkgs/applications/kde/dolphin.nix | 3 +- pkgs/applications/kde/elisa.nix | 4 +- pkgs/applications/kde/filelight.nix | 2 - .../kde/grantleetheme/default.nix | 1 - pkgs/applications/kde/kdebugsettings.nix | 3 +- .../kde/kdenetwork-filesharing.nix | 3 +- pkgs/applications/kde/kirigami-gallery.nix | 4 +- pkgs/applications/kde/kmime.nix | 1 - pkgs/applications/kde/konqueror.nix | 5 +-- pkgs/applications/kde/kpimtextedit.nix | 3 +- pkgs/applications/kde/kpkpass.nix | 1 - pkgs/applications/kde/krdc.nix | 3 +- pkgs/applications/kde/kwave.nix | 3 +- pkgs/applications/kde/libkgapi.nix | 3 +- pkgs/applications/kde/minuet.nix | 3 +- pkgs/applications/kde/spectacle.nix | 3 +- pkgs/applications/maui/default.nix | 6 +-- .../misc/qsyncthingtray/default.nix | 5 +-- pkgs/applications/plasma-mobile/default.nix | 6 +-- .../science/math/speedcrunch/default.nix | 3 +- pkgs/applications/video/avidemux/default.nix | 1 - pkgs/desktops/plasma-5/default.nix | 3 -- .../fix-build-for-qt-olderthan-514.patch | 43 ------------------- pkgs/development/libraries/appstream/qt.nix | 11 +---- .../libraries/kde-frameworks/default.nix | 4 -- .../kde-frameworks/kimageformats.nix | 4 -- .../development/libraries/kpmcore/default.nix | 4 +- .../libraries/qt-5/modules/qtdeclarative.nix | 2 +- .../libraries/qt-5/modules/qtmultimedia.nix | 3 +- .../qtstyleplugin-kvantum/default.nix | 1 - 32 files changed, 23 insertions(+), 125 deletions(-) delete mode 100644 pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 8fa12be3a8b6..e816d3eeb41e 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, + extra-cmake-modules, shared-mime-info, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, postgresql, qttools, signond, xz, @@ -17,7 +17,6 @@ mkDerivation { meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; - broken = lib.versionOlder qtbase.version "5.13"; }; patches = [ ./0001-akonadi-paths.patch diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6968c50c6099..c121d0fb5399 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -30,9 +30,6 @@ still shows most of the available features is in `./gwenview.nix`. }: let - minQtVersion = "5.15"; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; - mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; @@ -53,7 +50,6 @@ let meta // { homepage = meta.homepage or "http://www.kde.org"; platforms = meta.platforms or lib.platforms.linux; - broken = meta.broken or broken; }; }); diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 9e4ab1d41027..91ab0f8f57b1 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kcoreaddons, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem, phonon, solid, - wayland, qtbase, qtwayland + wayland, qtwayland }: mkDerivation { @@ -15,7 +15,6 @@ mkDerivation { description = "KDE file manager"; license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedUserEnvPkgs = [ baloo ]; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 51203271b1ff..5073d869a3aa 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -2,7 +2,6 @@ , lib , extra-cmake-modules , kdoctools -, qtbase , qtmultimedia , qtquickcontrols2 , qtwebsockets @@ -17,7 +16,7 @@ , libvlc }: -mkDerivation rec { +mkDerivation { pname = "elisa"; outputs = [ "out" "dev" ]; @@ -45,6 +44,5 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - broken = lib.versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 2a6e349f2f23..af1b131b5c76 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -5,7 +5,6 @@ , kio , kparts , kxmlgui -, qtbase , qtscript , solid , qtquickcontrols2 @@ -21,7 +20,6 @@ mkDerivation { homepage = "https://apps.kde.org/filelight/"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; - broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 6d29d6e6d8c1..ff4b8fc93ed9 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -9,7 +9,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; - broken = lib.versionOlder qtbase.version "5.13.0"; }; output = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index 6d407e0a50d7..2ebf9c889448 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, gettext, kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, - qtbase, python3 + python3 }: mkDerivation { @@ -13,7 +13,6 @@ mkDerivation { description = "KDE debug settings"; license = with lib.licenses; [ gpl2 ]; maintainers = [ ]; - broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index a7da03ffdd14..74ed9386cf05 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qtbase, + kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, }: mkDerivation { @@ -9,7 +9,6 @@ mkDerivation { meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ]; diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix index f012188ed992..c22cc16aaf91 100644 --- a/pkgs/applications/kde/kirigami-gallery.nix +++ b/pkgs/applications/kde/kirigami-gallery.nix @@ -6,10 +6,9 @@ , qtgraphicaleffects , qtquickcontrols2 , qttools -, qtbase }: -mkDerivation rec { +mkDerivation { pname = "kirigami-gallery"; nativeBuildInputs = [ extra-cmake-modules qttools ]; @@ -26,6 +25,5 @@ mkDerivation rec { description = "View examples of Kirigami components"; license = licenses.lgpl2; maintainers = with maintainers; [ shadowrz ]; - broken = versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 51e78b5f6497..8dfd910eeded 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -13,5 +13,4 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index cf4002a8f673..f048879ea545 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules, kdoctools , kinit, kcmutils, khtml, kdesu -, qtbase, qtwebengine, qtx11extras, qtscript, qtwayland +, qtwebengine, qtx11extras, qtscript, qtwayland }: mkDerivation { @@ -25,7 +25,6 @@ mkDerivation { homepage = "https://apps.kde.org/konqueror/"; description = "Web browser, file manager and viewer"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; - broken = lib.versionOlder qtbase.version "5.13"; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index e42c25e7463d..040fbd122ef8 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, - kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, qtspeech }: @@ -11,7 +11,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; - broken = lib.versionOlder qtbase.version "5.13.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index e7b814771220..1d5454ac0456 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -8,7 +8,6 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; - broken = lib.versionOlder qtbase.version "5.15"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 9d9762523d97..dfa84dae31bc 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, makeWrapper, kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons, - kwindowsystem, libvncserver, freerdp, qtbase, + kwindowsystem, libvncserver, freerdp, }: mkDerivation { @@ -22,6 +22,5 @@ mkDerivation { license = with licenses; [ gpl2Plus lgpl21Plus fdl12Plus bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.14"; }; } diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 43f41c345fdf..a315ce6bd9bd 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig , kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib -, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: +, libogg, libmad, libopus, libvorbis, fftw, librsvg }: mkDerivation { pname = "kwave"; @@ -11,7 +11,6 @@ mkDerivation { maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl2Plus; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index de0be7ea49ad..d5e34aa5024f 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtbase, qtwebengine, kio, kcalendarcore, kcontacts, + qtwebengine, kio, kcalendarcore, kcontacts, cyrus_sasl }: @@ -10,7 +10,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; - broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ]; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index 50a6a6f282ec..0aaa5012a073 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -1,4 +1,4 @@ -{ mkDerivation, qtbase +{ mkDerivation , lib, extra-cmake-modules, gettext, python3 , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools @@ -12,7 +12,6 @@ mkDerivation { description = "Music Education Software"; license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; - broken = lib.versionOlder qtbase.version "5.14"; }; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 qtdeclarative ]; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 39e9f344c3ee..cbba15beebc7 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -3,7 +3,7 @@ , ki18n, xcb-util-cursor , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi -, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator +, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator }: mkDerivation { @@ -23,6 +23,5 @@ mkDerivation { homepage = "https://apps.kde.org/spectacle/"; description = "Screenshot capture utility"; maintainers = with maintainers; [ ttuegel ]; - broken = versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index 6f045bda658b..b91f13d12594 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on. }: let - minQtVersion = "5.15"; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; - mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; @@ -51,11 +48,10 @@ let meta // { homepage = meta.homepage or "https://mauikit.org/"; platforms = meta.platforms or lib.platforms.linux; - broken = meta.broken or broken; }; }); - packages = self: with self; + packages = self: let callPackage = self.newScope { inherit mkDerivation; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 100be6c2dc87..bfe1d61818f5 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -64,9 +64,6 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; - # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 - # but qt > 5.6 works when only using the native browser - # https://github.com/sieren/QSyncthingTray/issues/223 - broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin; + broken = !preferNative || stdenv.isDarwin; }; } diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 9efbaa603395..34f28ae7ff5d 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -28,9 +28,6 @@ See also `pkgs/applications/kde` as this is what this is based on. }: let - minQtVersion = "5.15"; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; - mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; @@ -51,11 +48,10 @@ let meta // { homepage = meta.homepage or "https://www.plasma-mobile.org/"; platforms = meta.platforms or lib.platforms.linux; - broken = meta.broken or broken; }; }); - packages = self: with self; + packages = self: let callPackage = self.newScope { inherit mkDerivation; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 239b5fd6d367..98bc6b031f19 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -31,7 +31,6 @@ mkDerivation rec { ''; maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; - # works with qt 5.6 and qt 5.8 - broken = builtins.compareVersions qtbase.version "5.7.0" == 0 || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 061c00b3f325..ea7ba432a4a4 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { ++ lib.optional withVPX libvpx; buildCommand = let - qtVersion = "5.${lib.versions.minor qtbase.version}"; wrapWith = makeWrapper: filename: "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; wrapQtApp = wrapWith "wrapQtApp"; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index f33688245b13..0c501b4c5a4c 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -33,8 +33,6 @@ }: let - minQtVersion = "5.15"; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ lgpl21Plus @@ -107,7 +105,6 @@ let license = meta.license or license; maintainers = (meta.maintainers or [ ]) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; - broken = meta.broken or broken; }; in qtStdenv.mkDerivation (args // { diff --git a/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch b/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch deleted file mode 100644 index 35db2bec914e..000000000000 --- a/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/qt/component.h b/qt/component.h -index 47abd1f3..74de943c 100644 ---- a/qt/component.h -+++ b/qt/component.h -@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component { - UrlKindContact, - - // deprecated -- UrlTranslate [[deprecated]] = UrlKindTranslate, -+ UrlTranslate = UrlKindTranslate, - }; - Q_ENUM(UrlKind) - -diff --git a/qt/pool.h b/qt/pool.h -index b59829b7..5237f613 100644 ---- a/qt/pool.h -+++ b/qt/pool.h -@@ -70,9 +70,9 @@ public: - FlagMonitor = 1 << 7, - - // deprecated -- FlagReadCollection [[deprecated]] = FlagLoadOsCollection, -- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo, -- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles, -+ FlagReadCollection = FlagLoadOsCollection, -+ FlagReadMetainfo = FlagLoadOsMetainfo, -+ FlagReadDesktopFiles = FlagLoadOsDesktopFiles, - }; - - /** -@@ -84,9 +84,9 @@ public: - * Flags on how caching should be used. - **/ - enum CacheFlags { -- CacheFlagNone [[deprecated]] = 0, -- CacheFlagUseUser [[deprecated]] = 1 << 0, -- CacheFlagUseSystem [[deprecated]] = 1 << 1, -+ CacheFlagNone = 0, -+ CacheFlagUseUser = 1 << 0, -+ CacheFlagUseSystem = 1 << 1, - }; - - /** diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 3704332119e2..bcc24376ff3e 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }: +{ mkDerivation, appstream, qtbase, qttools, nixosTests }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here @@ -14,14 +14,7 @@ mkDerivation { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; - patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [ - # Fix darwin build for libsForQt5.appstream-qt - # Old Qt moc doesn't know about fancy C++14 features - # ../qt/component.h:93: Parse error at "UrlTranslate" - # Remove both this patch and related comment in default.nix - # once Qt 5.14 or later becomes default on darwin - ./fix-build-for-qt-olderthan-514.patch - ]; + patches = appstream.patches; postFixup = '' sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 1e8ce2dd5227..1ed4dd267c3d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -27,9 +27,6 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl }: let - - minQtVersion = "5.15"; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12Plus @@ -86,7 +83,6 @@ let license = meta.license or license; maintainers = (meta.maintainers or []) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; - broken = meta.broken or broken; }; in mkDerivation (args // { diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index beec3e13cf71..5954d56e6cca 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -16,8 +16,4 @@ mkDerivation { cmakeFlags = [ "-DKIMAGEFORMATS_HEIF=ON" ]; - - meta = with lib; { - broken = versionOlder qtbase.version "5.14"; - }; } diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index d5e72109ba88..bbd9d8fd2f5f 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, extra-cmake-modules -, qca-qt5, kauth, kio, polkit-qt, qtbase +, qca-qt5, kauth, kio, polkit-qt , util-linux }: @@ -42,7 +42,5 @@ stdenv.mkDerivation rec { homepage = "https://invent.kde.org/system/kpmcore"; license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ]; maintainers = with maintainers; [ peterhoeg oxalica ]; - # The build requires at least Qt 5.14: - broken = versionOlder qtbase.version "5.14"; }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index 89f2672c26dd..f19074e08a0c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -8,7 +8,7 @@ qtModule { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\"" ''; - configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ]; + configureFlags = [ "-qml-debug" ]; devTools = [ "bin/qml" "bin/qmlcachegen" diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 41a7eb6776c3..704cb7881c71 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -17,8 +17,7 @@ qtModule { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio - ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] - ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib wayland ]; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; NIX_LDFLAGS = lib.optionalString (stdenv.isDarwin) "-lobjc"; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 4d0cbafe3731..098443319ac6 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tsujan/Kvantum"; license = licenses.gpl3Plus; platforms = platforms.linux; - broken = lib.versionOlder qtbase.version "5.14"; maintainers = [ maintainers.romildo ]; }; } From bcc5d6cc2049243b0a00852bdd86e0ef058498cd Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 17 Mar 2023 21:15:27 -0300 Subject: [PATCH 28/44] CODEOWNERS: add superherointj to vscode (2th path) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b202fcd13ec1..248be7346118 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -238,7 +238,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # VsCode Extensions /pkgs/applications/editors/vscode @superherointj -/pkgs/applications/editors/vscode/extensions @jonringer +/pkgs/applications/editors/vscode/extensions @jonringer @superherointj # Prometheus exporter modules and tests /nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz From 15fa0306e56a3316a8982de9a4b9f9e3b305139f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 01:03:30 +0000 Subject: [PATCH 29/44] tfplugindocs: 0.14.0 -> 0.14.1 --- pkgs/development/tools/tfplugindocs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/development/tools/tfplugindocs/default.nix index 8d8e9faeda38..7f3e4a80ba3c 100644 --- a/pkgs/development/tools/tfplugindocs/default.nix +++ b/pkgs/development/tools/tfplugindocs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfplugindocs"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "v${version}"; - sha256 = "sha256-adOaX8VxMytnALkuXBlmRKfRmk6x7bHTg/oEJQiJ1+U="; + sha256 = "sha256-GiMjm7XG/gFGOQXYeXsKbU7WQdrkQ0+J/SvfbLu24bo="; }; - vendorHash = "sha256-Qo8L0Rm7ZxcZ9YZTqfx51Tt8DRj4M+be6NdrsrwRt30="; + vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w="; meta = with lib; { description = "Generate and validate Terraform plugin/provider documentation"; From ac5ad78aba3c1217b389ac6f748e7cde765c94e6 Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Fri, 17 Mar 2023 20:30:07 -0500 Subject: [PATCH 30/44] moarvm: 2022.07 -> 2023.02 --- pkgs/development/interpreters/rakudo/moarvm.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 7c8bedfd303f..ca31f0305b97 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , perl , CoreServices , ApplicationServices @@ -9,23 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2022.07"; + version = "2023.02"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - hash = "sha256-M37wTRb4JvmUZcZTuSAGAo/iIL5o09z9BylhL09rW0Y="; + hash = "sha256-Z+IU1E1fYmeHyn8EQkBDpjkwikOnd3tvpBkmtyQODcU="; }; - patches = [ - (fetchpatch { - name = "mimalloc-older-macos-fixes.patch"; - url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; - stripLen = 1; - extraPrefix = "3rdparty/mimalloc/"; - sha256 = "1gcbn1850vy7xzalhn9ffnsg6x1ywi3fmnxvnal3m6lmb4kz5kb1"; - }) - ]; - postPatch = '' patchShebangs . '' + lib.optionalString stdenv.isDarwin '' From 307db4066c2ccd3ede34f44067110a6c23566642 Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Fri, 17 Mar 2023 20:30:24 -0500 Subject: [PATCH 31/44] nqp: 2022.07 -> 2023.02 --- pkgs/development/interpreters/rakudo/nqp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 44eb417e5260..e238e5c20450 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2022.07"; + version = "2023.02"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - hash = "sha256-WAgcEG1nKlQGAY/WmRLI1IX9Er8iWVEyXFDJKagjImg="; + hash = "sha256-417V7ZTsMqbXMO6BW/hcX8+IqGf6xlZjaMGtSf5jtT8="; }; buildInputs = [ perl ]; From a09aae0d759a7147cb226c177f76fff2431f0213 Mon Sep 17 00:00:00 2001 From: superwhiskers Date: Fri, 17 Mar 2023 20:30:38 -0500 Subject: [PATCH 32/44] rakudo: 2022.07 -> 2023.02 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index a48c754c5b41..5acec350035c 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2022.07"; + version = "2023.02"; src = fetchurl { url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - hash = "sha256-ejvJ1lTh0nkqBVtPrxFu820UH2tq3eeqcDF3BfJgkK0="; + hash = "sha256-/RaGqizzLrnw630Nb5bfyJfPU8z4ntp9Iltoc4CTqhE="; }; nativeBuildInputs = [ removeReferencesTo ]; From 0e8870ccbd67757a0c6e991b0aedf6bdb16f9ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 02:04:08 +0000 Subject: [PATCH 33/44] devbox: 0.4.2 -> 0.4.4 --- pkgs/development/tools/devbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 2aa8a7c13a9b..9de9f393d318 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-9aGmX21TUINGDA3NB/OrGXi8W4i+b8fKS8ft8GtQxNM="; + hash = "sha256-mowrp08L74IgOoyA30cmt4QWDsHo1HPKm7bxiYp+YVI="; }; ldflags = [ From 11e800d521145ed51e36f0d2513866e4bdbb3615 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 03:29:06 +0000 Subject: [PATCH 34/44] uncover: 1.0.2 -> 1.0.3 --- pkgs/tools/security/uncover/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/tools/security/uncover/default.nix index d8eb2d46b923..38421ad70553 100644 --- a/pkgs/tools/security/uncover/default.nix +++ b/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-yyx7gkOUQibcrMCEeeSeHtnKlxSnd/i6c1pq1V6hzA4="; + hash = "sha256-emfS5/HEt+I0DlUDgbWGqjF8bVLHsKxgAS4CKB8WO9E="; }; - vendorHash = "sha256-xB1JJIM/aro1Hk4JIwpR6WV6V+5hO9T3yWokxbybRXU="; + vendorHash = "sha256-ckswffKbTXq8GMO2RvVz43ig27LKBxI2WqHRAx04dk0="; meta = with lib; { description = "API wrapper to search for exposed hosts"; From a6a085c6dc581b8a351295ffe42e99e770f2f6a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 03:55:07 +0000 Subject: [PATCH 35/44] netdata-go-plugins: 0.51.2 -> 0.51.3 --- pkgs/tools/system/netdata/go.d.plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index dd3b52eca66e..462bb48bcbf5 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "netdata-go-plugins"; - version = "0.51.2"; + version = "0.51.3"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "sha256-u87kTNM1oAmJRtm/iEESjVvQ9qEpFCGqRT8M+iVEwlI="; + sha256 = "sha256-z4sw/OJYgc2SaGsGwWcX2zAxnCkTTbK8G/XKGCGega0="; }; - vendorSha256 = "sha256-QB+Sf7biNPD8/3y9pFxOJZXtc6BaBcQsUGP7y9Wukwg="; + vendorHash = "sha256-lKoFm+wch9/ZgDSNSgYUrOq/X8DUEuSAQ4cc8UGaJzU="; doCheck = false; From bd2b3ec62b18c45293878bdff863f8c8ca663698 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Mar 2023 04:20:00 +0000 Subject: [PATCH 36/44] netdata-go-plugins: 0.51.3 -> 0.51.4 https://github.com/netdata/go.d.plugin/releases/tag/v0.51.4 --- pkgs/tools/system/netdata/go.d.plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 462bb48bcbf5..702d508d2ebf 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "netdata-go-plugins"; - version = "0.51.3"; + version = "0.51.4"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "sha256-z4sw/OJYgc2SaGsGwWcX2zAxnCkTTbK8G/XKGCGega0="; + hash = "sha256-yYagbTrUpynvmd20MATQvsR+jZM7dhrQdfSjuayrZJI="; }; vendorHash = "sha256-lKoFm+wch9/ZgDSNSgYUrOq/X8DUEuSAQ4cc8UGaJzU="; From a0753a8b4b947179749f9f0550590835a0d7b51f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Mar 2023 04:20:00 +0000 Subject: [PATCH 37/44] netdata-go-plugins: add netdata test to passthru --- pkgs/tools/system/netdata/go.d.plugin.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 702d508d2ebf..01594683a96b 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: + buildGoModule rec { pname = "netdata-go-plugins"; version = "0.51.4"; @@ -21,6 +22,8 @@ buildGoModule rec { cp -r config/* $out/lib/netdata/conf.d ''; + passthru.tests = { inherit (nixosTests) netdata; }; + meta = with lib; { description = "Netdata orchestrator for data collection modules written in go"; homepage = "https://github.com/netdata/go.d.plugin"; From 53262cefb708a74efa8bdf0c72ee60d099b69ccc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Mar 2023 04:20:00 +0000 Subject: [PATCH 38/44] netdata-go-plugins: update meta --- pkgs/tools/system/netdata/go.d.plugin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 01594683a96b..ac834ee18338 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -27,7 +27,8 @@ buildGoModule rec { meta = with lib; { description = "Netdata orchestrator for data collection modules written in go"; homepage = "https://github.com/netdata/go.d.plugin"; - license = licenses.gpl3; + changelog = "https://github.com/netdata/go.d.plugin/releases/tag/v${version}"; + license = licenses.gpl3Only; maintainers = [ ]; }; } From decdea95b6aa125b79f2b92305f3aaafc11048bc Mon Sep 17 00:00:00 2001 From: Anillc Date: Sat, 18 Mar 2023 13:05:46 +0800 Subject: [PATCH 39/44] go-cqhttp: 1.0.0-rc4 -> 1.0.0-rc5 --- pkgs/servers/go-cqhttp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/go-cqhttp/default.nix b/pkgs/servers/go-cqhttp/default.nix index c6ab0a6addc9..0c3335977201 100644 --- a/pkgs/servers/go-cqhttp/default.nix +++ b/pkgs/servers/go-cqhttp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-cqhttp"; - version = "1.0.0-rc4"; + version = "1.0.0-rc5"; src = fetchFromGitHub { owner = "Mrs4s"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7TWKd0y8yBi2piKBCUZFeo3swtC/SteRtXXRv7Ojajs="; + sha256 = "sha256-t9R1hnd0LzLYn2EiX6JOpbVuhyrWJUB0FYikP2g1CYs="; }; - vendorSha256 = "sha256-Oz/4bazhNnkf26YJ4H7c7d7vNzIJxG2OG0BJOiHBY7Y="; + vendorSha256 = "sha256-4j1CRRaHzjvFus+djR9tJU4vVY4g34o8V1owz7hi4qI="; meta = with lib; { description = "The Golang implementation of OneBot based on Mirai and MiraiGo"; From 76827e5ec81c1ba78acc8c2d45a40528c248ff90 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Mar 2023 04:20:00 +0000 Subject: [PATCH 40/44] hyperledger-fabric: 2.4.6 -> 2.4.9 https://github.com/hyperledger/fabric/releases/tag/v2.4.9 --- pkgs/tools/misc/hyperledger-fabric/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index 15bb67d62842..9d13e3f1c393 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -5,20 +5,22 @@ buildGoModule rec { pname = "hyperledger-fabric"; - version = "2.4.6"; + version = "2.4.9"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - sha256 = "sha256-Q0qrDPih3M4YCzjhLFBy51qVvoICwwn1LJf63rYiUUg="; + hash = "sha256-tHchOki5xlu87onUCqdK/OQxJ6lcvhlUlLcQM6Fap+A="; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' # Broken rm cmd/peer/main_test.go + # Requires network + rm cmd/osnadmin/main_test.go ''; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c73b3258e3d..510341ddab9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30573,9 +30573,7 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; hypnotix = callPackage ../applications/video/hypnotix { }; From bdb75d06dc398e85892e64b71af096a5d08c3a01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 10:15:03 +0100 Subject: [PATCH 41/44] perlPackages.CpanelJSONXS: 4.31 -> 4.36 https://metacpan.org/release/RURBAN/Cpanel-JSON-XS-4.36/source/Changes --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ab1469d3c07c..69b06d6ed22f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4458,10 +4458,10 @@ let CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.31"; + version = "4.36"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.31.tar.gz"; - hash = "sha256-AqZ6zuPeJKcow5ZIaADiojVZGlQ9B5REmtOI/j1c/yk="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.36.tar.gz"; + hash = "sha256-7OhHQhfLLt8E5PUaGM7aN4e1sd//7iyJGbLrEJpnJu0="; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; From 63a3c7c636697fd5dbe4bc9acb74555a69d915fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 09:53:05 +0100 Subject: [PATCH 42/44] pypy3Packages.greenlet: Set null for pypi Greenlet is provided as a built-in package on pypy and uninstalling and replacing it does not work. Set it to null, to make it disappear as a dependency, instead of marking it as disabled, which also disables reverse dependencies. Co-Authored-By: Jean-Paul Calderone --- pkgs/development/python-modules/greenlet/default.nix | 1 - pkgs/top-level/python-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index e8a4e862b78e..3c5049a8a619 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { pname = "greenlet"; version = "2.0.2"; format = "setuptools"; - disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 999f0e190472..d900cef9ec56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4180,7 +4180,8 @@ self: super: with self; { greeneye-monitor = callPackage ../development/python-modules/greeneye-monitor { }; - greenlet = callPackage ../development/python-modules/greenlet { }; + # built-in for pypi + greenlet = if isPyPy then null else callPackage ../development/python-modules/greenlet { }; grequests = callPackage ../development/python-modules/grequests { }; From fb16963fded3c3be137823e70252aab1587b273e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 09:58:43 +0100 Subject: [PATCH 43/44] pypy3Packages.six: Disable test that loads native library ``` for c in ['5.3', '5.2', '5.1', '5.0', '4.9', '4.8', '4.7', '4.6', '4.5']: libpath = ctypes.util.find_library('db-%s' % c) if libpath: break else: raise ModuleNotFoundError("Cannot find dbm library", name='_dbm') ModuleNotFoundError: Cannot find dbm find_library ``` --- pkgs/development/python-modules/six/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 775dd4b3992e..afaedae9529e 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPyPy , pytestCheckHook }: @@ -19,6 +20,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = if isPyPy then [ + # uses ctypes to find native library + "--deselect=test_six.py::test_move_items" + ] else null; + pythonImportsCheck = [ "six" ]; meta = { From 2e29c38ec41236bef9a4ae8001beb47bc215d99c Mon Sep 17 00:00:00 2001 From: Ted Reed Date: Wed, 15 Mar 2023 15:39:01 -0700 Subject: [PATCH 44/44] emacs.pkgs.project: Use project from elpa The version of project on ELPA has now moved well beyond what was available in emacs 28, and packages such as eglot are depending on these newer versions. --- .../editors/emacs/elisp-packages/elpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2a98995b5d59..1ffdb3365503 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -66,9 +66,6 @@ self: let seq = if lib.versionAtLeast self.emacs.version "27" then null else super.seq; - project = if lib.versionAtLeast self.emacs.version "28" - then null - else super.project; # Compilation instructions for the Ada executables: # https://www.nongnu.org/ada-mode/ ada-mode = super.ada-mode.overrideAttrs (old: {