diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
| commit | 03de4c02fbd35d1b730ba0957f71df9a7a82bacf (patch) | |
| tree | 78ed2f7dfa2efae85c9a76dd53320d875a8ff678 /pkgs/tools/package-management/morph/default.nix | |
| parent | 99d25675152f30caf6354db93f01fac87f640c8f (diff) | |
| parent | e27e3ae169d4ac64856befb6bbf044f2153e337d (diff) | |
| download | nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.gz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.bz2 nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.lz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.xz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.zst nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/package-management/morph/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/morph/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 130bf2bb2e5f..5ae4f5731ba7 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "morph"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "1y6clzi8sfnrv4an26b44r24nnxds1kj9aw3lmjbgxl9yrxxsj1k"; + sha256 = "064ccvvq4yk17jy5jvi1nxfp5ajvnvn2k4zvh9v0n3ragcl3rd20"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -22,13 +22,13 @@ buildGoPackage rec { main.version=${version} ''; - prePatch = '' + postPatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; postInstall = '' mkdir -p $lib - cp -v $src/data/*.nix $lib + cp -v go/src/$goPackagePath/data/*.nix $lib wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; |