diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-05-31 15:53:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 15:53:49 +0100 |
| commit | ab98a6e1091b9714303fb22e33a9e05bd7bab281 (patch) | |
| tree | 7d5f1f6f8fe13839a183368b3e6b84c267d5b84e | |
| parent | 1293a26299eaa825f2ba7a10b731d9f7de6a7d3e (diff) | |
| parent | b9fd21fe40f2cd380a57ce91d9cf2967de5d51bd (diff) | |
Merge pull request #125057 from NixOS/backport-124730-to-release-21.05
[Backport release-21.05] morph: 1.5.0 -> 1.6.0
| -rw-r--r-- | pkgs/tools/package-management/morph/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 61e4a897f48d1..56d824059f532 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -1,18 +1,17 @@ -{ buildGoPackage, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: +{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "morph"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20"; + sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8"; }; - goPackagePath = "github.com/dbcdk/morph"; - goDeps = ./deps.nix; + vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; nativeBuildInputs = [ makeWrapper go-bindata ]; @@ -28,7 +27,7 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib - cp -v go/src/$goPackagePath/data/*.nix $lib + cp -v ./data/*.nix $lib wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; |