Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9e8c45ff0ae7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd8dadb78680
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on May 5, 2017

  1. nodePackages: split into v4/v6 package set 

    A full package set is not needed for both node versions. The goal is to
remove the large amount of generated files. Instead only packages which
might be needed in v4 development environments are added to a dedicated
node-packages-v4.json file.
    @Mic92
    Mic92 committed May 5, 2017
    2
    Copy the full SHA
    6f7670e View commit details

Commits on May 21, 2017

  1. Merge pull request #25528 from Mic92/node-packages 

    nodePackages: split into v4/v6 package set
    @Mic92
    Mic92 authored May 21, 2017
    Copy the full SHA
    dd8dadb View commit details
7 changes: 4 additions & 3 deletions pkgs/development/node-packages/generate.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh -e
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix

rm -f node-env.nix
node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix
node2nix -6 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix
node2nix -i node-packages-v4.json -o node-packages-v4.nix -c composition-v4.nix
node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
10 changes: 10 additions & 0 deletions pkgs/development/node-packages/node-packages-v4.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
"coffee-script"
, "grunt-cli"
, "gulp"
, "node-gyp"
, "node-inspector"
, "node-pre-gyp"
, "npm"
, "titanium"
]
43,975 changes: 4,903 additions & 39,072 deletions pkgs/development/node-packages/node-packages-v4.nix
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ...elopment/node-packages/node-packages.json → ...pment/node-packages/node-packages-v6.json
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,6 @@
, "stylus"
, "svgo"
, "tern"
, "titanium"
, "typescript"
, "uglify-js"
, "ungit"
2,866 changes: 1,337 additions & 1,529 deletions pkgs/development/node-packages/node-packages-v6.nix
View file

Large diffs are not rendered by default.