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: 82b5f87fcc71
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: 1f80b4d15e99
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 19, 2020

  1. bcompare - 4.3.2.24472 -> 4.3.4.24657 (#84521) 

    Co-authored-by: Milan Pässler <mil@nyantec.com>
(cherry picked from commit 92688a1)
    @CloudArtAdmins @Ekleog
    CloudArtAdmins authored and Ekleog committed May 19, 2020
    Copy the full SHA
    42b96df View commit details

  2. skypeforlinux: 8.59.0.77 -> 8.60.0.76 

    (cherry picked from commit f44e3d4)
    @lsix @bjornfor
    lsix authored and bjornfor committed May 19, 2020
    Copy the full SHA
    1f80b4d View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  2. +2 −2 pkgs/applications/version-management/bcompare/default.nix
4 changes: 2 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.59.0.77";
version = "8.60.0.76";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -65,7 +65,7 @@ let
"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 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i";
sha256 = "1y919ki0c17vip90fln17impwky08qgprw0j1dgz239qqpwakn7a";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/bcompare/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "bcompare";
version = "4.3.2.24472";
version = "4.3.4.24657";

src = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
sha256 = "1msygg01yi0n8lpk8sl226p09ls7wvd3z3k067mdgrss8rjy5va5";
sha256 = "031ivmpy0mk43skb30r7p5zwf0m90pmsqhaq5kc08gzy6g4s0wd0";
};

unpackPhase = ''