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

nixos/dmidecode: added recommended patches #97614

Merged
merged 1 commit into from Sep 16, 2020
Merged

Conversation

@superherointj
Copy link
Contributor

superherointj commented Sep 10, 2020

Motivation for this change

In ARM libvirtd is broken because of a bug in 'dmidecode'. This patch applies the upstream recommended patches for dmidecode and fixes issue #97544 .

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@samueldr
Copy link
Member

samueldr commented Sep 10, 2020

We should backport this to, at least, 20.09. Though 20.03 also could benefit.

The change is quite small in scope within dmidecode, so I guess it'll have to depend on what the impact is in Nixpkgs.

@Mic92
Mic92 approved these changes Sep 10, 2020
Copy link
Contributor

Mic92 left a comment

Looks good for a backport to both releases.

@Mic92 Mic92 added this to the 20.09 milestone Sep 10, 2020
@superherointj superherointj mentioned this pull request Sep 10, 2020
0 of 10 tasks complete
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
@nixos-discourse
Copy link

nixos-discourse commented Sep 15, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/225

@nixos-discourse
Copy link

nixos-discourse commented Sep 15, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/226

@AndersonTorres AndersonTorres merged commit 2a6878c into NixOS:master Sep 16, 2020
17 checks passed
17 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="d284d32"; rev="d284d3203a1a2273a049d22f25d6e35ff3aa66b9"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@superherointj
Copy link
Contributor Author

superherointj commented Sep 17, 2020

@AndersonTorres

  1. Thanks for merging.
  2. SORRY! Didn't work - update to unstable hasn't happened - because version bump was forgotten! By me! (Oh! Sad...) As it is already merged, how should we go about it? The version bump is necessary.
  3. "dmidecode-3.2.8" version was suggested by samueldr IIRC being '8' because it is the number of upstream patches applied.
  4. Any preference to get this fixed?

Sorry again for all.

@superherointj superherointj mentioned this pull request Sep 17, 2020
0 of 10 tasks complete
@samueldr
Copy link
Member

samueldr commented Sep 17, 2020

What do you mean "update to unstable hasn't happened"?

The version number, with Nix, is only used by nix-env for upgrades of packages installed with nix-env -i. Any other uses I can think about and the version number of a package is largely ignored.

@superherointj
Copy link
Contributor Author

superherointj commented Sep 17, 2020

I was using nix-env to quickly test because on executing dmidecode it would crash. So I would install only locally and in case of crash I'd hard reset hardware. If I were using nixos-rebuild to test, it would crash the host and I'd have to manually do a recover, remove disk, etc. So yes, I was using nix-env for this.

Edit: I was using unstable channel which wasn't updated yet. This might be the problem then. What I was trying to test is the NixOS mainstream version not having the bug. (Not my fork that worked.) Guess I'll have to wait more then so builds can catch up?

@superherointj
Copy link
Contributor Author

superherointj commented Sep 17, 2020

@samueldr I'm proposing the 3 PRs referenced above to bump the version to 3.2.8. Is it acceptable?

@AndersonTorres
Copy link
Member

AndersonTorres commented Sep 17, 2020

@superherointj use the new pname convention.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.