diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-07-31 15:16:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 15:16:47 +1000 |
| commit | e703f3f34bb36590004c38143022dac29ead0257 (patch) | |
| tree | 8c2a272827f488ac5fc809d3ac4fb430df22a7f6 /pkgs/servers | |
| parent | baca1baa4316ff1f5fcf93aad5395052b9f37798 (diff) | |
| parent | 96908e43411c3146365de71e006303c5d70a76e3 (diff) | |
| download | nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar.gz nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar.bz2 nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar.lz nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar.xz nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.tar.zst nixpkgs-e703f3f34bb36590004c38143022dac29ead0257.zip | |
Merge pull request #89453 from c00w/vend
Add vend support to go-modules
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/blockbook/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/servers/mautrix-whatsapp/default.nix | 15 |
2 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 96feac60026..224b1490121 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -23,7 +23,8 @@ buildGoModule rec { sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; }; - vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; + runVend = true; + vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; nativeBuildInputs = [ packr pkg-config ]; @@ -36,20 +37,6 @@ buildGoModule rec { -X github.com/trezor/blockbook/common.buildDate=unknown ''; - goethereum = fetchFromGitHub { - owner = "ethereum"; - repo = "go-ethereum"; - rev = "v1.8.20"; - sha256 = "0m2q1nz6f39pyr2rk6vflkwi4ykganzwr7wndpwr9rliw0x8jgi0"; - }; - - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/ethereum/go-ethereum - cp -r --reflink=auto ${goethereum} vendor/github.com/ethereum/go-ethereum - ''; - }); - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8b4d9ea5539..73db7b96b33 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -13,19 +13,8 @@ buildGoModule rec { buildInputs = [ olm ]; - vendorSha256 = "0ixfawfavv5r1d01d4gmj87vf5vv6p3f7kv4rkhfv48ys0j0437a"; - - overrideModAttrs = _: { - postBuild = '' - rm -r vendor/github.com/chai2010/webp - cp -r --reflink=auto ${fetchFromGitHub { - owner = "chai2010"; - repo = "webp"; - rev = "3da79ec3d682694d42bfd211db18fc1343c07cd7"; - sha256 = "0gh3g52vz8na153mjmxkl80g3dvrcjw77xpjs1c02vagpj9jyw46"; - }} vendor/github.com/chai2010/webp - ''; - }; + vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6"; + runVend = true; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; |