flipperzero-firmware: update patches for latest changes

nix/pkgs/flipperzero-firmware/0001-simply-do-not-run-git.patch

@@ -1,4 +1,4 @@
-From 5a1296bed9f1e1a7c1a182828384309da31293a6 Mon Sep 17 00:00:00 2001
+From a93c1256674196fed9575a57a2efb23a54f7d244 Mon Sep 17 00:00:00 2001
 From: Luke Granger-Brown <git@lukegb.com>
 Date: Sat, 22 Oct 2022 19:33:07 +0100
 Subject: [PATCH 1/4] simply do not run git
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] simply do not run git
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/scripts/version.py b/scripts/version.py
-index df891e646..03c0fbc62 100644
+index 101224e21..1f9be40ed 100644
 --- a/scripts/version.py
 +++ b/scripts/version.py
 @@ -74,13 +74,7 @@ class GitVersion:
@@ -27,5 +27,5 @@ index df891e646..03c0fbc62 100644
  
  class Main(App):
 -- 
-2.39.2
+2.40.0
 

nix/pkgs/flipperzero-firmware/0002-proto_ver_generator-use-changelog-not-git.patch

@@ -1,17 +1,17 @@
-From e4682380261b7207dee8992dc6533821f71d7fa8 Mon Sep 17 00:00:00 2001
+From 0e9f71539ccf7a88c02a800f00b3c5d6e693444b Mon Sep 17 00:00:00 2001
 From: Luke Granger-Brown <git@lukegb.com>
 Date: Sat, 22 Oct 2022 19:35:00 +0100
 Subject: [PATCH 2/4] proto_ver_generator: use changelog, not git
 
 ---
- scripts/fbt_tools/fbt_assets.py | 29 ++++++++++-------------------
- 1 file changed, 10 insertions(+), 19 deletions(-)
+ scripts/fbt_tools/fbt_assets.py | 28 ++++++++++------------------
+ 1 file changed, 10 insertions(+), 18 deletions(-)
 
 diff --git a/scripts/fbt_tools/fbt_assets.py b/scripts/fbt_tools/fbt_assets.py
-index e4c567993..145d6ddda 100644
+index 68617c254..e7afb2d5c 100644
 --- a/scripts/fbt_tools/fbt_assets.py
 +++ b/scripts/fbt_tools/fbt_assets.py
-@@ -73,26 +73,17 @@ def _invoke_git(args, source_dir):
+@@ -73,26 +73,18 @@ def _invoke_git(args, source_dir):
  
  
  def proto_ver_generator(target, source, env):
@@ -27,11 +27,11 @@ index e4c567993..145d6ddda 100644
      target_file = target[0]
 -    src_dir = source[0].dir.abspath
 -    try:
--        git_fetch = _invoke_git(
+-        _invoke_git(
 -            ["fetch", "--tags"],
 -            source_dir=src_dir,
 -        )
--    except (subprocess.CalledProcessError, EnvironmentError) as e:
+-    except (subprocess.CalledProcessError, EnvironmentError):
 -        # Not great, not terrible
 -        print(fg.boldred("Git: fetch failed"))
 -
@@ -40,14 +40,14 @@ index e4c567993..145d6ddda 100644
 -            ["describe", "--tags", "--abbrev=0"],
 -            source_dir=src_dir,
 -        )
--    except (subprocess.CalledProcessError, EnvironmentError) as e:
+-    except (subprocess.CalledProcessError, EnvironmentError):
 -        raise StopError("Git: describe failed")
--
+ 
 -    git_major, git_minor = git_describe.split(".")
 +    git_major, git_minor = version.split(".")
      version_file_data = (
          "#pragma once",
          f"#define PROTOBUF_MAJOR_VERSION {git_major}",
 -- 
-2.39.2
+2.40.0
 

nix/pkgs/flipperzero-firmware/0003-scripts-fbt-version-no-git.patch

@@ -1,19 +1,19 @@
-From 0589a001f0207715e30e2bd9cb9f2edb39d53046 Mon Sep 17 00:00:00 2001
+From f8fc39744b594becca3543e6375dfd3bb1821bab Mon Sep 17 00:00:00 2001
 From: Luke Granger-Brown <git@lukegb.com>
 Date: Sat, 22 Oct 2022 19:40:33 +0100
 Subject: [PATCH 3/4] scripts/fbt/version: no git
 
 ---
- scripts/fbt/version.py | 20 +++-----------------
- 1 file changed, 3 insertions(+), 17 deletions(-)
+ scripts/fbt/version.py | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
 
 diff --git a/scripts/fbt/version.py b/scripts/fbt/version.py
-index e7fe2edaf..c07bc2915 100644
+index 09f48c8eb..e76bd1bc8 100644
 --- a/scripts/fbt/version.py
 +++ b/scripts/fbt/version.py
-@@ -1,30 +1,16 @@
--import subprocess
+@@ -1,30 +1,17 @@
  import datetime
+ import subprocess
  from functools import cache
 +import os
  
@@ -46,5 +46,5 @@ index e7fe2edaf..c07bc2915 100644
      except Exception as e:
          print("Failed to check for git changes", e)
 -- 
-2.39.2
+2.40.0
 

nix/pkgs/flipperzero-firmware/0004-scripts-sconsdist-disable-strict_timestamps-allow-FS.patch

@@ -1,4 +1,4 @@
-From a6e68ed93bd47302d8e0ab914ad463a1d7b07703 Mon Sep 17 00:00:00 2001
+From 534d8980354d87e2d1cb85def2cc50de8480cb83 Mon Sep 17 00:00:00 2001
 From: Luke Granger-Brown <git@lukegb.com>
 Date: Sat, 22 Oct 2022 19:50:27 +0100
 Subject: [PATCH 4/4] scripts/sconsdist: disable strict_timestamps - allow FS
@@ -29,5 +29,5 @@ index 23e194a94..5dd5db1ee 100644
              for component_key in sdk_components_keys:
                  component_path = self._dist_components.get(component_key)
 -- 
-2.39.2
+2.40.0