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: 47fbd1e4134b
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: 73e73c7d6b5f
Choose a head ref
  • 5 commits
  • 2 files changed
  • 4 contributors

Commits on Apr 29, 2020

  1. skypeforlinux: 8.58.0.93 -> 8.59.0.77 

    (cherry picked from commit 7b38685)
    @bachp @talyz
    bachp authored and talyz committed Apr 29, 2020
    Copy the full SHA
    9a505ee View commit details

  2. skypeforlinux: add additional mirror 

    The university of chigaco keeps the binaries of old releases.

This reduces the change of #81868 and #85724 happening again in the
future.

(cherry picked from commit e4aab9c)
    @bachp @talyz
    bachp authored and talyz committed Apr 29, 2020
    Copy the full SHA
    32e43fc View commit details

Commits on Apr 30, 2020

  1. Merge pull request #86354 from talyz/20.03-skypeforlinux 

    [20.03] skypeforlinux: 8.58.0.93 -> 8.59.0.77
    @talyz
    talyz authored Apr 30, 2020
    Copy the full SHA
    7b838df View commit details

  2. wireshark: 3.2.2 -> 3.2.3 

    https://www.wireshark.org/docs/relnotes/wireshark-3.2.3.html

(cherry picked from commit 7145a69)
    @zowoq @mmilata
    zowoq authored and mmilata committed Apr 30, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86dd44e View commit details

  3. Merge pull request #86412 from mmilata/20.03-wireshark-3.2.3 

    [20.03] wireshark: 3.2.2 -> 3.2.3
    @Ma27
    Ma27 authored Apr 30, 2020
    Copy the full SHA
    73e73c7 View commit details
5 changes: 3 additions & 2 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let

# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.58.0.93";
version = "8.59.0.77";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -62,9 +62,10 @@ let
fetchurl {
urls = [
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3";
sha256 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
4 changes: 2 additions & 2 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;

let
version = "3.2.2";
version = "3.2.3";
variant = if withQt then "qt" else "cli";

in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0ygdxpz0i4jxp55fg9x4xcan093wycjb66yas073gviz9kpj6naz";
sha256 = "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh";
};

cmakeFlags = [