kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

nodePackages: cleanup/fix overrides

Browse Source 
* Standardize on `override` vs `overrideAttrs'.
* Use `oldAttrs` as standard argument to `override` when it's needed.
* Fix overrides of `meta` so that original attributes are preserved.
main
Malo Bourgon 2 years ago
parent c8b24b7faa
commit 745739f280
1 changed files with 57 additions and 61 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 118
      pkgs/development/node-packages/default.nix

118
pkgs/development/node-packages/default.nix
Unescape View File

@ -30,8 +30,7 @@ let
}; };
}; };
aws-azure-login = super.aws-azure-login.override { aws-azure-login = super.aws-azure-login.override (oldAttrs: {
meta.platforms = pkgs.lib.platforms.linux;
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
prePatch = '' prePatch = ''
export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
@ -40,11 +39,12 @@ let
wrapProgram $out/bin/aws-azure-login \ wrapProgram $out/bin/aws-azure-login \
--set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium}/bin/chromium --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium}/bin/chromium
''; '';
}; meta = oldAttrs.meta // { platforms = pkgs.lib.platforms.linux; };
});
bitwarden-cli = super."@bitwarden/cli".override (drv: { bitwarden-cli = super."@bitwarden/cli".override (oldAttrs: {
name = "bitwarden-cli-${drv.version}"; name = "bitwarden-cli";
meta.mainProgram = "bw"; meta = oldAttrs.meta // { mainProgram = "bw"; };
}); });
bower2nix = super.bower2nix.override { bower2nix = super.bower2nix.override {
@ -67,39 +67,35 @@ let
''; '';
}; };
coc-imselect = super.coc-imselect.override { coc-imselect = super.coc-imselect.override (oldAttrs: {
meta.broken = since "10"; meta = oldAttrs.meta // { broken = since "10"; };
}; });
dat = super.dat.override { dat = super.dat.override (oldAttrs: {
buildInputs = [ self.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 = oldAttrs.meta // { broken = since "12"; };
}; });
deltachat-desktop = super."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override { deltachat-desktop = super."deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop".override (oldAttrs: {
meta.broken = true; # use the top-level package instead meta = oldAttrs.meta // { broken = true; }; # use the top-level package instead
}; });
# NOTE: this is a stub package to fetch npm dependencies for # NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation # ../../applications/video/epgstation
epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { epgstation = super."epgstation-../../applications/video/epgstation".override (oldAttrs: {
buildInputs = [ self.node-pre-gyp self.node-gyp-build ]; buildInputs = [ self.node-pre-gyp self.node-gyp-build ];
meta = drv.meta // { meta = oldAttrs.meta // { platforms = pkgs.lib.platforms.none; };
platforms = pkgs.lib.platforms.none;
};
}); });
# NOTE: this is a stub package to fetch npm dependencies for # NOTE: this is a stub package to fetch npm dependencies for
# ../../applications/video/epgstation/client # ../../applications/video/epgstation/client
epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (drv: { epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (oldAttrs: {
meta = drv.meta // { meta = oldAttrs.meta // { platforms = pkgs.lib.platforms.none; };
platforms = pkgs.lib.platforms.none;
};
}); });
expo-cli = super."expo-cli".override (attrs: { expo-cli = super."expo-cli".override (oldAttrs: {
# The traveling-fastlane-darwin optional dependency aborts build on Linux. # The traveling-fastlane-darwin optional dependency aborts build on Linux.
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") oldAttrs.dependencies;
}); });
fast-cli = super.fast-cli.override { fast-cli = super.fast-cli.override {
@ -113,15 +109,15 @@ let
''; '';
}; };
flood = super.flood.override { flood = super.flood.override (oldAttrs: {
buildInputs = [ self.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
meta.mainProgram = "flood"; meta = oldAttrs.meta // { mainProgram = "flood"; };
}; });
git-ssb = super.git-ssb.override { git-ssb = super.git-ssb.override (oldAttrs: {
buildInputs = [ self.node-gyp-build ]; buildInputs = [ self.node-gyp-build ];
meta.broken = since "10"; meta = oldAttrs.meta // { broken = since "10"; };
}; });
hsd = super.hsd.override { hsd = super.hsd.override {
buildInputs = [ self.node-gyp-build pkgs.unbound ]; buildInputs = [ self.node-gyp-build pkgs.unbound ];
@ -152,13 +148,13 @@ let
buildInputs = oldAttrs.buildInputs ++ [ self.node-gyp-build pkgs.zeromq ]; buildInputs = oldAttrs.buildInputs ++ [ self.node-gyp-build pkgs.zeromq ];
}); });
insect = super.insect.override (drv: { insect = super.insect.override (oldAttrs: {
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
}); });
intelephense = super.intelephense.override { intelephense = super.intelephense.override (oldAttrs: {
meta.license = pkgs.lib.licenses.unfree; meta = oldAttrs.meta // { license = pkgs.lib.licenses.unfree; };
}; });
joplin = super.joplin.override { joplin = super.joplin.override {
nativeBuildInputs = [ pkgs.pkg-config ]; nativeBuildInputs = [ pkgs.pkg-config ];
@ -176,7 +172,7 @@ let
]; ];
}; };
jsonplaceholder = super.jsonplaceholder.override (drv: { jsonplaceholder = super.jsonplaceholder.override {
buildInputs = [ nodejs ]; buildInputs = [ nodejs ];
postInstall = '' postInstall = ''
exe=$out/bin/jsonplaceholder exe=$out/bin/jsonplaceholder
@ -187,7 +183,7 @@ let
EOF EOF
chmod a+x $exe chmod a+x $exe
''; '';
}); };
makam = super.makam.override { makam = super.makam.override {
buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
@ -214,9 +210,9 @@ let
''; '';
}; };
markdownlint-cli = super.markdownlint-cli.override { markdownlint-cli = super.markdownlint-cli.override (oldAttrs: {
meta.mainProgram = "markdownlint"; meta = oldAttrs.meta // { mainProgram = "markdownlint"; };
}; });
mdctl-cli = super."@medable/mdctl-cli".override { mdctl-cli = super."@medable/mdctl-cli".override {
nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [ nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [
@ -267,10 +263,10 @@ let
''; '';
}; };
node-inspector = super.node-inspector.override { node-inspector = super.node-inspector.override (oldAttrs: {
buildInputs = [ self.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
meta.broken = since "10"; meta = oldAttrs.meta // { broken = since "10"; };
}; });
node-red = super.node-red.override { node-red = super.node-red.override {
buildInputs = [ self.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
@ -317,7 +313,7 @@ let
''; '';
}; };
postcss-cli = super.postcss-cli.override { postcss-cli = super.postcss-cli.override (oldAttrs: {
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/postcss" \ wrapProgram "$out/bin/postcss" \
@ -330,11 +326,11 @@ let
inherit (self) postcss-cli; inherit (self) postcss-cli;
}; };
}; };
meta = { meta = oldAttrs.meta // {
mainProgram = "postcss"; mainProgram = "postcss";
maintainers = with lib.maintainers; [ Luflosi ]; maintainers = with lib.maintainers; [ Luflosi ];
}; };
}; });
# To update prisma, please first update prisma-engines to the latest # To update prisma, please first update prisma-engines to the latest
# version. Then change the correct hash to this package. The PR should hold # version. Then change the correct hash to this package. The PR should hold
@ -389,16 +385,16 @@ let
} }
); );
ssb-server = super.ssb-server.override { ssb-server = super.ssb-server.override (oldAttrs: {
buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ];
meta.broken = since "10"; meta = oldAttrs.meta // { broken = since "10"; };
}; });
stf = super.stf.override { stf = super.stf.override (oldAttrs: {
meta.broken = since "10"; meta = oldAttrs.meta // { broken = since "10"; };
}; });
tailwindcss = super.tailwindcss.overrideAttrs (oldAttrs: { tailwindcss = super.tailwindcss.override {
plugins = [ ]; plugins = [ ];
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
@ -415,7 +411,7 @@ let
passthru.tests = { passthru.tests = {
simple-execution = pkgs.callPackage ./package-tests/tailwindcss.nix { inherit (self) tailwindcss; }; simple-execution = pkgs.callPackage ./package-tests/tailwindcss.nix { inherit (self) tailwindcss; };
}; };
}); };
teck-programmer = super.teck-programmer.override { teck-programmer = super.teck-programmer.override {
nativeBuildInputs = [ self.node-gyp-build ]; nativeBuildInputs = [ self.node-gyp-build ];
@ -430,15 +426,15 @@ let
''; '';
}; };
thelounge = super.thelounge.override { thelounge = super.thelounge.override (oldAttrs: {
buildInputs = [ self.node-pre-gyp ]; buildInputs = [ self.node-pre-gyp ];
postInstall = '' postInstall = ''
echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
patch -d $out/lib/node_modules/thelounge -p1 < ${./thelounge-packages-path.patch} patch -d $out/lib/node_modules/thelounge -p1 < ${./thelounge-packages-path.patch}
''; '';
passthru.tests = { inherit (nixosTests) thelounge; }; passthru.tests = { inherit (nixosTests) thelounge; };
meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; }; meta = oldAttrs.meta // { maintainers = with lib.maintainers; [ winter ]; };
}; });
thelounge-plugin-closepms = super.thelounge-plugin-closepms.override { thelounge-plugin-closepms = super.thelounge-plugin-closepms.override {
nativeBuildInputs = [ self.node-pre-gyp ]; nativeBuildInputs = [ self.node-pre-gyp ];
@ -459,7 +455,7 @@ let
''; '';
}; };
ts-node = super.ts-node.overrideAttrs (oldAttrs: { ts-node = super.ts-node.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/ts-node" \ wrapProgram "$out/bin/ts-node" \
@ -467,7 +463,7 @@ let
''; '';
}); });
tsun = super.tsun.overrideAttrs (oldAttrs: { tsun = super.tsun.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/tsun" \ wrapProgram "$out/bin/tsun" \
@ -475,7 +471,7 @@ let
''; '';
}); });
typescript = super.typescript.overrideAttrs (oldAttrs: { typescript = super.typescript.override (oldAttrs: {
meta = oldAttrs.meta // { mainProgram = "tsc"; }; meta = oldAttrs.meta // { mainProgram = "tsc"; };
}); });

Write Preview
Loading…
Cancel
Save