diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:11 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:35 +0100 |
| commit | 0be87c79797a5fa384fbc356c74ed54f9f7829ea (patch) | |
| tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /pkgs/tools/security | |
| parent | ac241fb7a570d6cf81d229ad22a8889602639160 (diff) | |
| download | nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.gz nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.bz2 nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.lz nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.xz nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.zst nixpkgs-0be87c79797a5fa384fbc356c74ed54f9f7829ea.zip | |
Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/sequoia/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/sudo/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 75fc66647e8..21403225aad 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.13.0"; + version = "0.11.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "0hxdjzd2qjwf9pbnkzrnzlg0xa8vf1f65aryq7pd9895bpnk7740"; + sha256 = "1k0pr3vn77fpfzyvbg7xb4jwm6srsiws9bsd8q7i3hl6j56a880i"; }; - cargoSha256 = "0w968ynxqkznp9g1ah040iv6ghwqwqjk1cjlr2f0j5fs57rspzf2"; + cargoSha256 = "15bhg7b88rq8p0bn6y5wwv2l42kqb1qyx2s3kw0r0v0wadf823q3"; nativeBuildInputs = [ pkgconfig diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 842509888b4..71a71be9147 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.8.31"; + version = "1.8.30"; src = fetchurl { url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; - sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y"; + sha256 = "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3"; }; prePatch = '' |