bruno: 1.34.0 -> 1.34.2 (#354103)

This commit is contained in:
Austin Horstman 2024-11-08 21:58:42 -06:00 committed by GitHub
commit 6a0d52155b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5,7 +5,6 @@
buildNpmPackage, buildNpmPackage,
nix-update-script, nix-update-script,
electron, electron,
writeShellScriptBin,
makeWrapper, makeWrapper,
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
@ -19,25 +18,24 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "bruno"; pname = "bruno";
version = "1.34.0"; version = "1.34.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "usebruno"; owner = "usebruno";
repo = "bruno"; repo = "bruno";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA="; hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc=";
postFetch = '' postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json ${lib.getExe npm-lockfile-fix} $out/package-lock.json
''; '';
}; };
npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw="; npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI=";
npmFlags = [ "--legacy-peer-deps" ]; npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs = nativeBuildInputs =
[ [
(writeShellScriptBin "phantomjs" "echo 2.1.1")
pkg-config pkg-config
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
@ -80,8 +78,17 @@ buildNpmPackage rec {
ELECTRON_SKIP_BINARY_DOWNLOAD = 1; ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
dontNpmBuild = true; # remove giflib dependency
postBuild = '' npmRebuildFlags = [ "--ignore-scripts" ];
preBuild = ''
substituteInPlace node_modules/canvas/binding.gyp \
--replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'"
npm rebuild
'';
buildPhase = ''
runHook preBuild
npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-common
npm run build --workspace=packages/bruno-graphql-docs npm run build --workspace=packages/bruno-graphql-docs
npm run build --workspace=packages/bruno-app npm run build --workspace=packages/bruno-app
@ -121,6 +128,8 @@ buildNpmPackage rec {
} }
popd popd
runHook postBuild
''; '';
npmPackFlags = [ "--ignore-scripts" ]; npmPackFlags = [ "--ignore-scripts" ];
@ -160,19 +169,19 @@ buildNpmPackage rec {
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };
meta = with lib; { meta = {
description = "Open-source IDE For exploring and testing APIs"; description = "Open-source IDE For exploring and testing APIs";
homepage = "https://www.usebruno.com"; homepage = "https://www.usebruno.com";
platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.mit;
license = licenses.mit; mainProgram = "bruno";
maintainers = with maintainers; [ maintainers = with lib.maintainers; [
gepbird gepbird
kashw2 kashw2
lucasew lucasew
mattpolzin mattpolzin
water-sucks
redyf redyf
water-sucks
]; ];
mainProgram = "bruno"; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }