Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: ebf0764ad73c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ad5f23870caf
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 26, 2021

  1. docker: allow overriding package inputs per docker package

    Previously we could not override the input packages to docker at all as
    that had been shadowed due to the usage of inherit in all-package.nix.
    
    We are now mixing the "variable" variables for the build and the
    dependency declarations for the package and using callPackage as if each
    of the docker packages would be separate files that we evaluate.
    
    This now enables overriding e.g. iptables for a single verison of
    docker which previously was not feasible without importing the
    default.nix again (and passing different arguments).
    
    > pkgs.docker.override { iptables = pkgs.iptables-nftables-compat; }
    andir committed Jan 26, 2021
    Copy the full SHA
    ed46383 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2021

  1. Merge pull request #110847 from andir/docker-overrides

    docker: allow overriding package inputs per docker package
    andir committed Jan 31, 2021
    Copy the full SHA
    ad5f238 View commit details
    Browse the repository at this point in the history