diff options
author | Yurii Rashkovskii <yrashk@gmail.com> | 2018-06-12 10:55:33 -0700 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-12 19:55:33 +0200 |
commit | f45fd23bd12c01786d4401ce608b946fec7de69e (patch) | |
tree | 4bcd33bcc335c10c1664d827bbc8e8233a89f659 /pkgs/applications | |
parent | 7cb01d58b22a163e2075c567ef6f470d5d5a2f99 (diff) | |
download | nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar.gz nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar.bz2 nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar.lz nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar.xz nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.tar.zst nixlib-f45fd23bd12c01786d4401ce608b946fec7de69e.zip |
sit: 0.3.2 -> 0.4.0 (#41863)
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/version-management/sit/aarch64-isel.patch | 9 | ||||
-rw-r--r-- | pkgs/applications/version-management/sit/default.nix | 21 |
2 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch deleted file mode 100644 index 411922cfd8e7..000000000000 --- a/pkgs/applications/version-management/sit/aarch64-isel.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 e189241531d6..75368bd88463 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,25 +1,30 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, + # Darwin + libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { - owner = "sit-it"; + owner = "sit-fyi"; repo = "sit"; rev = "v${version}"; - sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57"; + sha256 = "10ycs6vc7mfzxnxrki09xn974pcwh196h1pfnsds98x6r87hxkpn"; }; - buildInputs = [ cmake libzip ]; + buildInputs = [ cmake libzip gnupg ] ++ + (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []); - cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; + preCheck = '' + export HOME=$(mktemp -d) + ''; - patches = [ ./aarch64-isel.patch ]; + cargoSha256 = "023anmnprxbsvqww1b1bdyfhbhjh1ah2kc67cdihvdvi4lqdmbia"; meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = https://sit.sh/; + homepage = https://sit.fyi/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; |