colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #302663: upower: 1.90.2 -> 1.90.4 

...into staging
This commit is contained in:
Vladimír Čunát 2024-04-10 08:13:00 +02:00
parent d68f826302 a0b2df0017
commit 5f361da7dc
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/upower/default.nix
View File

@ -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;