diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 811fb768f17d..af0138114a91 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -3,6 +3,7 @@ stdenv, clang_20, buildNpmPackage, + nodejs_22, bruno, pkg-config, pango, @@ -21,6 +22,9 @@ buildNpmPackage { # to keep them in sync with easier maintenance inherit (bruno) version src npmDepsHash; + # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535 + nodejs = nodejs_22; + npmWorkspace = "packages/bruno-cli"; npmFlags = [ "--legacy-peer-deps" ]; @@ -45,6 +49,7 @@ buildNpmPackage { npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs + npm run build --workspace=packages/bruno-schema-types npm run build --workspace=packages/bruno-converters npm run build --workspace=packages/bruno-query npm run build --workspace=packages/bruno-filestore @@ -64,12 +69,12 @@ buildNpmPackage { pushd $out/lib/node_modules/usebruno # packages used by the GUI app, unused by CLI - rm -r packages/bruno-{app,electron,tests,toml,schema,docs} + rm -r packages/bruno-{app,electron,tests,toml,docs} rm node_modules/bruno - rm node_modules/@usebruno/{app,tests,toml,schema} + rm node_modules/@usebruno/{app,tests,toml} # heavy dependencies that seem to be unused - rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*} + rm -rf node_modules/{@tabler,pdfjs-dist,*redux*,prettier,@types*,*react*,*graphiql*,@swagger-api} rm -r node_modules/.bin # unused file types diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 14c1bd52bb54..4c7420b311c2 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,13 +21,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.15.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-REK3rJ+Svf6bLIfLwizlLa3rIBgnhQHbhzTTe8VPoc4="; + hash = "sha256-lvv1SJuUxNwukg/yi6mhgvVs8M/Eyf2H36NJN+6XKSE="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json @@ -36,7 +36,7 @@ buildNpmPackage rec { nodejs = nodejs_22; - npmDepsHash = "sha256-CXXXyDaaoAoZhUo1YNP3PUEGzlmIaDnA+JhrCqBY1H4="; + npmDepsHash = "sha256-zb0oP4/L7449z83tpcT6W/6sXS4Urph3ELN9kUC32dA="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ @@ -102,6 +102,7 @@ buildNpmPackage rec { npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs + npm run build --workspace=packages/bruno-schema-types npm run build --workspace=packages/bruno-converters npm run build --workspace=packages/bruno-app npm run build --workspace=packages/bruno-query @@ -167,6 +168,11 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/bruno \ --add-flags $out/opt/bruno/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + stdenv.cc.cc.lib + ] + } \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0