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: a5b5fb918eb4
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: 973a27053516
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 28, 2019

  1. environment.noXlibs: disable gnome3 for pinentry

    @wmertens
    wmertens authored Jun 28, 2019
    Copy the full SHA
    8622ff8 View commit details

Commits on Jul 16, 2019

  1. Merge #64917: wavpack: CVE-2018-19840 CVE-2018-19841 

    (cherry picked from commit 5777f52)
    @vcunat
    vcunat committed Jul 16, 2019
    Copy the full SHA
    12d7fb5 View commit details

  2. youtube-dl: 2019.07.12 -> 2019.07.16 

    (cherry picked from commit 3a1111b)
(cherry picked from commit 3e4e93d)
    @xrelkd @worldofpeace
    xrelkd authored and worldofpeace committed Jul 16, 2019
    Copy the full SHA
    76cb4fe View commit details

  3. Merge pull request #63896 from NixOS/noxlibs-nognome 

    [19.03] environment.noXlibs: disable gnome3 for pinentry
    @danbst
    danbst authored Jul 16, 2019
    Copy the full SHA
    973a270 View commit details
Showing with 13 additions and 3 deletions.
  1. +1 −1 nixos/modules/config/no-x-libs.nix
  2. +10 −0 pkgs/development/libraries/wavpack/default.nix
  3. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/config/no-x-libs.nix
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ with lib;
networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
pinentry = super.pinentry_ncurses;
pinentry = super.pinentry.override { gtk2 = null; gcr = null; qt = null; };
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
}));
};
10 changes: 10 additions & 0 deletions pkgs/development/libraries/wavpack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,16 @@ stdenv.mkDerivation rec {
name = "CVE-2019-11498-4.patch";
sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7";
})
(fetchpatch {
url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch";
name = "CVE-2018-19840.patch";
sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz";
})
(fetchpatch {
url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch";
name = "CVE-2018-19841.patch";
sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy";
})
];

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/youtube-dl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2019.07.12";
version = "2019.07.16";

src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "1mf8nh972hjpxj01q37jghj32rv21y91fpbwwsqmbmh65dr4k1dn";
sha256 = "06qd6z9swx8aw9v7vi85q44hmzxgy8wx18a9ljfhx7l7wjpm99ky";
};

nativeBuildInputs = [ makeWrapper ];