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

Commits on Aug 27, 2019

  1. elmPackages: share node-env.nix, add elm-live & elm-xref

    @turboMaCk
    turboMaCk committed Aug 27, 2019
    Copy the full SHA
    eb5ba59 View commit details

Commits on Aug 28, 2019

  1. Merge pull request #67439 from turboMaCk/elm-packages/improvements-an… 

    …d-additions

elmPackages: share node-env.nix, add elm-live & elm-xref
    @domenkozar
    domenkozar authored Aug 28, 2019
    Copy the full SHA
    aa31307 View commit details
5 changes: 3 additions & 2 deletions pkgs/development/compilers/elm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,8 +56,9 @@ let
*/
elm-test = patchBinwrap [elmi-to-json] elmNodePackages.elm-test;
elm-verify-examples = patchBinwrap [elmi-to-json] elmNodePackages.elm-verify-examples;
elm-analyse = elmNodePackages.elm-analyse;
inherit (elmNodePackages) elm-doc-preview elm-upgrade;
# elm-analyse@0.16.4 build is not working
elm-analyse = elmNodePackages."elm-analyse-0.16.3";
inherit (elmNodePackages) elm-doc-preview elm-live elm-upgrade elm-xref;
};
in elmPkgs // {
inherit elmPkgs;
6 changes: 5 additions & 1 deletion pkgs/development/compilers/elm/packages/generate-node-packages.sh
View file
Original file line number Diff line number Diff line change
@@ -4,4 +4,8 @@
set -eu -o pipefail

rm -f node-env.nix
node2nix --nodejs-10 -i node-packages.json -o node-packages.nix -c node-composition.nix
node2nix --nodejs-10 \
-i node-packages.json \
-o node-packages.nix \
-c node-composition.nix \
--no-copy-node-env -e ../../../node-packages/node-env.nix
2 changes: 1 addition & 1 deletion pkgs/development/compilers/elm/packages/node-composition.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:

let
nodeEnv = import ./node-env.nix {
nodeEnv = import ../../../node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
540 changes: 0 additions & 540 deletions pkgs/development/compilers/elm/packages/node-env.nix
View file

This file was deleted.

6 changes: 4 additions & 2 deletions pkgs/development/compilers/elm/packages/node-packages.json
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
"elm-test",
"elm-verify-examples",
"elm-doc-preview",
"elm-analyse",
"elm-upgrade"
"elm-upgrade",
{ "elm-analyse": "0.16.3" },
"elm-live",
"elm-xref"
]
1,724 changes: 1,284 additions & 440 deletions pkgs/development/compilers/elm/packages/node-packages.nix
View file

Large diffs are not rendered by default.