Skip to content

Commit 30f8a9c

Browse files
authored
Merge branch 'CachyOS:master' into plasmalogin
2 parents 8cab8c9 + 6821184 commit 30f8a9c

File tree

47 files changed

+666
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+666
-149
lines changed

cachyos-calamares/.SRCINFO

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
pkgbase = cachyos-calamares-qt6-next-systemd
1+
pkgbase = cachyos-calamares-next
22
pkgdesc = Distribution-independent installer framework
33
pkgver = 3.4.0
44
pkgrel = 1
5-
url = https://github.com/cachyos/cachyos-calamares
5+
url = https://github.com/CachyOS/cachyos-calamares
66
arch = x86_64
77
license = GPL-3.0-or-later
88
makedepends = boost
@@ -44,7 +44,7 @@ pkgbase = cachyos-calamares-qt6-next-systemd
4444
provides = calamares
4545
conflicts = calamares
4646
options = !emptydirs
47-
source = calamares::git+https://github.com/cachyos/cachyos-calamares.git#branch=cachyos-systemd-qt6-dev
47+
source = calamares::git+https://github.com/CachyOS/cachyos-calamares.git#branch=cachyos-dev
4848
sha256sums = SKIP
4949

50-
pkgname = cachyos-calamares-qt6-next-systemd
50+
pkgname = cachyos-calamares-next

cachyos-calamares/PKGBUILD

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22
# Maintainer: Vladislav Nepogodin <[email protected]>
33
# Contributor: Philip Müller <philm[at]manjaro[dog]org>
44

