Unverified Commit 6a0d5215 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

bruno: 1.34.0 -> 1.34.2 (#354103)

parents d79447f6 01310793

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

+22 −13
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
  buildNpmPackage,

  nix-update-script,

  electron,

  writeShellScriptBin,

  makeWrapper,

  copyDesktopItems,

  makeDesktopItem,
@@ -19,25 +18,24 @@ 


buildNpmPackage rec {

  pname = "bruno";

  version = "1.34.0";

  version = "1.34.2";



  src = fetchFromGitHub {

    owner = "usebruno";

    repo = "bruno";

    rev = "v${version}";

    hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA=";

    hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc=";



    postFetch = ''

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

    '';

  };



  npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw=";

  npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI=";

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



  nativeBuildInputs =

    [

      (writeShellScriptBin "phantomjs" "echo 2.1.1")

      pkg-config

    ]

    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
@@ -80,8 +78,17 @@ buildNpmPackage rec { 


  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;



  dontNpmBuild = true;

  postBuild = ''

  # remove giflib dependency

  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-graphql-docs

    npm run build --workspace=packages/bruno-app
@@ -121,6 +128,8 @@ buildNpmPackage rec { 
    }



    popd



    runHook postBuild

  '';



  npmPackFlags = [ "--ignore-scripts" ];
@@ -160,19 +169,19 @@ buildNpmPackage rec { 


  passthru.updateScript = nix-update-script { };



  meta = with lib; {

  meta = {

    description = "Open-source IDE For exploring and testing APIs";

    homepage = "https://www.usebruno.com";

    platforms = platforms.linux ++ platforms.darwin;

    license = licenses.mit;

    maintainers = with maintainers; [

    license = lib.licenses.mit;

    mainProgram = "bruno";

    maintainers = with lib.maintainers; [

      gepbird

      kashw2

      lucasew

      mattpolzin

      water-sucks

      redyf

      water-sucks

    ];

    mainProgram = "bruno";

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

  };

}