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

Commits on Nov 2, 2018

  1. Revert "c-ares: 1.14.0 -> 1.15.0" 

    This reverts commit 5ace270.
It's a mass rebuild, moving to staging.
    @vcunat
    vcunat committed Nov 2, 2018
    Copy the full SHA
    87e4e1b View commit details
Showing with 12 additions and 3 deletions.
  1. +12 −3 pkgs/development/libraries/c-ares/default.nix
15 changes: 12 additions & 3 deletions pkgs/development/libraries/c-ares/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,23 @@

let self =
stdenv.mkDerivation rec {
name = "c-ares-1.15.0";
name = "c-ares-1.14.0";

src = fetchurl {
url = "https://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
};

configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;

# ares_android.h header is missing
# see issue https://github.com/c-ares/c-ares/issues/216
postPatch = if stdenv.hostPlatform.isAndroid then ''
cp ${fetchurl {
url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
}} ares_android.h
'' else null;

meta = with stdenv.lib; {
description = "A C library for asynchronous DNS requests";