diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix index 9251f04ed060..a8d20c579b7d 100644 --- a/pkgs/by-name/bu/bulletty/package.nix +++ b/pkgs/by-name/bu/bulletty/package.nix @@ -1,38 +1,50 @@ { lib, - pkgs, - fetchFromGitHub, rustPlatform, - nix-update-script, + fetchFromGitHub, + pkg-config, + openssl, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bulletty"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "CrociDB"; repo = "bulletty"; tag = "v${finalAttrs.version}"; - hash = "sha256-fNMUdZ5WoDUVShiKl4pitkcOlHYTKXUVfiAHVqpdWmo="; + hash = "sha256-HX5J00Y7nkBwLIOEoc9jRtv9xObeWrWpHhYBQUOUVKA="; }; - cargoHash = "sha256-ZdJtFPEjPDQSUEtdPv3uIH44wa6mGPzm/KRp5VTOb1Y="; - - # perl is required for bulletty package build for openssl - nativeBuildInputs = with pkgs; [ - perl + patches = [ + # Add patch that disables rustfmt to prevent compile time crashes + ./remove-rustfmt-exec.patch ]; - doInstallCheck = true; + cargoHash = "sha256-WIEbZIWdIGWiwi6918MVFu++aZ2oWJTF4AUSTpKRZvQ="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + env.OPENSSL_NO_VENDOR = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; meta = { - description = "bulletty is a feed reader for the terminal"; - homepage = "https://bulletty.croci.dev/"; + description = "Terminal UI RSS/ATOM feed reader"; + homepage = "https://bulletty.croci.dev"; + changelog = "https://github.com/CrociDB/bulletty/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.FKouhai ]; + mainProgram = "bulletty"; }; }) diff --git a/pkgs/by-name/bu/bulletty/remove-rustfmt-exec.patch b/pkgs/by-name/bu/bulletty/remove-rustfmt-exec.patch new file mode 100644 index 000000000000..27f764046738 --- /dev/null +++ b/pkgs/by-name/bu/bulletty/remove-rustfmt-exec.patch @@ -0,0 +1,14 @@ +diff --git a/build.rs b/build.rs +index cb8d19a..f6dc5dc 100644 +--- a/build.rs ++++ b/build.rs +@@ -103,9 +103,4 @@ fn embed_themes() { + writeln!(out, " m").unwrap(); + writeln!(out, "}}").unwrap(); + } +- +- std::process::Command::new("rustfmt") +- .arg(out_path) +- .status() +- .expect("Failed to run rustfmt"); + }