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: c7f415b52250
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: b47b4f3dd3c9
Choose a head ref
  • 4 commits
  • 12 files changed
  • 2 contributors

Commits on Mar 12, 2018

  1. nodePackages: regenerate with node2nix 1.5.3

    @svanderburg
    svanderburg committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    21126a8 View commit details

  2. nodePackages: fix evaluation 

    Introduced in 40e3ad6.
    @fpletz
    fpletz committed Mar 12, 2018
    Copy the full SHA
    1bb0ecd View commit details

Commits on Mar 13, 2018

  1. remarkjs: regenerate with node2nix 1.5.3

    @svanderburg
    svanderburg committed Mar 13, 2018
    Copy the full SHA
    a0f10b5 View commit details

  2. nixui: regnerate with node2nix 1.5.3

    @svanderburg
    svanderburg committed Mar 13, 2018
    Copy the full SHA
    b47b4f3 View commit details
3 changes: 2 additions & 1 deletion pkgs/development/node-packages/composition-v4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.2. Do not edit!
# This file has been generated by node2nix 1.5.3. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
@@ -8,6 +8,7 @@ let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v4.nix {
3 changes: 2 additions & 1 deletion pkgs/development/node-packages/composition-v6.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.2. Do not edit!
# This file has been generated by node2nix 1.5.3. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
@@ -8,6 +8,7 @@ let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v6.nix {
3 changes: 2 additions & 1 deletion pkgs/development/node-packages/composition-v8.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.5.2. Do not edit!
# This file has been generated by node2nix 1.5.3. Do not edit!

{pkgs ? import <nixpkgs> {
inherit system;
@@ -8,6 +8,7 @@ let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v8.nix {
12 changes: 9 additions & 3 deletions pkgs/development/node-packages/node-env.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file originates from node2nix

{stdenv, nodejs, python2, utillinux, runCommand, writeTextFile}:
{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:

let
python = if nodejs ? python then nodejs.python else python2;
@@ -316,7 +316,10 @@ let
in
stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // {
name = "node-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ args.buildInputs or [];
dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments

inherit dontNpmInstall preRebuild;
@@ -413,7 +416,10 @@ let
nodeDependencies = stdenv.mkDerivation {
name = "node-dependencies-${name}-${version}";

buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
buildInputs = [ tarWrapper python nodejs ]
++ stdenv.lib.optional (stdenv.isLinux) utillinux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ args.buildInputs or [];

includeScript = includeDependencies { inherit dependencies; };
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
Loading