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

lxd: added patch for fixing path `/usr/share/misc/usb.ids` #86660

Merged
merged 1 commit into from May 3, 2020

Conversation

@asbachb
Copy link
Contributor

asbachb commented May 3, 2020

closes #86650

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"
 ✘ asbachb@nixos  ~/dev/src/nix/nixpkgs   lxd-usb.ids  nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
these paths will be fetched (0.03 MiB download, 0.13 MiB unpacked):
  /nix/store/c0j7hbxbffh08la9bp90dxqx8s1xm1xp-nixpkgs-review-2.3.0
copying path '/nix/store/c0j7hbxbffh08la9bp90dxqx8s1xm1xp-nixpkgs-review-2.3.0' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 246, done.
remote: Counting objects: 100% (246/246), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 395 (delta 238), reused 234 (delta 234), pack-reused 149
Receiving objects: 100% (395/395), 342.44 KiB | 1.25 MiB/s, done.
Resolving deltas: 100% (289/289), completed with 129 local objects.
From https://github.com/NixOS/nixpkgs
   776f12b39ec..65d4935c0d0  master     -> refs/nixpkgs-review/0
$ git worktree add /home/asbachb/.cache/nixpkgs-review/rev-5857a17f403105246cc5ac13b206a059215e8703-dirty/nixpkgs 65d4935c0d0cc67e2c22911150bfda8fb597c12d
Preparing worktree (detached HEAD 65d4935c0d0)
Updating files: 100% (21630/21630), done.
HEAD is now at 65d4935c0d0 jsoncpp: fix build on 32-bit arm
$ nix-env -f /home/asbachb/.cache/nixpkgs-review/rev-5857a17f403105246cc5ac13b206a059215e8703-dirty/nixpkgs -qaP --xml --out-path --show-trace
No diff detected, stopping review...
$ git worktree prune
  • Tested execution of all binary files (usually in ./result/bin/)
asbachb@nixos  ~/dev/src/nix/nixpkgs   lxd-usb.ids  nix-shell -I nixpkgs=/home/asbachb/dev/src/nix/nixpkgs -p lxd     

[nix-shell:~/dev/src/nix/nixpkgs]$ lxc --version
4.0.1

[nix-shell:~/dev/src/nix/nixpkgs]$ lxd --version
4.0.1
  • 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.
pkgs/tools/admin/lxd/default.nix Outdated Show resolved Hide resolved
@asbachb asbachb force-pushed the asbachb:lxd-usb.ids branch from 5857a17 to 32934a6 May 3, 2020
@marsam marsam merged commit d33c22d into NixOS:master May 3, 2020
16 checks passed
16 checks passed
lxd, lxd.passthru.tests on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
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="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./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="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="32934a6"; rev="32934a673f4668a1784ed8bb14a982ac414a730c"; } ./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
lxd, lxd.passthru.tests on x86_64-linux Success
Details
@asbachb asbachb deleted the asbachb:lxd-usb.ids branch Jun 13, 2020
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.

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