From 48a42cd500c5673f9a017b18f9f14bc4fd4d01e1 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Aug 2024 15:30:15 +0300 Subject: [PATCH 1/4] flake.lock: update pinned nixpkgs --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8411eaa2..c0471a5d 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { From 5502640ab56b68211f6acaf63004c61d7b7ab547 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Aug 2024 15:32:13 +0300 Subject: [PATCH 2/4] manifest: misc updates --- support/manifest/mappings.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/support/manifest/mappings.toml b/support/manifest/mappings.toml index 03496017..248632e7 100644 --- a/support/manifest/mappings.toml +++ b/support/manifest/mappings.toml @@ -309,8 +309,8 @@ steamos-atomupd-client-git.ignore = true # applied as NixOS modules instead # check both to make sure we get the latest changes -steamos-customizations-git.check = "20240530.1-3" -steamos-customizations-jupiter.check = "20240709.1-1" +steamos-customizations-git.check = "20240530.1-4" +steamos-customizations-jupiter.check = "20240709.1-2" # devkit stuff steamos-devkit-service.ignore = true @@ -369,8 +369,9 @@ vpower.ignore = true wakehook = { map = true, pkgrel = 2 } -# we use upstream -wayland-protocols.ignore = true +# we use upstream but check the versions +wayland = { map = true, pkgrel = 1 } +wayland-protocols = { map = true, pkgrel = 1 } # dependency of pipewire webrtc-audio-processing-1.ignore = true @@ -381,7 +382,7 @@ wireplumber.check = "0.5.3-1.2" xdg-desktop-portal-gtk.ignore = true # upstream backport -xorg-xwayland.check = "23.2.6-3" +xorg-xwayland = { map = "xwayland", pkgrel = 1 } # build dependency xorgproto.ignore = true From fc3edf3af5b9cc3106aa9f500f82dac1d8804f4f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Aug 2024 16:00:08 +0300 Subject: [PATCH 3/4] gamescope: 3.14.28 -> 3.14.29 --- pkgs/gamescope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/gamescope/default.nix b/pkgs/gamescope/default.nix index ebb95a16..e155922f 100644 --- a/pkgs/gamescope/default.nix +++ b/pkgs/gamescope/default.nix @@ -7,14 +7,14 @@ # version shipped by the vendor, ensuring feature level is equivalent. gamescope'.overrideAttrs(old: rec { - version = "3.14.28"; + version = "3.14.29"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = version; fetchSubmodules = true; - hash = "sha256-0dE98/Tr1yDPEvQ/n/44i3sv78lXp/rnnIKalKHIxUY="; + hash = "sha256-q3HEbFqUeNczKYUlou+quxawCTjpM5JNLrML84tZVYE="; }; buildInputs = old.buildInputs ++ [ lcms ]; From a7cc10b5993fa885828491043060aff8aac51513 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 9 Aug 2024 16:44:32 +0300 Subject: [PATCH 4/4] gamescope-session: 3.14.28 -> 3.14.29 --- pkgs/gamescope-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/gamescope-session/default.nix b/pkgs/gamescope-session/default.nix index 7688e81e..1721c38c 100644 --- a/pkgs/gamescope-session/default.nix +++ b/pkgs/gamescope-session/default.nix @@ -104,13 +104,13 @@ let }; in stdenv.mkDerivation(finalAttrs: { pname = "gamescope-session"; - version = "3.14.28-1"; + version = "3.14.29-1"; src = fetchFromGitHub { owner = "Jovian-Experiments"; repo = "PKGBUILDs-mirror"; rev = "jupiter-main/gamescope-${finalAttrs.version}"; - hash = "sha256-YePgfPJP6Fne3rITAgWps4L7ZcgW+Af/sHuQ5AfKcEY="; + hash = "sha256-nwmZwdj+fhUiszj2JVK9jw0kFz0RIlh0YREDUmGqSNI="; }; patches = [