-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fwupd: 1.0.1 → 1.0.4 #32751
fwupd: 1.0.1 → 1.0.4 #32751
Conversation
Maybe we can wait for the pull request to be merged so we do not include the patch in repo? |
@GrahamcOfBorg build fwupd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Failure for system: aarch64-linux
a) For `nixos-rebuild` you can set
{ nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.
b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
(use '--show-trace' to show detailed location information)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Failure for system: x86_64-darwin
error: Package ‘fwupd-1.0.2’ in /tmp/nix-ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/firmware/fwupd/default.nix:10 is not supported on ‘x86_64-darwin’, refusing to evaluate.
a) For `nixos-rebuild` you can set
{ nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.
b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
{ allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Success for system: x86_64-linux
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/fwupd-plugins-3/libfu_plugin_steelseries.so
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/fwupd-plugins-3/libfu_plugin_amt.so
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/fwupd-plugins-3/libfu_plugin_colorhug.so
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/fwupd-plugins-3/libfu_plugin_thunderbolt_power.so
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/fwupd-plugins-3/libfu_plugin_unifying.so
shrinking /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib/libfwupd.so.2.0.0
stripping (with flags -S) in /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/lib /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/libexec /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2/bin
patching script interpreter paths in /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2
checking for references to /tmp/nix-build-fwupd-1.0.2.drv-0 in /nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2...
/nix/store/kxl44x4605vcqm9sh01v631nbk8gay1i-fwupd-1.0.2
looks good! I don't see any problems with merging with the patch, but if you want to wait, that's fine too. |
Waiting few days should not be a problem. Regarding the aarch64 failure, we could remove |
however our libsmbios does not live up to this claim:
I'm not sure we strictly need to handle the aarch64 failure at this time. |
beep boop, ping! 1.0.4 is now out, FWIW! |
This seems to do the trick: From 6fb73e976372fbebf00e3d27e465dfa06121c3ee Mon Sep 17 00:00:00 2001
From: Will Dietz <[email protected]>
Date: Fri, 9 Feb 2018 14:37:23 -0600
Subject: [PATCH] fwupd: 1.0.3 -> 1.0.4
---
pkgs/os-specific/linux/firmware/fwupd/default.nix | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index cf2216d3916..a67a052e5fe 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,18 +1,16 @@
-{ stdenv, fetchFromGitHub, gtk_doc, pkgconfig, gobjectIntrospection, intltool
+{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking
, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar, glibcLocales
, fwupdate, libyaml, valgrind, meson, libuuid, pygobject3, colord
-, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook
+, pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook, json_glib
}:
let
- version = "1.0.3";
+ version = "1.0.4";
in stdenv.mkDerivation {
name = "fwupd-${version}";
- src = fetchFromGitHub {
- owner = "hughsie";
- repo = "fwupd";
- rev = version;
- sha256 = "0vg9f1gzcvfd7jnfhvv0ylf04fy7cw31ykrim7qik6gbkhr4gr65";
+ src = fetchurl {
+ url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
+ sha256 = "1n4d6fw3ffg051072hbxn106s52x2wlh5dh2kxwdfjsb5kh03ra3";
};
nativeBuildInputs = [
@@ -21,7 +19,7 @@ in stdenv.mkDerivation {
];
buildInputs = [
polkit appstream-glib gusb sqlite libarchive libsoup libelf libsmbios fwupdate libyaml
- libgudev colord gpgme libuuid pillow gnutls glib_networking efivar
+ libgudev colord gpgme libuuid pillow gnutls glib_networking efivar json_glib
];
LC_ALL = "en_US.UTF-8"; # For po/make-images
--
2.16.1 |
Hmm, for some reason using this (1.0.4) as well at least on master (1.0.1) doesn't seem to find updates. Logs show messages like:
Which is strange, considering: $ file /var/lib/fwupd/remotes.d/lvfs/metadata.xml.gz
/var/lib/fwupd/remotes.d/lvfs/metadata.xml.gz: gzip compressed data, from Unix Oh! Searching on upstream's github it appears you've discussed this and we need to update gcab, maybe? |
https://github.com/dtzWill/nixpkgs/tree/experimental/fwupd bumps our gcab and appstream-glib (with no testing of anything other than blitzing a path to fwupd 😇), if that's helpful. Unfortunately still seeing the problem re:unable to parse text/plain. Dunno. |
The issue I was reporting was caused by a broken error handler, it has nothing to do with gcab and it was fixed in fwupd/fwupd@5f733f2 – the “cannot process file of type text/plain” only triggered the bug. I noticed your issue in 1.0.1 but since I only needed fwupd as a build dependency for gnome-software, I did not pay it much heed. It should probably be reported upstream. |
Looks like we need That seems to fix problems parsing the remotes' XML! Woo. But nothing seems to happen when I request the updates are performed/applied. |
@dtzWill I merged your And |
Failure on aarch64-linux (full log) Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
03617f7
to
f118d2b
Compare
Failure on aarch64-linux (full log) Partial log (click to expand)
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
@@ -258,6 +258,7 @@ in rec { | |||
tests.firefox = callTest tests/firefox.nix {}; | |||
tests.firewall = callTest tests/firewall.nix {}; | |||
tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; | |||
tests.fwupd = callTest tests/fwupd.nix {}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a problem on Hydra. It causes build during evaluation, most likely due to the code around listFiles
. It's probably the cause why it doesn't have resources to evaluate trunk-combined ATM. I disabled the test for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's an issue already :-) #32142
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, sorry about that. Still the same old #32142, still not sure how to best fix it.
Motivation for this change
Update and clean-up.
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)