diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-07 23:01:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 23:01:48 +0200 |
| commit | 02fff4699cb70ec11e41a732f64599b5f6c03796 (patch) | |
| tree | a2d252d470b4c3bce8366a4bcff30583905355a2 | |
| parent | 60a52761bf706f1a5780f77582c9eca0e14a87c4 (diff) | |
| parent | 783d547bddf66070b3a33b1fd4b972d945e5942c (diff) | |
| download | nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar.gz nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar.bz2 nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar.lz nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar.xz nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.tar.zst nixlib-02fff4699cb70ec11e41a732f64599b5f6c03796.zip | |
Merge pull request #40143 from yrashk/sit-0.3.2-aarch64
sit: fix tests on aarch64
| -rw-r--r-- | pkgs/applications/version-management/sit/aarch64-eexist.patch | 17 | ||||
| -rw-r--r-- | pkgs/applications/version-management/sit/default.nix | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch new file mode 100644 index 000000000000..8b45e77d040d --- /dev/null +++ b/pkgs/applications/version-management/sit/aarch64-eexist.patch @@ -0,0 +1,17 @@ +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 { diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 0cc75f8bd5a3..ae84add283e6 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; + patches = [ ./aarch64-eexist.patch ]; + meta = with stdenv.lib; { description = "Serverless Information Tracker"; homepage = https://sit.sh/; |