diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-12-05 23:41:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 23:41:15 +0100 |
| commit | bfee3a4989c93f042fb4f293c91ddb4ddb942dfb (patch) | |
| tree | e9b85a9916eb87d968dc9eea037104e933cb39d7 /pkgs/servers | |
| parent | 3af3d6bfbe747f1eac99d6798383acdf1f8a0a1f (diff) | |
| parent | 8331ba3550228286b42efc87479e50a281860349 (diff) | |
| download | nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar.gz nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar.bz2 nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar.lz nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar.xz nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.tar.zst nixpkgs-bfee3a4989c93f042fb4f293c91ddb4ddb942dfb.zip | |
Merge pull request #74743 from Ma27/bump-documize
documize-community: 3.5.0 -> 3.5.1
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/documize-community/default.nix | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index 2cc6b2a9f74..a839901e843 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -1,37 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, go-bindata-assetfs }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: -buildGoPackage rec { +buildGoModule rec { pname = "documize-community"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "1y38lgkxhyrga44wj216vl08fzyv8wbk02a85flnihrb4b1092x0"; + sha256 = "1dnb5b24x50c258fk47i7vngv28gai0mywns6nvgm3q59zyzphbj"; }; - goPackagePath = "github.com/documize/community"; + modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0"; buildInputs = [ go-bindata-assetfs go-bindata ]; - buildPhase = '' - runHook preBuild + subPackages = [ "edition/community.go" ]; - pushd go/src/github.com/documize/community - GO111MODULE=off go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize ./edition/community.go - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $bin/bin - cp go/src/github.com/documize/community/bin/documize $bin/bin - - runHook postInstall + postInstall = '' + # `buildGoModule` calls `go install` (without `go build` first), so + # `-o bin/documize` doesn't work. + mv $out/bin/community $out/bin/documize ''; meta = with lib; { |