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

Merge pull request #87017 from jtojnar/fwupd-1.4.1

Browse Source
This commit is contained in:
Jan Tojnar 2020-05-06 01:20:16 +02:00 committed by GitHub
commit ea38cf9d96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libjcat/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, docbook_xml_dtd_43
, docbook-xsl-nons
, glib
@ -20,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
version = "0.1.1";
version = "0.1.2";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@ -28,18 +27,12 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0=";
sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo=";
};
patches = [
# Installed tests are installed to different output
./installed-tests-path.patch
# Fix version file generation
(fetchpatch {
url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch";
sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is=";
})
];
nativeBuildInputs = [

32
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -87,11 +87,11 @@ in
stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.4.0";
version = "1.4.1";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4=";
sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M=";
};
# libfwupd goes to lib
@ -154,34 +154,6 @@ stdenv.mkDerivation rec {
# they are not really part of the library.
./install-fwupdplugin-to-out.patch
# Make it easier to patch installed-tests directory.
# https://github.com/fwupd/fwupd/pull/2002
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch";
sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA=";
})
# Install systemd files to our prefix.
# https://github.com/fwupd/fwupd/pull/2006
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch";
sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8=";
})
# Fix installed tests.
# https://github.com/fwupd/fwupd/issues/2007
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch";
sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU=";
})
# Fix build with bash-completion 2.10
# https://github.com/fwupd/fwupd/pull/2014
(fetchpatch {
url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch";
sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw=";
})
# Installed tests are installed to different output
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
(substituteAll {