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: b67bc34d4e3d
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: dd46307a5fc6
Choose a head ref
  • 7 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 20, 2020

  1. nodejs-12_x: 12.14.1 -> 12.15.0 

    Changelog: https://github.com/nodejs/node/releases/tag/v12.15.0
    @marsam @wmertens
    marsam authored and wmertens committed Mar 20, 2020
    Copy the full SHA
    2cc4474 View commit details

  2. nodejs-12_x: 12.15.0 -> 12.16.0 

    Changelog: https://github.com/nodejs/node/releases/tag/v12.16.0
    @marsam @wmertens
    marsam authored and wmertens committed Mar 20, 2020
    Copy the full SHA
    9b2a26d View commit details

  3. nodejs-12_x: 12.16.0 -> 12.16.1 

    Changelog: https://github.com/nodejs/node/releases/tag/v12.16.1
    @marsam @wmertens
    marsam authored and wmertens committed Mar 20, 2020
    Copy the full SHA
    8e47767 View commit details

Commits on Mar 28, 2020

  1. Merge branch 'release-19.09' into staging-19.09

    @vcunat
    vcunat committed Mar 28, 2020
    Copy the full SHA
    95d7551 View commit details

Commits on Mar 30, 2020

  1. Merge pull request #83026 from wmertens/nodejs-backport 

    Nodejs 12 backport from master
    @wmertens
    wmertens authored Mar 30, 2020
    Copy the full SHA
    ce73818 View commit details

Commits on Apr 5, 2020

  1. Merge #84273: gnutls: 3.6.11.1 -> 3.6.13 [security] 

    ... into staging.  Fixes CVE-2020-11501.

(cherry picked from commit f91b34e)
These bumps combined still seem quite safe in terms of regression
likelihood.
    @vcunat
    vcunat committed Apr 5, 2020
    Copy the full SHA
    c1ef04e View commit details

Commits on Apr 16, 2020

  1. Merge branch 'staging-19.09' into release-19.09

    @vcunat
    vcunat committed Apr 16, 2020
    Copy the full SHA
    dd46307 View commit details
Showing with 5 additions and 18 deletions.
  1. +2 −2 pkgs/development/libraries/gnutls/default.nix
  2. +0 −11 pkgs/development/web/nodejs/disable-libatomic-darwin.patch
  3. +3 −5 pkgs/development/web/nodejs/v12.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gnutls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

assert guileBindings -> guile != null;
let
version = "3.6.11.1";
version = "3.6.13";

# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@@ -24,7 +24,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv";
sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j";
};

outputs = [ "bin" "dev" "out" "man" "devdoc" ];
11 changes: 0 additions & 11 deletions pkgs/development/web/nodejs/disable-libatomic-darwin.patch
View file

This file was deleted.

8 changes: 3 additions & 5 deletions pkgs/development/web/nodejs/v12.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{ stdenv, callPackage, openssl, icu, enableNpm ? true }:
{ callPackage, openssl, icu, enableNpm ? true }:

let
buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };
in
buildNodejs {
inherit enableNpm;
version = "12.14.1";
sha256 = "1nvsivl496fgaypbk2pqqh7py29g7wsggyjlqydy1c0q4f24nyw7";

patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
version = "12.16.1";
sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a";
}