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: 6dfa72b172af
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 90b88c416d4d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 18, 2021

  1. ebtables: restore "legacy" commands 

    ebtables 2.0.11 renamed the ebtables commands
from "ebtables*" to "ebtables-legacy-*".

Of course this breaks legacy packages and scripts
that depends on the ebtables commands.

The idea behind this upstream change appears to be that
ebtables-nft replaces ebtables and distributions should
rename either the ebtables-legacy or ebtables-nft commands
to provide the ebtables commands.

For nix a better fit is for packages to specify either the
ebtables or the ebtables-nft package, while both packages
provide the same commands.

This patch restores the ebtables package so it functions again.
    @yesbox
    yesbox committed Jan 18, 2021
    Copy the full SHA
    1cb447c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #81545 from yesbox/ebtables-legacy 

    ebtables: restore legacy commands
    @Mic92
    Mic92 committed Jan 18, 2021
    Copy the full SHA
    90b88c4 View commit details
    Browse the repository at this point in the history