Skip to content
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.2.1 -> 1.2.3 #53425

Merged
merged 4 commits into from
Jan 31, 2019
Merged

fwupd: 1.2.1 -> 1.2.3 #53425

merged 4 commits into from
Jan 31, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 4, 2019

Motivation for this change

The fwupd NixOS test passes :).

Also this disables the test plugin by default
for a slightly improved default experience.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

};

outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];
outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, I am getting the circular dependency but cannot grep the lib references in the out

@jtojnar
Copy link
Member

jtojnar commented Jan 5, 2019

MetadataURI key in fwupd/remotes.d/fwupd-tests.conf points to wrong path (out output instead of installedTests) but fixing it will probably cause a cycle.

@dtzWill
Copy link
Member Author

dtzWill commented Jan 5, 2019 via email

@jtojnar
Copy link
Member

jtojnar commented Jan 5, 2019

Is seems like the issue is that the newly added plug-ins are in lib output instead of out.

$ git checkout channels/nixos-unstable-small
$ du --human-readable $(nix-build -A fwupd.all) --summarize 
2,0M	/nix/store/d92li0fnkyxdyr98xccwxiw2pm2l4h8p-fwupd-1.2.1
3,7M	/nix/store/cyjma8cf68lg1rcdli55w61rlhw8lnky-fwupd-1.2.1-lib
272K	/nix/store/dh33r3xnykrhjh0nvilfaxwf6qsidslq-fwupd-1.2.1-dev
976K	/nix/store/502c6qikkfq08sy71g86bac3wqbc1kwf-fwupd-1.2.1-devdoc
24K	/nix/store/rvvrly90n0c0gqw2dqmc2w9jisdl0va4-fwupd-1.2.1-man
52K	/nix/store/0fvw17z4w3rv0kqxcpbmi43rm1vcxs81-fwupd-1.2.1-installedTests
$ nix path-info -S /nix/store/d92li0fnkyxdyr98xccwxiw2pm2l4h8p-fwupd-1.2.1 /nix/store/cyjma8cf68lg1rcdli55w61rlhw8lnky-fwupd-1.2.1-lib
/nix/store/cyjma8cf68lg1rcdli55w61rlhw8lnky-fwupd-1.2.1-lib	  232096728
/nix/store/d92li0fnkyxdyr98xccwxiw2pm2l4h8p-fwupd-1.2.1    	  570954824
$ git checkout dtzWill/update/fwupd-1.2.3
$ du --human-readable $(nix-build -A fwupd.all) --summarize 
11M	/nix/store/79dn0g3wnnghk4bx6b75vxdhmmfkamg0-fwupd-1.2.3
272K	/nix/store/9aphq7lr2k6rnim1i843n0hgli2if01y-fwupd-1.2.3-dev
992K	/nix/store/s23vnalm4gp0bgh1h6hbnjpcankiv7r8-fwupd-1.2.3-devdoc
24K	/nix/store/ahppw5jh7nbib2yhx76cxbaycf0rg1bm-fwupd-1.2.3-man
52K	/nix/store/4z7zwmnnl8mvk7w8x52qcim9ncg8lncr-fwupd-1.2.3-installedTests
$ nix path-info -S /nix/store/79dn0g3wnnghk4bx6b75vxdhmmfkamg0-fwupd-1.2.3
/nix/store/79dn0g3wnnghk4bx6b75vxdhmmfkamg0-fwupd-1.2.3	  575884792

@dtzWill
Copy link
Member Author

dtzWill commented Jan 5, 2019 via email

dtzWill and others added 4 commits January 27, 2019 21:26
Drop lib output to avoid cycle.
Don't add the testing "webcam" device,
which is unexpected to see when querying
what devices fwupd believes exist :).

Won't change behavior for anyone defining
the blacklistPlugin option already,
but doesn't seem worth making more complicated.
@jtojnar
Copy link
Member

jtojnar commented Jan 27, 2019

Yup, gnome-software is what I was concerned about.

Plug-ins should work fine, as the plugin_dir meson variable is used in for locating the plug-ins at runtime as well.

I fixed the location of the fwupd-tests.conf so hopefully this is ready now.

@jtojnar jtojnar merged commit 65e6d80 into NixOS:master Jan 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants