From a0b2df0017df62ffc1209f773dffe90fe401012e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 8 Apr 2024 21:42:02 +0100 Subject: [PATCH] upower: 1.90.2 -> 1.90.4 Changes: https://gitlab.freedesktop.org/upower/upower/-/blob/v1.90.4/NEWS --- pkgs/os-specific/linux/upower/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 3b08318c965e..8a1d79a9d7bd 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , makeWrapper , pkg-config , libxslt @@ -33,7 +32,7 @@ assert withDocs -> withIntrospection; stdenv.mkDerivation (finalAttrs: { pname = "upower"; - version = "1.90.2"; + version = "1.90.4"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withDocs [ "devdoc" ]; @@ -43,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upower"; repo = "upower"; rev = "v${finalAttrs.version}"; - hash = "sha256-7WzMAJuf1czU8ZalsEU/NwCXYqTGvcqEqxFt5ocgt48="; + hash = "sha256-5twHuDLisVF07Y5KYwlqWMi12+p6UpARJvoBN/+tX2o="; }; patches = lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ @@ -52,10 +51,6 @@ stdenv.mkDerivation (finalAttrs: { ./i686-test-remove-battery-check.patch ] ++ [ ./installed-tests-path.patch - (fetchpatch { - url = "https://gitlab.freedesktop.org/upower/upower/-/merge_requests/207.diff"; - hash = "sha256-ldr1bKbSAdYpwbbe/Iq9i0Q9zQrHWvIvBGym/F3+vxs="; - }) ]; strictDeps = true;