From b401edfa7ddc72b5580a17f26bf7938d3dc2eb42 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 11 Mar 2025 00:10:07 +0100 Subject: [PATCH 1/2] litemdview: unbreak on GCC 14 --- pkgs/by-name/li/litemdview/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/litemdview/package.nix b/pkgs/by-name/li/litemdview/package.nix index a425d597c3e5..d2604522341b 100644 --- a/pkgs/by-name/li/litemdview/package.nix +++ b/pkgs/by-name/li/litemdview/package.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation { ]; meta = with lib; { + # Required for build with gcc-14 + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + homepage = "https://notabug.org/g0tsu/litemdview"; description = "Suckless markdown viewer"; longDescription = '' From 49fd5ff33d54adb9baf8b3a2708e682e0f4a1b02 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Tue, 11 Mar 2025 00:10:32 +0100 Subject: [PATCH 2/2] litemdview: modernize Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/li/litemdview/package.nix | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/litemdview/package.nix b/pkgs/by-name/li/litemdview/package.nix index d2604522341b..63f08fb7fd8f 100644 --- a/pkgs/by-name/li/litemdview/package.nix +++ b/pkgs/by-name/li/litemdview/package.nix @@ -5,18 +5,18 @@ gtkmm3, autoreconfHook, pkg-config, + versionCheckHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "litemdview"; - # litemdview -v version = "0.0.32"; src = fetchFromGitea { - domain = "notabug.org"; + domain = "codeberg.org"; owner = "g0tsu"; repo = "litemdview"; - rev = "litemdview-0.0.32"; + rev = "litemdview-${finalAttrs.version}"; hash = "sha256-XGjP+7i3mYCEzPYwVY+75DARdXJFY4vUWHFpPeoNqAE="; }; @@ -29,11 +29,18 @@ stdenv.mkDerivation { pkg-config ]; - meta = with lib; { # Required for build with gcc-14 env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - homepage = "https://notabug.org/g0tsu/litemdview"; + enableParallelBuilding = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + homepage = "https://codeberg.org/g0tsu/litemdview"; description = "Suckless markdown viewer"; longDescription = '' LiteMDview is a lightweight, extremely fast markdown viewer with lots of useful features. One of them is ability to use your prefered text editor to edit markdown files, every time you save the file, litemdview reloads those changes (I call it live-reload). It has a convinient navigation through local directories, has support for a basic "git-like" folders hierarchy as well as vimwiki projects. @@ -56,9 +63,9 @@ stdenv.mkDerivation { - Basic html support (very simple offline documents in html) - Syntax highlighting ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ WhiteBlackGoose ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ WhiteBlackGoose ]; + platforms = lib.platforms.linux; mainProgram = "litemdview"; }; -} +})