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: 024e71ec02f6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d210cbff49cb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 26, 2020

  1. lib/types.nix: fix missing inherit 

    I think there was a silent (i.e. semantic) merge conflict between PR #101139 and
PR #100456.  This commit should fix the error, which manifests as follows:

  error: undefined variable 'boolToString' at /home/kkini/src/nixpkgs/lib/types.nix:552:42
    @kini
    kini committed Oct 26, 2020
    Copy the full SHA
    a456ccb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #101743 from kini/boolToString-merge-conflict 

    lib/types.nix: fix missing inherit
    @roberth
    roberth committed Oct 26, 2020
    Copy the full SHA
    d210cbf View commit details
    Browse the repository at this point in the history