tide-linux/fastfetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update package version to 2.60.0

Browse Source
This commit is contained in:
EnumDev
2026-03-08 17:29:15 +02:00
parent 8c39b05ba5
commit 16dc3ac6e1
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg.info
+2 -2
View File
@@ -1,6 +1,6 @@
name: fastfetch name: fastfetch
description: A maintained, feature-rich and performance oriented, neofetch like system information tool description: A maintained, feature-rich and performance oriented, neofetch like system information tool
version: 2.59.0 version: 2.60.0
revision: 1 revision: 1
url: https://github.com/fastfetch-cli/fastfetch url: https://github.com/fastfetch-cli/fastfetch
license: MIT license: MIT
@@ -45,4 +45,4 @@ downloads:
- url: https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz - url: https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
extract_to: ${BPM_SOURCE} extract_to: ${BPM_SOURCE}
extract_strip_components: 1 extract_strip_components: 1
checksum: 978e2524d0dc1ff9fd8c89fb24ae5b131af18ff108da82c6d99823712557e499 checksum: 001dd608ebe0d8b651069983690cc93fe7f3e41ac11a50fc591b22c2fe97d9a4
source-files/add-tide-bpm-detection.patch
+20 -20
View File
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 725b2b66..695b9f8b 100644 index a6447f9c..15eccd0a 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS) @@ -120,7 +120,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
@@ -12,20 +12,20 @@ index 725b2b66..695b9f8b 100644
if(package_manager STREQUAL "WINGET") if(package_manager STREQUAL "WINGET")
option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON) option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
diff --git a/doc/json_schema.json b/doc/json_schema.json diff --git a/doc/json_schema.json b/doc/json_schema.json
index dac6715f..28ce2c06 100644 index 8627d322..4dc6ce5a 100644
--- a/doc/json_schema.json --- a/doc/json_schema.json
+++ b/doc/json_schema.json +++ b/doc/json_schema.json
@@ -442,7 +442,7 @@ @@ -442,7 +442,7 @@
"type": "string" "type": "string"
}, },
"packagesFormat": { "packagesFormat": {
- "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {nix-all}: Total number of all nix packages\n 45. {flatpak-all}: Total number of all flatpak app packages\n 46. {brew-all}: Total number of all brew packages\n 47. {guix-all}: Total number of all guix packages\n 48. {hpkg-all}: Total number of all hpkg packages", - "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {nix-all}: Total number of all nix packages\n 46. {flatpak-all}: Total number of all flatpak app packages\n 47. {brew-all}: Total number of all brew packages\n 48. {guix-all}: Total number of all guix packages\n 49. {hpkg-all}: Total number of all hpkg packages",
+ "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {nix-all}: Total number of all nix packages\n 45. {flatpak-all}: Total number of all flatpak app packages\n 46. {brew-all}: Total number of all brew packages\n 47. {guix-all}: Total number of all guix packages\n 48. {hpkg-all}: Total number of all hpkg packages 49. {bpm}: Total number of all bpm packages\n", + "description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {nix-all}: Total number of all nix packages\n 46. {flatpak-all}: Total number of all flatpak app packages\n 47. {brew-all}: Total number of all brew packages\n 48. {guix-all}: Total number of all guix packages\n 49. {hpkg-all}: Total number of all hpkg packages\n 50. {bpm}: Total number of all bpm packages\n",
"type": "string" "type": "string"
}, },
"physicaldiskFormat": { "physicaldiskFormat": {
diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h
index 12e98793..6db93e17 100644 index 8b8a435d..ee2a2402 100644
--- a/src/detection/packages/packages.h --- a/src/detection/packages/packages.h
+++ b/src/detection/packages/packages.h +++ b/src/detection/packages/packages.h
@@ -8,6 +8,7 @@ typedef struct FFPackagesResult @@ -8,6 +8,7 @@ typedef struct FFPackagesResult
@@ -37,13 +37,13 @@ index 12e98793..6db93e17 100644
uint32_t brewCask; uint32_t brewCask;
uint32_t choco; uint32_t choco;
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 07998bc9..a376edc9 100644 index 8d9c9b0b..4148329b 100644
--- a/src/detection/packages/packages_linux.c --- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c
@@ -492,6 +492,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, @@ -493,6 +493,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false);
if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true); if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true);
if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR); if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR);
if (!(options->disabled & FF_PACKAGES_FLAG_MOSS_BIT)) packageCounts->moss += getSQLite3Int(baseDir, "/.moss/db/state", "SELECT COUNT(*) FROM state_selections WHERE state_id = (SELECT MAX(id) FROM state)", "moss");
+ if (!(options->disabled & FF_PACKAGES_FLAG_BPM_BIT)) packageCounts->bpm += getNumElements(baseDir, "/var/lib/bpm/installed", true); + if (!(options->disabled & FF_PACKAGES_FLAG_BPM_BIT)) packageCounts->bpm += getNumElements(baseDir, "/var/lib/bpm/installed", true);
} }
@@ -69,10 +69,10 @@ index 00000000..2d8b44e3
+ $2*$1@@$2~~ $2~$1@@@@$2~~~ + $2*$1@@$2~~ $2~$1@@@@$2~~~
+ $2~~ $2~~~~ + $2~~ $2~~~~
diff --git a/src/logo/builtin.c b/src/logo/builtin.c diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index 0abf2229..21422079 100644 index 5315fdd4..54d086d7 100644
--- a/src/logo/builtin.c --- a/src/logo/builtin.c
+++ b/src/logo/builtin.c +++ b/src/logo/builtin.c
@@ -4903,6 +4903,17 @@ static const FFlogo T[] = { @@ -4920,6 +4920,17 @@ static const FFlogo T[] = {
FF_COLOR_FG_GREEN, FF_COLOR_FG_GREEN,
}, },
}, },
@@ -91,19 +91,19 @@ index 0abf2229..21422079 100644
{ {
.names = {"Torizon OS", "TorizonCore"}, .names = {"Torizon OS", "TorizonCore"},
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
index f3954138..c580d2be 100644 index 45c04971..6f37ea2a 100644
--- a/src/modules/packages/option.h --- a/src/modules/packages/option.h
+++ b/src/modules/packages/option.h +++ b/src/modules/packages/option.h
@@ -37,6 +37,7 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags @@ -38,6 +38,7 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags
FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29,
FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30, FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30,
FF_PACKAGES_FLAG_KISS_BIT = 1ULL << 31, FF_PACKAGES_FLAG_KISS_BIT = 1ULL << 31,
+ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 32, FF_PACKAGES_FLAG_MOSS_BIT = 1ULL << 32,
+ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 33,
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX, FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
} FFPackagesFlags; } FFPackagesFlags;
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), ""); static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index c9d3d558..195cf60c 100644 index f9433718..e6f7f102 100644
--- a/src/modules/packages/packages.c --- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c
@@ -63,6 +63,7 @@ bool ffPrintPackages(FFPackagesOptions* options) @@ -63,6 +63,7 @@ bool ffPrintPackages(FFPackagesOptions* options)
@@ -114,7 +114,7 @@ index c9d3d558..195cf60c 100644
if (options->combined) if (options->combined)
{ {
FF_PRINT_PACKAGE_ALL(nix); FF_PRINT_PACKAGE_ALL(nix);
@@ -161,6 +162,7 @@ bool ffPrintPackages(FFPackagesOptions* options) @@ -162,6 +163,7 @@ bool ffPrintPackages(FFPackagesOptions* options)
FF_FORMAT_ARG(counts.emerge, "emerge"), FF_FORMAT_ARG(counts.emerge, "emerge"),
FF_FORMAT_ARG(counts.eopkg, "eopkg"), FF_FORMAT_ARG(counts.eopkg, "eopkg"),
FF_FORMAT_ARG(counts.xbps, "xbps"), FF_FORMAT_ARG(counts.xbps, "xbps"),
@@ -122,7 +122,7 @@ index c9d3d558..195cf60c 100644
FF_FORMAT_ARG(counts.nixSystem, "nix-system"), FF_FORMAT_ARG(counts.nixSystem, "nix-system"),
FF_FORMAT_ARG(counts.nixUser, "nix-user"), FF_FORMAT_ARG(counts.nixUser, "nix-user"),
FF_FORMAT_ARG(counts.nixDefault, "nix-default"), FF_FORMAT_ARG(counts.nixDefault, "nix-default"),
@@ -249,6 +251,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) @@ -251,6 +253,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
FF_TEST_PACKAGE_NAME(AM) FF_TEST_PACKAGE_NAME(AM)
break; break;
case 'B': if (false); case 'B': if (false);
@@ -130,7 +130,7 @@ index c9d3d558..195cf60c 100644
FF_TEST_PACKAGE_NAME(BREW) FF_TEST_PACKAGE_NAME(BREW)
break; break;
case 'C': if (false); case 'C': if (false);
@@ -343,6 +346,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do @@ -346,6 +349,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
if (false); if (false);
FF_TEST_PACKAGE_NAME(AM) FF_TEST_PACKAGE_NAME(AM)
FF_TEST_PACKAGE_NAME(APK) FF_TEST_PACKAGE_NAME(APK)
@@ -138,7 +138,7 @@ index c9d3d558..195cf60c 100644
FF_TEST_PACKAGE_NAME(BREW) FF_TEST_PACKAGE_NAME(BREW)
FF_TEST_PACKAGE_NAME(CHOCO) FF_TEST_PACKAGE_NAME(CHOCO)
FF_TEST_PACKAGE_NAME(DPKG) FF_TEST_PACKAGE_NAME(DPKG)
@@ -399,6 +403,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy @@ -403,6 +407,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
FF_APPEND_PACKAGE_COUNT(amSystem) FF_APPEND_PACKAGE_COUNT(amSystem)
FF_APPEND_PACKAGE_COUNT(amUser) FF_APPEND_PACKAGE_COUNT(amUser)
FF_APPEND_PACKAGE_COUNT(apk) FF_APPEND_PACKAGE_COUNT(apk)
@@ -146,7 +146,7 @@ index c9d3d558..195cf60c 100644
FF_APPEND_PACKAGE_COUNT(brew) FF_APPEND_PACKAGE_COUNT(brew)
FF_APPEND_PACKAGE_COUNT(brewCask) FF_APPEND_PACKAGE_COUNT(brewCask)
FF_APPEND_PACKAGE_COUNT(choco) FF_APPEND_PACKAGE_COUNT(choco)
@@ -471,6 +476,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { @@ -476,6 +481,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{"Number of emerge packages", "emerge"}, {"Number of emerge packages", "emerge"},
{"Number of eopkg packages", "eopkg"}, {"Number of eopkg packages", "eopkg"},
{"Number of xbps packages", "xbps"}, {"Number of xbps packages", "xbps"},