diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-30 19:56:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-30 19:56:12 +0100 |
commit | 639d53bbef6ea402c661a724e33e7d6fdb737e43 (patch) | |
tree | 6fbfe9cbadb6ccbbd576c1b5ad25f054952a4fc7 /pkgs | |
parent | 319418f226ea214c3852c172e600fb8cd2aa79d9 (diff) | |
parent | 3ee20ba064fcee93aefb256f809dc1fb611914ee (diff) | |
download | nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar.gz nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar.bz2 nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar.lz nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar.xz nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.tar.zst nixlib-639d53bbef6ea402c661a724e33e7d6fdb737e43.zip |
Merge pull request #89210 from Mic92/pulp
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/node-packages/default.nix | 301 |
1 files changed, 154 insertions, 147 deletions
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ac442e2e07f2..7ff3db8894ec 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -3,156 +3,163 @@ let since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); - nodePackages = import ./composition.nix { + super = import ./composition.nix { inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; -in -nodePackages // { - "@angular/cli" = nodePackages."@angular/cli".override { - prePatch = '' - export NG_CLI_ANALYTICS=false - ''; - }; - bower2nix = nodePackages.bower2nix.override { - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} - done - ''; - }; - - coc-imselect = nodePackages.coc-imselect.override { - meta.broken = since "10"; - }; - - "fast-cli-1.x" = nodePackages."fast-cli-1.x".override { - meta.broken = since "10"; - }; - - jshint = nodePackages.jshint.override { - buildInputs = [ pkgs.phantomjs2 ]; - }; - - dat = nodePackages.dat.override { - buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; - meta.broken = since "12"; - }; - - dnschain = nodePackages.dnschain.override { - buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; - postInstall = '' - wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin - ''; - meta.broken = since "14"; - }; - - bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: { - name = "bitwarden-cli-${drv.version}"; - }); - - ios-deploy = nodePackages.ios-deploy.override (drv: { - nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; - preRebuild = '' - LD=$CC - tmp=$(mktemp -d) - ln -s /usr/bin/xcodebuild $tmp - export PATH="$PATH:$tmp" - ''; - meta.platforms = [ pkgs.lib.platforms.darwin ]; - }); - - fast-cli = nodePackages."fast-cli-1.x".override { - preRebuild = '' - # 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 - ''; - buildInputs = [ pkgs.phantomjs2 ]; - }; - - git-ssb = nodePackages.git-ssb.override { - buildInputs = [ nodePackages.node-gyp-build ]; - meta.broken = since "10"; - }; - - insect = nodePackages.insect.override (drv: { - nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ]; - meta.broken = since "10"; - }); - - node-inspector = nodePackages.node-inspector.override { - buildInputs = [ nodePackages.node-pre-gyp ]; - meta.broken = since "10"; - }; - - node2nix = nodePackages.node2nix.override { - buildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} - ''; - }; - - node-red = nodePackages.node-red.override { - meta.broken = since "10"; - }; - - pnpm = nodePackages.pnpm.override { - nativeBuildInputs = [ pkgs.makeWrapper ]; - - preRebuild = '' - sed 's/"link:/"file:/g' --in-place package.json - ''; - - postInstall = let - pnpmLibPath = stdenv.lib.makeBinPath [ - nodejs.passthru.python - nodejs + self = super // { + "@angular/cli" = super."@angular/cli".override { + prePatch = '' + export NG_CLI_ANALYTICS=false + ''; + }; + bower2nix = super.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} + done + ''; + }; + + coc-imselect = super.coc-imselect.override { + meta.broken = since "10"; + }; + + "fast-cli-1.x" = super."fast-cli-1.x".override { + meta.broken = since "10"; + }; + + jshint = super.jshint.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; + + dat = super.dat.override { + buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; + meta.broken = since "12"; + }; + + dnschain = super.dnschain.override { + buildInputs = [ pkgs.makeWrapper super.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + meta.broken = since "14"; + }; + + bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { + name = "bitwarden-cli-${drv.version}"; + }); + + ios-deploy = super.ios-deploy.override (drv: { + nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; + preRebuild = '' + LD=$CC + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + ''; + meta.platforms = [ pkgs.lib.platforms.darwin ]; + }); + + fast-cli = super."fast-cli-1.x".override { + preRebuild = '' + # 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 + ''; + buildInputs = [ pkgs.phantomjs2 ]; + }; + + git-ssb = super.git-ssb.override { + buildInputs = [ self.node-gyp-build ]; + meta.broken = since "10"; + }; + + insect = super.insect.override (drv: { + nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; + }); + + node-inspector = super.node-inspector.override { + buildInputs = [ self.node-pre-gyp ]; + meta.broken = since "10"; + }; + + node2nix = super.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} + ''; + }; + + node-red = super.node-red.override { + meta.broken = since "10"; + }; + + pnpm = super.pnpm.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + + preRebuild = '' + sed 's/"link:/"file:/g' --in-place package.json + ''; + + postInstall = let + pnpmLibPath = stdenv.lib.makeBinPath [ + nodejs.passthru.python + nodejs + ]; + in '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} + done + ''; + }; + + 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"; + }; + + tedicross = super."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \ + --add-flags "$out/lib/node_modules/tedicross/main.js" + ''; + }; + + stf = super.stf.override { + meta.broken = since "10"; + }; + + webtorrent-cli = super.webtorrent-cli.override { + buildInputs = [ self.node-gyp-build ]; + }; + + joplin = super.joplin.override { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = with pkgs; [ + # required by sharp + # https://sharp.pixelplumbing.com/install + vips + + self.node-pre-gyp ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - - pulp = nodePackages.pulp.override { - meta.broken = since "10"; - }; - - ssb-server = nodePackages.ssb-server.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 ]; - postInstall = '' - makeWrapper '${nodejs}/bin/node' "$out/bin/tedicross" \ - --add-flags "$out/lib/node_modules/tedicross/main.js" - ''; - }; - - stf = nodePackages.stf.override { - meta.broken = since "10"; - }; - - webtorrent-cli = nodePackages.webtorrent-cli.override { - buildInputs = [ nodePackages.node-gyp-build ]; - }; - - joplin = nodePackages.joplin.override { - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = with pkgs; [ - # required by sharp - # https://sharp.pixelplumbing.com/install - vips - - nodePackages.node-pre-gyp - ]; - }; + }; - thelounge = nodePackages.thelounge.override { - buildInputs = [ nodePackages.node-pre-gyp ]; + thelounge = super.thelounge.override { + buildInputs = [ self.node-pre-gyp ]; + }; }; -} +in self |