Skip to content

Commit

Permalink
Bump 20240403-0 (#665)
Browse files Browse the repository at this point in the history
  • Loading branch information
PedroHLC authored Apr 4, 2024
1 parent eca4f84 commit 7e340fc
Show file tree
Hide file tree
Showing 9 changed files with 212 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8

[*.nix,*.toml,*.yml]
[*.nix,*.toml,*.yml,*.sh]
indent_size = 2
indent_style = space
10 changes: 5 additions & 5 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

311 changes: 156 additions & 155 deletions maintenance/failures.x86_64-linux.nix

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pkgs/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,8 @@
"CONFIG_AS_SHA256_NI" = "y";
"CONFIG_AS_TPAUSE" = "y";
"CONFIG_AS_GFNI" = "y";
"CONFIG_AS_VAES" = "y";
"CONFIG_AS_VPCLMULQDQ" = "y";
"CONFIG_AS_WRUSS" = "y";
"CONFIG_HOTPLUG_SMT" = "y";
"CONFIG_HOTPLUG_CORE_SYNC" = "y";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,8 @@
"CONFIG_AS_SHA256_NI" = "y";
"CONFIG_AS_TPAUSE" = "y";
"CONFIG_AS_GFNI" = "y";
"CONFIG_AS_VAES" = "y";
"CONFIG_AS_VPCLMULQDQ" = "y";
"CONFIG_AS_WRUSS" = "y";
"CONFIG_HOTPLUG_SMT" = "y";
"CONFIG_HOTPLUG_CORE_SYNC" = "y";
Expand Down Expand Up @@ -5400,6 +5402,7 @@
"CONFIG_DRM_AMD_DC_FP" = "y";
"CONFIG_DRM_AMD_DC_SI" = "y";
"CONFIG_DRM_AMD_SECURE_DISPLAY" = "y";
"CONFIG_AMD_PRIVATE_COLOR" = "y";
"CONFIG_HSA_AMD" = "y";
"CONFIG_HSA_AMD_SVM" = "y";
"CONFIG_DRM_NOUVEAU" = "m";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/linux-cachyos/config-nix/cachyos.x86_64-linux.nix
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,8 @@
"CONFIG_AS_SHA256_NI" = "y";
"CONFIG_AS_TPAUSE" = "y";
"CONFIG_AS_GFNI" = "y";
"CONFIG_AS_VAES" = "y";
"CONFIG_AS_VPCLMULQDQ" = "y";
"CONFIG_AS_WRUSS" = "y";
"CONFIG_HOTPLUG_SMT" = "y";
"CONFIG_HOTPLUG_CORE_SYNC" = "y";
Expand Down
12 changes: 6 additions & 6 deletions pkgs/linux-cachyos/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"suffix": "-cachyos",
"_linux": "pkgver from config's PKGBUILD",
"linux": {
"version": "6.8.2",
"hash": "sha256-msMi2FvPmKBGZ9kp9cJmaxW9WMbC1o3VEscqy87QfQQ="
"version": "6.8.3",
"hash": "sha256-2361bVAU7pp/rAxxUFMVXZJ5jZjZGXohc+7x8KSWyYY="
},
"_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos",
"config": {
"rev": "61731469188f6c8bd82508334254223077bf66df",
"hash": "sha256-1bpqkQYfqddBlz0fkJQiKZYCH4u+PL6UUhuucAQt8+k="
"rev": "fbc958607023a3ffc556c419de49c7faaf358f40",
"hash": "sha256-KdSDU0s8RNt2CEYRLYnWETVt1TGKEWDYnIpBHtZUSsM="
},
"_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y",
"patches": {
"rev": "5bfa847bc22e66fbafa3fcb05d0dc8ed3211bc50",
"hash": "sha256-5F84jnsPGSovsEVfsCglHQjlS7v/fuE25T1I0BriWIw="
"rev": "7f1fee3a051ee65e3411d16735bb62b8c8b9d28a",
"hash": "sha256-R9y8i5jQk9xkJRtb4JCadtV4QnATCPlm0g+2EBhq7Rg="
},
"_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD",
"zfs": {
Expand Down
37 changes: 37 additions & 0 deletions pkgs/scx/update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p cargo
set -eu

if ! [ -f common.nix ]; then
echo 'Needs to run in pkgs/scx' >&2
exit 1
fi

PKGROOT=$PWD
pushd /tmp

if [ -d scx ]; then
echo 'WARNING: Using an already cloned version of scx, the result might be outdated.'
else
git clone --single-branch 'https://github.com/sched-ext/scx.git'
fi

pushd scx
CURRREV=$(git rev-parse HEAD)

pushd scheds/rust
for s in lavd layered rlfifo rustland rusty; do
pushd "scx_${s}"

cargo generate-lockfile
cp Cargo.lock "$PKGROOT/${s}/Cargo.lock"

popd
done

popd
popd
popd

echo "Updated to ${CURRREV}"
echo 'FINISHED SUCCESSFULLY'
1 change: 0 additions & 1 deletion pkgs/telegram-desktop-git/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ gitOverride {
tg-owt_git
else
realCall;
glibmm_2_68 = glibmm_git;
};

nyxKey = "telegram-desktop_git";
Expand Down

1 comment on commit 7e340fc

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All packages were built and cached successfully! (293 not suitable for building)

Please sign in to comment.