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: c1746708b16e
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: c4db4e5538bf
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Mar 4, 2020

  1. openssl_1_0_2: mark as insecure; fixes #77503 (kinda) 

    No vulnerabilities are know so far (to me), but still I'd go this way.
Especially for 20.03 it seems better to deprecate it before official
release happens.

Current casualties:
$ ./maintainers/scripts/rebuild-amount.sh --print HEAD HEAD^
Estimating rebuild amount by counting changed Hydra jobs.
     87 x86_64-darwin
    161 x86_64-linux

(cherry picked from commit 7cda282)
    @vcunat @worldofpeace
    vcunat authored and worldofpeace committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: FE918C3A98C1030F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7dfb444 View commit details

Commits on Mar 5, 2020

  1. brave: 1.4.95 -> 1.4.96 

    Update brave from the version 1.4.95 to 1.4.96.

(cherry picked from commit 3f6d356)
Reason: Keep the browser to the latest stable version
    @JeffLabonte
    JeffLabonte committed Mar 5, 2020
    Copy the full SHA
    093092a View commit details

  2. Merge pull request #81718 from worldofpeace/backport-80746 

    [20.03] openssl_1_0_2: mark as insecure; fixes #77503 (kinda)
    @worldofpeace
    worldofpeace authored Mar 5, 2020
    Copy the full SHA
    1f99fd2 View commit details

  3. Merge pull request #81793 from JeffLabonte/20_03-brave_1.4.95_to_1.4.96 

    [20.03] brave 1.4.95 to 1.4.96
    @worldofpeace
    worldofpeace authored Mar 5, 2020
    Copy the full SHA
    c4db4e5 View commit details
Showing with 6 additions and 4 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/brave/default.nix
  2. +4 −2 pkgs/development/libraries/openssl/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/brave/default.nix
View file
Original file line number Diff line number Diff line change
@@ -82,11 +82,11 @@ in

stdenv.mkDerivation rec {
pname = "brave";
version = "1.4.95";
version = "1.4.96";

src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc";
};

dontConfigure = true;
6 changes: 4 additions & 2 deletions pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@
with stdenv.lib;

let
common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
stdenv.mkDerivation rec {
pname = "openssl";
inherit version;

@@ -130,7 +131,7 @@ let
license = licenses.openssl;
platforms = platforms.all;
maintainers = [ maintainers.peti ];
};
} // extraMeta;
};

in {
@@ -145,6 +146,7 @@ in {
then ./1.0.2/use-etc-ssl-certs-darwin.patch
else ./1.0.2/use-etc-ssl-certs.patch)
];
extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
};

openssl_1_1 = common {