Merge pull request #32123 from kosta/master

brotli: 0.6.0 -> 1.0.1

pkgs/development/libraries/libbrotli/default.nix

@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
-
-stdenv.mkDerivation rec {
-  name = "libbrotli-${version}";
-  version = "1.0";
-
-  src = fetchFromGitHub {
-    owner = "bagder";
-    repo = "libbrotli";
-    rev = name;
-    sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
-  };
-
-  nativeBuildInputs = [ autoconf automake libtool ];
-
-  preConfigure = ''
-    cp -r ${brotliUnstable.src}/* brotli/
-    chmod -R +700 brotli
-    mkdir m4
-    autoreconf --install --force --symlink
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Meta project to build libraries from the brotli source code";
-    longDescription = ''
-      Wrapper scripts and code around the brotli code base.
-      Builds libraries out of the brotli decode and encode sources. Uses autotools.
-      'brotlidec' is the library for decoding, decompression
-      'brotlienc' is the library for encoding, compression
-    '';
-
-    homepage = https://github.com/bagder/libbrotli;
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [];
-  };
-}

pkgs/servers/http/nginx/modules.nix

@@ -5,10 +5,10 @@
     src = fetchFromGitHub {
       owner = "google";
       repo = "ngx_brotli";
-      rev = "788615eab7c5e0a984278113c55248305620df14";
-      sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf";
+      rev = "bfd2885b2da4d763fed18f49216bb935223cd34b";
+      sha256 = "04yx1n0wi3l2x37jd1ynl9951qxkn8xp42yv0mfp1qz9svips81n";
+      fetchSubmodules = true;
     };
-    inputs = [ pkgs.libbrotli ];
   };
 
   rtmp = {

pkgs/tools/compression/brotli/default.nix

@@ -4,19 +4,19 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "0.6.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1wapq5hzflbmrcqgz92iv79rm893bskh03kvqgnn33dzbz3slavs";
+    sha256 = "1rqgp8xi1k4sjy9sngg1vw0v8q2mm46dhyya4d35n3k6yk7pk0qv";
   };
 
   buildInputs = [ cmake ];
 
   # This breaks on Darwin because our cmake hook tries to make a build folder
-  # and the wonderful bazel BUILD file is already there (yay case-insensitivty?)
+  # and the wonderful bazel BUILD file is already there (yay case-insensitivity?)
   prePatch = "rm BUILD";
 
   meta = with stdenv.lib; {

pkgs/tools/compression/brotli/unstable.nix

@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-# ?TODO: there's also python lib in there
-
-stdenv.mkDerivation rec {
-  name = "brotli-20160112";
-  version = "bed93862";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "brotli";
-    rev = "bed93862608d4d232ebe6d229f04e48399775e8b";
-    sha256 = "0g94kqh984qkbqbj4fpkkyji9wnbrb9cs32r9d6niw1sqfnfkd6f";
-  };
-
-  preConfigure = "cd tools";
-
-  # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mv ./bro "$out/bin/"
-  '';
-
-  meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
-
-    description = "A generic-purpose lossless compression algorithm and tool";
-
-    longDescription =
-      ''  Brotli is a generic-purpose lossless compression algorithm that
-          compresses data using a combination of a modern variant of the LZ77
-          algorithm, Huffman coding and 2nd order context modeling, with a
-          compression ratio comparable to the best currently available
-          general-purpose compression methods. It is similar in speed with
-          deflate but offers more dense compression.
-
-          The specification of the Brotli Compressed Data Format is defined
-          in the following internet draft:
-          http://www.ietf.org/id/draft-alakuijala-brotli
-      '';
-
-    license = licenses.mit;
-    maintainers = [];
-    platforms = platforms.all;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -1553,10 +1553,6 @@ with pkgs;
 
   brotli = callPackage ../tools/compression/brotli { };
 
-  brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { };
-
-  libbrotli = callPackage ../development/libraries/libbrotli { };
-
   biosdevname = callPackage ../tools/networking/biosdevname { };
 
   c14 = callPackage ../applications/networking/c14 { };