Merge master into staging

1 files changed, 0 insertions, 17 deletions

diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch
deleted file mode 100644
index 8b45e77d040d..000000000000
--- a/pkgs/applications/version-management/sit/aarch64-eexist.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
-index ebd357d..074dcc9 100644
---- a/sit-core/src/repository.rs
-+++ b/sit-core/src/repository.rs
-@@ -305,6 +305,12 @@ impl Repository {
-         let id: String = name.into();
-         let mut path = self.items_path.clone();
-         path.push(&id);
-+        #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
-+          use std::io;
-+          if path.is_dir() {
-+             return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
-+          }
-+        }
-         fs::create_dir(path)?;
-         let id = OsString::from(id);
-         Ok(Item {