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

fwupd: 1.2.2 -> 1.2.3

Browse Source 
Drop lib output to avoid cycle.
This commit is contained in:
Will Dietz 2019-01-04 12:42:20 -06:00 committed by Jan Tojnar
parent bc41317e24
commit 461699607e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
}: }:
let let
# Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
version = "1.2.1"; version = "1.2.3";
python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
@ -19,10 +19,10 @@ in stdenv.mkDerivation {
name = "fwupd-${version}"; name = "fwupd-${version}";
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "126b3lsh4gkyajsqm2c8l6wqr4dd7m26krz2527khmlps0lxdhg1"; sha256 = "11qpgincndahq96rbm2kgcy9kw5n9cmbbilsrqcqcyk7mvv464sl";
}; };
outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
@ -48,6 +48,7 @@ in stdenv.mkDerivation {
patchShebangs . patchShebangs .
substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd" substituteInPlace data/installed-tests/fwupdmgr.test.in --subst-var-by installedtestsdir "$installedTests/share/installed-tests/fwupd"
substituteInPlace data/installed-tests/meson.build --replace sysconfdir sysconfdir_install
''; '';
# /etc/os-release not available in sandbox # /etc/os-release not available in sandbox
@ -103,6 +104,7 @@ in stdenv.mkDerivation {
"fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor.conf"
"fwupd/remotes.d/fwupd-tests.conf"
"pki/fwupd/GPG-KEY-Hughski-Limited" "pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"