Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 74f2559a69fb
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41aa2272feb2
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Jun 18, 2020

  1. tendermint: 0.32.3 -> 0.32.10 

    (cherry picked from commit ce4e6b8)
    @r-ryantm @alexfmpe
    r-ryantm authored and alexfmpe committed Jun 18, 2020
    Copy the full SHA
    7ccfe75 View commit details

Commits on Jul 5, 2020

  1. roundcube: 1.4.6 -> 1.4.7 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.7
(cherry picked from commit d4cf52c)
    @Ma27
    Ma27 committed Jul 5, 2020
    Copy the full SHA
    1d56d73 View commit details

  2. Merge pull request #91041 from alexfmpe/backport-tendermint-0.32.10 

    [20.03] tendermint: 0.32.3 -> 0.32.10 for security fixes
    @bhipple
    bhipple authored Jul 5, 2020
    Copy the full SHA
    41aa227 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/servers/roundcube/default.nix
  2. +4 −4 pkgs/tools/networking/tendermint/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.4.6";
version = "1.4.7";

src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm";
sha256 = "1jdcda6102n948l6qzhjsiylnmx5fkgjg2hn17g93x3yzwkmvn16";
};

patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
8 changes: 4 additions & 4 deletions pkgs/tools/networking/tendermint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

buildGoModule rec {
pname = "tendermint";
version = "0.32.3";
version = "0.32.10";

src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr";
sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg";
};

modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a";
modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r";

meta = with stdenv.lib; {
description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
homepage = https://tendermint.com/;
homepage = "https://tendermint.com/";
license = licenses.asl20;
maintainers = with maintainers; [ alexfmpe ];
platforms = platforms.linux ++ platforms.darwin;