mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
Merge pull request #304378 from gepbird/bruno-1.13.0
bruno: 1.12.3 -> 1.13.1, use --replace-fail
This commit is contained in:
commit
a8eb4883da
@ -27,20 +27,20 @@ let
|
|||||||
in
|
in
|
||||||
buildNpmPackage' rec {
|
buildNpmPackage' rec {
|
||||||
pname = "bruno";
|
pname = "bruno";
|
||||||
version = "1.12.3";
|
version = "1.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "usebruno";
|
owner = "usebruno";
|
||||||
repo = "bruno";
|
repo = "bruno";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-ubvsTJ/MSEguVeJg91LvgARWte+p5MHdqhXIVqbyPhQ=";
|
hash = "sha256-fVbwHmJ/5OtMM0lkOIo6zPXkAa8mIK+WRHCTXJ1XEIw=";
|
||||||
|
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-Zt5cVB1S86iPYKOUj7FwyR97lwmnFz6sZ+S3Ms/b9+o=";
|
npmDepsHash = "sha256-D90y6NaiR9zpgtjfm9QgLxBVbHa09OMSi+fvgwqSjgY=";
|
||||||
npmFlags = [ "--legacy-peer-deps" ];
|
npmFlags = [ "--legacy-peer-deps" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -73,7 +73,7 @@ buildNpmPackage' rec {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace scripts/build-electron.sh \
|
substituteInPlace scripts/build-electron.sh \
|
||||||
--replace 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
|
--replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
ELECTRON_SKIP_BINARY_DOWNLOAD=1;
|
ELECTRON_SKIP_BINARY_DOWNLOAD=1;
|
||||||
@ -94,8 +94,8 @@ buildNpmPackage' rec {
|
|||||||
find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw
|
find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw
|
||||||
|
|
||||||
substituteInPlace electron-builder-config.js \
|
substituteInPlace electron-builder-config.js \
|
||||||
--replace "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \
|
--replace-fail "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \
|
||||||
--replace "afterSign: 'notarize.js'," ""
|
--replace-fail "afterSign: 'notarize.js'," ""
|
||||||
|
|
||||||
npm exec electron-builder -- \
|
npm exec electron-builder -- \
|
||||||
--dir \
|
--dir \
|
||||||
@ -151,7 +151,7 @@ buildNpmPackage' rec {
|
|||||||
homepage = "https://www.usebruno.com";
|
homepage = "https://www.usebruno.com";
|
||||||
inherit (electron.meta) platforms;
|
inherit (electron.meta) platforms;
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ water-sucks lucasew kashw2 mattpolzin ];
|
maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks ];
|
||||||
mainProgram = "bruno";
|
mainProgram = "bruno";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user