diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json deleted file mode 100644 index 3a1e643c6f7f..000000000000 --- a/pkgs/applications/editors/cudatext/deps.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "EncConv": { - "owner": "Alexey-T", - "rev": "2023.04.16", - "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc=" - }, - "ATBinHex-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g=" - }, - "ATFlatControls": { - "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" - }, - "ATSynEdit": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" - }, - "ATSynEdit_Cmp": { - "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo=" - }, - "EControl": { - "owner": "Alexey-T", - "rev": "2023.11.16", - "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" - }, - "ATSynEdit_Ex": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" - }, - "Python-for-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.06.30", - "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" - }, - "Emmet-Pascal": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg=" - }, - "CudaText-lexers": { - "owner": "Alexey-T", - "rev": "2021.07.09", - "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" - }, - "bgrabitmap": { - "owner": "bgrabitmap", - "rev": "v11.5.6", - "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" - } -} diff --git a/pkgs/by-name/cu/cudatext-gtk/package.nix b/pkgs/by-name/cu/cudatext-gtk/package.nix new file mode 100644 index 000000000000..d2afa68f07f1 --- /dev/null +++ b/pkgs/by-name/cu/cudatext-gtk/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "gtk3"; } diff --git a/pkgs/by-name/cu/cudatext-qt/package.nix b/pkgs/by-name/cu/cudatext-qt/package.nix new file mode 100644 index 000000000000..dfed1f03a38b --- /dev/null +++ b/pkgs/by-name/cu/cudatext-qt/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "qt5"; } diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json new file mode 100644 index 000000000000..f05c521228cf --- /dev/null +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -0,0 +1,57 @@ +{ + "EncConv": { + "owner": "Alexey-T", + "rev": "2024.12.15", + "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A=" + }, + "ATBinHex-Lazarus": { + "owner": "Alexey-T", + "rev": "2025.09.10", + "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY=" + }, + "ATFlatControls": { + "owner": "Alexey-T", + "rev": "2026.05.06", + "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ=" + }, + "ATSynEdit": { + "owner": "Alexey-T", + "rev": "2026.05.20", + "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0=" + }, + "ATSynEdit_Cmp": { + "owner": "Alexey-T", + "rev": "2025.02.15", + "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ=" + }, + "EControl": { + "owner": "Alexey-T", + "rev": "2026.05.06", + "hash": "sha256-G2OSGA5MVaZC/6H0agio6cbUg1iXYEz7YszBoRwcPwI=" + }, + "ATSynEdit_Ex": { + "owner": "Alexey-T", + "rev": "2026.01.19", + "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM=" + }, + "Python-for-Lazarus": { + "owner": "Alexey-T", + "rev": "2024.10.15", + "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s=" + }, + "Emmet-Pascal": { + "owner": "Alexey-T", + "rev": "2023.12.02", + "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E=" + }, + "CudaText-lexers": { + "owner": "CudaText-addons", + "rev": "2026.04.05", + "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E=" + }, + "bgrabitmap": { + "owner": "bgrabitmap", + "rev": "v11.6.6", + "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=" + } +} diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/by-name/cu/cudatext/package.nix similarity index 88% rename from pkgs/applications/editors/cudatext/default.nix rename to pkgs/by-name/cu/cudatext/package.nix index ba0cdf1ea046..21dad5046557 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -7,15 +7,16 @@ fpc, libx11, - # GTK2/3 + # GTK3 + harfbuzz, pango, cairo, glib, atk, - gtk2, gtk3, gdk-pixbuf, python3, + wrapGAppsHook3, # Qt5 libsForQt5, @@ -26,7 +27,6 @@ }: assert builtins.elem widgetset [ - "gtk2" "gtk3" "qt5" ]; @@ -42,13 +42,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 ]; @@ -65,20 +65,21 @@ stdenv.mkDerivation (finalAttrs: { lazarus fpc ] + ++ lib.optional (widgetset == "gtk3") wrapGAppsHook3 # required for FileChooser ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook; buildInputs = [ libx11 ] - ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ + ++ lib.optionals (widgetset == "gtk3") [ + harfbuzz pango cairo glib atk gdk-pixbuf + gtk3 ] - ++ lib.optional (widgetset == "gtk2") gtk2 - ++ lib.optional (widgetset == "gtk3") gtk3 ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas; env.NIX_LDFLAGS = toString [ @@ -94,10 +95,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 \ diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/by-name/cu/cudatext/proc_globdata.patch similarity index 100% rename from pkgs/applications/editors/cudatext/proc_globdata.patch rename to pkgs/by-name/cu/cudatext/proc_globdata.patch diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/by-name/cu/cudatext/update.sh similarity index 91% rename from pkgs/applications/editors/cudatext/update.sh rename to pkgs/by-name/cu/cudatext/update.sh index 3ed1f8d56dc3..eb5eb43c46fa 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/by-name/cu/cudatext/update.sh @@ -19,8 +19,8 @@ url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash) -sed -i "s#version = \".*\"#version = \"$version\"#" default.nix -sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix +sed -i "s#version = \".*\"#version = \"$version\"#" package.nix +sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" package.nix while IFS=$'\t' read repo owner rev; do latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10c6ab434f02..82691aa64d57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8667,10 +8667,6 @@ with pkgs; codeblocksFull = codeblocks.override { contribPlugins = true; }; - cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; - cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; - cudatext = cudatext-qt; - darcs = haskell.lib.compose.disableCabalFlag "library" ( haskell.lib.compose.justStaticExecutables haskellPackages.darcs );