git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87017 from jtojnar/fwupd-1.4.1
commitea38cf9d964900e7ecf395331122a222553ff835 authorJan Tojnar <jtojnar@gmail.com> dateWed 6 May 2020, 01:20 (7 years ago) parentd8f894d88d15ee
2 files changed+4−39
pkgs/development/libraries/libjcat/default.nix+2−9 pkgs/os-specific/linux/firmware/fwupd/default.nix+2−30
pkgs/development/libraries/libjcat/default.nix+2−9
@@ -1,6 +1,5 @@
11{ stdenv
22, fetchFromGitHub
3−, fetchpatch
43, docbook_xml_dtd_43
54, docbook-xsl-nons
65, glib
@@ -20,7 +19,7 @@
2019
2120stdenv.mkDerivation rec {
2221 pname = "libjcat";
23− version = "0.1.1";
22+ version = "0.1.2";
2423
2524 outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
2625
@@ -28,18 +27,12 @@ stdenv.mkDerivation rec {
2827 owner = "hughsie";
2928 repo = "libjcat";
3029 rev = version;
31− sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0=";
30+ sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo=";
3231 };
3332
3433 patches = [
3534 # Installed tests are installed to different output
3635 ./installed-tests-path.patch
37−
38− # Fix version file generation
39− (fetchpatch {
40− url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch";
41− sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is=";
42− })
4336 ];
4437
4538 nativeBuildInputs = [
pkgs/os-specific/linux/firmware/fwupd/default.nix+2−30
@@ -87,11 +87,11 @@ in
8787
8888stdenv.mkDerivation rec {
8989 pname = "fwupd";
90− version = "1.4.0";
90+ version = "1.4.1";
9191
9292 src = fetchurl {
9393 url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
94− sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4=";
94+ sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M=";
9595 };
9696
9797 # libfwupd goes to lib
@@ -154,34 +154,6 @@ stdenv.mkDerivation rec {
154154 # they are not really part of the library.
155155 ./install-fwupdplugin-to-out.patch
156156
157− # Make it easier to patch installed-tests directory.
158− # https://github.com/fwupd/fwupd/pull/2002
159− (fetchpatch {
160− url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch";
161− sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA=";
162− })
163−
164− # Install systemd files to our prefix.
165− # https://github.com/fwupd/fwupd/pull/2006
166− (fetchpatch {
167− url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch";
168− sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8=";
169− })
170−
171− # Fix installed tests.
172− # https://github.com/fwupd/fwupd/issues/2007
173− (fetchpatch {
174− url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch";
175− sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU=";
176− })
177−
178− # Fix build with bash-completion 2.10
179− # https://github.com/fwupd/fwupd/pull/2014
180− (fetchpatch {
181− url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch";
182− sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw=";
183− })
184−
185157 # Installed tests are installed to different output
186158 # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
187159 (substituteAll {