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: c5fd298d6706
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: 9e379117c459
Choose a head ref
  • 5 commits
  • 6 files changed
  • 4 contributors

Commits on Jun 17, 2020

  1. 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

  2. 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

  3. 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. google-chrome: add coreutils to PATH 

    google-chrome-stable can't run without coreutils in PATH

(cherry picked from commit e8ddc0c)
    @grahamc
    grahamc committed Jun 17, 2020
    Copy the full SHA
    725c4fd View commit details

  5. xdg_utils: xdg-open: add $out to PATH 

    Otherwise, xdg-open cannot call xdg-mime and this does not work:

    "${pkgs.xdg_utils}/bin/xdg-open"

(cherry picked from commit 4b5880f)
    @grahamc
    grahamc committed Jun 17, 2020
    Copy the full SHA
    9e37911 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 {
5 changes: 4 additions & 1 deletion pkgs/applications/networking/browsers/google-chrome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
, kerberos, libdrm, mesa

# Command line programs
, coreutils

# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""

@@ -58,7 +61,7 @@ let
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap at-spi2-atk at-spi2-core
kerberos libdrm mesa
kerberos libdrm mesa coreutils
] ++ optional pulseSupport libpulseaudio
++ [ gtk ];

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 = ''
1 change: 1 addition & 0 deletions pkgs/tools/X11/xdg-utils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
xset() { ${xset}/bin/xset "$@"; }\
perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\
PATH=$PATH:'"$out"'/bin\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \