From 61ac7bd917fb86aca9aed6490c18a7e27016e9fe Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 11 Jul 2019 02:18:42 +0800 Subject: [PATCH] dex-oidc: 2.16.0 -> 2.17.0 (#64592) --- pkgs/servers/dex/default.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 1f9c2c9cb77..21aa31d6235 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,36 +1,36 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dex"; - version = "2.16.0"; - - goPackagePath = "github.com/dexidp/dex"; + version = "2.17.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "dexidp"; repo = pname; - sha256 = "0w8nl7inqp4grbaq320dgynmznbrln8vihd799dwb2cx86laxsi1"; + rev = "v${version}"; + sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; }; + modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi"; + subPackages = [ "cmd/dex" ]; buildFlagsArray = [ - "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}" + "-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' mkdir -p $out/share - cp -r go/src/${goPackagePath}/web $out/share/web + cp -r $src/web $out/share/web ''; - meta = { + meta = with lib; { description = "OpenID Connect and OAuth2 identity provider with pluggable connectors"; - license = lib.licenses.asl20; - homepage = https://github.com/dexidp/dex; - maintainers = with lib.maintainers; [benley]; - platforms = lib.platforms.unix; + homepage = "https://github.com/dexidp/dex"; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; }