From 35681340d18d3f3dd4d399adc1369f8a0eb004c3 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:27:48 +0100 Subject: [PATCH 01/49] Revert "love: 0.10.2 -> 11.4" There are supposed to be different versions of love. - 0.10.2 in 0.10.nix - 11.4 in 11.nix This reverts commit e8662b6688ff790102b01c3c6c176e98fb1dca88. --- pkgs/development/interpreters/love/0.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 5e97e4f003e2..881bc59ccff2 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "11.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; + sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; nativeBuildInputs = [ pkg-config autoconf automake ]; From fe18efc37b8c7b8d362c23bb559f9bd4cbb1fc1d Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:38:49 +0100 Subject: [PATCH 02/49] mrrescue: fix path to love game file --- pkgs/games/mrrescue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index a873424aa24c..a020a6b34f1b 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v $src $out/share/${pname}.love + cp -v $src $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love From 5dc4dfb42222b1db97f1b105e4c8b30217e2c762 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Thu, 16 Feb 2023 18:55:00 +0100 Subject: [PATCH 03/49] love: make love_11 the default Use the latest love version by default, but hardcode the 0.10.2 legacy version for games that are not yet compatible with love 11. The following packages depend on love. They all seem to work. love 0.10.2 users: duckmarines, mrrescue, 90secondportraits, orthorobot love 11.4 users: sienna, mari0 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb6fd2f0c4d6..8653d2ba8d24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16403,7 +16403,7 @@ with pkgs; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; love_11 = callPackage ../development/interpreters/love/11.nix { }; - love = love_0_10; + love = love_11; wabt = callPackage ../development/tools/wabt { }; @@ -35388,7 +35388,7 @@ with pkgs; python = python3; }; - mrrescue = callPackage ../games/mrrescue { }; + mrrescue = callPackage ../games/mrrescue { love = love_0_10; }; mudlet = libsForQt5.callPackage ../games/mudlet { lua = lua5_1; @@ -35499,7 +35499,7 @@ with pkgs; openxray = callPackage ../games/openxray { }; - orthorobot = callPackage ../games/orthorobot { }; + orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; pacvim = callPackage ../games/pacvim { }; From 9f79456f9078a0c6401404888efa972e15408de7 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Thu, 16 Feb 2023 15:23:00 -0700 Subject: [PATCH 04/49] vscode-extensions.matthewpi.caddyfile-support: init at 0.2.4 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 00a1a5f16e10..6746ae4c0bb8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1741,6 +1741,23 @@ let meta.license = lib.licenses.mit; }; + matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "caddyfile-support"; + publisher = "matthewpi"; + version = "0.2.4"; + sha256 = "sha256-7D7fNlI55MxD6M8ml/dzBAMwCGCEkC+9aKhreZCVMv4="; + }; + meta = { + description = "Rich Caddyfile support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=matthewpi.caddyfile-support"; + homepage = "https://github.com/caddyserver/vscode-caddyfile"; + changelog = "https://marketplace.visualstudio.com/items/matthewpi.caddyfile-support/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewpi ]; + }; + }; + mattn.lisp = buildVscodeMarketplaceExtension { mktplcRef = { name = "lisp"; From 02825ae100a261e72ff9b1024acdaacf4c0663eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Feb 2023 12:04:51 +0000 Subject: [PATCH 05/49] python310Packages.weasyprint: 57.2 -> 58.0 --- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 071fe201119a..a6f3c6844546 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "57.2"; + version = "58.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-uOnvLcvPvILpkhWs/Wj5R7K18ZmbWxVtt1+r44C6fpo="; + hash = "sha256-cPSCytjlPCw+rpz4avQS65NAWxash4G1GeozJtR1vW8="; }; patches = [ From 7df36e5addf6b20df1ba4fc0fa778457576f4c27 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 18 Feb 2023 11:24:44 +0000 Subject: [PATCH 06/49] openssh_hpn: 9.1p1 -> 9.2p1 The latest patch has diffs with mixed strip prefixes counts (i.e. patch -pX) so it needs to be split into two diffs, one that can be applied with -p1 and one that needs to be fixed up --- pkgs/tools/networking/openssh/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index b7e1e879b060..13e41d0e6fd0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.1p1"; + version = "9.2p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ @@ -32,17 +32,19 @@ in # HPN Patch from FreeBSD ports (fetchpatch { - name = "ssh-hpn.patch"; - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ae66cffc19f357cbd51d5841c9b110a9ffd63e32/security/openssh-portable/files/extra-patch-hpn"; + name = "ssh-hpn-wo-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; stripLen = 1; - sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; + excludes = [ "channels.c" ]; + sha256 = "sha256-kSj0oE7gNHfIciy0/ErhdfrbmfjQmd8hduyiRXFnVZA="; }) (fetchpatch { - name = "CVE-2023-25136.patch"; - url = "https://ftp.openbsd.org/pub/OpenBSD/patches/7.2/common/017_sshd.patch.sig"; - stripLen = 1; - hash = "sha256-ol/YXXb2gJNBfvg9JKmIEdwGK8RaDfW53aKKT6HU++M="; + name = "ssh-hpn-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; + extraPrefix = ""; + includes = [ "channels.c" ]; + sha256 = "sha256-pDLUbjv5XIyByEbiRAXC3WMUPKmn15af1stVmcvr7fE="; }) ]; From 4f3353c775c40dd7fbfb6718ef0175c13d731227 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 18 Feb 2023 19:21:26 +0100 Subject: [PATCH 07/49] miriway: unstable-2022-12-18 -> unstable-2023-02-18 --- .../window-managers/miriway/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index a7048e83dae0..fd3e82e43aa5 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,24 +11,15 @@ stdenv.mkDerivation rec { pname = "miriway"; - version = "unstable-2022-12-18"; + version = "unstable-2023-02-18"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "d294c303cb99b7becb0d6686be9a09f0a1f57596"; - hash = "sha256-H+IZgI1IQxNl5yAygbDKXkyXajGHV/mp9gEqZcp0TeE="; + rev = "1363ae0452c5093f84418bc65354e93796caec65"; + hash = "sha256-hQ2z3GlTJG9qewJLkPpoRMSn0D7xCLyl+1O+G4NnedA="; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" \ - --replace "/usr/share" "\''${CMAKE_INSTALL_DATADIR}" \ - --replace "/etc" "\''${CMAKE_INSTALL_SYSCONFDIR}" - - sed -i -e '/project(/a include(GNUInstallDirs)' CMakeLists.txt - ''; - strictDeps = true; nativeBuildInputs = [ From b2a74bc0ab17f32532318e80b32e0759583a287a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 18 Feb 2023 19:27:51 +0100 Subject: [PATCH 08/49] tests/miriway: Refer to upstream issue about keyboard problem --- nixos/tests/miriway.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index c4c50646f015..2ddac4cc61de 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -3,7 +3,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { meta = { maintainers = with lib.maintainers; [ OPNA2608 ]; - # FIXME On ARM Miriway inside the VM doesn't receive keyboard inputs, why? + # Natively running Mir has problems with capturing the first registered libinput device. + # In our VM runners on ARM and on some hardware configs (my RPi4, distro-independent), this misses the keyboard. + # It can be worked around by dis- and reconnecting the affected hardware, but we can't do this in these tests. + # https://github.com/MirServer/mir/issues/2837 broken = pkgs.stdenv.hostPlatform.isAarch; }; From 0de3431e303e372e509f37479e856c23de6ecc18 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 18 Feb 2023 20:40:53 +0100 Subject: [PATCH 09/49] tests/miriway: Explicitly enable X11 for XWayland testing Works fine without, but just in case --- nixos/tests/miriway.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index 2ddac4cc61de..d0d9f16d40f9 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -33,6 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { enable = true; config = '' add-wayland-extensions=all + enable-x11= ctrl-alt=t:foot --maximized ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty --option window.startup_mode=maximized From f305cd1098cdd90228620f9886ca733da327fa0a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 18 Feb 2023 20:48:28 +0100 Subject: [PATCH 10/49] gnomeExtensions.EasyScreenCast: 1.4.0 -> 1.7.0 --- .../extensions/EasyScreenCast/default.nix | 8 ++-- .../EasyScreenCast/fix-gi-path.patch | 46 ++++++++++++++----- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index 29a60e5513af..759fd1d9bfe3 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; - version = "1.4.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "EasyScreenCast"; repo = "EasyScreenCast"; rev = version; - sha256 = "sha256-+lh/hqYC9+DUvLE016KuAY4Ybw8KrqEEG7WG4pUbg2k="; + hash = "sha256-+cH/gczCdxoSrLp5nD82Spo8bSGyRnUUut3Xkmr9f3o="; }; patches = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - glib gettext + glib gettext jq ]; makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch index 2d32021b6c66..4ea048ba79bf 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch @@ -1,16 +1,40 @@ -diff --git i/utilaudio.js w/utilaudio.js -index 983b29c..7a94de8 100644 ---- i/utilaudio.js -+++ w/utilaudio.js -@@ -11,10 +11,7 @@ - */ +diff --git a/prefs.js b/prefs.js +index 97b85a3..2fc6539 100644 +--- a/prefs.js ++++ b/prefs.js +@@ -14,8 +14,8 @@ + 'use strict'; const GIRepository = imports.gi.GIRepository; --GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); --GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); --GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); +-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); ++GIRepository.Repository.prepend_search_path('@gnomeShell@/lib/gnome-shell'); ++GIRepository.Repository.prepend_library_path('@gnomeShell@/lib/gnome-shell'); + + const GObject = imports.gi.GObject; + const Gio = imports.gi.Gio; +@@ -746,7 +746,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({ + Lib.TalkativeLog('-^-NOT SET xdg-user video'); + + ctx.CtrlExe.Execute( +- '/usr/bin/sh -c "echo $HOME"', ++ '/bin/sh -c "echo $HOME"', + true, + (success, out) => { + Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`); +diff --git a/utilaudio.js b/utilaudio.js +index 957eda2..84af241 100644 +--- a/utilaudio.js ++++ b/utilaudio.js +@@ -15,10 +15,7 @@ + + const GObject = imports.gi.GObject; + const GIRepository = imports.gi.GIRepository; +-GIRepository.Repository.prepend_search_path('/usr/lib/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib/gnome-shell'); +-GIRepository.Repository.prepend_search_path('/usr/lib64/gnome-shell'); +-GIRepository.Repository.prepend_library_path('/usr/lib64/gnome-shell'); +GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); const Gvc = imports.gi.Gvc; - const Lang = imports.lang; + const ExtensionUtils = imports.misc.extensionUtils; From e8f21cbac9ac2ab0020c7a51564f0f5b556f73d3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 19 Feb 2023 19:01:17 +0800 Subject: [PATCH 11/49] cinnamon.warpinator: 1.4.4 -> 1.4.5 https://github.com/linuxmint/warpinator/compare/1.4.4...1.4.5 --- pkgs/desktops/cinnamon/warpinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 7bdfb469c346..a488baab0071 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.4.4"; + version = "1.4.5"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-oHJOwdCvHnPalTHb5E3mNDYBaR9ZvlV1F6ux7nejBlc="; + hash = "sha256-5mMV4WinpFR9ihgoQsgIXre0VpBdg9S8GjSkx+7ocLg="; }; nativeBuildInputs = [ From 9a0c8c5c4445533bb143d31dc1405b806042b3e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 11:53:28 +0000 Subject: [PATCH 12/49] clash-geoip: 20230112 -> 20230212 --- pkgs/data/misc/clash-geoip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index c138ac710d57..7c28c82e8646 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230112"; + version = "20230212"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-mMu+U3gtoZmi6LrTMTqsNZKZ+w4J6LZ16Aorneyy7P8="; + sha256 = "sha256-Tnma6tpET4Vrm5G8KmLpsVnpD2JIKts56kZQsBIbRZ8="; }; dontUnpack = true; From e9f759c8257680e2430481cb2cce83b5a6d5f315 Mon Sep 17 00:00:00 2001 From: Ember 'n0emis' Keske Date: Sun, 19 Feb 2023 15:03:24 +0100 Subject: [PATCH 13/49] element-{web,desktop}: 1.11.22 -> 1.11.23 --- .../networking/instant-messengers/element/pin.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ccb7ecd1537f..bf1458c264eb 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.22", - "desktopSrcHash": "UJesD6cshsf/NK2ZTzOtAUfH+8JcGP9oCLFhkgfM0E0=", - "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv", - "webSrcHash": "B2clSJgKkjvQdIXQgi3bBPaVTDKOjeNBOvkAtcPOkFI=", - "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df" + "version": "1.11.23", + "desktopSrcHash": "Q3kyAiBvedTy4jiBkYmEJeonRf6HesdpKgmtOT2sYwI=", + "desktopYarnHash": "8lHIkUkFAo7m8XjfnFSAkp4mIKyrXOsnbstRIPXI+vE=", + "webSrcHash": "JOfuzo0DQ0v2rC80/HkucLgc2xsCb3eujaH0fg7j0nI=", + "webYarnHash": "0Cb7TuRFHcQvYbnVAnXOIwt6NXa7ITrMPJnmbUFaPNU=" } From 8239d1fde5407c7530d95c22c8206f5b552248d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 15:04:26 +0000 Subject: [PATCH 14/49] domoticz: 2022.2 -> 2023.1 --- pkgs/servers/domoticz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 11fd50bc581a..abb668c12e67 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "domoticz"; - version = "2022.2"; + version = "2023.1"; src = fetchFromGitHub { owner = "domoticz"; repo = pname; rev = version; - sha256 = "sha256-xgHfbNY5qzBkrMaJvFQ+EqJ7tcy0LNdPLD1bD92WkKg="; + sha256 = "sha256-fXNS7EVMqGM4tYppgG+l/adBt9eyW8RBK3Cs/pb2kg4="; fetchSubmodules = true; }; From 7ea75aa672527ba9f4623955a0d1d4fccf759de3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 15:16:00 +0000 Subject: [PATCH 15/49] diswall: 0.3.0 -> 0.3.1 --- pkgs/applications/networking/diswall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 0a8ac4456416..ceeeae75a18f 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-3FTqT3IL48lYmGoB9u76RQSgZPbaq7IkOyQjyxwpkWA="; + sha256 = "sha256-54iNbMZ+j6ioBTb/okyWZqqe4p6IyapZwc6VdtiAkLs="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-sb6s4Oc3W+I9DB0SGyZINxyWHCSpkakiEeQUatEpeEU="; + cargoHash = "sha256-stpJNDC+dQQNZdZTihbQWZ66wgdQ+oz8s3Ogb1wxnxY="; doCheck = false; From d076d05deb328757db814b421ce294b405577cf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 15:37:42 +0000 Subject: [PATCH 16/49] icinga2: 2.13.6 -> 2.13.7 --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 59425cfcf691..76d66cd76355 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.6"; + version = "2.13.7"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-Zrq+pw1dZyKVxpbsXeEPU3hLqcaYj/0wqB9HmYXnd0Y="; + sha256 = "sha256-YLNzXdR54DA9araC7pxZmopAZB90j9sx4gb3hOVsu0I="; }; patches = [ From d575718cc35456aab00fd6ea25c5f6a1038f9c2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:36:43 +0100 Subject: [PATCH 17/49] python311Packages.datadog: add changelog to meta --- pkgs/development/python-modules/datadog/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 6a258cf73036..af48a042714b 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; + hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; postPatch = '' @@ -60,7 +60,9 @@ buildPythonPackage rec { meta = with lib; { description = "The Datadog Python library"; - license = licenses.bsd3; homepage = "https://github.com/DataDog/datadogpy"; + changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 734f322686694ee0a43ece28954394c3b355ed98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:41:45 +0100 Subject: [PATCH 18/49] python311Packages.datadog: disable on unsupported Python releases --- .../python-modules/datadog/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index af48a042714b..223bdff816a8 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,18 +1,15 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, hatchling -, decorator -, requests -, typing ? null -, configparser , click +, fetchPypi , freezegun +, hatchling , mock -, pytestCheckHook , pytest-vcr +, pytestCheckHook , python-dateutil +, pythonOlder +, requests , vcrpy }: @@ -21,22 +18,20 @@ buildPythonPackage rec { version = "0.44.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; - postPatch = '' - find . -name '*.pyc' -exec rm {} \; - ''; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ decorator requests ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optional (pythonOlder "3.0") configparser; + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ click @@ -56,7 +51,9 @@ buildPythonPackage rec { "test_default_settings_set" ]; - pythonImportsCheck = [ "datadog" ]; + pythonImportsCheck = [ + "datadog" + ]; meta = with lib; { description = "The Datadog Python library"; From c3bf65df673ad1bd7141b87af6d528bf5d027266 Mon Sep 17 00:00:00 2001 From: zainab-ali Date: Sun, 19 Feb 2023 16:42:53 +0000 Subject: [PATCH 19/49] ocaml: remove spaceTimeSupport after 4.12 Spacetime support was removed in OCaml version 4.12. See the OCaml release notes: https://ocaml.org/releases/4.12.0. See the pull request to OCaml: ocaml/ocaml#9948. --- pkgs/development/compilers/ocaml/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1fa52721ddb9..c2cc7bb40b5f 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -17,7 +17,7 @@ in assert useX11 -> safeX11 stdenv; assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; -assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; +assert spaceTimeSupport -> lib.versionAtLeast version "4.04" && lib.versionOlder version "4.12"; assert unsafeStringSupport -> lib.versionAtLeast version "4.06" && lib.versionOlder version "5.0"; let From 0f701851358739d8703ba4dcc29b6ef339f24203 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Sun, 19 Feb 2023 17:44:35 +0100 Subject: [PATCH 20/49] caddy: install man pages --- pkgs/servers/caddy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index b4cd637d3d02..dfba1d0f4927 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -43,6 +43,9 @@ buildGoModule { substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy" substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy" + $out/bin/caddy manpage --directory manpages + installManPage manpages/* + installShellCompletion --cmd metal \ --bash <($out/bin/caddy completion bash) \ --zsh <($out/bin/caddy completion zsh) From 3a574538ee8e600f2bd3498af6cfa883af304894 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Sun, 19 Feb 2023 17:44:35 +0100 Subject: [PATCH 21/49] caddy: add shell completions for fish --- pkgs/servers/caddy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index dfba1d0f4927..9ada37768ad1 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -48,6 +48,7 @@ buildGoModule { installShellCompletion --cmd metal \ --bash <($out/bin/caddy completion bash) \ + --fish <($out/bin/caddy completion fish) \ --zsh <($out/bin/caddy completion zsh) ''; From 145d1f379db37559a09870fc1d28537dc0651062 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 17:52:20 +0100 Subject: [PATCH 22/49] python311Packages.datadog: disable failing tests on Python 3.11 --- pkgs/development/python-modules/datadog/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 223bdff816a8..d3592d76a8f0 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -8,6 +8,7 @@ , pytest-vcr , pytestCheckHook , python-dateutil +, pythonAtLeast , pythonOlder , requests , vcrpy @@ -49,6 +50,9 @@ buildPythonPackage rec { disabledTests = [ "test_default_settings_set" + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/DataDog/datadogpy/issues/746 + "TestDogshell" ]; pythonImportsCheck = [ From 13b94f186cbe94b43793a14b7c0d681f928a0efe Mon Sep 17 00:00:00 2001 From: Phani Rithvij Date: Sun, 19 Feb 2023 22:34:24 +0530 Subject: [PATCH 23/49] keynav: update --- pkgs/tools/X11/keynav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 847d13315f8d..4a2a0e8b5904 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -14,7 +14,7 @@ , xdotool }: -let release = "20180821"; in +let release = "20220825"; in stdenv.mkDerivation { pname = "keynav"; version = "0.${release}.0"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "jordansissel"; repo = "keynav"; - rev = "78f9e076a5618aba43b030fbb9344c415c30c1e5"; - sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d"; + rev = "28a1ba9a045c62a9d2bc5c3474a66d96c8bf5c32"; + hash = "sha256-y4ONq6fDBFhVGASvz28zlJRXfkCE/j8GDcbq/j8xvUY="; }; nativeBuildInputs = [ pkg-config ]; From cfd6efafc8de39f37cee550f086bc99af76d0bb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Feb 2023 17:50:29 +0000 Subject: [PATCH 24/49] python310Packages.pyomo: 6.4.4 -> 6.5.0 --- pkgs/development/python-modules/pyomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index eef2875a0d97..b7b35a765731 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.4.4"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-FVpwJRCRlc537tJomB4Alxx8zJj8FpZp+LxB0f12rGE="; + hash = "sha256-ZsoWz+35hQS15dbpe1IOzft6JwZygKjv5AQWjVe+8kQ="; }; propagatedBuildInputs = [ From d6dd12a2c95d2865e78e34ec447400b55abc9407 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 18:42:45 +0100 Subject: [PATCH 25/49] python311Packages.gradient_statsd: add missing inputs - use nixpkgs-fmt - disable on unsupported Python releases - normalize pname --- .../gradient_statsd/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/gradient_statsd/default.nix b/pkgs/development/python-modules/gradient_statsd/default.nix index e4d7127236e0..d7c5c258ab5e 100644 --- a/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/pkgs/development/python-modules/gradient_statsd/default.nix @@ -1,39 +1,51 @@ { lib -, fetchPypi , buildPythonPackage +, certifi , chardet -, configparser , datadog +, decorator +, fetchPypi +, idna , requests -, python +, urllib3 +, pythonOlder }: buildPythonPackage rec { - pname = "gradient_statsd"; + pname = "gradient-statsd"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; + pname = "gradient_statsd"; + inherit version; + hash = "sha256-iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530="; }; propagatedBuildInputs = [ + certifi chardet datadog + decorator + idna requests - ] - ++ lib.optional python.isPy2 configparser; + urllib3 + ]; - pythonImportsCheck = [ "gradient_statsd" ]; + pythonImportsCheck = [ + "gradient_statsd" + ]; # Pypi does not contain tests doCheck = false; meta = with lib; { description = "Wrapper around the DogStatsd client"; - homepage = "https://paperspace.com"; - license = licenses.mit; - platforms = platforms.unix; + homepage = "https://paperspace.com"; + license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.unix; }; } From aebdd631d1395bb43e0f989be26ae397f9d98186 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Feb 2023 20:29:32 +0100 Subject: [PATCH 26/49] python310Packages.mypy-boto3-builder: 7.12.3 -> 7.12.4 Diff: https://github.com/youtype/mypy_boto3_builder/compare/refs/tags/7.12.3...7.12.4 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/7.12.4 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d6ada06ef91e..3c582230ee2e 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.12.3"; + version = "7.12.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-cAbDw/u0kLUEdmd/NBNDy/bt5Wno9QpmqpqicqZ/Q6g="; + hash = "sha256-X8ATnycG7MvzDNaMClvhyy4Qy4hvoNhn0sQ+s/JnX64="; }; nativeBuildInputs = [ From 743bd1f29fb0c2aeeb8e756f23f44a51e4de3596 Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sun, 19 Feb 2023 21:04:50 +0100 Subject: [PATCH 27/49] linux: fix-build on i686 --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 78fe1ad0b993..b03e8e76715b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -71,13 +71,13 @@ let PM_WAKELOCKS = yes; POWERCAP = yes; # ACPI Firmware Performance Data Table Support - ACPI_FPDT = whenAtLeast "5.12" yes; + ACPI_FPDT = whenAtLeast "5.12" (option yes); # ACPI Heterogeneous Memory Attribute Table Support - ACPI_HMAT = whenAtLeast "5.2" yes; + ACPI_HMAT = whenAtLeast "5.2" (option yes); # ACPI Platform Error Interface - ACPI_APEI = yes; + ACPI_APEI = (option yes); # APEI Generic Hardware Error Source - ACPI_APEI_GHES = yes; + ACPI_APEI_GHES = (option yes); } // optionalAttrs (stdenv.hostPlatform.isx86) { INTEL_IDLE = yes; INTEL_RAPL = whenAtLeast "5.3" module; From 3f8ad50f9afc077784c260f0e3c948c926f0d402 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 20 Feb 2023 01:38:31 +0100 Subject: [PATCH 28/49] build-support/vm/deb/deb-closure: quote generated urls otherwise, eval fails when the experimental no-url-literals feature is activated unquoted urls are discouraged after https://github.com/NixOS/rfcs/pull/45 --- pkgs/build-support/vm/deb/deb-closure.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index fe23025df1d8..2d331e18dfeb 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -156,7 +156,7 @@ foreach my $pkgName (@order) { $cleanedName =~ s/~//g; print " (fetchurl {\n"; - print " url = $urlPrefix/$cdata->{Filename};\n"; + print " url = \"$urlPrefix/$cdata->{Filename}\";\n"; print " sha256 = \"$cdata->{SHA256}\";\n"; print " name = \"$cleanedName\";\n" if $cleanedName ne $origName; print " })\n"; From d3b783f29b7666dff6a4b33eb134c01d0e93b90d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 01:59:29 +0000 Subject: [PATCH 29/49] commix: 3.6 -> 3.7 --- pkgs/tools/security/commix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/tools/security/commix/default.nix index 3b2ba60291dc..4bbfd66e6237 100644 --- a/pkgs/tools/security/commix/default.nix +++ b/pkgs/tools/security/commix/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "commix"; - version = "3.6"; + version = "3.7"; format = "setuptools"; src = fetchFromGitHub { owner = "commixproject"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QdhJp7oUqOY8Z36haIrHgP4hVGaFXlOxNVg1ams7uhg="; + hash = "sha256-pqfb0CkWTPq6B8T7nn25lWuEQFRRziCDWYm5a1S3mIY="; }; postInstall = '' From e3926b7046e45ac29f20802637e9a51273cb0771 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 02:07:42 +0000 Subject: [PATCH 30/49] python310Packages.ansible-lint: 6.13.0 -> 6.13.1 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index cc971f43215f..1b61ab6afc4a 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.13.0"; + version = "6.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4tRdgxVyn0Kcu+/atEbTgFCtezbZ46oewb6vKRTQKaA="; + hash = "sha256-Q1wStP2I2oFa9oIfO/iwTrtlGBHaiaEcnRkLr/Ibrao="; }; postPatch = '' From 9c87dcbf85069c5a94325c0eec52623f77689353 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 20 Feb 2023 12:21:01 +0700 Subject: [PATCH 31/49] maintainers: fix incorrect Matrix for toastal --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0e7d6a16a77c..6b7afac33b96 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14864,7 +14864,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; - matrix = "@toastal:chat.mozilla.org"; + matrix = "@toastal:mozilla.org"; github = "toastal"; githubId = 561087; name = "toastal"; From 654cc11a5f4c19bc9f0a719b02f8e08e5b4efc60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 06:03:54 +0000 Subject: [PATCH 32/49] git-machete: 3.15.0 -> 3.15.2 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 9667e7bd2fee..885f6d1355e9 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.15.0"; + version = "3.15.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-HSgCvHjSOrMPsdOPtgFUeK6b0ioVnwTtg2oHGg4BrZw="; + hash = "sha256-hIm3JDLXUTwjuVfAHvZBWFBJNOAVWyfl/X4A6B0OoXg="; }; nativeBuildInputs = [ installShellFiles ]; From 434bb4d090db77c495c1bb2bcf9bb97447b42b0a Mon Sep 17 00:00:00 2001 From: QuantMint Date: Sat, 18 Feb 2023 20:21:19 +0100 Subject: [PATCH 33/49] librtlsdr: remove Removing librtlsdr because it's the same exact package as rtl-sdr. --- pkgs/applications/radio/rtl-sdr/default.nix | 4 +- .../libraries/librtlsdr/default.nix | 39 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/libraries/librtlsdr/default.nix diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index d8180750c7a1..722a0565e0de 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "librtlsdr"; repo = "librtlsdr"; rev = "v${version}"; - sha256 = "1fgxlkgmdchbrf0nn98ivjr6css5hak3608nr4xrf2qzf7xy2kdk"; + hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; }; postPatch = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; cmakeFlags = lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix deleted file mode 100644 index c09575924a0a..000000000000 --- a/pkgs/development/libraries/librtlsdr/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "librtlsdr"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "librtlsdr"; - repo = "librtlsdr"; - rev = "v${version}"; - sha256 = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" - - substituteInPlace rtl-sdr.rules \ - --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' - ''; - - nativeBuildInputs = [ pkg-config cmake ]; - - propagatedBuildInputs = [ libusb1 ]; - - meta = with lib; { - description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = "https://github.com/librtlsdr/librtlsdr"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1918a640d163..861f4b002fb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -814,6 +814,7 @@ mapAliases ({ libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ef1f7c2bd16..9dd674ec0330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32768,9 +32768,7 @@ with pkgs; rtl-ais = callPackage ../applications/radio/rtl-ais { }; - # librtlsdr is a friendly fork with additional features rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; - librtlsdr = callPackage ../development/libraries/librtlsdr { }; rubyripper = callPackage ../applications/audio/rubyripper {}; From af260c1e5a5d9dc0fa046343f2151e0fe743495c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 19 Feb 2023 23:50:55 +0100 Subject: [PATCH 34/49] wezterm: fix build against rust 1.67, remove outdated checkFlags --- .../terminal-emulators/wezterm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index cece7cb8a01e..88120c26a178 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -2,6 +2,7 @@ , rustPlatform , lib , fetchFromGitHub +, fetchpatch , ncurses , perl , pkg-config @@ -40,12 +41,12 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s="; }; - # Rust 1.65 does better at enum packing (according to - # 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65 - # yet (still in staging), so skip these tests for now. - checkFlags = [ - "--skip=escape::action_size" - "--skip=surface::line::storage::test::memory_usage" + patches = [ + # fix build with rust 1.67 + (fetchpatch { + url = "https://github.com/wez/wezterm/commit/36519f0d90e1875fb4b3f11f6cbf94c7d716ef78.patch"; + sha256 = "sha256-sOGFmDan1uO1xOBCpvlGrSotjfw01MjRg0KVqa5omig="; + }) ]; postPatch = '' From c90dcc73273387b152e7d3cf1a50abec00c3204b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 18 Feb 2023 16:08:57 +0100 Subject: [PATCH 35/49] rustc: add ripgrep and wezterm to passthru.tests ripgrep is a very popular grep replacement (similar to fd and find) and wezterm is a popular terminal emulator which has a big codebase with lots of features tested (it also broke in the past multiple times on rustc upgrades.). --- pkgs/development/compilers/rust/rustc.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 60f07a64299a..130cb8326115 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -11,6 +11,8 @@ , sha256 , patches ? [] , fd +, ripgrep +, wezterm , firefox , thunderbird }: @@ -204,7 +206,9 @@ in stdenv.mkDerivation rec { passthru = { llvm = llvmShared; inherit llvmPackages; - tests = { inherit fd; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; + tests = { + inherit fd ripgrep wezterm; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; }; }; meta = with lib; { From 8be63c2f948c7329faba3becb39f7bf31f5082bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 19 Feb 2023 23:51:05 +0100 Subject: [PATCH 36/49] wezterm: cleanup meta, format --- pkgs/applications/terminal-emulators/wezterm/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 88120c26a178..74de8d070750 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -123,9 +123,7 @@ rustPlatform.buildRustPackage rec { }; terminfo = runCommand "wezterm-terminfo" { - nativeBuildInputs = [ - ncurses - ]; + nativeBuildInputs = [ ncurses ]; } '' mkdir -p $out/share/terminfo $out/nix-support tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo @@ -133,10 +131,9 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; + description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.unix; }; } From 759bd7b26f363f4701cb9a44da578fcf4676f103 Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 17 Feb 2023 00:04:21 -0500 Subject: [PATCH 37/49] clippy: fix on darwin As of Rust 1.67.0, the cargo-clippy binary now relies on the rustc_private libraries [0], so let's do the RPATH fixup to it too. I've also added a comment to explain the RPATH situation, as it took me a bit to figure out. [0]: https://github.com/rust-lang/rust-clippy/pull/9541 --- pkgs/development/compilers/rust/clippy.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 23b8e7effe12..8edec88a9192 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -20,8 +20,15 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; + # Clippy uses the rustc_driver and std private libraries, and Rust's build process forces them to have + # an install name of `@rpath/...` [0] [1] instead of the standard on macOS, which is an absolute path + # to itself. + # + # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 + # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver + install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver" + install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy" ''; meta = with lib; { From fd5fa383fe79a0582100a26fa223a9099d5bac7e Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 17 Feb 2023 00:11:18 -0500 Subject: [PATCH 38/49] clippy: drop rustc from buildInputs This may have been required when the package was originally added [0], but it builds and runs just fine without it now. [0]: 682e6fafa427e592610d1cac406c038bb206c183 --- pkgs/development/compilers/rust/clippy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 8edec88a9192..e02a47ddac11 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - buildInputs = [ rustc rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ rustc.llvm ] ++ lib.optionals stdenv.isDarwin [ Security ]; # fixes: error: the option `Z` is only accepted on the nightly compiler RUSTC_BOOTSTRAP = 1; From f08437edcb9249eb7bd9f9ebe11982ac5dbf655c Mon Sep 17 00:00:00 2001 From: Winter Date: Fri, 17 Feb 2023 00:08:52 -0500 Subject: [PATCH 39/49] clippy: add rust team to maintainers Missed this in 1e814042af43346c995fedd41d467032c4fd0d25. --- pkgs/development/compilers/rust/clippy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index e02a47ddac11..499db45021ea 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://rust-lang.github.io/rust-clippy/"; description = "A bunch of lints to catch common mistakes and improve your Rust code"; - maintainers = with maintainers; [ basvandijk ]; + maintainers = with maintainers; [ basvandijk ] ++ teams.rust.members; license = with licenses; [ mit asl20 ]; platforms = platforms.unix; }; From 20539ac23d38ef257b5db8d199ad1eb17f25b2f1 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 19 Feb 2023 20:36:06 +0100 Subject: [PATCH 40/49] prefetch-npm-deps: add nix to PATH Fixes "No such file or directory" error when running prefetch-npm-deps in its default mode (print hashes, for update scripts etc), in an environment that doesn't have a `nix` binary (for `nix hash`). --- pkgs/build-support/node/fetch-npm-deps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 7d6277df987f..d87071d8559f 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: +{ lib, stdenvNoCC, rustPlatform, makeWrapper, Security, gnutar, gzip, nix, testers, fetchurl, prefetch-npm-deps, fetchNpmDeps }: { prefetch-npm-deps = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ buildInputs = lib.optional stdenvNoCC.isDarwin Security; postInstall = '' - wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip ]} + wrapProgram "$out/bin/prefetch-npm-deps" --prefix PATH : ${lib.makeBinPath [ gnutar gzip nix ]} ''; passthru.tests = From 10803b968b2be9cfbf3137904908c80057fcc728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20H=C3=A4ring?= Date: Wed, 1 Feb 2023 12:05:21 +0100 Subject: [PATCH 41/49] unison: 2.52.1 -> 2.53.0 besides updating the version/src sha, upstream switched to GTK3, as can be seen in the release notes [0]. This apparently requires the ocaml cairo2 bindings an zlib. I also used wrapGAppsHook to supply the schemas from gsettings-desktop-schemas. Screenshot: https://i.imgur.com/CrPvLgQ.png I can not test the Icon creation since I am not using a desktop, @viric please check. Maybe this is also done by wrapGAppsHook.. [0] https://github.com/bcpierce00/unison/releases/tag/v2.53.0 --- .../networking/sync/unison/default.nix | 28 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index c6ce7c8f593a..7c0b8dc0747e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -2,42 +2,45 @@ , stdenv , fetchFromGitHub , ocamlPackages -, fontschumachermisc -, xset -, makeWrapper , ncurses -, gnugrep , copyDesktopItems , makeDesktopItem +, wrapGAppsHook +, glib +, gsettings-desktop-schemas +, zlib , enableX11 ? true +, Cocoa }: stdenv.mkDerivation rec { pname = "unison"; - version = "2.52.1"; + version = "2.53.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; + sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; }; strictDeps = true; - nativeBuildInputs = [ makeWrapper ocamlPackages.ocaml ] + nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ncurses ]; + buildInputs = [ gsettings-desktop-schemas ncurses zlib ] + ++ lib.optional stdenv.isDarwin Cocoa; preBuild = lib.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml '' + '' echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" - "UISTYLE=${if enableX11 then "gtk2" else "text"}" + "UISTYLE=${if enableX11 then "gtk3" else "text"}" ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; preInstall = '' @@ -45,11 +48,6 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString enableX11 '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" - done - install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dd674ec0330..a1fd91d1dacf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33617,6 +33617,7 @@ with pkgs; unison = callPackage ../applications/networking/sync/unison { enableX11 = config.unison.enableX11 or true; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; unpaper = callPackage ../tools/graphics/unpaper { }; From ced929a2d02672e23f5c528829b9b99988476c16 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 20 Feb 2023 08:19:02 +0100 Subject: [PATCH 42/49] nixos/tests: add test for luksroot and initrd keymaps (#189725) --- nixos/tests/all-tests.nix | 1 + nixos/tests/luks.nix | 69 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 nixos/tests/luks.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 86dd096afc0b..ac15ecdad6b8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -368,6 +368,7 @@ in { login = handleTest ./login.nix {}; logrotate = handleTest ./logrotate.nix {}; loki = handleTest ./loki.nix {}; + luks = handleTest ./luks.nix {}; lvm2 = handleTest ./lvm2 {}; lxd = handleTest ./lxd.nix {}; lxd-nftables = handleTest ./lxd-nftables.nix {}; diff --git a/nixos/tests/luks.nix b/nixos/tests/luks.nix new file mode 100644 index 000000000000..82f5095cb260 --- /dev/null +++ b/nixos/tests/luks.nix @@ -0,0 +1,69 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "luks"; + + nodes.machine = { pkgs, ... }: { + # Use systemd-boot + virtualisation = { + emptyDiskImages = [ 512 512 ]; + useBootLoader = true; + useEFIBoot = true; + }; + boot.loader.systemd-boot.enable = true; + + boot.kernelParams = lib.mkOverride 5 [ "console=tty1" ]; + + environment.systemPackages = with pkgs; [ cryptsetup ]; + + specialisation = rec { + boot-luks.configuration = { + boot.initrd.luks.devices = lib.mkVMOverride { + # We have two disks and only type one password - key reuse is in place + cryptroot.device = "/dev/vdc"; + cryptroot2.device = "/dev/vdd"; + }; + virtualisation.bootDevice = "/dev/mapper/cryptroot"; + }; + boot-luks-custom-keymap.configuration = lib.mkMerge [ + boot-luks.configuration + { + console.keyMap = "neo"; + } + ]; + }; + }; + + enableOCR = true; + + testScript = '' + # Create encrypted volume + machine.wait_for_unit("multi-user.target") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -") + machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -") + + # Boot from the encrypted disk + machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf") + machine.succeed("sync") + machine.crash() + + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("supersecret\n") + machine.wait_for_unit("multi-user.target") + + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + + # Boot from the encrypted disk with custom keymap + machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-custom-keymap.conf") + machine.succeed("sync") + machine.crash() + + # Boot and decrypt the disk + machine.start() + machine.wait_for_text("Passphrase for") + machine.send_chars("havfkhfrkfl\n") + machine.wait_for_unit("multi-user.target") + + assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount") + ''; +}) From 37cc718bf9a3dc1c2251906650e04a2d3564ca57 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 20 Feb 2023 08:20:00 +0100 Subject: [PATCH 43/49] liburing: backport portability fixes (#216975) --- ...-Add-custom-error-function-for-tests.patch | 66 +++++ ...Use-t_error-instead-of-glibc-s-error.patch | 109 +++++++++ ...Use-t_error-instead-of-glibc-s-error.patch | 226 ++++++++++++++++++ .../libraries/liburing/default.nix | 13 + 4 files changed, 414 insertions(+) create mode 100644 pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch create mode 100644 pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch create mode 100644 pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch diff --git a/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch b/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch new file mode 100644 index 000000000000..191f6ae8cd5a --- /dev/null +++ b/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch @@ -0,0 +1,66 @@ +From d4714fd7aac9c5f499c406703bc437dc6cf72ef3 Mon Sep 17 00:00:00 2001 +From: Steffen +Date: Mon, 13 Feb 2023 17:32:16 +0100 +Subject: [PATCH 1/3] Add custom error function for tests. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. t_error calls fprintf(stderr, ...) and +exits. + +Closes: #786 + +Signed-off-by: Steffen Winter +--- + test/helpers.c | 18 ++++++++++++++++++ + test/helpers.h | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/test/helpers.c b/test/helpers.c +index 8fb32b8..caa887e 100644 +--- a/test/helpers.c ++++ b/test/helpers.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -266,3 +267,20 @@ bool t_probe_defer_taskrun(void) + io_uring_queue_exit(&ring); + return true; + } ++ ++/* ++ * Implementation of error(3), prints an error message and exits. ++ */ ++void t_error(int status, int errnum, const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ ++ vfprintf(stderr, format, args); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ ++ fprintf(stderr, "\n"); ++ va_end(args); ++ exit(status); ++} +diff --git a/test/helpers.h b/test/helpers.h +index 4375a9e..33b82cf 100644 +--- a/test/helpers.h ++++ b/test/helpers.h +@@ -87,6 +87,8 @@ bool t_probe_defer_taskrun(void); + + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + ++void t_error(int status, int errnum, const char *format, ...); ++ + #ifdef __cplusplus + } + #endif +-- +2.39.1 + diff --git a/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch new file mode 100644 index 000000000000..676b006482c4 --- /dev/null +++ b/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch @@ -0,0 +1,109 @@ +From e84f40ca872f0bce72b5686c95a11739d9c89494 Mon Sep 17 00:00:00 2001 +From: Steffen +Date: Mon, 13 Feb 2023 17:56:03 +0100 +Subject: [PATCH 2/3] test: Use t_error instead of glibc's error. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. Replacing calls to error() with t_error(). + +Closes: #786 + +Signed-off-by: Steffen Winter +--- + test/defer-taskrun.c | 1 - + test/send-zerocopy.c | 1 - + test/single-issuer.c | 15 +++++++-------- + 3 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c +index 9283f28..87cd256 100644 +--- a/test/defer-taskrun.c ++++ b/test/defer-taskrun.c +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c +index 4db102b..be33094 100644 +--- a/test/send-zerocopy.c ++++ b/test/send-zerocopy.c +@@ -4,7 +4,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/test/single-issuer.c b/test/single-issuer.c +index 1d13f47..d71cd74 100644 +--- a/test/single-issuer.c ++++ b/test/single-issuer.c +@@ -5,7 +5,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -56,13 +55,13 @@ static int try_submit(struct io_uring *ring) + return ret; + + if (ret != 1) +- error(1, ret, "submit %i", ret); ++ t_error(1, ret, "submit %i", ret); + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) +- error(1, ret, "wait fail %i", ret); ++ t_error(1, ret, "wait fail %i", ret); + + if (cqe->res || cqe->user_data != 42) +- error(1, ret, "invalid cqe"); ++ t_error(1, ret, "invalid cqe"); + + io_uring_cqe_seen(ring, cqe); + return 0; +@@ -106,7 +105,7 @@ int main(int argc, char *argv[]) + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_R_DISABLED); + if (ret) +- error(1, ret, "ring init (2) %i", ret); ++ t_error(1, ret, "ring init (2) %i", ret); + + if (!fork_t()) { + io_uring_enable_rings(&ring); +@@ -122,7 +121,7 @@ int main(int argc, char *argv[]) + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | + IORING_SETUP_R_DISABLED); + if (ret) +- error(1, ret, "ring init (3) %i", ret); ++ t_error(1, ret, "ring init (3) %i", ret); + + io_uring_enable_rings(&ring); + if (!fork_t()) { +@@ -137,7 +136,7 @@ int main(int argc, char *argv[]) + /* test that anyone can submit to a SQPOLL|SINGLE_ISSUER ring */ + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER|IORING_SETUP_SQPOLL); + if (ret) +- error(1, ret, "ring init (4) %i", ret); ++ t_error(1, ret, "ring init (4) %i", ret); + + ret = try_submit(&ring); + if (ret) { +@@ -157,7 +156,7 @@ int main(int argc, char *argv[]) + /* test that IORING_ENTER_REGISTERED_RING doesn't break anything */ + ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER); + if (ret) +- error(1, ret, "ring init (5) %i", ret); ++ t_error(1, ret, "ring init (5) %i", ret); + + if (!fork_t()) { + ret = try_submit(&ring); +-- +2.39.1 + diff --git a/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch new file mode 100644 index 000000000000..ce92f16dcb18 --- /dev/null +++ b/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch @@ -0,0 +1,226 @@ +From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001 +From: Steffen +Date: Mon, 13 Feb 2023 18:23:44 +0100 +Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error. + +On musl systems, liburing cannot build examples and tests due to +it's usage of error.h. t_error copied from test/helpers.c. +Replacing calls to error() with t_error(). + +Closes: #786 + +Signed-off-by: Steffen Winter +--- + examples/send-zerocopy.c | 61 +++++++++++++++++++++++++--------------- + 1 file changed, 39 insertions(+), 22 deletions(-) + +diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c +index 7f5f2b1..6092af9 100644 +--- a/examples/send-zerocopy.c ++++ b/examples/send-zerocopy.c +@@ -5,11 +5,11 @@ + #include + #include + #include +-#include + #include + #include + #include + #include ++#include + #include + + #include +@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr; + + static char payload[IP_MAXPACKET] __attribute__((aligned(4096))); + ++/* ++ * Implementation of error(3), prints an error message and exits. ++ */ ++static void t_error(int status, int errnum, const char *format, ...) ++{ ++ va_list args; ++ va_start(args, format); ++ ++ vfprintf(stderr, format, args); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ ++ fprintf(stderr, "\n"); ++ va_end(args); ++ exit(status); ++} ++ + static unsigned long gettimeofday_ms(void) + { + struct timeval tv; +@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void) + static void do_setsockopt(int fd, int level, int optname, int val) + { + if (setsockopt(fd, level, optname, &val, sizeof(val))) +- error(1, errno, "setsockopt %d.%d: %d", level, optname, val); ++ t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val); + } + + static void setup_sockaddr(int domain, const char *str_addr, +@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr, + addr4->sin_port = htons(cfg_port); + if (str_addr && + inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1) +- error(1, 0, "ipv4 parse error: %s", str_addr); ++ t_error(1, 0, "ipv4 parse error: %s", str_addr); + break; + case PF_INET6: + memset(addr6, 0, sizeof(*addr6)); +@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr, + addr6->sin6_port = htons(cfg_port); + if (str_addr && + inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1) +- error(1, 0, "ipv6 parse error: %s", str_addr); ++ t_error(1, 0, "ipv6 parse error: %s", str_addr); + break; + default: +- error(1, 0, "illegal domain"); ++ t_error(1, 0, "illegal domain"); + } + } + +@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol) + + fd = socket(domain, type, protocol); + if (fd == -1) +- error(1, errno, "socket t"); ++ t_error(1, errno, "socket t"); + + do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21); + + if (connect(fd, (void *) &cfg_dst_addr, cfg_alen)) +- error(1, errno, "connect"); ++ t_error(1, errno, "connect"); + return fd; + } + +@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring) + + ret = io_uring_wait_cqe(ring, &cqe); + if (ret) +- error(1, ret, "wait cqe"); ++ t_error(1, ret, "wait cqe"); + return cqe; + } + +@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN); + if (ret) +- error(1, ret, "io_uring: queue init"); ++ t_error(1, ret, "io_uring: queue init"); + + if (cfg_fixed_files) { + ret = io_uring_register_files(&ring, &fd, 1); + if (ret < 0) +- error(1, ret, "io_uring: files registration"); ++ t_error(1, ret, "io_uring: files registration"); + } + if (cfg_reg_ringfd) { + ret = io_uring_register_ring_fd(&ring); + if (ret < 0) +- error(1, ret, "io_uring: io_uring_register_ring_fd"); ++ t_error(1, ret, "io_uring: io_uring_register_ring_fd"); + } + + iov.iov_base = payload; +@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_register_buffers(&ring, &iov, 1); + if (ret) +- error(1, ret, "io_uring: buffer registration"); ++ t_error(1, ret, "io_uring: buffer registration"); + + tstop = gettimeofday_ms() + cfg_runtime_ms; + do { +@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol) + + ret = io_uring_submit(&ring); + if (ret != cfg_nr_reqs) +- error(1, ret, "submit"); ++ t_error(1, ret, "submit"); + + for (i = 0; i < cfg_nr_reqs; i++) { + cqe = wait_cqe_fast(&ring); + + if (cqe->flags & IORING_CQE_F_NOTIF) { + if (cqe->flags & IORING_CQE_F_MORE) +- error(1, -EINVAL, "F_MORE notif"); ++ t_error(1, -EINVAL, "F_MORE notif"); + compl_cqes--; + i--; + io_uring_cqe_seen(&ring, cqe); +@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol) + fprintf(stderr, "Connection failure"); + goto out_fail; + } else if (cqe->res != -EAGAIN) { +- error(1, cqe->res, "send failed"); ++ t_error(1, cqe->res, "send failed"); + } + io_uring_cqe_seen(&ring, cqe); + } +@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol) + out_fail: + shutdown(fd, SHUT_RDWR); + if (close(fd)) +- error(1, errno, "close"); ++ t_error(1, errno, "close"); + + fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n", + packets, bytes >> 20, +@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol) + + static void usage(const char *filepath) + { +- error(1, 0, "Usage: %s [-n] [-z] [-s] " ++ t_error(1, 0, "Usage: %s [-n] [-z] [-s] " + "(-4|-6) [-t