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: 92ab741f1cf2
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: 222004e52e82
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 7, 2019

  1. zziplib: apply patches for CVE-2018-16548 

    (cherry picked from commit aa74d07)
    @delroth
    delroth committed Oct 7, 2019
    Copy the full SHA
    3472f1a View commit details

Commits on Oct 12, 2019

  1. Merge #70560: zziplib: apply patches for CVE-2018-16548 

    ...into release-19.09
    @vcunat
    vcunat committed Oct 12, 2019
    Copy the full SHA
    d392cf8 View commit details

  2. nvidia-x11: Remove patches from the 390 version. (#69851) 

    Without those patches it builds and works with kernels 4.19 and 5.2.

Fixes NixOS/nixpkgs#65937

(cherry picked from commit b1ed9c6)
    @ambrop72 @vcunat
    ambrop72 authored and vcunat committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    onsails Andrey Kuznetsov
    GPG key ID: 9EC1B2ACE338B18B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ce5780 View commit details

  3. copyq: 3.9.0 -> 3.9.2 (#69490) 

    * copyq: 3.9.0 -> 3.9.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/copyq/versions

* copyq: use mkDerivation from Qt

Backport of #69490 - fixes #70896

(cherry picked from commit 7f8befd)
    @r-ryantm @c0bw3b
    r-ryantm authored and c0bw3b committed Oct 12, 2019
    Copy the full SHA
    222004e View commit details
Showing with 23 additions and 19 deletions.
  1. +7 −7 pkgs/applications/misc/copyq/default.nix
  2. +16 −0 pkgs/development/libraries/zziplib/default.nix
  3. +0 −12 pkgs/os-specific/linux/nvidia-x11/default.nix
14 changes: 7 additions & 7 deletions pkgs/applications/misc/copyq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst
, qtx11extras, git
{ lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git
, webkitSupport ? true
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "CopyQ";
version = "3.9.0";
version = "3.9.2";

src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
sha256 = "1l9f0hg2ggy944sjlyiyglln5mjm9fvgmvwp3pnvmmc6mfbmslq3";
sha256 = "02zs444i7hnqishs1i6vp8ffjxlxk3xkrw935pdwnwppv9s9v202";
};

nativeBuildInputs = [ cmake ];

buildInputs = [
git qtbase qtscript libXfixes libXtst qtx11extras
] ++ stdenv.lib.optional webkitSupport qtwebkit;
] ++ lib.optional webkitSupport qtwebkit;

meta = with stdenv.lib; {
meta = with lib; {
homepage = https://hluk.github.io/CopyQ;
description = "Clipboard Manager with Advanced Features";
license = licenses.gpl3;
16 changes: 16 additions & 0 deletions pkgs/development/libraries/zziplib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,22 @@ stdenv.mkDerivation rec {
url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff";
sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry";
})

(fetchpatch {
name = "CVE-2018-16548-part1.patch";
url = "https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch";
sha256 = "0cy8i182zbvcqzs5z2j13d5sl7hbh59pkgw4xkyg5yz739q4fp9b";
})
(fetchpatch {
name = "CVE-2018-16548-part2.patch";
url = "https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch";
sha256 = "153wd4vab8xqj9avcpx8g2zw9qsp9nkaqi7yc65pz3r7xfcxwdla";
})
(fetchpatch {
name = "CVE-2018-16548-part3.patch";
url = "https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch";
sha256 = "0fs6dns8l7dz5a900397g8b7x62z72b0pbpdmwk1hnx6vb7z5rz5";
})
];
postPatch = ''
sed -i -e s,--export-dynamic,, configure
12 changes: 0 additions & 12 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,18 +39,6 @@ rec {
sha256_64bit = "0h0jcckqpd63vaj95lvdgj2sbbn9y1ri1xx7r2snxfx0plhwz46n";
settingsSha256 = "1w5nkxs7a40mq0qf97nhfazdqhfn1bvr54v50s8p0ggixb6vdm3l";
persistencedSha256 = "02v76202qcnh8hvg4y9wmk9swdlv7z39ppfd1c850nlv158vn5nf";

patches = [
(fetchurl {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0";
sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2";
})

(fetchurl {
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a";
sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r";
})
];
};

legacy_340 = generic {