mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
numbat: 1.12.0 -> 1.13.0 (#341128)
This commit is contained in:
commit
fc76c54b9f
@ -2,23 +2,33 @@
|
||||
, stdenv
|
||||
, testers
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, darwin
|
||||
, numbat
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "numbat";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "numbat";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MYoNziQiyppftLPNM8cqEuNwUA4KCmtotQqDhgyef1E=";
|
||||
hash = "sha256-o3EYhMFBgs/Ni+YCM3+RdUYlwRt+nMaEP/cAkDXMVHc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-t6vxJ0UIQJILCGv4PO5V4/QF5de/wtMQDkb8gPtE70E=";
|
||||
cargoHash = "sha256-rK9RPd/hww2F87l/dd14pB4izE58NuqaewYaqMimV1M=";
|
||||
|
||||
patches = [
|
||||
# https://github.com/sharkdp/numbat/pull/562
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sharkdp/numbat/commit/4756a1989ecdab35fd05ca18c721ed15d8cde2b1.patch";
|
||||
hash = "sha256-22+yePjy+MxJQ60EdvgaTw/IVV0d/wS2Iqza1p1xmfk=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
@ -31,6 +41,13 @@ rustPlatform.buildRustPackage rec {
|
||||
cp -r $src/numbat/modules $out/share/numbat/
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# The datetime library used by Numbat, "jiff", always attempts to use the
|
||||
# system TZDIR on Unix and doesn't fall back to the embedded tzdb when not
|
||||
# present.
|
||||
export TZDIR=${tzdata}/share/zoneinfo
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = numbat;
|
||||
};
|
||||
@ -46,5 +63,7 @@ rustPlatform.buildRustPackage rec {
|
||||
license = with licenses; [ asl20 mit ];
|
||||
mainProgram = "numbat";
|
||||
maintainers = with maintainers; [ giomf atemu ];
|
||||
# Failing tests on Darwin.
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user