Merge pull request #329402 from mattpolzin/bruno-1-22

bruno: 1.21.0 -> 1.22.0

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

@@ -28,20 +28,20 @@ let
 in
 buildNpmPackage' rec {
   pname = "bruno";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     rev = "v${version}";
-    hash = "sha256-k8pRSAQpE//qH7XRjSTXmxundgK5dmOQTRKP9D2RUdY=";
+    hash = "sha256-RcMmW1+XbQSVeaYnK7y8/WdQLYOIozyt9OCDAsSZ3HU=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-aw4jOvlfZHCRrgoXT69XrMYe40YXULrfbVG1pQAFGr4=";
+  npmDepsHash = "sha256-157hm7h5FWuOuxoo6WTtlMPq5LcRZIsSt5NDg0pvim8=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
@@ -73,11 +73,6 @@ buildNpmPackage' rec {
     })
   ];
 
-  patches = [
-    # Workaround to fix css issue in bruno due to electron difference between Nix and mainstream. https://github.com/NixOS/nixpkgs/issues/324176
-    ./scroll-width-fix.patch
-  ];
-
   postPatch = ''
     substituteInPlace scripts/build-electron.sh \
       --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'

pkgs/by-name/br/bruno/scroll-width-fix.patch

@@ -1,37 +0,0 @@
-diff --git a/packages/bruno-app/src/globalStyles.js b/packages/bruno-app/src/globalStyles.js
-index c2b16781..936449ed 100644
---- a/packages/bruno-app/src/globalStyles.js
-+++ b/packages/bruno-app/src/globalStyles.js
-@@ -163,32 +163,6 @@ const GlobalStyle = createGlobalStyle`
-   }
- 
- 
--  // scrollbar styling
--  // the below media query target non-macos devices
--  // (macos scrollbar styling is the ideal style reference)
--  @media not all and (pointer: coarse) {
--    * {
--      scrollbar-width: thin;
--      scrollbar-color: ${(props) => props.theme.scrollbar.color};
--    }
--    
--    *::-webkit-scrollbar {
--      width: 5px;
--    }
--    
--    *::-webkit-scrollbar-track {
--      background: transparent;
--      border-radius: 5px;
--    }
--    
--    *::-webkit-scrollbar-thumb {
--      background-color: ${(props) => props.theme.scrollbar.color};
--      border-radius: 14px;
--      border: 3px solid ${(props) => props.theme.scrollbar.color};
--    }
--  }
--
--
-   // codemirror
-   .CodeMirror {
-     .cm-variable-valid {