diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-22 11:32:03 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-05-22 16:40:00 +0200 |
| commit | 5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a (patch) | |
| tree | 4ad5e1a821e0e5eec5ca913666211c8652c4d4f7 /pkgs/servers/mautrix-whatsapp | |
| parent | 7857634d3feb4a98720630cb8ba232ea8b65930a (diff) | |
| download | nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar.gz nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar.bz2 nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar.lz nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar.xz nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.tar.zst nixpkgs-5cdc8f4818b8ce758d7d5c8b18b87994183c3e1a.zip | |
mautrix-whatsapp: 2020-04-21-1 -> 2020-05-21
Diffstat (limited to 'pkgs/servers/mautrix-whatsapp')
| -rw-r--r-- | pkgs/servers/mautrix-whatsapp/default.nix | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index dea3d7b1b23..1ee491acebe 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,32 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, olm }: -let -webp = fetchFromGitHub { - owner = "chai2010"; - repo = "webp"; - rev = "19c584e49a98c31e2138c82fd0108435cd80d182"; - sha256 = "1bqf1ifsfw5dwvnc9vl3dhp775qv5hgl34219lvnja0bj6pq5zks"; -}; -in buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-21-1"; + version = "2020-05-21"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "e0aea74abf090bc9dc499332b28bf03640c162f8"; - sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; + rev = "b4949eec5982643502bb9787cf5e2872a78807c1"; + sha256 = "1hjqxqfza6r7fsxr4fgwhfdwjzligxk416692xi4pavd5krfxxmd"; }; - vendorSha256 = "0j397zyjs7v5q2jjd3l0wz4lh1fh45whgxjp7cwgc332ch9j2010"; + buildInputs = [ olm ]; - overrideModAttrs = (_: { - postBuild = '' - rm -r vendor/github.com/chai2010/webp - cp -r --reflink=auto ${webp} vendor/github.com/chai2010/webp - ''; - }); + vendorSha256 = "0ix65b48cpx6vkqmjizzij7zl8h2kjkfsa0s42vnmjdlmsv7yn42"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; @@ -34,4 +21,4 @@ buildGoModule { license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; }; -} \ No newline at end of file +} |