diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
| commit | a18b493e022a4d94916b2d73198b29ff1a241114 (patch) | |
| tree | e6f69c279e63f753e958773e854caeb934ac770c /pkgs/applications/version-management | |
| parent | 8ff2dca3884b99799d90e0a025de59552161eebf (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
| download | nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.gz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.bz2 nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.lz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.xz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.zst nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 11 insertions, 19 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 14026df81853..a2f0c8ae4142 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = { description = "Prevents you from committing passwords and other sensitive information to a git repository"; - homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets; + homepage = https://github.com/awslabs/git-secrets; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; }; 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 { diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch new file mode 100644 index 000000000000..411922cfd8e7 --- /dev/null +++ b/pkgs/applications/version-management/sit/aarch64-isel.patch @@ -0,0 +1,9 @@ +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..15e7649 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,3 @@ ++# https://github.com/rust-lang/rust/issues/50516 ++[target.'cfg(all(debug_assertions, target_arch = "aarch64"))'] ++rustflags = ["-C", "llvm-args=-fast-isel"] diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index ae84add283e6..e189241531d6 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; - patches = [ ./aarch64-eexist.patch ]; + patches = [ ./aarch64-isel.patch ]; meta = with stdenv.lib; { description = "Serverless Information Tracker"; |