diff options
author | Marek Mahut <marek.mahut@gmail.com> | 2020-05-27 20:51:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 20:51:46 +0200 |
commit | a9ecd36dcbd9ba890c6020b44440921dc7e0889f (patch) | |
tree | c8c693e62bc89bf8c57c00fd4320b36d7defa8b4 | |
parent | de700262d0bbae103cd478f3737d4c52073a1119 (diff) | |
parent | 6448b903aa79fb1330236e8c6835ce9caa12bcb8 (diff) | |
download | nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar.gz nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar.bz2 nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar.lz nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar.xz nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.tar.zst nixlib-a9ecd36dcbd9ba890c6020b44440921dc7e0889f.zip |
Merge pull request #89020 from johanot/morph-improvements
morph: 1.4.0 -> 1.5.0
-rw-r--r-- | pkgs/tools/package-management/morph/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/package-management/morph/deps.nix | 2 |
2 files changed, 5 insertions, 5 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 ]}; ''; diff --git a/pkgs/tools/package-management/morph/deps.nix b/pkgs/tools/package-management/morph/deps.nix index fdae5ef39ee2..4da6f0278b79 100644 --- a/pkgs/tools/package-management/morph/deps.nix +++ b/pkgs/tools/package-management/morph/deps.nix @@ -63,4 +63,4 @@ sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; }; } -] +] \ No newline at end of file |