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: 0d474ee1aede
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: 08d429920bcb
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 7, 2020

  1. wire-desktop: linux 3.18.2925 -> 3.20.2934 

    (cherry picked from commit ad9d115)
    @toonn
    toonn committed Oct 7, 2020
    Copy the full SHA
    0e5d4c2 View commit details

  2. wire-desktop: mac 3.18.3728 -> 3.20.3912 

    (cherry picked from commit 4448bd4)
    @toonn
    toonn committed Oct 7, 2020
    Copy the full SHA
    0954856 View commit details

Commits on Oct 8, 2020

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

    wire-desktop: backport to release-20.03
    @marsam
    marsam authored Oct 8, 2020
    Copy the full SHA
    eba1d01 View commit details

Commits on Oct 9, 2020

  1. knot-dns: 2.9.6 -> 2.9.7 

    https://gitlab.nic.cz/knot/knot-dns/-/tags/v2.9.7

(cherry picked from commit a786d00)
    @vcunat
    vcunat committed Oct 9, 2020
    Copy the full SHA
    08d4299 View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
  2. +2 −2 pkgs/servers/dns/knot-dns/default.nix
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.19.3799";
x86_64-linux = "3.19.2928";
x86_64-darwin = "3.20.3912";
x86_64-linux = "3.20.2934";
}.${system} or throwSystem;

sha256 = {
x86_64-darwin = "1sv8n4g1pd4nwpwsg0m61zhrfjlh7sj29rnh46xjw1qg332g6cw9";
x86_64-linux = "038h1j59qfj5ckaxk823qpfflxay47v0jrqc0hmrdmnd2y59dpx7";
x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr";
x86_64-linux = "0z6vrhzrhrrnl3swjbxrbl1dhk2fx86s45n2z2in2shdlv08dcx7";
}.${system} or throwSystem;

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/servers/dns/knot-dns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in

stdenv.mkDerivation rec {
pname = "knot-dns";
version = "2.9.6";
version = "2.9.7";

src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7";
sha256 = "418a50c4c0467109814f2fa696c2faff4ecf1bd40b2ed93fa153b46c52dfcecd";
};

outputs = [ "bin" "out" "dev" ];