Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-15 01:44:24 +00:00
parent a9b942c061 d227d9a70e
commit 3f45f0948d
550 changed files with 9204 additions and 3225 deletions
@@ -1,6 +1,16 @@
 { fetchFromGitHub, pkgs }:

 {
+  brotli = {
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "ngx_brotli";
+      rev = "788615eab7c5e0a984278113c55248305620df14";
+      sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf";
+    };
+    inputs = [ pkgs.libbrotli ];
+  };
+
  rtmp = {
    src = fetchFromGitHub {
      owner = "arut";