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: f277096c4c4f
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: 1aa527111710
Choose a head ref
  • 5 commits
  • 2 files changed
  • 4 contributors

Commits on May 31, 2020

  1. cawbird: 1.0.5 -> 1.1.0 

    (cherry picked from commit 4e45534)
    @schmittlauch
    schmittlauch committed May 31, 2020
    Copy the full SHA
    44c1be5 View commit details

Commits on Jun 2, 2020

  1. wire-desktop: linux 3.17.2924 -> 3.18.2925 

    (cherry picked from commit 3e2b6b99bff59aac7e2c961802583d350106192e)
    @toonn
    toonn committed Jun 2, 2020
    Copy the full SHA
    bf8b946 View commit details

  2. wire-desktop: mac 3.17.3666 -> 3.18.3728 

    (cherry picked from commit 9535a4370b08175947ea06871c3f548dbb6aa94b)
    @toonn
    toonn committed Jun 2, 2020
    Copy the full SHA
    4606ae3 View commit details

Commits on Jun 6, 2020

  1. Merge pull request #89370 from toonn/release-20.03 

    wire-desktop: linux 3.17.2924 -> 3.18.2925, mac 3.17.3666 -> 3.18.3728
    @flokli
    flokli authored Jun 6, 2020
    Copy the full SHA
    c136fd3 View commit details

  2. Merge pull request #89260 from schmittlauch/cawbird1.1.0-backport 

    [backport] cawbird: 1.0.5 -> 1.1.0
    @Lassulus
    Lassulus authored Jun 6, 2020
    Copy the full SHA
    1aa5271 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/applications/networking/cawbird/default.nix
  2. +4 −4 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cawbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@
}:

stdenv.mkDerivation rec {
version = "1.0.5";
version = "1.1.0";
pname = "cawbird";

src = fetchFromGitHub {
owner = "IBBoard";
repo = "cawbird";
rev = "v${version}";
sha256 = "sha256:0prrrkgmnm78sq2c6yvy86qb3lcl51d250q7gvmqili2ffnjmamf";
sha256 = "sha256:0zghryx5y47ff8kxa65lvgmy1cnhvhazxml7r1lxixxj3d88wh7p";
};

nativeBuildInputs = [
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,13 +20,13 @@ let
pname = "wire-desktop";

version = {
x86_64-darwin = "3.17.3666";
x86_64-linux = "3.17.2924";
x86_64-darwin = "3.18.3728";
x86_64-linux = "3.18.2925";
}.${system} or throwSystem;

sha256 = {
x86_64-darwin = "0r3ckfrdx0ah6wn364ii1q1laya2nmmfz9jsikc6ss28lijb6ipn";
x86_64-linux = "16f8zawdx7dyrb8hp3fd2j821jj7jlan60knmdlrrk84phlc9ldd";
x86_64-darwin = "0xi3k95yw59xsfavncc1giwxlwjz26z34qm3i604ksjjalvpzy5l";
x86_64-linux = "01g39hncj1w0zyfrzv4mgv8npwvx0g0lw99azyai99877b30bm8j";
}.${system} or throwSystem;

meta = with stdenv.lib; {