From 73f2f644bc83647edbfc0fc3e8e5bd31ef9f02d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Feb 2018 01:49:49 +0100 Subject: [PATCH] =?UTF-8?q?fwupd:=201.0.4=20=E2=86=92=201.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linux/firmware/fwupd/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 858f1448dfac..ab25ed795143 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -6,14 +6,14 @@ , shared_mime_info, umockdev }: let - version = "1.0.4"; + version = "1.0.5"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3"; + sha256 = "0wm195vkf6x1kg1dz0sbfwpdcn9f6638l7vyzplcfrb3v07pqxpq"; }; outputs = [ "out" "devdoc" "man" "installedTests" ]; @@ -31,20 +31,9 @@ in stdenv.mkDerivation { patches = [ ./fix-missing-deps.patch - # https://github.com/hughsie/fwupd/issues/403 (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/bd6082574989e4f48b66c7270bb408d439b77a06.patch; - sha256 = "17pixyizkmn6wlsjmr1wwya17ivn770hdv9mp769vifxinya8w9y"; - }) - # drop docbook2man - (fetchpatch { - url = https://github.com/hughsie/fwupd/commit/2c43d3e6e65868b66a9a64a76123697e259ec7c2.patch; - sha256 = "0vjv7jnai0g96frlipk2sc59pj3mhq9di01hajycjv7y5v6qqrmc"; - }) - # https://github.com/hughsie/fwupd/issues/405 - (fetchpatch { - url = https://github.com/hughsie/fwupd/pull/407.patch; - sha256 = "1dxhqps12x7bz0s974xk5hfpk4nwn1gs29vl0dfi9j54wy18f688"; + url = https://github.com/hughsie/fwupd/commit/767210e4b1401d5d5bb7ac1e7c052a60b6529d88.patch; + sha256 = "00adfabxpgdg74jx7i6jihhh8njjk2r7v3fxqs4scj3vn06k5fmw"; }) ]; @@ -77,7 +66,6 @@ in stdenv.mkDerivation { --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" ''; - enableParallelBuilding = true; meta = with stdenv.lib; { homepage = https://fwupd.org/; maintainers = with maintainers; [];