summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware/fwupd
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-01-04 12:42:20 -0600
committerJan Tojnar <jtojnar@gmail.com>2019-01-27 21:26:42 +0100
commit461699607ebdce98a05b414bcec4861be8c37c27 (patch)
tree36133d5658b989a0b7a713da44ff474c3d8cb84e /pkgs/os-specific/linux/firmware/fwupd
parentbc41317e24317b0f506287f2d5bab00140b9b50e (diff)
downloadnixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar.gz
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar.bz2
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar.lz
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar.xz
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.tar.zst
nixpkgs-461699607ebdce98a05b414bcec4861be8c37c27.zip
fwupd: 1.2.2 -> 1.2.3
Drop lib output to avoid cycle.
Diffstat (limited to 'pkgs/os-specific/linux/firmware/fwupd')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index de0a1e2ee0d..fca35e6ea1b 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -8,7 +8,7 @@
 }:
 let
   # 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 ]);
   installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
 
@@ -19,10 +19,10 @@ in stdenv.mkDerivation {
   name = "fwupd-${version}";
   src = fetchurl {
     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 = [
     meson ninja gtk-doc pkgconfig gobject-introspection intltool glibcLocales shared-mime-info
@@ -48,6 +48,7 @@ in stdenv.mkDerivation {
 
     patchShebangs .
     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
@@ -103,6 +104,7 @@ in stdenv.mkDerivation {
       "fwupd/remotes.d/lvfs-testing.conf"
       "fwupd/remotes.d/lvfs.conf"
       "fwupd/remotes.d/vendor.conf"
+      "fwupd/remotes.d/fwupd-tests.conf"
       "pki/fwupd/GPG-KEY-Hughski-Limited"
       "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
       "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"