From a47124da9e3ca020f8849e4f955f1e98b73d2195 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 25 Apr 2019 23:32:54 +0200
Subject: [PATCH] oauth2_proxy: 20180325 -> 3.2.0

after bitly repo was frozen, pusher is now the official hard fork
https://github.com/bitly/oauth2_proxy/issues/628
---
 pkgs/servers/oauth2_proxy/default.nix |  17 ++-
 pkgs/servers/oauth2_proxy/deps.nix    | 158 +++++++++++++++++---------
 2 files changed, 114 insertions(+), 61 deletions(-)

diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix
index d9919005e39..2de69d5d967 100644
--- a/pkgs/servers/oauth2_proxy/default.nix
+++ b/pkgs/servers/oauth2_proxy/default.nix
@@ -1,24 +1,23 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "oauth2_proxy-${version}";
-  version = "20180325-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b";
+  pname = "oauth2_proxy";
+  version = "3.2.0";
   
-  goPackagePath = "github.com/bitly/oauth2_proxy";
+  goPackagePath = "github.com/pusher/${pname}";
 
   src = fetchFromGitHub {
-    inherit rev;
-    repo = "oauth2_proxy";
-    owner = "bitly";
-    sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217";
+    repo = pname;
+    owner = "pusher";
+    sha256 = "0k73ggyh12g2vzjq91i9d3bxbqfvh5k6njzza1lvkzasgp07wisg";
+    rev = "v${version}";
   };
 
   goDeps = ./deps.nix;
 
   meta = with lib; {
     description = "A reverse proxy that provides authentication with Google, Github or other provider";
-    homepage = https://github.com/bitly/oauth2_proxy/;
+    homepage = https://github.com/pusher/oauth2_proxy/;
     license = licenses.mit;
     maintainers = [ maintainers.yorickvp ];
   };
diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix
index 435c7d12782..dd10ab28668 100644
--- a/pkgs/servers/oauth2_proxy/deps.nix
+++ b/pkgs/servers/oauth2_proxy/deps.nix
@@ -1,129 +1,183 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "cloud.google.com/go";
+    goPackagePath  = "cloud.google.com/go";
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/gocloud";
-      rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da";
-      sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5";
+      rev =  "2d3a6656c17a60b0815b7e06ab0be04eacb6e613";
+      sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq";
     };
   }
   {
-    goPackagePath = "github.com/BurntSushi/toml";
+    goPackagePath  = "github.com/BurntSushi/toml";
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
-      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+      rev =  "b26d9c308763d68093482582cea63d69be07a0f0";
+      sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
     };
   }
   {
-    goPackagePath = "github.com/bitly/go-simplejson";
+    goPackagePath  = "github.com/bitly/go-simplejson";
     fetch = {
       type = "git";
       url = "https://github.com/bitly/go-simplejson";
-      rev = "0c965951289cce37dec52ad1f34200fefc816777";
-      sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3";
+      rev =  "aabad6e819789e569bd6aabf444c935aa9ba1e44";
+      sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj";
     };
   }
   {
-    goPackagePath = "github.com/coreos/go-oidc";
+    goPackagePath  = "github.com/coreos/go-oidc";
     fetch = {
       type = "git";
       url = "https://github.com/coreos/go-oidc";
-      rev = "065b426bd41667456c1a924468f507673629c46b";
-      sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6";
+      rev =  "77e7f2010a464ade7338597afe650dfcffbe2ca8";
+      sha256 = "0mh8fa7al9gfzx4k7rd623bpy14s06s96iz6lbf6psi5q2bnbs2r";
     };
   }
   {
-    goPackagePath = "github.com/mbland/hmacauth";
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "1e59b77b52bf8e4b449a57e6f79f21226d571845";
+      sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mbland/hmacauth";
     fetch = {
       type = "git";
       url = "https://github.com/mbland/hmacauth";
-      rev = "44256dfd4bfa7594cfa73587a464ca890e85971a";
-      sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1";
+      rev =  "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb";
+      sha256 = "1zd9r8znhkxyl997lhjk8nrlxlfv5s1hn7ql87wrcyvlsszx3mzh";
     };
   }
   {
-    goPackagePath = "github.com/mreiferson/go-options";
+    goPackagePath  = "github.com/mreiferson/go-options";
     fetch = {
       type = "git";
       url = "https://github.com/mreiferson/go-options";
-      rev = "77551d20752b54535462404ad9d877ebdb26e53d";
-      sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj";
+      rev =  "20ba7d382d05facb01e02eb777af0c5f229c5c95";
+      sha256 = "1vdz3wqkj885a0jkggaygl4k6k8b94fpspywr26snm4xnb8vgxsf";
     };
   }
   {
-    goPackagePath = "github.com/pquerna/cachecontrol";
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pquerna/cachecontrol";
     fetch = {
       type = "git";
       url = "https://github.com/pquerna/cachecontrol";
-      rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520";
-      sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3";
+      rev =  "0dec1b30a0215bb68605dfc568e8855066c9202d";
+      sha256 = "14yyfhrv60rvb983rqm7s916nwvn9kcmbvnrcna2md0s3mkzs3yh";
     };
   }
   {
-    goPackagePath = "golang.org/x/crypto";
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
+      sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/yhat/wsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/yhat/wsutil";
+      rev =  "1d66fa95c997864ba4d8479f56609620fe542928";
+      sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "88942b9c40a4c9d203b82b3731787b672d6e809b";
-      sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw";
+      rev =  "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94";
+      sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "6078986fec03a1dcc236c34816c71b0e05018fda";
-      sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb";
+      rev =  "9dfe39835686865bff950a07b394c12a98ddc811";
+      sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a";
     };
   }
   {
-    goPackagePath = "golang.org/x/oauth2";
+    goPackagePath  = "golang.org/x/oauth2";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/oauth2";
-      rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb";
-      sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww";
+      rev =  "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402";
+      sha256 = "035v5w1nad6r1l22cj6f73zzr6qi4jgq71yjywf2c6rvsa5147r2";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835";
-      sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/api";
+    goPackagePath  = "google.golang.org/api";
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/google-api-go-client";
-      rev = "e4126357c891acdef6dcd7805daa4c6533be6544";
-      sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n";
+      rev =  "8791354e7ab150705ede13637a18c1fcc16b62e8";
+      sha256 = "0ps7y4m9787wvkqwrwqyb4nmmibhrihmg7xqh7sba2cyj397wngm";
     };
   }
   {
-    goPackagePath = "gopkg.in/fsnotify.v1";
+    goPackagePath  = "google.golang.org/appengine";
     fetch = {
       type = "git";
-      url = "https://gopkg.in/fsnotify/fsnotify.v1";
-      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+      url = "https://github.com/golang/appengine";
+      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
+      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
     };
   }
   {
-    goPackagePath = "gopkg.in/square/go-jose.v2";
+    goPackagePath  = "gopkg.in/fsnotify/fsnotify.v1";
     fetch = {
       type = "git";
-      url = "https://gopkg.in/square/go-jose.v2";
-      rev = "552e98edab5d620205ff1a8960bf52a5a10aad03";
-      sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6";
+      sha256 = "0470dznkcbabncskgr8hfilpj5w24ygg455pyggbfbssmfv1m9gg";
     };
   }
-]
+  {
+    goPackagePath  = "gopkg.in/square/go-jose.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/square/go-jose";
+      rev =  "f8f38de21b4dcd69d0413faf231983f5fd6634b1";
+      sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa";
+    };
+  }
+]
\ No newline at end of file