From 9c26d2966ad644ea0ad9640eff37be4b59ec846f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 11 Apr 2026 14:04:35 +0400 Subject: [PATCH] =?UTF-8?q?cudatext:=201.202.1=20=E2=86=92=201.234.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/editors/cudatext/default.nix | 11 ++--- pkgs/applications/editors/cudatext/deps.json | 46 +++++++++---------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index ba0cdf1ea046..a14c87ba1bd9 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -8,6 +8,7 @@ libx11, # GTK2/3 + harfbuzz, pango, cairo, glib, @@ -42,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.202.1"; + version = "1.234.4.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4="; + hash = "sha256-eVdV02R1YZ3mdoucEoyp7iKhA30+QJNAqdbnOz2Xjy4="; }; patches = [ ./proc_globdata.patch ]; @@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 ] ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ + harfbuzz pango cairo glib @@ -94,10 +96,6 @@ stdenv.mkDerivation (finalAttrs: { '') deps ) + '' - # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText - substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ - --replace GTK2_IME_CODE _GTK2_IME_CODE - lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ @@ -145,5 +143,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.linux; mainProgram = "cudatext"; + broken = widgetset == "gtk2"; # https://wiki.freepascal.org/CudaText#Linux_error_on_ATSynEdit_compiling }; }) diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 3a1e643c6f7f..f05c521228cf 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,57 +1,57 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2023.04.16", - "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc=" + "rev": "2024.12.15", + "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g=" + "rev": "2025.09.10", + "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" + "rev": "2026.05.06", + "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" + "rev": "2026.05.20", + "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo=" + "rev": "2025.02.15", + "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ=" }, "EControl": { "owner": "Alexey-T", - "rev": "2023.11.16", - "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" + "rev": "2026.05.06", + "hash": "sha256-G2OSGA5MVaZC/6H0agio6cbUg1iXYEz7YszBoRwcPwI=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" + "rev": "2026.01.19", + "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.06.30", - "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" + "rev": "2024.10.15", + "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s=" }, "Emmet-Pascal": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg=" + "rev": "2023.12.02", + "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E=" }, "CudaText-lexers": { - "owner": "Alexey-T", - "rev": "2021.07.09", - "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" + "owner": "CudaText-addons", + "rev": "2026.04.05", + "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E=" }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.6", - "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" + "rev": "v11.6.6", + "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=" } }