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

Commits on Oct 15, 2019

  1. tengine: 2.3.1 -> 2.3.2 (#70574) 

    * tengine: 2.3.1 -> 2.3.2

Changelog: https://github.com/alibaba/tengine/releases/tag/2.3.2

* tengine: unbreak
    @marsam @c0bw3b
    marsam authored and c0bw3b committed Oct 15, 2019
    Copy the full SHA
    86df0e3 View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/servers/http/tengine/default.nix
14 changes: 8 additions & 6 deletions pkgs/servers/http/tengine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt
{ stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt
, gd, geoip, gperftools, jemalloc
, withDebug ? false
, withMail ? false
@@ -10,12 +10,14 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "2.3.1";
version = "2.3.2";
pname = "tengine";

src = fetchurl {
url = "https://github.com/alibaba/tengine/archive/${version}.tar.gz";
sha256 = "075blm2d62a0bdixc3vngrxpgr7ngl1s4y8hm20pbvc07f0kzn9x";
src = fetchFromGitHub {
owner = "alibaba";
repo = pname;
rev = version;
sha256 = "04xfnbc0qlk8vi6bb8sl38nxnx9naxh550xsgrb4hql6jdi0wv7l";
};

buildInputs =
@@ -84,6 +86,7 @@ stdenv.mkDerivation rec {

NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-Wno-error=implicit-fallthrough"
] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";

preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
@@ -102,6 +105,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ izorkin ];
broken = true;
};
}