lol

jaq: 1.6.0 -> 2.0.1 (#363868)

authored by

Aleksana and committed by
GitHub
e4d97f3e 0b088d4b

+31 -15
+31 -15
pkgs/by-name/ja/jaq/package.nix
··· 1 - { lib 2 - , rustPlatform 3 - , fetchFromGitHub 4 - , stdenv 5 - , darwin 1 + { 2 + lib, 3 + stdenv, 4 + rustPlatform, 5 + fetchFromGitHub, 6 + versionCheckHook, 7 + nix-update-script, 6 8 }: 7 9 8 10 rustPlatform.buildRustPackage rec { 9 11 pname = "jaq"; 10 - version = "1.6.0"; 12 + version = "2.0.1"; 11 13 12 14 src = fetchFromGitHub { 13 15 owner = "01mf02"; 14 16 repo = "jaq"; 15 - rev = "v${version}"; 16 - hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM="; 17 + tag = "v${version}"; 18 + hash = "sha256-S8ELxUKU8g8+6HpM+DxINEqMDha7SgesDymhCb7T9bg="; 17 19 }; 18 20 19 - cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; 21 + cargoHash = "sha256-i3AxIlRY6r0zrMmZVh1l9fPiR652xjhTcwCyHCHCrL8="; 20 22 21 - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ 22 - darwin.apple_sdk.frameworks.Security 23 + # This very line fails on `x86_64-darwin`: assertion failed: out.eq(ys) 24 + # https://github.com/01mf02/jaq/blob/v2.0.1/jaq-json/tests/funs.rs#L118 25 + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' 26 + substituteInPlace jaq-json/tests/funs.rs \ 27 + --replace-fail 'give(json!(null), "2.1 % 0 | isnan", json!(true));' "" 28 + ''; 29 + 30 + nativeInstallCheckInputs = [ 31 + versionCheckHook 23 32 ]; 33 + versionCheckProgramArg = [ "--version" ]; 34 + doInstallCheck = true; 35 + 36 + passthru.updateScript = nix-update-script { }; 24 37 25 - meta = with lib; { 38 + meta = { 26 39 description = "Jq clone focused on correctness, speed and simplicity"; 27 40 homepage = "https://github.com/01mf02/jaq"; 28 - changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}"; 29 - license = licenses.mit; 30 - maintainers = with maintainers; [ figsoda siraben ]; 41 + changelog = "https://github.com/01mf02/jaq/releases/tag/v${version}"; 42 + license = lib.licenses.mit; 43 + maintainers = with lib.maintainers; [ 44 + figsoda 45 + siraben 46 + ]; 31 47 mainProgram = "jaq"; 32 48 }; 33 49 }