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: 8056c5006288
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: 92f1c50dabfb
Choose a head ref
  • 4 commits
  • 5 files changed
  • 4 contributors

Commits on Jun 17, 2020

  1. vlc: 3.0.8 -> 3.0.11 (security) 

    Includes a security fix for CVE-2020-13428.

improved security for stored passwords (from 3.0.9)
multiple security fixes, including microdns (from 3.0.9.1)

(cherry picked from commit 745245a)
    @progval @teto
    progval authored and teto committed Jun 17, 2020
    Copy the full SHA
    c5fd298 View commit details

  2. Don't enable nix-bash-completions when using Nix 2.4 

    2.4 has its own completion script which collides with
nix-bash-completions.

(cherry picked from commit bbfc473)
    @edolstra
    edolstra committed Jun 17, 2020
    Copy the full SHA
    583ccf8 View commit details

  3. fwupd: add patch for CVE-2020-10759 

    Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-10759
See also: https://github.com/justinsteven/advisories/blob/master/2020_fwupd_dangling_s3_bucket_and_CVE-2020-10759_signature_verification_bypass.md
    @mmilata
    mmilata committed Jun 17, 2020
    Copy the full SHA
    80b50f3 View commit details

  4. Merge pull request #90679 from mmilata/20.03/fwupd-cve-2020-10759 

    [20.03] fwupd: add patch for CVE-2020-10759
    @jtojnar
    jtojnar authored Jun 17, 2020
    Copy the full SHA
    92f1c50 View commit details
4 changes: 1 addition & 3 deletions nixos/modules/config/system-path.nix
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@ with lib;
let

requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
[ config.nix.package
pkgs.acl
[ pkgs.acl
pkgs.attr
pkgs.bashInteractive # bash with ncurses support
pkgs.bzip2
@@ -33,7 +32,6 @@ let
pkgs.nano
pkgs.ncurses
pkgs.netcat
pkgs.nix-info
config.programs.ssh.package
pkgs.perl
pkgs.procps
3 changes: 0 additions & 3 deletions nixos/modules/programs/bash/bash.nix
View file
Original file line number Diff line number Diff line change
@@ -238,9 +238,6 @@ in
"/share/bash-completion"
];

environment.systemPackages = optional cfg.enableCompletion
pkgs.nix-bash-completions;

environment.shells =
[ "/run/current-system/sw/bin/bash"
"/run/current-system/sw/bin/sh"
6 changes: 6 additions & 0 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -441,6 +441,12 @@ in
nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];

environment.systemPackages =
[ nix
pkgs.nix-info
]
++ optional (config.programs.bash.enableCompletion && !versionAtLeast nixVersion "2.4pre") pkgs.nix-bash-completions;

environment.etc."nix/nix.conf".source = nixConf;

environment.etc."nix/registry.json".text = builtins.toJSON {
4 changes: 2 additions & 2 deletions pkgs/applications/video/vlc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra

stdenv.mkDerivation rec {
pname = "vlc";
version = "3.0.8";
version = "3.0.11";

src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
sha256 = "e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6";
sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y";
};

# VLC uses a *ton* of libraries for various pieces of functionality, many of
7 changes: 7 additions & 0 deletions pkgs/os-specific/linux/firmware/fwupd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

{ stdenv
, fetchurl
, fetchpatch
, substituteAll
, gtk-doc
, pkgconfig
@@ -162,6 +163,12 @@ stdenv.mkDerivation rec {
# needs a different set of modules than po/make-images
inherit installedTestsPython;
})

(fetchpatch {
name = "CVE-2020-10759.patch";
url = "https://github.com/fwupd/fwupd/commit/21f2d12fccef63b8aaa99ec53278ce18250b0444.patch";
sha256 = "1lgfm1k8723i1dawg71nv21lgmbbyzlm8hxkra8xpf73qmpxygnk";
})
];

postPatch = ''