diff options
| author | Martin Milata <martin@martinmilata.cz> | 2020-06-02 01:13:56 +0200 |
|---|---|---|
| committer | Martin Milata <martin@martinmilata.cz> | 2020-06-02 01:21:55 +0200 |
| commit | 108273bc1b16a46fb44e99061d815dae9d4e6e4a (patch) | |
| tree | 8d0a1e5344937ff2dbe76df6f28e98c2e68f9e7c /pkgs/tools | |
| parent | 4a4adb273364f23ecc0cd021365d7be57987c495 (diff) | |
| download | nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar.gz nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar.bz2 nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar.lz nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar.xz nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.tar.zst nixpkgs-108273bc1b16a46fb44e99061d815dae9d4e6e4a.zip | |
verifpal: 0.7.5 -> 0.13.7
Switch from buildGoPackage to buildGoModule.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/verifpal/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/security/verifpal/deps.nix | 12 |
2 files changed, 12 insertions, 30 deletions
diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index e1e5e100bd1..a3f3132aa3c 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -1,35 +1,29 @@ { lib , fetchgit -, buildGoPackage +, buildGoModule , pigeon }: -buildGoPackage rec { +buildGoModule rec { pname = "verifpal"; - version = "0.7.5"; - - goPackagePath = "github.com/SymbolicSoft/verifpal"; - goDeps = ./deps.nix; + version = "0.13.7"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; - rev = version; - sha256 = "0njgn6j5qg5kgid6ddv23axhw5gwjbayhdjkj4ya08mnxndr284m"; + rev = "v${version}"; + sha256 = "1ia3mxwcvcxghga2vvhf6mia59cm3jl7vh8laywh421bfj42sh9d"; }; - nativeBuildInputs = [ pigeon ]; + vendorSha256 = "0cmj6h103igg5pcs9c9wrcmrsf0mwp9vbgzf5amsnj1206ryb1p2"; - postPatch = '' - sed -e 's|/bin/echo |echo |g' -i Makefile - ''; + nativeBuildInputs = [ pigeon ]; - buildPhase = '' - make -C go/src/$goPackagePath parser linux - ''; + subPackages = [ "cmd/verifpal" ]; - installPhase = '' - mkdir -p $out/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ + # goversioninfo is for Windows only and can be skipped during go generate + preBuild = '' + substituteInPlace cmd/verifpal/main.go --replace "go:generate goversioninfo" "(disabled goversioninfo)" + go generate verifpal.com/cmd/verifpal ''; meta = { diff --git a/pkgs/tools/security/verifpal/deps.nix b/pkgs/tools/security/verifpal/deps.nix deleted file mode 100644 index aaa4269416a..00000000000 --- a/pkgs/tools/security/verifpal/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "94edacc10f9b"; - sha256 = "0bhwy3rrd8mwb8xjwf44nj6vmxaj5hdvayvszr1rskkmz08l5v01"; - }; - } -] |