Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99d96a7db1f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b5925f2189d
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on May 27, 2020

  1. vorta: 0.6.24 -> 0.6.26 

    https://github.com/borgbase/vorta/releases/tag/v0.6.26
    @Ma27
    Ma27 committed May 27, 2020
    Copy the full SHA
    440f352 View commit details

  2. cargo-make: 0.30.7 -> 0.30.8 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.30.8
    @Ma27
    Ma27 committed May 27, 2020
    Copy the full SHA
    45e53a7 View commit details

  3. mautrix-whatsapp: 2020-05-21 -> 2020-05-27

    @Ma27
    Ma27 committed May 27, 2020
    Copy the full SHA
    1b5925f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/backup/vorta/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

buildPythonApplication rec {
pname = "vorta";
version = "0.6.24";
version = "0.6.26";

src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z";
sha256 = "189kzwdmissg9142cd7wvxa1rvc2y7lysgr7if99zc7ks59mv6dq";
};

postPatch = ''
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.30.7";
version = "0.30.8";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "0i8jf3161qqazp8cy3kzn2cw7zrcv1ijf2w3s8d8l0y2i2b25cv1";
sha256 = "0sx1kvrk2df5v9f35cd6201b3m8d6ynppmikqm00g55db9r4vfl2";
};
in
runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "08mn1ckvyffys9wqnvva7w1qzvarqvmnkpliv118vnnr072jnc6y";
cargoSha256 = "1b0x12hcjy061dvbpy5cwgp6pwlzq2k1dapr9glw8dwprns57ar7";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
20 changes: 16 additions & 4 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,30 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-05-21";
version = "2020-05-27";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "b4949eec5982643502bb9787cf5e2872a78807c1";
sha256 = "1hjqxqfza6r7fsxr4fgwhfdwjzligxk416692xi4pavd5krfxxmd";
rev = "7cf19b0908dec6cb8239aebc3f79ee88dccbfc51";
sha256 = "14cadqvbcjd9vp6dix3jzn0l071r3i9sz0lwpppgzpid8mg9zbx4";
};

buildInputs = [ olm ];

vendorSha256 = "0ix65b48cpx6vkqmjizzij7zl8h2kjkfsa0s42vnmjdlmsv7yn42";
vendorSha256 = "01psqvxkf13had7gkg1cbzf2flac4a6ivlb7vfzw7s50vhwkb95d";

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
'';
};

meta = with stdenv.lib; {
homepage = "https://github.com/tulir/mautrix-whatsapp";