Unverified Commit b4dd10a3 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #38857 from yorickvP/oauth2_proxy 

oauth2_proxy: 20160120 -> 20180325
parents 6bb609d6 441126c3

pkgs/servers/oauth2_proxy/default.nix

+14 −6
Original line number Diff line number Diff line 
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

{ stdenv, lib, buildGoPackage, fetchFromGitHub }:



buildGoPackage rec {

  name = "oauth2_proxy-${version}";

  version = "20160120-${stdenv.lib.strings.substring 0 7 rev}";

  rev = "10f47e325b782a60b8689653fa45360dee7fbf34";

  version = "20180325-${stdenv.lib.strings.substring 0 7 rev}";

  rev = "a94b0a8b25e553f7333f7b84aeb89d9d18ec259b";

  

  goPackagePath = "github.com/bitly/oauth2_proxy";



  src = fetchgit {

  src = fetchFromGitHub {

    inherit rev;

    url = "https://github.com/bitly/oauth2_proxy";

    sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";

    repo = "oauth2_proxy";

    owner = "bitly";

    sha256 = "07m258s9fxjsgixggw0d1zicd7l6l2rkm5mh3zdjdaj20sqcj217";

  };



  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/;

    license = licenses.mit;

    maintainers = [ maintainers.yorickvp ];

  };

}

pkgs/servers/oauth2_proxy/deps.nix

+76 −30
Original line number Diff line number Diff line 
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1

[

  {

    goPackagePath = "gopkg.in/fsnotify.v1";

    goPackagePath = "cloud.google.com/go";

    fetch = {

      type = "git";

      url = "https://gopkg.in/fsnotify.v1";

      rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0";

      sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2";

      url = "https://code.googlesource.com/gocloud";

      rev = "d27f27d9b3cf75c9901d9981f9af50bbfd9002da";

      sha256 = "18vdhkymm4cqh5fjyz0ia0bc2mpmarjk6w6zh9ydm2d4nkj36cm5";

    };

  }

  {

    goPackagePath = "golang.org/x/net";

    goPackagePath = "github.com/BurntSushi/toml";

    fetch = {

      type = "git";

      url = "https://go.googlesource.com/net";

      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";

      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";

      url = "https://github.com/BurntSushi/toml";

      rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";

      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";

    };

  }

  {
@@ -22,17 +23,26 @@ 
    fetch = {

      type = "git";

      url = "https://github.com/bitly/go-simplejson";

      rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";

      sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy";

      rev = "0c965951289cce37dec52ad1f34200fefc816777";

      sha256 = "0ys37wshd430dizzbg39x5mw55daih2q4qj5l9gr3qbmq9qdn0f3";

    };

  }

  {

    goPackagePath = "github.com/BurntSushi/toml";

    goPackagePath = "github.com/coreos/go-oidc";

    fetch = {

      type = "git";

      url = "https://github.com/BurntSushi/toml";

      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";

      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";

      url = "https://github.com/coreos/go-oidc";

      rev = "065b426bd41667456c1a924468f507673629c46b";

      sha256 = "10xhrh70rccgydi708dc9xl4ivmjnzhh1skd1ij6xl1i3x8lk3g6";

    };

  }

  {

    goPackagePath = "github.com/mbland/hmacauth";

    fetch = {

      type = "git";

      url = "https://github.com/mbland/hmacauth";

      rev = "44256dfd4bfa7594cfa73587a464ca890e85971a";

      sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1";

    };

  }

  {
@@ -40,26 +50,35 @@ 
    fetch = {

      type = "git";

      url = "https://github.com/mreiferson/go-options";

      rev = "7c174072188d0cfbe6f01bb457626abb22bdff52";

      sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";

      rev = "77551d20752b54535462404ad9d877ebdb26e53d";

      sha256 = "02c18zrx038gbas58l90xzsz9m5q3gpjprdcwmnvxsn0zvld0vpj";

    };

  }

  {

    goPackagePath = "google.golang.org/api";

    goPackagePath = "github.com/pquerna/cachecontrol";

    fetch = {

      type = "git";

      url = "https://code.googlesource.com/google-api-go-client";

      rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";

      sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";

      url = "https://github.com/pquerna/cachecontrol";

      rev = "525d0eb5f91d30e3b1548de401b7ef9ea6898520";

      sha256 = "13r6qz9pghy9fapps5h9mhblggnjq2nfxysvf2jp4scanc5vw2y3";

    };

  }

  {

    goPackagePath = "google.golang.org/cloud";

    goPackagePath = "golang.org/x/crypto";

    fetch = {

      type = "git";

      url = "https://code.googlesource.com/gocloud";

      rev = "6335269abf9002cf5a84613c13cda6010842b834";

      sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf";

      url = "https://go.googlesource.com/crypto";

      rev = "88942b9c40a4c9d203b82b3731787b672d6e809b";

      sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw";

    };

  }

  {

    goPackagePath = "golang.org/x/net";

    fetch = {

      type = "git";

      url = "https://go.googlesource.com/net";

      rev = "6078986fec03a1dcc236c34816c71b0e05018fda";

      sha256 = "0qbl17mzpq7anwyzy6hdvxqk7f6q2xlm6f9dknkwlszfd4id2fwb";

    };

  }

  {
@@ -67,17 +86,44 @@ 
    fetch = {

      type = "git";

      url = "https://go.googlesource.com/oauth2";

      rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";

      sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";

      rev = "fdc9e635145ae97e6c2cb777c48305600cf515cb";

      sha256 = "0pznj7pb2rjar005dvppimdynarm8smj6vnqz9wvd9fxyn0q0yww";

    };

  }

  {

    goPackagePath = "golang.org/x/sys";

    fetch = {

      type = "git";

      url = "https://go.googlesource.com/sys";

      rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835";

      sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk";

    };

  }

  {

    goPackagePath = "google.golang.org/api";

    fetch = {

      type = "git";

      url = "https://code.googlesource.com/google-api-go-client";

      rev = "e4126357c891acdef6dcd7805daa4c6533be6544";

      sha256 = "19c874pr7vhhiyw7zn6v625g8i70gqzi3rr645kai6pnd1w7s27n";

    };

  }

  {

    goPackagePath = "gopkg.in/fsnotify.v1";

    fetch = {

      type = "git";

      url = "https://gopkg.in/fsnotify/fsnotify.v1";

      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";

      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";

    };

  }

  {

    goPackagePath = "github.com/18F/hmacauth";

    goPackagePath = "gopkg.in/square/go-jose.v2";

    fetch = {

      type = "git";

      url = "https://github.com/18F/hmacauth";

      rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd";

      sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1";

      url = "https://gopkg.in/square/go-jose.v2";

      rev = "552e98edab5d620205ff1a8960bf52a5a10aad03";

      sha256 = "03w6rgxkvdv3vcfr23s6wbck431w7dwnw0jy7qnyl0qihxzn40rv";

    };

  }

]