Unverified Commit a8eb4883 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #304378 from gepbird/bruno-1.13.0 

bruno: 1.12.3 -> 1.13.1, use --replace-fail
parents c65021a7 10defe38

pkgs/by-name/br/bruno/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -27,20 +27,20 @@ let 
in

buildNpmPackage' rec {

  pname = "bruno";

  version = "1.12.3";

  version = "1.13.1";



  src = fetchFromGitHub {

    owner = "usebruno";

    repo = "bruno";

    rev = "v${version}";

    hash = "sha256-ubvsTJ/MSEguVeJg91LvgARWte+p5MHdqhXIVqbyPhQ=";

    hash = "sha256-fVbwHmJ/5OtMM0lkOIo6zPXkAa8mIK+WRHCTXJ1XEIw=";



    postFetch = ''

      ${lib.getExe npm-lockfile-fix} $out/package-lock.json

    '';

  };



  npmDepsHash = "sha256-Zt5cVB1S86iPYKOUj7FwyR97lwmnFz6sZ+S3Ms/b9+o=";

  npmDepsHash = "sha256-D90y6NaiR9zpgtjfm9QgLxBVbHa09OMSi+fvgwqSjgY=";

  npmFlags = [ "--legacy-peer-deps" ];



  nativeBuildInputs = [
@@ -73,7 +73,7 @@ buildNpmPackage' rec { 


  postPatch = ''

    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;
@@ -94,8 +94,8 @@ buildNpmPackage' rec { 
    find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw



    substituteInPlace electron-builder-config.js \

      --replace "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \

      --replace "afterSign: 'notarize.js'," ""

      --replace-fail "identity: 'Anoop MD (W7LPPWA48L)'" 'identity: null' \

      --replace-fail "afterSign: 'notarize.js'," ""



    npm exec electron-builder -- \

      --dir \
@@ -151,7 +151,7 @@ buildNpmPackage' rec { 
    homepage = "https://www.usebruno.com";

    inherit (electron.meta) platforms;

    license = licenses.mit;

    maintainers = with maintainers; [ water-sucks lucasew kashw2 mattpolzin ];

    maintainers = with maintainers; [ gepbird kashw2 lucasew mattpolzin water-sucks ];

    mainProgram = "bruno";

  };

}