Update package version to 2.65.2

This commit is contained in:
2026-07-08 13:33:24 +03:00
parent 86b6582335
commit 4845eb53ef
2 changed files with 28 additions and 41 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
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.64.2 version: 2.65.2
revision: 2 revision: 1
url: https://github.com/fastfetch-cli/fastfetch url: https://github.com/fastfetch-cli/fastfetch
license: MIT license: MIT
maintainers: maintainers:
@@ -47,4 +47,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: 28db81d6568f28281d9aab9e88d5a4c7892d519c54b8739eef17953cce6802d0 checksum: d0b318c33cf6c8bbae1162325f91624762a040a60f748941cbf1b4b99a75fa30
+25 -38
View File
@@ -1,31 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2323569b..b105c3f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ endif()
set(PACKAGE_MANAGERS
AM APK APPIMAGE
- BREW
+ BPM BREW
CARDS CHOCO
DPKG
EMERGE EOPKG
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 2243fb6f..90c0dfe8 100644 index e9271b2f..dbe921f3 100644
--- a/doc/json_schema.json --- a/doc/json_schema.json
+++ b/doc/json_schema.json +++ b/doc/json_schema.json
@@ -446,7 +446,7 @@ @@ -446,7 +446,7 @@
"type": "string" "type": "string"
}, },
"packagesFormat": { "packagesFormat": {
- "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {am-system}: Number of am-system packages\n 3. {am-user}: Number of am-user (aka appman) packages\n 4. {appimage}: Number of appimage packages\n 5. {apk}: Number of apk packages\n 6. {brew}: Number of brew packages\n 7. {brew-all}: Total number of all brew packages\n 8. {brew-cask}: Number of brew-cask packages\n 9. {cards}: Number of cards packages\n 10. {choco}: Number of choco packages\n 11. {dpkg}: Number of dpkg packages\n 12. {emerge}: Number of emerge packages\n 13. {eopkg}: Number of eopkg packages\n 14. {flatpak-all}: Total number of all flatpak app packages\n 15. {flatpak-system}: Number of flatpak-system app packages\n 16. {flatpak-user}: Number of flatpak-user app packages\n 17. {guix-all}: Total number of all guix packages\n 18. {guix-home}: Number of guix-home packages\n 19. {guix-system}: Number of guix-system packages\n 20. {guix-user}: Number of guix-user packages\n 21. {hpkg-all}: Total number of all hpkg packages\n 22. {hpkg-system}: Number of hpkg-system packages\n 23. {hpkg-user}: Number of hpkg-user packages\n 24. {kiss}: Number of kiss packages\n 25. {linglong}: Number of linglong packages\n 26. {lpkg}: Number of lpkg packages\n 27. {lpkgbuild}: Number of lpkgbuild packages\n 28. {macports}: Number of macports packages\n 29. {mport}: Number of mport packages\n 30. {moss}: Number of moss packages\n 31. {nix-all}: Total number of all nix packages\n 32. {nix-default}: Number of nix-default packages\n 33. {nix-system}: Number of nix-system packages\n 34. {nix-user}: Number of nix-user packages\n 35. {opkg}: Number of opkg packages\n 36. {pacman}: Number of pacman packages\n 37. {pacman-branch}: Pacman branch on manjaro\n 38. {pacstall}: Number of pacstall packages\n 39. {paludis}: Number of paludis packages\n 40. {pisi}: Number of pisi packages\n 41. {pkg}: Number of pkg packages\n 42. {pkgsrc}: Number of pkgsrc packages\n 43. {pkgtool}: Number of pkgtool packages\n 44. {rpm}: Number of rpm packages\n 45. {scoop-global}: Number of scoop-global packages\n 46. {scoop-user}: Number of scoop-user packages\n 47. {snap}: Number of snap packages\n 48. {soar}: Number of soar packages\n 49. {sorcery}: Number of sorcery packages\n 50. {winget}: Number of winget packages\n 51. {xbps}: Number of xbps packages", - "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {am-system}: Number of am-system packages\n 2. {am-user}: Number of am-user (aka appman) packages\n 3. {appimage}: Number of appimage packages\n 4. {apk}: Number of apk packages\n 5. {brew}: Number of brew packages\n 6. {brew-cask}: Number of brew-cask packages\n 7. {cards}: Number of cards packages\n 8. {choco}: Number of choco packages\n 9. {dpkg}: Number of dpkg packages\n 10. {emerge}: Number of emerge packages\n 11. {eopkg}: Number of eopkg packages\n 12. {flatpak-system}: Number of flatpak-system app packages\n 13. {flatpak-user}: Number of flatpak-user app packages\n 14. {guix-home}: Number of guix-home packages\n 15. {guix-system}: Number of guix-system packages\n 16. {guix-user}: Number of guix-user packages\n 17. {hpkg-system}: Number of hpkg-system packages\n 18. {hpkg-user}: Number of hpkg-user packages\n 19. {install-release}: Number of install-release packages\n 20. {kiss}: Number of kiss packages\n 21. {linglong}: Number of linglong packages\n 22. {lpkg}: Number of lpkg packages\n 23. {lpkgbuild}: Number of lpkgbuild packages\n 24. {macports}: Number of macports packages\n 25. {mport}: Number of mport packages\n 26. {moss}: Number of moss packages\n 27. {nix-default}: Number of nix-default packages\n 28. {nix-system}: Number of nix-system packages\n 29. {nix-user}: Number of nix-user packages\n 30. {opkg}: Number of opkg packages\n 31. {pacman}: Number of pacman packages\n 32. {pacman-branch}: Pacman branch on manjaro\n 33. {pacstall}: Number of pacstall packages\n 34. {paludis}: Number of paludis packages\n 35. {pisi}: Number of pisi packages\n 36. {pkg}: Number of pkg packages\n 37. {pkgsrc}: Number of pkgsrc packages\n 38. {pkgtool}: Number of pkgtool packages\n 39. {porg}: Number of porg packages\n 40. {rpm}: Number of rpm packages\n 41. {scoop-global}: Number of scoop-global packages\n 42. {scoop-user}: Number of scoop-user packages\n 43. {snap}: Number of snap packages\n 44. {soar}: Number of soar packages\n 45. {sorcery}: Number of sorcery packages\n 46. {winget}: Number of winget packages\n 47. {xbps}: Number of xbps packages\n 48. {brew-all}: Total number of all brew packages\n 49. {flatpak-all}: Total number of all flatpak app packages\n 50. {guix-all}: Total number of all guix packages\n 51. {hpkg-all}: Total number of all hpkg packages\n 52. {nix-all}: Total number of all nix packages\n 53. {all}: Number of all packages",
+ "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {am-system}: Number of am-system packages\n 3. {am-user}: Number of am-user (aka appman) packages\n 4. {appimage}: Number of appimage packages\n 5. {apk}: Number of apk packages\n 6. {bpm}: Total number of all bpm packages\n 7. {brew}: Number of brew packages\n 8. {brew-all}: Total number of all brew packages\n 9. {brew-cask}: Number of brew-cask packages\n 10. {cards}: Number of cards packages\n 11. {choco}: Number of choco packages\n 12. {dpkg}: Number of dpkg packages\n 13. {emerge}: Number of emerge packages\n 14. {eopkg}: Number of eopkg packages\n 15. {flatpak-all}: Total number of all flatpak app packages\n 16. {flatpak-system}: Number of flatpak-system app packages\n 17. {flatpak-user}: Number of flatpak-user app packages\n 18. {guix-all}: Total number of all guix packages\n 19. {guix-home}: Number of guix-home packages\n 20. {guix-system}: Number of guix-system packages\n 21. {guix-user}: Number of guix-user packages\n 22. {hpkg-all}: Total number of all hpkg packages\n 23. {hpkg-system}: Number of hpkg-system packages\n 24. {hpkg-user}: Number of hpkg-user packages\n 25. {kiss}: Number of kiss packages\n 26. {linglong}: Number of linglong packages\n 27. {lpkg}: Number of lpkg packages\n 28. {lpkgbuild}: Number of lpkgbuild packages\n 29. {macports}: Number of macports packages\n 30. {mport}: Number of mport packages\n 31. {moss}: Number of moss packages\n 32. {nix-all}: Total number of all nix packages\n 33. {nix-default}: Number of nix-default packages\n 34. {nix-system}: Number of nix-system packages\n 35. {nix-user}: Number of nix-user packages\n 36. {opkg}: Number of opkg packages\n 37. {pacman}: Number of pacman packages\n 38. {pacman-branch}: Pacman branch on manjaro\n 39. {pacstall}: Number of pacstall packages\n 40. {paludis}: Number of paludis packages\n 41. {pisi}: Number of pisi packages\n 42. {pkg}: Number of pkg packages\n 43. {pkgsrc}: Number of pkgsrc packages\n 44. {pkgtool}: Number of pkgtool packages\n 45. {rpm}: Number of rpm packages\n 46. {scoop-global}: Number of scoop-global packages\n 47. {scoop-user}: Number of scoop-user packages\n 48. {snap}: Number of snap packages\n 49. {soar}: Number of soar packages\n 50. {sorcery}: Number of sorcery packages\n 51. {winget}: Number of winget packages\n 52. {xbps}: Number of xbps packages", + "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {am-system}: Number of am-system packages\n 2. {am-user}: Number of am-user (aka appman) packages\n 3. {appimage}: Number of appimage packages\n 4. {apk}: Number of apk packages\n 5. {bpm}: Total number of all bpm packages\n 6. {brew}: Number of brew packages\n 7. {brew-cask}: Number of brew-cask packages\n 8. {cards}: Number of cards packages\n 9. {choco}: Number of choco packages\n 10. {dpkg}: Number of dpkg packages\n 11. {emerge}: Number of emerge packages\n 12. {eopkg}: Number of eopkg packages\n 13. {flatpak-system}: Number of flatpak-system app packages\n 14. {flatpak-user}: Number of flatpak-user app packages\n 15. {guix-home}: Number of guix-home packages\n 16. {guix-system}: Number of guix-system packages\n 17. {guix-user}: Number of guix-user packages\n 18. {hpkg-system}: Number of hpkg-system packages\n 19. {hpkg-user}: Number of hpkg-user packages\n 20. {install-release}: Number of install-release packages\n 21. {kiss}: Number of kiss packages\n 22. {linglong}: Number of linglong packages\n 23. {lpkg}: Number of lpkg packages\n 24. {lpkgbuild}: Number of lpkgbuild packages\n 25. {macports}: Number of macports packages\n 26. {mport}: Number of mport packages\n 27. {moss}: Number of moss packages\n 28. {nix-default}: Number of nix-default packages\n 29. {nix-system}: Number of nix-system packages\n 30. {nix-user}: Number of nix-user packages\n 31. {opkg}: Number of opkg packages\n 32. {pacman}: Number of pacman packages\n 33. {pacman-branch}: Pacman branch on manjaro\n 34. {pacstall}: Number of pacstall packages\n 35. {paludis}: Number of paludis packages\n 36. {pisi}: Number of pisi packages\n 37. {pkg}: Number of pkg packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {pkgtool}: Number of pkgtool packages\n 40. {porg}: Number of porg packages\n 41. {rpm}: Number of rpm packages\n 42. {scoop-global}: Number of scoop-global packages\n 43. {scoop-user}: Number of scoop-user packages\n 44. {snap}: Number of snap packages\n 45. {soar}: Number of soar packages\n 46. {sorcery}: Number of sorcery packages\n 47. {winget}: Number of winget packages\n 48. {xbps}: Number of xbps packages\n 49. {brew-all}: Total number of all brew packages\n 50. {flatpak-all}: Total number of all flatpak app packages\n 51. {guix-all}: Total number of all guix packages\n 52. {hpkg-all}: Total number of all hpkg packages\n 53. {nix-all}: Total number of all nix packages\n 54. {all}: Number of all packages",
"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 f0d42004..2e68903e 100644 index 21193493..7aa0c86a 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,10 +24,10 @@ index f0d42004..2e68903e 100644
uint32_t brewCask; uint32_t brewCask;
uint32_t cards; uint32_t cards;
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 79de8cb3..dc8cf080 100644 index ee4efbe4..63c3de0c 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
@@ -540,6 +540,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, @@ -568,6 +568,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
if (FF_PACKAGES_IS_ENABLED(options, CARDS)) { if (FF_PACKAGES_IS_ENABLED(options, CARDS)) {
packageCounts->cards += getNumElements(baseDir, "/var/lib/pkg/DB", true); packageCounts->cards += getNumElements(baseDir, "/var/lib/pkg/DB", true);
} }
@@ -51,7 +38,7 @@ index 79de8cb3..dc8cf080 100644
static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options) { static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options) {
diff --git a/src/logo/ascii/t.inc b/src/logo/ascii/t.inc diff --git a/src/logo/ascii/t.inc b/src/logo/ascii/t.inc
index 53947eab..bedeac3b 100644 index 3adf4784..1e61d352 100644
--- a/src/logo/ascii/t.inc --- a/src/logo/ascii/t.inc
+++ b/src/logo/ascii/t.inc +++ b/src/logo/ascii/t.inc
@@ -85,6 +85,19 @@ static const FFlogo T[] = { @@ -85,6 +85,19 @@ static const FFlogo T[] = {
@@ -95,19 +82,19 @@ index 00000000..2d8b44e3
+ $2*$1@@$2~~ $2~$1@@@@$2~~~ + $2*$1@@$2~~ $2~$1@@@@$2~~~
+ $2~~ $2~~~~ + $2~~ $2~~~~
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 1e895335..931dda08 100644 index c215593c..b7075139 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
@@ -39,6 +39,7 @@ typedef enum FF_A_PACKED FFPackagesFlags { @@ -41,6 +41,7 @@ typedef enum FF_A_PACKED FFPackagesFlags {
FF_PACKAGES_FLAG_MOSS_BIT = UINT64_C(1) << 32U,
FF_PACKAGES_FLAG_APPIMAGE_BIT = UINT64_C(1) << 33U,
FF_PACKAGES_FLAG_CARDS_BIT = UINT64_C(1) << 34U, FF_PACKAGES_FLAG_CARDS_BIT = UINT64_C(1) << 34U,
+ FF_PACKAGES_FLAG_BPM_BIT = UINT64_C(1) << 35U, FF_PACKAGES_FLAG_PORG_BIT = UINT64_C(1) << 35U,
FF_PACKAGES_FLAG_INSTALLRELEASE_BIT = UINT64_C(1) << 36U,
+ FF_PACKAGES_FLAG_BPM_BIT = UINT64_C(1) << 37U,
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 4ef1d049..e55577bf 100644 index 8cb4027b..05128816 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
@@ -55,6 +55,7 @@ bool ffPrintPackages(FFPackagesOptions* options) { @@ -55,6 +55,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
@@ -118,15 +105,15 @@ index 4ef1d049..e55577bf 100644
if (options->combined) { if (options->combined) {
FF_PRINT_PACKAGE_ALL(brew); FF_PRINT_PACKAGE_ALL(brew);
} else { } else {
@@ -149,6 +150,7 @@ bool ffPrintPackages(FFPackagesOptions* options) { @@ -150,6 +151,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
FF_ARG(counts.amUser, "am-user"), FF_ARG(counts.amUser, "am-user"),
FF_ARG(counts.appimage, "appimage"), FF_ARG(counts.appimage, "appimage"),
FF_ARG(counts.apk, "apk"), FF_ARG(counts.apk, "apk"),
+ FF_ARG(counts.bpm, "bpm"), + FF_ARG(counts.bpm, "bpm"),
FF_ARG(counts.brew, "brew"), FF_ARG(counts.brew, "brew"),
FF_ARG(brewAll, "brew-all"),
FF_ARG(counts.brewCask, "brew-cask"), FF_ARG(counts.brewCask, "brew-cask"),
@@ -246,6 +248,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { FF_ARG(counts.cards, "cards"),
@@ -251,6 +253,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
if (false) if (false)
; ;
FF_TEST_PACKAGE_NAME(BREW) FF_TEST_PACKAGE_NAME(BREW)
@@ -134,7 +121,7 @@ index 4ef1d049..e55577bf 100644
break; break;
case 'C': case 'C':
if (false) if (false)
@@ -376,6 +379,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do @@ -387,6 +390,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
FF_TEST_PACKAGE_NAME(AM) FF_TEST_PACKAGE_NAME(AM)
FF_TEST_PACKAGE_NAME(APK) FF_TEST_PACKAGE_NAME(APK)
FF_TEST_PACKAGE_NAME(APPIMAGE) FF_TEST_PACKAGE_NAME(APPIMAGE)
@@ -142,7 +129,7 @@ index 4ef1d049..e55577bf 100644
FF_TEST_PACKAGE_NAME(BREW) FF_TEST_PACKAGE_NAME(BREW)
FF_TEST_PACKAGE_NAME(CARDS) FF_TEST_PACKAGE_NAME(CARDS)
FF_TEST_PACKAGE_NAME(CHOCO) FF_TEST_PACKAGE_NAME(CHOCO)
@@ -435,6 +439,7 @@ bool ffGeneratePackagesJsonResult(FFPackagesOptions* options, yyjson_mut_doc* do @@ -447,6 +451,7 @@ bool ffGeneratePackagesJsonResult(FFPackagesOptions* options, yyjson_mut_doc* do
FF_APPEND_PACKAGE_COUNT(amUser) FF_APPEND_PACKAGE_COUNT(amUser)
FF_APPEND_PACKAGE_COUNT(appimage) FF_APPEND_PACKAGE_COUNT(appimage)
FF_APPEND_PACKAGE_COUNT(apk) FF_APPEND_PACKAGE_COUNT(apk)
@@ -150,11 +137,11 @@ index 4ef1d049..e55577bf 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(cards) FF_APPEND_PACKAGE_COUNT(cards)
@@ -535,6 +540,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { @@ -523,6 +528,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{ "Number of macports packages", "macports" }, { "Number of am-user (aka appman) packages", "am-user" },
{ "Number of mport packages", "mport" }, { "Number of appimage packages", "appimage" },
{ "Number of moss packages", "moss" }, { "Number of apk packages", "apk" },
+ { "Number of bpm packages", "bpm" }, + { "Number of bpm packages", "bpm" },
{ "Total number of all nix packages", "nix-all" }, { "Number of brew packages", "brew" },
{ "Number of nix-default packages", "nix-default" }, { "Number of brew-cask packages", "brew-cask" },
{ "Number of nix-system packages", "nix-system" }, { "Number of cards packages", "cards" },