Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 60a52761bf70
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 02fff4699cb7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 7, 2018

  1. sit: fix tests on aarch64 

    As we found out in #40032, sit tests won't pass on
aarch64. The problem seems to be related to
`create_dir` not returning an error if the directory
already exists, happening specifically on aarch64+debug
(not aarch64+release)

This update injects a patch for tests that will also
be included in subsequent versions of SIT.
    @yrashk
    yrashk committed May 7, 2018
    Copy the full SHA
    783d547 View commit details

  2. Merge pull request #40143 from yrashk/sit-0.3.2-aarch64 

    sit: fix tests on aarch64
    @xeji
    xeji authored May 7, 2018
    Copy the full SHA
    02fff46 View commit details
Showing with 19 additions and 0 deletions.
  1. +17 −0 pkgs/applications/version-management/sit/aarch64-eexist.patch
  2. +2 −0 pkgs/applications/version-management/sit/default.nix
17 changes: 17 additions & 0 deletions pkgs/applications/version-management/sit/aarch64-eexist.patch
View file
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 2 additions & 0 deletions pkgs/applications/version-management/sit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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/;