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: e1843646b04f
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: 6554f690ce40
Choose a head ref
  • 6 commits
  • 5 files changed
  • 6 contributors

Commits on Nov 19, 2019

  1. steam: use 32bit version of libva 

    (cherry picked from commit 87c674d)
    Jonathan Ringer committed Nov 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40fcdac View commit details

  2. nixpart0: remove broken, fix build for (local) pykickstart dep 

    (cherry picked from commit 302396f)
    @rbvermaa
    rbvermaa committed Nov 19, 2019
    Copy the full SHA
    96c9578 View commit details

  3. samba: 4.10.8 -> 4.10.10 - security 

    Addresses issue: NixOS/nixpkgs#73682
Samba fixes overview for reference:
https://www.samba.org/samba/history/security.html

(cherry picked from commit 0de2c30)
    @d-goldin
    d-goldin committed Nov 19, 2019
    Copy the full SHA
    cad09e9 View commit details

  4. ktorrent: mkDerivation 

    (cherry picked from commit d6451a7)
    @dtzWill @FRidh
    dtzWill authored and FRidh committed Nov 19, 2019
    Copy the full SHA
    0afec75 View commit details

  5. libextractor: add patch for CVE-2019-15531 

     (#73728)
(cherry picked from commit 593def2)
    @risicle @c0bw3b
    risicle authored and c0bw3b committed Nov 19, 2019
    Copy the full SHA
    3bccd38 View commit details

  6. Merge pull request #73761 from d-goldin/backport_samba 

    [r19.09] samba: 4.10.8 -> 4.10.10 - security
    @grahamc
    grahamc authored Nov 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6554f69 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/p2p/ktorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, cmake
{ mkDerivation, lib, fetchurl, fetchpatch, cmake
, extra-cmake-modules, qtbase, qtscript
, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
, kdoctools, kross, kcmutils, kwindowsystem
, libktorrent, taglib, libgcrypt, kplotting
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "ktorrent";
version = "${libktorrent.mainVersion}";

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

meta = with stdenv.lib; {
meta = with lib; {
description = "KDE integrated BtTorrent client";
homepage = https://www.kde.org/applications/internet/ktorrent/;
license = licenses.gpl2;
6 changes: 6 additions & 0 deletions pkgs/development/libraries/libextractor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
})
(fetchpatch {
name = "CVE-2019-15531.patch";
url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a";
sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
excludes = [ "ChangeLog" ];
})
];

preConfigure =
2 changes: 1 addition & 1 deletion pkgs/games/steam/chrootenv.nix
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ in buildFHSUserEnv rec {
xorg.libX11
xorg.libXfixes
libGL
libva
pkgsi686Linux.libva

# Not formally in runtime but needed by some games
at-spi2-atk
4 changes: 2 additions & 2 deletions pkgs/servers/samba/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ with lib;

stdenv.mkDerivation rec {
pname = "samba";
version = "4.10.8";
version = "4.10.10";

src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
sha256 = "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4";
sha256 = "19b653rr2i9snvapik58phbqj38cxjdlyx6nl3m2y3k1a55p633h";
};

outputs = [ "out" "dev" "man" ];
1 change: 0 additions & 1 deletion pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@ buildPythonApplication rec {
propagatedBuildInputs = [ urlgrabber ];

checkPhase = ''
export PYTHONPATH="$PYTHONPATH:."
${python}/bin/${python.executable} tests/baseclass.py -vv
'';