diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index c29d8684c90..099b06c078d 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "cointop"; version = "1.3.4"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n"; }; - modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg"; + goPackagePath = "github.com/miguelmota/cointop"; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index a69dc8890a7..aaf183ad666 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "kubeless"; version = "1.0.4"; @@ -10,7 +10,8 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; }; - modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd"; + + goPackagePath = "github.com/kubeless/kubeless"; subPackages = [ "cmd/kubeless" ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa0870ea858..5e9945492de 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "rclone"; version = "1.49.3"; @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa"; }; - modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; + goPackagePath = "github.com/rclone/rclone"; subPackages = [ "." ]; - outputs = [ "out" "man" ]; + outputs = [ "bin" "out" "man" ]; postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 261ae3317f2..f2d87fd69dd 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.8.0"; @@ -11,21 +11,12 @@ buildGoModule rec { sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; }; - modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7"; - - patches = [ - (fetchpatch { - # Build fails on v2.8.0 with go 1.13 due to invalid dependency version: - # go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z) - # TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release. - url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch"; - sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj"; - }) - ]; + goPackagePath = "github.com/git-lfs/git-lfs"; subPackages = [ "." ]; preBuild = '' + cd go/src/${goPackagePath} go generate ./commands ''; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 7a3d7882715..b8026a9f885 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoPackage rec { pname = "golangci-lint"; version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; @@ -14,8 +14,6 @@ buildGoModule rec { sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac"; }; - modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6"; - meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index cb127906c0b..b1a51a77144 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "elfinfo"; version = "0.7.6"; @@ -12,8 +12,6 @@ buildGoModule rec { sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9"; }; - modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf"; - meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; homepage = https://elfinfo.roboticoverlords.org/; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 7a3ccaa9fbc..b9b1f83322d 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "mkcert"; version = "1.4.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7"; }; - modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd"; + goPackagePath = "github.com/FiloSottile/mkcert"; meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 21aa31d6235..799b73294e8 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "dex"; version = "2.17.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn"; }; - modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi"; + goPackagePath = "github.com/dexidp/dex"; subPackages = [ "cmd/dex" @@ -22,8 +22,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share - cp -r $src/web $out/share/web + mkdir -p $bin/share + cp -r $src/web $bin/share/web ''; meta = with lib; { diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 1445d0b523c..df3022536ea 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "miniflux"; version = "2.0.17"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm"; }; - modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr"; + goPackagePath = "miniflux.app"; doCheck = true; @@ -20,7 +20,7 @@ buildGoModule rec { ''; postInstall = '' - mv $out/bin/miniflux.app $out/bin/miniflux + mv $bin/bin/miniflux.app $bin/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index f53ef4a16fa..923344c6411 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "certigo"; version = "1.11.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b"; }; - modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj"; + goPackagePath = "github.com/square/certigo"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 1b578628caf..80b90e8e6b2 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,8 +1,8 @@ -{ buildGoModule, fetchFromGitHub, lib +{ buildGoPackage, fetchFromGitHub, lib , wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm }: -buildGoModule rec { +buildGoPackage rec { pname = "wallutils"; version = "5.8.2"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh"; }; - modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah"; + goPackagePath = "github.com/xyproto/wallutils"; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 9ee494e1f86..3d9111b6a61 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "lazydocker"; version = "0.7.4"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6"; }; - modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y"; + goPackagePath = "github.com/jesseduffield/lazydocker"; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 7620fc9760d..4d47e5d4134 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -buildGoModule rec { +buildGoPackage rec { pname = "vault"; version = "1.2.3"; @@ -11,7 +11,9 @@ buildGoModule rec { sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8"; }; - modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; + goPackagePath = "github.com/hashicorp/vault"; + + subPackages = [ "." ]; buildFlagsArray = [ "-tags='vault'" @@ -19,8 +21,8 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + mkdir -p $bin/share/bash-completion/completions + echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 0a2b7ab4f3b..3f23624071f 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule { +buildGoPackage rec { pname = "SystemdJournal2Gelf-unstable"; version = "20190702"; @@ -8,10 +8,11 @@ buildGoModule { rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; + sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv"; + fetchSubmodules = true; }; - modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; + goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index b73015dd19f..308f893e73b 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "vale"; version = "1.7.1"; @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m"; }; - modSha256 = "0av728w22rrlw2030d09q5dz9ks58p3n4g1hx4xcs0gi33sdsdb8"; + goPackagePath = "github.com/errata-ai/vale"; meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/;