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: 26b4165c2d47
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b6933e1e1ebe
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 1, 2020

  1. cacert: fix blacklist 

    It's broken under Python 3, ironically due to the patch we're carrying.
Fix it, and add a test to check it works.

Fixes #93230.

(cherry picked from commit b1f9e9c)
    @lukegb
    lukegb committed Dec 1, 2020
    Copy the full SHA
    49ff2e8 View commit details
    Browse the repository at this point in the history

  2. cacert: remove broken includeEmail option 

    This doesn't do anything. Building with includeEmail = true produces
the same set as includeEmail = false, and the substitute rule removes
a random dictionary index operation.

(cherry picked from commit b28436a)
    @lukegb
    lukegb committed Dec 1, 2020
    Copy the full SHA
    45eb83c View commit details
    Browse the repository at this point in the history

  3. cacert: add myself as maintainer 

    (cherry picked from commit 17b1bde)
    @andir @lukegb
    andir authored and lukegb committed Dec 1, 2020
    Copy the full SHA
    2eaa4bb View commit details
    Browse the repository at this point in the history

  4. cacert: add lukegb as maintainer 

    (cherry picked from commit 87f4676)
    @lukegb
    lukegb committed Dec 1, 2020
    Copy the full SHA
    fd51124 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2020

  1. Merge pull request #105610 from lukegb/nixpkgs-cacert-blacklist 

    [20.09] cacert: fix certificate denylist
    @andir
    andir committed Dec 2, 2020
    Copy the full SHA
    b6933e1 View commit details
    Browse the repository at this point in the history