From be2e01f8a025532d914872fb7886fac17aa22aca Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 9 Jan 2018 10:32:02 -0600
Subject: [PATCH] ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1

Fixes build when used with nginxMainline.

(FWIW, 1.11.33.4 is from 2016-09-15)
---
 pkgs/development/libraries/psol/default.nix | 4 ++--
 pkgs/development/libraries/psol/generic.nix | 2 +-
 pkgs/servers/http/nginx/modules.nix         | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/development/libraries/psol/default.nix
index 5c78c1a288f6..dd6037e68329 100644
--- a/pkgs/development/libraries/psol/default.nix
+++ b/pkgs/development/libraries/psol/default.nix
@@ -1,5 +1,5 @@
 { callPackage }:
 callPackage ./generic.nix {} {
-  version = "1.11.33.4";
-  sha256  = "1jq2llp0i4666rwqnx1hs4pjlpblxivvs1jkkjzlmdbsv28jzjq8";
+  version = "1.13.35.1"; # Latest beta, 2017-11-08
+  sha256  = "126823gpr3rdqakwixmr887rbvwhksr3xg14jnyzlp84q4hg1p0n";
 }
diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix
index 3e82bb4975dc..c61926fe13fa 100644
--- a/pkgs/development/libraries/psol/generic.nix
+++ b/pkgs/development/libraries/psol/generic.nix
@@ -3,7 +3,7 @@
 { inherit version; } // fetchzip {
   inherit sha256;
   name   = "psol-${version}";
-  url    = "https://dl.google.com/dl/page-speed/psol/${version}.tar.gz";
+  url    = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
 
   meta = {
     description = "PageSpeed Optimization Libraries";
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index a6fe4942d53d..36d0ea6b1e88 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -153,7 +153,7 @@
         owner  = "pagespeed";
         repo   = "ngx_pagespeed";
         rev    = "v${version}-beta";
-        sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9";
+        sha256 = "176skx7zmi7islc1hmdxcynix4lkvgmr78lknn13s9gskc7qi25w";
       };
 
       ngx_pagespeed = pkgs.runCommand
@@ -172,6 +172,7 @@
         '';
     in {
       src = ngx_pagespeed;
+      inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
     };
 
     shibboleth = {