summary refs log tree commit diff stats
path: root/modules/development
diff options
context:
space:
mode:
authorAlan Pearce2018-09-30 19:19:08 +0200
committerAlan Pearce2018-09-30 19:19:08 +0200
commitc74a9e9fefee59a23759de6791b19771316691fc (patch)
tree43c60762f28a45175fe2fbb16b4cb6857a0e52bd /modules/development
parent5f4723df19ab14b917b98677aa74d20aaf5a6557 (diff)
parenta114b12027fbd82484833a7a2ded35273de39e3b (diff)
downloadnixfiles-c74a9e9fefee59a23759de6791b19771316691fc.tar.lz
nixfiles-c74a9e9fefee59a23759de6791b19771316691fc.tar.zst
nixfiles-c74a9e9fefee59a23759de6791b19771316691fc.zip
Merge branch 'master' of https://git.alanpearce.eu/nixos-configuration
Diffstat (limited to 'modules/development')
-rw-r--r--modules/development/base.nix1
-rw-r--r--modules/development/javascript.nix7
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/development/base.nix b/modules/development/base.nix
index e8d2b76a..d2d67db7 100644
--- a/modules/development/base.nix
+++ b/modules/development/base.nix
@@ -8,6 +8,7 @@
 
     editorconfig-core-c
     multimarkdown
+    go
     gocode
 
     surf
diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 2e92509a..c8828600 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -4,12 +4,17 @@
     nodejs-8_x
     phantomjs2
     yarn
+
     nodePackages.tern
     nodePackages.node2nix
     nodePackages.nodemon
     nodePackages.javascript-typescript-langserver
     nodePackages.eslint_d
+
+    # npm install may use any of these
+    python2
     nodePackages.node-gyp
-    gnumake
+    nodePackages.node-gyp-build
+    nodePackages.node-pre-gyp
   ];
 }