public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89210 from Mic92/pulp

Browse Source
This commit is contained in:
Jörg Thalheim 2020-05-30 19:56:12 +01:00 committed by GitHub
commit 639d53bbef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 138 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
pkgs/development/node-packages/default.nix
View File

@ -3,18 +3,17 @@
let let
since = (version: pkgs.lib.versionAtLeast nodejs.version version); since = (version: pkgs.lib.versionAtLeast nodejs.version version);
before = (version: pkgs.lib.versionOlder nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version);
nodePackages = import ./composition.nix { super = import ./composition.nix {
inherit pkgs nodejs; inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
}; };
in self = super // {
nodePackages // { "@angular/cli" = super."@angular/cli".override {
"@angular/cli" = nodePackages."@angular/cli".override {
prePatch = '' prePatch = ''
export NG_CLI_ANALYTICS=false export NG_CLI_ANALYTICS=false
''; '';
}; };
bower2nix = nodePackages.bower2nix.override { bower2nix = super.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
for prog in bower2nix fetch-bower; do for prog in bower2nix fetch-bower; do
@ -23,36 +22,36 @@ nodePackages // {
''; '';
}; };
coc-imselect = nodePackages.coc-imselect.override { coc-imselect = super.coc-imselect.override {
meta.broken = since "10"; meta.broken = since "10";
}; };
"fast-cli-1.x" = nodePackages."fast-cli-1.x".override { "fast-cli-1.x" = super."fast-cli-1.x".override {
meta.broken = since "10"; meta.broken = since "10";
}; };
jshint = nodePackages.jshint.override { jshint = super.jshint.override {
buildInputs = [ pkgs.phantomjs2 ]; buildInputs = [ pkgs.phantomjs2 ];
}; };
dat = nodePackages.dat.override { dat = super.dat.override {
buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
meta.broken = since "12"; meta.broken = since "12";
}; };
dnschain = nodePackages.dnschain.override { dnschain = super.dnschain.override {
buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; buildInputs = [ pkgs.makeWrapper super.coffee-script ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
''; '';
meta.broken = since "14"; meta.broken = since "14";
}; };
bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: { bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: {
name = "bitwarden-cli-${drv.version}"; name = "bitwarden-cli-${drv.version}";
}); });
ios-deploy = nodePackages.ios-deploy.override (drv: { ios-deploy = super.ios-deploy.override (drv: {
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ];
preRebuild = '' preRebuild = ''
LD=$CC LD=$CC
@ -63,7 +62,7 @@ nodePackages // {
meta.platforms = [ pkgs.lib.platforms.darwin ]; meta.platforms = [ pkgs.lib.platforms.darwin ];
}); });
fast-cli = nodePackages."fast-cli-1.x".override { fast-cli = super."fast-cli-1.x".override {
preRebuild = '' preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
@ -71,33 +70,32 @@ nodePackages // {
buildInputs = [ pkgs.phantomjs2 ]; buildInputs = [ pkgs.phantomjs2 ];
}; };
git-ssb = nodePackages.git-ssb.override { git-ssb = super.git-ssb.override {
buildInputs = [ nodePackages.node-gyp-build ]; buildInputs = [ self.node-gyp-build ];
meta.broken = since "10"; meta.broken = since "10";
}; };
insect = nodePackages.insect.override (drv: { insect = super.insect.override (drv: {
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ]; nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
meta.broken = since "10";
}); });
node-inspector = nodePackages.node-inspector.override { node-inspector = super.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
meta.broken = since "10"; meta.broken = since "10";
}; };
node2nix = nodePackages.node2nix.override { node2nix = super.node2nix.override {
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
''; '';
}; };
node-red = nodePackages.node-red.override { node-red = super.node-red.override {
meta.broken = since "10"; meta.broken = since "10";
}; };
pnpm = nodePackages.pnpm.override { pnpm = super.pnpm.override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
preRebuild = '' preRebuild = ''
@ -116,16 +114,24 @@ nodePackages // {
''; '';
}; };
pulp = nodePackages.pulp.override { pulp = super.pulp.override {
# tries to install purescript
npmFlags = "--ignore-scripts";
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [
pkgs.purescript
]}
'';
};
ssb-server = super.ssb-server.override {
buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ];
meta.broken = since "10"; meta.broken = since "10";
}; };
ssb-server = nodePackages.ssb-server.override { tedicross = super."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
buildInputs = [ pkgs.automake pkgs.autoconf nodePackages.node-gyp-build ];
meta.broken = since "10";
};
tedicross = nodePackages."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \ makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \
@ -133,26 +139,27 @@ nodePackages // {
''; '';
}; };
stf = nodePackages.stf.override { stf = super.stf.override {
meta.broken = since "10"; meta.broken = since "10";
}; };
webtorrent-cli = nodePackages.webtorrent-cli.override { webtorrent-cli = super.webtorrent-cli.override {
buildInputs = [ nodePackages.node-gyp-build ]; buildInputs = [ self.node-gyp-build ];
}; };
joplin = nodePackages.joplin.override { joplin = super.joplin.override {
nativeBuildInputs = [ pkgs.pkg-config ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# required by sharp # required by sharp
# https://sharp.pixelplumbing.com/install # https://sharp.pixelplumbing.com/install
vips vips
nodePackages.node-pre-gyp self.node-pre-gyp
]; ];
}; };
thelounge = nodePackages.thelounge.override { thelounge = super.thelounge.override {
buildInputs = [ nodePackages.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
}; };
} };
in self