diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-09-22 16:36:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 16:36:54 +0100 |
| commit | 17bf171b13121d1502f1a0959adef53eeec2e214 (patch) | |
| tree | 18fe211593b4598312e53b3ecf5b09b147df2e20 /pkgs/servers | |
| parent | 31e89df52a5f5e514e9badfd1570a8c114611cef (diff) | |
| parent | 9e968db302ebf3b4503a70cf202ba3aebf6d2649 (diff) | |
Merge pull request #69229 from marsam/use-buildGoPackage
treewide: use buildGoPackage in packages which vendor dependencies
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dex/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/miniflux/default.nix | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 21aa31d6235..799b73294e8 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "dex"; version = "2.17.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; }; - modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi"; + goPackagePath = "github.com/dexidp/dex"; subPackages = [ "cmd/dex" @@ -22,8 +22,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share - cp -r $src/web $out/share/web + mkdir -p $bin/share + cp -r $src/web $bin/share/web ''; meta = with lib; { diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 1445d0b523c..df3022536ea 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "miniflux"; version = "2.0.17"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm"; }; - modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; + goPackagePath = "miniflux.app"; doCheck = true; @@ -20,7 +20,7 @@ buildGoModule rec { ''; postInstall = '' - mv $out/bin/miniflux.app $out/bin/miniflux + mv $bin/bin/miniflux.app $bin/bin/miniflux ''; meta = with stdenv.lib; { |