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: 773ef5ae7833
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: 21d8e70a69f7
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 20, 2020

  1. matrix-synapse: 1.19.2 -> 1.19.3 

    https://github.com/matrix-org/synapse/releases/tag/v1.19.3
(cherry picked from commit 44c558b)
    @Ma27
    Ma27 committed Sep 20, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b11dbe View commit details

  2. fzf: 0.20.0 -> 0.21.0 

    https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0210
(cherry picked from commit da13cdb)
    @zowoq
    zowoq committed Sep 20, 2020
    Copy the full SHA
    5289f22 View commit details

  3. fzf: 0.21.0 -> 0.21.0-1 

    (cherry picked from commit 179aa6e)
    @zowoq
    zowoq committed Sep 20, 2020
    Copy the full SHA
    f3e3199 View commit details

  4. fzf: 0.21.0-1 -> 0.21.1 

    https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0211
(cherry picked from commit cc21aa9)
    @zowoq
    zowoq committed Sep 20, 2020
    Copy the full SHA
    a0b222c View commit details

  5. fzf: 0.21.1 -> 0.22.0 

    https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0220
(cherry picked from commit 6a8ca28)
    @zowoq
    zowoq committed Sep 20, 2020
    Copy the full SHA
    21d8e70 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/servers/matrix-synapse/default.nix
  2. +4 −4 pkgs/tools/misc/fzf/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.19.2";
version = "1.19.3";

src = fetchPypi {
inherit pname version;
sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj";
sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys";
};

patches = [
8 changes: 4 additions & 4 deletions pkgs/tools/misc/fzf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }:

buildGoModule rec {
pname = "fzf";
version = "0.20.0";
version = "0.22.0";

src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
sha256 = "02zy3c4k84rzqdkaf04idbj10v286hi0ix1xl2qsz1wrblh168w8";
sha256 = "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l";
};

modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143";
vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm";

outputs = [ "out" "man" ];