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

[20.03] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 #89311

Merged

Conversation

@jsravn
Copy link
Contributor

jsravn commented Jun 1, 2020

Motivation for this change
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.
@prusnak
Copy link
Member

prusnak commented Jun 1, 2020

This PR does not fit CONTRIBUTING.md

You should backport commit using git cherry-pick -x which makes it very easy to verify the change has been already merged to master first.

Also the PR title should start with [20.03] not [backport].

@jsravn
Copy link
Contributor Author

jsravn commented Jun 1, 2020

Sorry! I did not see CONTRIBUTING.md initially. I see now it's sort of hidden in .github. I will update accordingly.

@jsravn jsravn changed the title [backport] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 [20.03] firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 Jun 1, 2020
(cherry picked from commit 46f2bf6)
@jsravn jsravn force-pushed the jsravn:backport-firmware-linux-nonfree branch from 39cf476 to 5cd1d38 Jun 1, 2020
@jsravn
Copy link
Contributor Author

jsravn commented Jun 1, 2020

Okay, all done.

@prusnak
prusnak approved these changes Jun 1, 2020
@jsravn
Copy link
Contributor Author

jsravn commented Jun 9, 2020

@prusnak can this be merged?

@prusnak
Copy link
Member

prusnak commented Jun 9, 2020

@jsravn I don't have permissions to do so, unfortunately

@jsravn
Copy link
Contributor Author

jsravn commented Jun 10, 2020

Ah okay. @fpletz then?

@worldofpeace worldofpeace merged commit f9b261c into NixOS:release-20.03 Jun 18, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
firmwareLinuxNonfree, firmwareLinuxNonfree.passthru.tests on aarch64-linux Success
Details
firmwareLinuxNonfree, firmwareLinuxNonfree.passthru.tests on x86_64-linux Success
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="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./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="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5cd1d38"; rev="5cd1d383441441013aeec8bcfbd7ed65e1550773"; } ./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
@worldofpeace
Copy link
Member

worldofpeace commented Jun 18, 2020

Thanks for backporting @jsravn

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

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