public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119798 from yorickvP/mv-oauth2_proxy

This commit is contained in:
Sandro 2021-04-20 21:49:50 +02:00 committed by GitHub
parent 4725fcc93e 279c7d43ee
commit 6a5576e420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/security/oauth2_proxy.nix
View File

@ -90,10 +90,10 @@ in
package = mkOption {
type = types.package;
default = pkgs.oauth2_proxy;
defaultText = "pkgs.oauth2_proxy";
default = pkgs.oauth2-proxy;
defaultText = "pkgs.oauth2-proxy";
description = ''
The package that provides oauth2_proxy.
The package that provides oauth2-proxy.
'';
};

0
pkgs/servers/oauth2_proxy/default.nix → pkgs/servers/oauth2-proxy/default.nix
View File

1
pkgs/top-level/aliases.nix
View File

@ -475,6 +475,7 @@ mapAliases ({
nologin = shadow; # added 2018-04-25
nxproxy = nx-libs; # added 2019-02-15
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18
opencascade_oce = opencascade; # added 2018-04-25
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
opencl-icd = ocl-icd; # added 2017-01-20

2
pkgs/top-level/all-packages.nix
View File

@ -18741,7 +18741,7 @@ in
nsq = callPackage ../servers/nsq { };
oauth2_proxy = callPackage ../servers/oauth2_proxy {
oauth2-proxy = callPackage ../servers/oauth2-proxy {
buildGoModule = buildGo115Module;
};