diff options
| author | Johan Thomsen <jth@dbc.dk> | 2020-05-27 14:49:33 +0200 |
|---|---|---|
| committer | Johan Thomsen <jth@dbc.dk> | 2020-05-27 14:49:33 +0200 |
| commit | 6448b903aa79fb1330236e8c6835ce9caa12bcb8 (patch) | |
| tree | 2bee06a7acd1c610ab8e6ab6c67dc9c2ccfdda17 | |
| parent | 7978a7e90bc4d80789fece96425a504e8f4b3af6 (diff) | |
| download | nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar.gz nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar.bz2 nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar.lz nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar.xz nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.tar.zst nixpkgs-6448b903aa79fb1330236e8c6835ce9caa12bcb8.zip | |
morph: 1.4.0 -> 1.5.0
also; make package more patchable by delaying to postPatch and not referring to $src
| -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 130bf2bb2e5..5ae4f5731ba 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 fdae5ef39ee..4da6f0278b7 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 |