From d307dad7a8128080f651a8b735dbcb0438f02df1 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 18 Apr 2021 14:17:11 +0200 Subject: [PATCH 1/2] oauth2_proxy: rename to oauth2-proxy --- pkgs/servers/{oauth2_proxy => oauth2-proxy}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/servers/{oauth2_proxy => oauth2-proxy}/default.nix (100%) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix similarity index 100% rename from pkgs/servers/oauth2_proxy/default.nix rename to pkgs/servers/oauth2-proxy/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 78e7c308e7e..f85218d0eee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -466,6 +466,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad178f83a18..ed4690e73ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18714,7 +18714,7 @@ in nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { + oauth2-proxy = callPackage ../servers/oauth2-proxy { buildGoModule = buildGo115Module; }; From 279c7d43eea3c6925fb8b0a34f118270c8d6ccae Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 18 Apr 2021 14:21:38 +0200 Subject: [PATCH 2/2] nixos/oauth2_proxy: fix package name in nixos module --- nixos/modules/services/security/oauth2_proxy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 77c579279ab..e85fd4b75df 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -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. ''; };