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/{cri-o,podman}: remove cni-plugins from environment.systemPackages #85822

Merged
merged 2 commits into from Apr 23, 2020

Conversation

@zowoq
Copy link
Contributor

zowoq commented Apr 22, 2020

Having cni-plugins in systemPackages results in a collision with iproute.

collision between `/nix/store/8v9yf7card7qpv9rlw84xphvnka96afd-iproute2-5.5.0/bin/bridge' and `/nix/store/xqg5p15znrhbsaszin1vbvmyv076h5az-cni-plugins-0.8.5-bin/bin/bridge'

Upstream docs say that a path to the plugins can be passed via config file.

https://github.com/containers/libpod/blob/master/cni/README.md#cni
https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md#crionetwork-table

This is already set for podman by nixos/containers.

cc @adisbladis @saschagrunert @vdemeester

@zowoq zowoq changed the title nixos/{crio,podman}: remove cni-plugins from environment.systemPackages nixos/{cri-o,podman}: remove cni-plugins from environment.systemPackages Apr 22, 2020
@zowoq zowoq force-pushed the zowoq:cni-collision branch from bb569c0 to 4102db2 Apr 23, 2020
Copy link
Member

vdemeester left a comment

LGTM 🐯

Copy link
Member

saschagrunert left a comment

Yes, LGTM

@adisbladis adisbladis merged commit 0dc3e48 into NixOS:master Apr 23, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./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="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="4102db2"; rev="4102db21277175e847b9e5ea1eff95466d0e2a89"; } ./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
@zowoq zowoq deleted the zowoq:cni-collision branch Apr 23, 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.

None yet

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