Skip to content

Commit 7fb5257

Browse files
committed
Merge remote-tracking branch 'origin/nixpkgs-stable-21.11'
2 parents 29a438e + 8b49bb4 commit 7fb5257

File tree

10 files changed

+5828
-1
lines changed

10 files changed

+5828
-1
lines changed

.semaphore/semaphore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ blocks:
3333
- name: Lint all files
3434
commands:
3535
- nix-linter default.nix overlay.nix shell.nix
36-
- nix-linter -r pkgs
36+
- find . -name "*.nix" -path "./pkgs/*" -not -path "./pkgs/node-packages/*" | xargs nix-linter
3737

3838
- name: Build overlay packages
3939
task:

overlay.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ self: super:
33
with super.lib;
44

55
let
6+
nodePackages = self.callPackage ./pkgs/node-packages { };
7+
68
override = {
79
# These packages will hide packages in the top level nixpkgs
810
};
@@ -12,6 +14,9 @@ in
1214
# Any other packages should go in the replitPackages namespace
1315
jdt-language-server = self.callPackage ./pkgs/jdt-language-server { };
1416
replbox = self.callPackage ./pkgs/replbox { };
17+
jest = nodePackages."jest-cli-23.6.0";
18+
coffeescript = nodePackages.coffeescript;
19+
rescript-language-server = self.callPackage ./pkgs/rescript-language-server { };
1520

1621
# The override packages are injected into the replitPackages namespace as
1722
# well so they can all be built together

pkgs/node-packages/default.nix

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file has been generated by node2nix 1.9.0. Do not edit!
2+
3+
{ pkgs ? import <nixpkgs> {
4+
inherit system;
5+
}
6+
, system ? builtins.currentSystem
7+
, nodejs ? pkgs."nodejs-12_x"
8+
}:
9+
10+
let
11+
nodeEnv = import ./node-env.nix {
12+
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
13+
inherit pkgs nodejs;
14+
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
15+
};
16+
in
17+
import ./node-packages.nix {
18+
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
19+
inherit nodeEnv;
20+
}

pkgs/node-packages/generate.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
nix-shell -p nodePackages.node2nix --run 'node2nix -i node-packages.json'
3+
nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt .'
4+

0 commit comments

Comments
 (0)