summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Zielinski <jozi@dbc.dk>2022-04-22 08:39:48 +0200
committerJonathan Zielinski <jozi@dbc.dk>2022-05-06 07:31:12 +0200
commitd704edb7751e20e3dccbfcee59608bfe53c4d5f4 (patch)
treece654bf6f1791846904cbd80ed1017ddcd1106c6
parenteed65357919870061fba1fb6a70756041903f42b (diff)
downloadnixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar.gz
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar.bz2
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar.lz
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar.xz
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.tar.zst
nixpkgs-d704edb7751e20e3dccbfcee59608bfe53c4d5f4.zip
morph: 1.6.0 -> 1.7.0
-rw-r--r--pkgs/tools/package-management/morph/default.nix13
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index e7b6b3adf1f..b8810ad36df 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -1,28 +1,25 @@
-{ buildGoModule, fetchFromGitHub, go-bindata, openssh, makeWrapper, lib }:
+{ buildGoModule, fetchFromGitHub, lib, makeWrapper, openssh }:
 
 buildGoModule rec {
   pname = "morph";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "dbcdk";
     repo = "morph";
     rev = "v${version}";
-    sha256 = "0aibs4gsb9pl21nd93bf963kdzf0661qn0liaw8v8ak2xbz7nbs8";
+    sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg=";
   };
 
   vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9";
 
-  nativeBuildInputs = [ makeWrapper go-bindata ];
+  nativeBuildInputs = [ makeWrapper ];
 
   ldflags = [
     "-X main.version=${version}"
+    "-X main.assetRoot=${placeholder "lib"}"
   ];
 
-  postPatch = ''
-    go-bindata -pkg assets -o assets/assets.go data/
-  '';
-
   postInstall = ''
     mkdir -p $lib
     cp -v ./data/*.nix $lib