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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d2bd93da80e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5c366156c09
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 9, 2019

  1. bind: drop a darwin-specific patch (#62882) 

    The patch didn't apply since 9.12 -> 9.14 (26026c3).
I'll hope it's not needed anymore (and let Borg verify that).
It was reportedly just a configure-time error: e460267.
    @vcunat
    vcunat committed Jun 9, 2019
    Copy the full SHA
    c5c3661 View commit details
Showing with 1 addition and 27 deletions.
  1. +0 −26 pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
  2. +1 −1 pkgs/servers/dns/bind/default.nix
26 changes: 0 additions & 26 deletions pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/servers/dns/bind/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [
./dont-keep-configure-flags.patch
./remove-mkdir-var.patch
] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
];

nativeBuildInputs = [ perl ];
buildInputs = [ libtool libxml2 openssl ]