diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix deleted file mode 100644 index 144634d60d03..000000000000 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "newsboat"; - version = "2.36"; - - src = fetchFromGitHub { - owner = "newsboat"; - repo = "newsboat"; - rev = "r${version}"; - hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ="; - }; - - cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; - - # TODO: Check if that's still needed - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - ''; - - nativeBuildInputs = [ - pkg-config - asciidoctor - gettext - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ncurses ]; - - buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation libiconv gettext ]; - - postBuild = '' - make -j $NIX_BUILD_CORES prefix="$out" - ''; - - # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set - # these for all platforms, since upstream's gettext crate behavior might - # change in the future. - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; - - doCheck = true; - - preCheck = '' - make -j $NIX_BUILD_CORES test - ''; - - postInstall = '' - make -j $NIX_BUILD_CORES prefix="$out" install - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://newsboat.org/"; - changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; - description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; - maintainers = with lib.maintainers; [ dotlambda nicknovitski ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - mainProgram = "newsboat"; - }; -} diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix new file mode 100644 index 000000000000..5c6bfcfd8852 --- /dev/null +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + stfl, + sqlite, + curl, + gettext, + pkg-config, + libxml2, + json_c, + ncurses, + darwin, + asciidoctor, + libiconv, + makeWrapper, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "newsboat"; + version = "2.37"; + + src = fetchFromGitHub { + owner = "newsboat"; + repo = "newsboat"; + rev = "r${version}"; + hash = "sha256-RNvzGGvicujqkRWVHBwnlROuhpH5XqPNWmx6q7n4g+U="; + }; + + cargoHash = "sha256-EBA+ucegXr3YtU2K7bhwli8O+knnugMMUuSksDuaY9E="; + + # TODO: Check if that's still needed + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + ''; + + nativeBuildInputs = + [ + pkg-config + asciidoctor + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ncurses + ]; + + buildInputs = + [ + stfl + sqlite + curl + libxml2 + json_c + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + Foundation + libiconv + gettext + ] + ); + + postBuild = '' + make -j $NIX_BUILD_CORES prefix="$out" + ''; + + # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set + # these for all platforms, since upstream's gettext crate behavior might + # change in the future. + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; + + doCheck = true; + + preCheck = '' + make -j $NIX_BUILD_CORES test + ''; + + postInstall = + '' + make -j $NIX_BUILD_CORES prefix="$out" install + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://newsboat.org/"; + changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; + description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; + maintainers = with lib.maintainers; [ + dotlambda + nicknovitski + ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "newsboat"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7ad6a4f8d26..0b31842ad01a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10404,10 +10404,6 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; - newsboat = callPackage ../applications/networking/feedreaders/newsboat { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {})