Unverified Commit dbcb81f6 authored by Antoine du Hamel's avatar Antoine du Hamel Committed by GitHub
Browse files

nodejs: make `nodejs_*` depend on `nodejs-slim_*` (#481461)

parents e217c74e 7459fe94

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ 


- `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported.



- `nodejs-slim` has a `npm` output, and `nodejs` no longer has a `libv8` output.



- All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.



- `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`.

pkgs/by-name/th/thelounge/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  fetchYarnDeps,

  nodejs,

  nodejs-slim,

  yarn,

  fixup-yarn-lock,

  python3,
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk}

  '';



  disallowedReferences = [ nodejs.src ];

  disallowedReferences = [ nodejs-slim.src ];



  dontNpmPrune = true;

pkgs/by-name/x2/x2t/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  jdk,

  lib,

  nodejs_22,

  nodejs-slim_22,

  openssl,

  pkg-config,

  python3,
@@ -704,7 +705,7 @@ let 
      qmakeFlags

      ++ icuQmakeFlags

      ++ [

        # c++1z for nodejs_22.libv8 (20 seems to produce errors around 'is_void_v' there)

        # c++1z for nodejs-slim_22.libv8 (20 seems to produce errors around 'is_void_v' there)

        # c++ 20 for nodejs_23.libv8

        "CONFIG+=c++2a"

        # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000
@@ -735,8 +736,8 @@ let 
      echo "== v8 =="

      mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64

      # using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805

      ln -s ${nodejs_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj

      tar xf ${nodejs_22.libv8.src} --one-top-level=/tmp/xxxxx

      ln -s ${nodejs-slim_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj

      tar xf ${nodejs-slim_22.libv8.src} --one-top-level=/tmp/xxxxx

      for i in /tmp/xxxxx/*/deps/v8/*; do

        cp -r $i Common/3dParty/v8_89/v8/

      done

pkgs/development/r-modules/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ let 
      rustc

    ];

    vdiffr = [ pkgs.libpng.dev ];

    V8 = [ pkgs.nodejs_22.libv8 ]; # when unpinning the version, don't forget about the other usages later

    V8 = [ pkgs.nodejs-slim_22.libv8 ]; # when unpinning the version, don't forget about the other usages later

    xactonomial = with pkgs; [

      cargo

      rustc
@@ -2515,8 +2515,8 @@ let 


      preConfigure = ''

        # when unpinning the version, don't forget about the other usage earlier

        export INCLUDE_DIR=${pkgs.nodejs_22.libv8}/include

        export LIB_DIR=${pkgs.nodejs_22.libv8}/lib

        export INCLUDE_DIR=${pkgs.nodejs-slim_22.libv8}/include

        export LIB_DIR=${pkgs.nodejs-slim_22.libv8}/lib

        patchShebangs configure

      '';

pkgs/development/ruby-modules/gem-config/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
  which,

  libiconv,

  libpq,

  nodejs,

  nodejs-slim,

  clang,

  sqlite,

  zlib,
@@ -338,7 +338,7 @@ in 


  mini_racer = attrs: {

    buildFlags = [

      "--with-v8-dir=\"${nodejs.libv8}\""

      "--with-v8-dir=\"${nodejs-slim.libv8}\""

    ];

    dontBuild = false;

    postPatch = ''
@@ -699,7 +699,7 @@ in 
  };



  execjs = attrs: {

    propagatedBuildInputs = [ nodejs.libv8 ];

    propagatedBuildInputs = [ nodejs-slim.libv8 ];

  };



  libxml-ruby = attrs: {