Revert "Revert "Merge master into staging-next""

In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
This commit is contained in:
Frederik Rietdijk
2020-02-05 19:41:25 +01:00
parent 873e6a4e65
commit 419bc0a4cd
28 changed files with 297 additions and 422 deletions
+3 -3
View File
@@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
version = "0.11.0";
version = "0.13.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = pname;
rev = "v${version}";
sha256 = "1k0pr3vn77fpfzyvbg7xb4jwm6srsiws9bsd8q7i3hl6j56a880i";
sha256 = "0hxdjzd2qjwf9pbnkzrnzlg0xa8vf1f65aryq7pd9895bpnk7740";
};
cargoSha256 = "15bhg7b88rq8p0bn6y5wwv2l42kqb1qyx2s3kw0r0v0wadf823q3";
cargoSha256 = "0w968ynxqkznp9g1ah040iv6ghwqwqjk1cjlr2f0j5fs57rspzf2";
nativeBuildInputs = [
pkgconfig