From 6de0380378fb118b90ffeaa36da2e80c1af76a69 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 29 Nov 2017 00:49:48 +0000 Subject: [PATCH 1/5] nginxModules.brotli: 2015-11-18 -> 2016-12-02 This version bundles brotli. --- pkgs/servers/http/nginx/modules.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f59d7717756..de6fd61ee81 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/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 = { From 486625e0fe4711fcf4d75898dc7d697b6868c352 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 29 Nov 2017 00:51:02 +0000 Subject: [PATCH 2/5] libbrotli: 1.0 -> 1.0.1.2017-10-30 --- pkgs/development/libraries/libbrotli/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix index 03604e3a93e..7eada377f0a 100644 --- a/pkgs/development/libraries/libbrotli/default.nix +++ b/pkgs/development/libraries/libbrotli/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, brotli }: stdenv.mkDerivation rec { name = "libbrotli-${version}"; - version = "1.0"; + version = "1.0.1.2017-10-30"; src = fetchFromGitHub { owner = "bagder"; repo = "libbrotli"; - rev = name; - sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y"; + rev = "a90f3a40bf597fe0bec4ddc4651bbc8470055b6f"; + sha256 = "05zkgbnsmnn34gryk1kz6r46jgkbd2jhx2brfzhza7ddwhc3dr1j"; }; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoreconfHook libtool ]; - preConfigure = '' - cp -r ${brotliUnstable.src}/* brotli/ + preAutoreconf = '' + cp -r ${brotli.src}/* brotli/ chmod -R +700 brotli mkdir m4 - autoreconf --install --force --symlink ''; meta = with stdenv.lib; { From e8b6a11aba4d6c924f37dea6b202c7881efac87b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 29 Nov 2017 00:51:48 +0000 Subject: [PATCH 3/5] libbrotli: delete Its functionality was incorporatad into brotli. --- .../libraries/libbrotli/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/libbrotli/default.nix diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix deleted file mode 100644 index 7eada377f0a..00000000000 --- a/pkgs/development/libraries/libbrotli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libtool, brotli }: - -stdenv.mkDerivation rec { - name = "libbrotli-${version}"; - version = "1.0.1.2017-10-30"; - - src = fetchFromGitHub { - owner = "bagder"; - repo = "libbrotli"; - rev = "a90f3a40bf597fe0bec4ddc4651bbc8470055b6f"; - sha256 = "05zkgbnsmnn34gryk1kz6r46jgkbd2jhx2brfzhza7ddwhc3dr1j"; - }; - - nativeBuildInputs = [ autoreconfHook libtool ]; - - preAutoreconf = '' - cp -r ${brotli.src}/* brotli/ - chmod -R +700 brotli - mkdir m4 - ''; - - 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 = []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f9ee4013a6..b50312a15fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1548,8 +1548,6 @@ with pkgs; brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { }; - libbrotli = callPackage ../development/libraries/libbrotli { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; c14 = callPackage ../applications/networking/c14 { }; From 7584d1c3bdcf4da5cf820989bb838eca25fc8586 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 29 Nov 2017 00:52:24 +0000 Subject: [PATCH 4/5] brotliUnstable: delete --- pkgs/tools/compression/brotli/unstable.nix | 46 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 48 deletions(-) delete mode 100644 pkgs/tools/compression/brotli/unstable.nix diff --git a/pkgs/tools/compression/brotli/unstable.nix b/pkgs/tools/compression/brotli/unstable.nix deleted file mode 100644 index 59eb1e1d469..00000000000 --- a/pkgs/tools/compression/brotli/unstable.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b50312a15fd..ee61d154d7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1546,8 +1546,6 @@ with pkgs; brotli = callPackage ../tools/compression/brotli { }; - brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; c14 = callPackage ../applications/networking/c14 { }; From 2a0e757fb8839f4e02e6d1fec3ad0bec97698d62 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 29 Nov 2017 00:52:38 +0000 Subject: [PATCH 5/5] brotli: 0.6.0 -> 1.0.1 --- pkgs/tools/compression/brotli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index c900cfa79f7..bd33eb4d437 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/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; {