From 6646939ad336e291b2d943bf0e278412d83b7950 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Mar 2023 02:49:33 +0100 Subject: [PATCH] caffeine-ng: Use hash and SRI hashes With the python package set moving to hash, overriding the fetcher and reintroducing sha256 breaks eval, due to multiple hashes passed. Also set an explicit format for buildPythonApplication. --- pkgs/tools/X11/caffeine-ng/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 5aab492c75e8..344e3a892450 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -28,16 +28,17 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); in buildPythonApplication rec { pname = "caffeine-ng"; version = "4.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU="; + hash = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU="; }; nativeBuildInputs = [ wrapGAppsHook glib gobject-introspection setuptools-scm ];