From 4b6b1348f6c7d16b77bae390ab72e8dbc0011986 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 13 Aug 2025 23:15:53 +0200 Subject: [PATCH] pragtical: 3.6.0 -> 3.7.0 --- pkgs/by-name/pr/pragtical/package.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 443a87ffd76b..c26d366ae150 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -2,27 +2,30 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cacert, meson, ninja, pkg-config, freetype, libgit2, + libkqueue, libuchardet, libzip, lua5_4, luajit, mbedtls_2, pcre2, - SDL2, + sdl3, xz, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.6.0"; + version = "3.7.0"; pluginManagerVersion = "1.4.0"; + linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42"; src = fetchFromGitHub { owner = "pragtical"; @@ -37,17 +40,28 @@ stdenv.mkDerivation (finalAttrs: { export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt substituteInPlace subprojects/ppm.wrap \ - --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' + --replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}' + substituteInPlace subprojects/linenoise.wrap \ + --replace-fail 'revision = master' 'revision = ${finalAttrs.linenoiseRev}' ${lib.getExe meson} subprojects download \ - colors widget plugins ppm + colors linenoise plugins ppm widget find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-rJEUTLjMTv19W1wSvW2HJaxHrzrBQHiG74v8XlcqgMc="; + hash = "sha256-oqXv08TvZWVRsSCX6V9oAGHkFS0hL/gm3tGdiivOI6Q="; }; + patches = [ + # https://github.com/pragtical/pragtical/pull/334 + (fetchpatch { + name = "fix-dirmonitor-backend-detection.patch"; + url = "https://github.com/pragtical/pragtical/commit/5cf26e1f6a491f28d761390309dd77a795bdae9d.patch"; + hash = "sha256-eD17ItcsyRTKn6jydyW3J2lFq/hl3qHUmQ2LC4LXKC0="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ @@ -60,13 +74,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype libgit2 + libkqueue # optional libuchardet libzip lua5_4 luajit mbedtls_2 pcre2 - SDL2 + sdl3 xz zlib ];