From 9035276a8e01cc8243d038117bccace44f1433eb Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 7 Jan 2025 14:13:33 -0300 Subject: [PATCH] fixing more sneaky eval failures Signed-off-by: lucasew --- pkgs/applications/misc/plover/default.nix | 10 +++++----- pkgs/by-name/xd/xdgmenumaker/package.nix | 2 +- pkgs/servers/openafs/1.8/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index c4165bea8dafaf..7d892bcdfc0c44 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, wmctrl, qtbase, mkDerivationWith }: +{ lib, fetchFromGitHub, python3Packages, wmctrl, qtbase, stdenv, mkDerivationWith }: { stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 - dev = with python3Packages; mkDerivationWith buildPythonPackage rec { + dev = mkDerivationWith python3Packages.buildPythonPackage rec { pname = "plover"; version = "4.0.0.dev10"; @@ -11,7 +11,7 @@ broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with lib.maintainers; [ twey kovirobi ]; - license = licenses.gpl2; + license = lib.licenses.gpl2; }; src = fetchFromGitHub { @@ -25,8 +25,8 @@ # sed on many of the platforms Plover builds for postPatch = "sed -i /PyQt5/d setup.cfg"; - nativeCheckInputs = [ pytest mock ]; - propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; + nativeCheckInputs = with python3Packages; [ pytest mock ]; + propagatedBuildInputs = with python3Packages; [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/xd/xdgmenumaker/package.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix index 2c3e87cf198dd9..18be439d11825e 100644 --- a/pkgs/by-name/xd/xdgmenumaker/package.nix +++ b/pkgs/by-name/xd/xdgmenumaker/package.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/gapan/xdgmenumaker"; license = lib.licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch - platforms = with lib.platforms; filter (x: !(elem x darwin)) unix; + platforms = lib.filter (x: !(lib.elem x lib.platforms.darwin)) lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 9e143092ac6165..f9dda1d91003bf 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -155,9 +155,9 @@ stdenv.mkDerivation { homepage = "https://www.openafs.org"; license = lib.licenses.ipl10; platforms = lib.platforms.linux; - maintainers = [ - maintainers.maggesi - maintainers.spacefrogg + maintainers = with lib.maintainers; [ + maggesi + spacefrogg ]; }; }