Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable into master #29

Merged
merged 12 commits into from
Jan 4, 2022
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ blocks:
- name: Lint all files
commands:
- nix-linter default.nix overlay.nix shell.nix
- nix-linter -r pkgs
- find . -name "*.nix" -path "./pkgs/*" -not -path "./pkgs/node-packages/*" | xargs nix-linter

- name: Build overlay packages
task:
Expand Down
5 changes: 5 additions & 0 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ self: super:
with super.lib;

let
nodePackages = self.callPackage ./pkgs/node-packages { };

override = {
# These packages will hide packages in the top level nixpkgs
};
Expand All @@ -12,6 +14,9 @@ in
# Any other packages should go in the replitPackages namespace
jdt-language-server = self.callPackage ./pkgs/jdt-language-server { };
replbox = self.callPackage ./pkgs/replbox { };
jest = nodePackages."jest-cli-23.6.0";
coffeescript = nodePackages.coffeescript;
rescript-language-server = self.callPackage ./pkgs/rescript-language-server { };

# The override packages are injected into the replitPackages namespace as
# well so they can all be built together
Expand Down
20 changes: 20 additions & 0 deletions pkgs/node-packages/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file has been generated by node2nix 1.9.0. Do not edit!

{ pkgs ? import <nixpkgs> {
inherit system;
}
, system ? builtins.currentSystem
, nodejs ? pkgs."nodejs-12_x"
}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}
4 changes: 4 additions & 0 deletions pkgs/node-packages/generate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
nix-shell -p nodePackages.node2nix --run 'node2nix -i node-packages.json'
nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt .'

Loading