5-
# Bootloader to select
6-
# possible options:
7-
# grub, systemd, refind, limine
8-
_bootloader=${_bootloader-'systemd'}
9-
_branch_name="cachyos-${_bootloader}-qt6"
10-
11-
pkgname=cachyos-calamares-qt6-next-${_bootloader}
5+
pkgname=cachyos-calamares-next
126
pkgver=3.4.0
137
pkgrel=1
148
pkgdesc='Distribution-independent installer framework'
159
arch=('x86_64')
1610
license=(GPL-3.0-or-later)
17-
url="https://github.com/cachyos/cachyos-calamares"
11+
url="https://github.com/CachyOS/cachyos-calamares"
1812
conflicts=('calamares')
1913
provides=('calamares')
2014
depends=(
@@ -59,7 +53,7 @@ makedepends=(
5953
)
6054
sha256sums=('SKIP')
6155
# Bootloader
62-
source=(calamares::git+${url}.git#branch=${_branch_name}-dev)
56+
source=(calamares::"git+${url}.git#branch=cachyos-dev")
6357
options=('!emptydirs')
6458

6559
prepare() {
@@ -72,8 +66,6 @@ prepare() {
7266
sed -i -e "s|CALAMARES_VERSION_RC 1|CALAMARES_VERSION_RC 0|g" CMakeLists.txt
7367
}
7468

75-
76-
7769
build() {
7870
cd ${srcdir}/calamares
7971

cachyos-gaming-applications/.SRCINFO

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
pkgbase = cachyos-gaming-applications
22
pkgdesc = Common Applications used for Gaming
33
pkgver = 1.0.0
4-
pkgrel = 2
4+
pkgrel = 3
55
arch = any
66
depends = cachyos-gaming-meta
77
depends = gamescope
88
depends = goverlay
99
depends = heroic-games-launcher
10+
depends = faugus-launcher
1011
depends = lib32-mangohud
1112
depends = lutris
1213
depends = mangohud

cachyos-gaming-applications/PKGBUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
pkgname=cachyos-gaming-applications
55
pkgver=1.0.0
6-
pkgrel=2
6+
pkgrel=3
77
arch=(any)
88
pkgdesc='Common Applications used for Gaming'
99
depends=(
1010
cachyos-gaming-meta
1111
gamescope
1212
goverlay
1313
heroic-games-launcher
14+
faugus-launcher
1415
lib32-mangohud
1516
lutris
1617
mangohud

cachyos-zsh-config/.SRCINFO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = cachyos-zsh-config
22
pkgdesc = Zsh configuration for CachyOS
3-
pkgver = 1.0.2
3+
pkgver = 1.0.3
44
pkgrel = 1
55
url = https://github.com/CachyOS/cachyos-zsh-config
66
arch = any
@@ -17,8 +17,8 @@ pkgbase = cachyos-zsh-config
1717
depends = zsh-history-substring-search
1818
depends = zsh-syntax-highlighting
1919
depends = zsh-theme-powerlevel10k
20-
source = git+https://github.com/CachyOS/cachyos-zsh-config.git?signed#tag=v1.0.2
20+
source = git+https://github.com/CachyOS/cachyos-zsh-config.git?signed#tag=v1.0.3
2121
validpgpkeys = B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9
22-
sha256sums = 0683e83f25458d706caf614cf41895f44b7a997a32b34cc3c490fa38f5345608
22+
sha256sums = 131d830ced9cda5f7e7058c00aa91075f88c3e7e97dcb92d755537bf5cd459d7
2323

2424
pkgname = cachyos-zsh-config

cachyos-zsh-config/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Vladislav Nepogodin (vnepogodin) <[email protected]>
22

33
pkgname=cachyos-zsh-config
4-
pkgver=1.0.2
4+
pkgver=1.0.3
55
pkgrel=1
66
pkgdesc="Zsh configuration for CachyOS"
77
arch=(any)
@@ -24,7 +24,7 @@ makedepends=(
2424
git
2525
)
2626
source=("git+${url}.git?signed#tag=v${pkgver}")
27-
sha256sums=('0683e83f25458d706caf614cf41895f44b7a997a32b34cc3c490fa38f5345608')
27+
sha256sums=('131d830ced9cda5f7e7058c00aa91075f88c3e7e97dcb92d755537bf5cd459d7')
2828
validpgpkeys=(
2929
B1B70BB1CD56047DEF31DE2EB62C3D10C54D5DA9 # Vladislav Nepogodin <[email protected]>
3030
)

falcond/.SRCINFO

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
pkgbase = falcond
22
pkgdesc = Advanced Linux Gaming Performance Daemon
3-
pkgver = 1.1.9
3+
pkgver = 1.2.3
44
pkgrel = 1
55
url = https://github.com/PikaOS-Linux/falcond
66
arch = x86_64
77
license = MIT
88
makedepends = git
99
makedepends = zig
1010
depends = glibc
11-
source = git+https://github.com/PikaOS-Linux/falcond#tag=v1.1.9
11+
source = git+https://github.com/PikaOS-Linux/falcond#tag=v1.2.3
1212
source = git+https://github.com/PikaOS-Linux/falcond-profiles.git
1313
source = falcond.service
1414
validpgpkeys = 74460D32B80810EBA9AFA2E962394C698C2739FA
15-
sha256sums = 769883a746ee8e157bbc75a05e1b5e6979dea5c48eb0eeb9c313d541a3e319e1
15+
sha256sums = 0359c7ea705557c766baf638717948598e4cb1be207ac440c5499fb34d9ff258
1616
sha256sums = SKIP
1717
sha256sums = 2c53ee97c65d5e025b6b4d04a4f740187604a42259d7adbd05c8d04ac1e5e0b9
18-
b2sums = 5d8858101e107805899ca11461039f4982e3fe7dfef20d33c66925c5e95b9cc532d7133976f484f3f28269293525b6b78d5c995c7ac41bc049cb676b3db7c429
18+
b2sums = 66a2605e59bdfb3a1b8e6697f7543a5f8ebb7f8ccd38b263eebddb88e4820a530845c674719628ac3ed11c9e2dbd8949b457b725603bf830b2db721d0628c4e0
1919
b2sums = SKIP
2020
b2sums = d52e0d3c79b348d698e73173efcadefee8308e0fbf7c60c3053f5a3d192e53a36da28e89df43c894c9e36363da2db5456f65d873730aef93faf69bad25c3e9c0
2121

falcond/PKGBUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Peter Jung <[email protected]>
22

33
pkgname=falcond
4-
pkgver=1.1.9
4+
pkgver=1.2.3
55
pkgrel=1
66
pkgdesc='Advanced Linux Gaming Performance Daemon'
77
url='https://github.com/PikaOS-Linux/falcond'
@@ -17,10 +17,10 @@ arch=(x86_64)
1717
source=(git+https://github.com/PikaOS-Linux/falcond#tag=v${pkgver}
1818
git+https://github.com/PikaOS-Linux/falcond-profiles.git
1919
falcond.service)
20-
sha256sums=('769883a746ee8e157bbc75a05e1b5e6979dea5c48eb0eeb9c313d541a3e319e1'
20+
sha256sums=('0359c7ea705557c766baf638717948598e4cb1be207ac440c5499fb34d9ff258'
2121
'SKIP'
2222
'2c53ee97c65d5e025b6b4d04a4f740187604a42259d7adbd05c8d04ac1e5e0b9')
23-
b2sums=('5d8858101e107805899ca11461039f4982e3fe7dfef20d33c66925c5e95b9cc532d7133976f484f3f28269293525b6b78d5c995c7ac41bc049cb676b3db7c429'
23+
b2sums=('66a2605e59bdfb3a1b8e6697f7543a5f8ebb7f8ccd38b263eebddb88e4820a530845c674719628ac3ed11c9e2dbd8949b457b725603bf830b2db721d0628c4e0'
2424
'SKIP'
2525
'd52e0d3c79b348d698e73173efcadefee8308e0fbf7c60c3053f5a3d192e53a36da28e89df43c894c9e36363da2db5456f65d873730aef93faf69bad25c3e9c0')
2626
validpgpkeys=('74460D32B80810EBA9AFA2E962394C698C2739FA') # Yoran Heling <[email protected]>

go/.SRCINFO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = go
22
pkgdesc = Core compiler tools for the Go programming language
3-
pkgver = 1.25.5
3+
pkgver = 1.25.6
44
pkgrel = 2
55
epoch = 2
66
url = https://golang.org/
@@ -12,7 +12,7 @@ pkgbase = go
1212
replaces = go-pie
1313
options = !strip
1414
options = staticlibs
15-
source = https://go.dev/dl/go1.25.5.src.tar.gz
16-
sha256sums = 22a5fd0a91efcd28a1b0537106b9959b2804b61f59c3758b51e8e5429c1a954f
15+
source = https://go.dev/dl/go1.25.6.src.tar.gz
16+
sha256sums = 58cbf771e44d76de6f56d19e33b77d745a1e489340922875e46585b975c2b059
1717

1818
pkgname = go

go/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ _optimize_v4=${_optimize_v4-}
1919

2020
pkgname=go
2121
epoch=2
22-
pkgver=1.25.5
22+
pkgver=1.25.6
2323
pkgrel=2
2424
pkgdesc='Core compiler tools for the Go programming language'
2525
arch=(x86_64)
@@ -30,7 +30,7 @@ replaces=(go-pie)
3030
provides=(go-pie)
3131
options=(!strip staticlibs)
3232
source=(https://go.dev/dl/go${pkgver}.src.tar.gz)
33-
sha256sums=('22a5fd0a91efcd28a1b0537106b9959b2804b61f59c3758b51e8e5429c1a954f')
33+
sha256sums=('58cbf771e44d76de6f56d19e33b77d745a1e489340922875e46585b975c2b059')
3434

3535
prepare() {
3636
cd $pkgname

0 commit comments

Comments
 (0)