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: 842d499ce872
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: 0817bb1a957a
Choose a head ref
  • 11 commits
  • 6 files changed
  • 6 contributors

Commits on Dec 7, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    b091d1d View commit details

Commits on Dec 12, 2019

  1. boolector: add patch for CVE-2019-7560

    (cherry picked from commit b9185a9)
    risicle committed Dec 12, 2019

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    ce35c56 View commit details
  2. btor2tools: correct meta information

    (cherry picked from commit c676063)
    risicle committed Dec 12, 2019

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    78ac8fc View commit details

Commits on Dec 13, 2019

  1. Merge pull request #75577 from risicle/ris-boolector-CVE-2019-7560-r1…

    …9.09
    
    [r19.09] boolector: add patch for CVE-2019-7560
    andir authored Dec 13, 2019
    Copy the full SHA
    18ca17f View commit details
  2. Merge pull request #75159 from risicle/ris-libofx-CVE-2019-9656-r19.09

    [r19.09] libofx: add patch for CVE-2019-9656
    andir authored Dec 13, 2019
    Copy the full SHA
    a5d5fc1 View commit details
  3. linux: 4.19.88 -> 4.19.89

    (cherry picked from commit 00875c0)
    NeQuissimus committed Dec 13, 2019
    Copy the full SHA
    8cd3530 View commit details
  4. linux: 5.4.2 -> 5.4.3

    (cherry picked from commit 4974c6f)
    NeQuissimus committed Dec 13, 2019
    Copy the full SHA
    d570b98 View commit details
  5. vscode: 1.39.1 -> 1.39.2

    (cherry picked from commit 9fadd8e)
    eadwu authored and worldofpeace committed Dec 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    Copy the full SHA
    8cea6d2 View commit details
  6. vscode: 1.39.2 -> 1.40.0

    (cherry picked from commit a2f62bc)
    domenkozar authored and worldofpeace committed Dec 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    Copy the full SHA
    89d4136 View commit details
  7. vscode 1.40.0 -> 1.40.1 (#73610)

    (cherry picked from commit a6934e3)
    Dema authored and worldofpeace committed Dec 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    9862792 View commit details
  8. vscode: 1.40.1 -> 1.41.0

    (cherry picked from commit 8d5e90b)
    domenkozar authored and worldofpeace committed Dec 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    0817bb1 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/vscode.nix
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "06yrcn7857fw1dvwj0fhj6b2pb224i0r1m2diqg49a0jaj15mnak";
x86_64-darwin = "0gq2lazjlzf7wmmdlpg5zg60lmwlmq5rm65lb815r0dpqqj0dizn";
x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l";
x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm";
}.${system};
in
callPackage ./generic.nix rec {

version = "1.39.1";
version = "1.41.0";
pname = "vscode";

executableName = "code" + lib.optionalString isInsiders "-insiders";
10 changes: 9 additions & 1 deletion pkgs/applications/science/logic/boolector/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub
{ stdenv, fetchFromGitHub, fetchpatch
, cmake, lingeling, btor2tools
}:

@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz";
};

patches = [
(fetchpatch {
name = "CVE-2019-7560.patch";
url = "https://github.com/Boolector/boolector/commit/8d979d02e0482c7137c9f3a34e6d430dbfd1f5c5.patch";
sha256 = "1a1g02mk8b0azzjcigdn5zpshn0dn05fciwi8sd5q38yxvnvpbbi";
})
];

nativeBuildInputs = [ cmake ];
buildInputs = [ lingeling btor2tools ];

4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/btor2tools/default.nix
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" "lib" ];

meta = with stdenv.lib; {
description = "Fast SAT solver";
homepage = http://fmv.jku.at/lingeling/;
description = "A generic parser and tool package for the BTOR2 format";
homepage = "https://github.com/Boolector/btor2tools";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
10 changes: 9 additions & 1 deletion pkgs/development/libraries/libofx/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl, fetchpatch }:

stdenv.mkDerivation rec {
name = "libofx-0.9.14";
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "02i9zxkp66yxjpjay5dscfh53bz5vxy03zcxncpw09svl6zmf9xq";
};

patches = [
(fetchpatch {
name = "CVE-2019-9656.patch";
url = "https://github.com/libofx/libofx/commit/15d0511253d7a8011ab7fa8d1e74c265d17d1b44.patch";
sha256 = "13lmn8izjdxsi8yvwqn635kc8qcr0cazzhz16lj4fdwwa645z2ca";
})
];

configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ opensp libxml2 curl ];
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.88";
version = "4.19.89";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1gizkdmq46ykw7ya3hibd6lalww2kvsia346pq3xvrk6s5mkp4n1";
sha256 = "0ijx8ih91p4g95zpwz6ga3q2x9lf1948xf2v5mz4348byf5hdwv8";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.2";
version = "5.4.3";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0mx50cp61kajya3lfcksw7wksq7ihkqzrzszf4bb19kwhxb85y9j";
sha256 = "0lgfg31pgvdhkh9y4y4yh075mlk3qa6npxp7n19yxcg168pnhcb7";
};
} // (args.argsOverride or {}))