From 0f4a40ac7f9a33530128925dde1b29597e7ee931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 10:57:56 -0300 Subject: [PATCH 1/7] vulkanPackages_latest.vulkanLoader: update patch --- pkgs/vulkan-versioned/fix-pkgconfig.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/vulkan-versioned/fix-pkgconfig.patch b/pkgs/vulkan-versioned/fix-pkgconfig.patch index f52c4794f..379d5ab79 100644 --- a/pkgs/vulkan-versioned/fix-pkgconfig.patch +++ b/pkgs/vulkan-versioned/fix-pkgconfig.patch @@ -1,11 +1,12 @@ diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in -index 16b0ded..6f725cc 100644 +index 6a285f2..03ff061 100644 --- a/loader/vulkan.pc.in +++ b/loader/vulkan.pc.in -@@ -1,4 +1,5 @@ +@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ Name: Vulkan-Loader Description: Vulkan Loader Version: @VULKAN_LOADER_VERSION@ --Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@ +-Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ +-Cflags: -I${includedir} +Libs: -L@CMAKE_INSTALL_LIBDIR@ -lvulkan@VULKAN_LIB_SUFFIX@ +Cflags: -I@CMAKE_INSTALL_INCLUDEDIR@ From da3bc0254b3675119d67e3b9f05ffeed465fef6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 11:01:36 -0300 Subject: [PATCH 2/7] Revert "glib_git: 20231010212346-2f5088b -> 20231122104501-c7a0228" This reverts commit 73ad47b6fe45a69d519d2aa6288175bf02083715. Requires newer deps that I don't have the time to upgrade right now. --- pkgs/glib-git/version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/glib-git/version.json b/pkgs/glib-git/version.json index 6453d3393..f1ff727ec 100644 --- a/pkgs/glib-git/version.json +++ b/pkgs/glib-git/version.json @@ -1,5 +1,5 @@ { - "version": "unstable-20231122104501-c7a0228", - "rev": "c7a02280f5cf544f4a2bd074705102d778c16708", - "hash": "sha256-LmpSJdWLQBAwnha1TvWJHp83QytOlEeK8g5JyGRa/Fk=" + "version": "unstable-20231010212346-2f5088b", + "rev": "2f5088b7b6fd4b3e62a33d8336acd01ea3f63834", + "hash": "sha256-kBw4HqS98sOuBJ9HqZW2RuYY7AMosg7d0udxI0IYqAA=" } From 734ca1c1566750deb9ef1f12fa83cc54106e530a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 11:30:37 -0300 Subject: [PATCH 3/7] mesa32_git: revert e4ffb2473b59dd98ea0b400a47b6b50beda3dbf2 cause it breaks in i686 --- pkgs/mesa-git/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/mesa-git/default.nix b/pkgs/mesa-git/default.nix index 2af19d818..db6185874 100644 --- a/pkgs/mesa-git/default.nix +++ b/pkgs/mesa-git/default.nix @@ -9,8 +9,18 @@ , ... }: +let + inherit (final.stdenv) is32bit; + inherit (final.lib) optional; + + problematicCommit = final.fetchpatch { + url = "https://github.com/chaotic-cx/mesa-mirror/commit/e4ffb2473b59dd98ea0b400a47b6b50beda3dbf2.patch"; + hash = "sha256-5f80Ru1SdrkfSC+uG/haTF7Z7I6LetGY3WiownRdHfE="; + revert = true; + }; +in gitOverride (current: { - nyxKey = if final.stdenv.is32bit then "mesa32_git" else "mesa_git"; + nyxKey = if is32bit then "mesa32_git" else "mesa_git"; prev = prev.mesa; versionNyxPath = "pkgs/mesa-git/version.json"; @@ -19,7 +29,7 @@ gitOverride (current: { owner = "chaotic-cx"; repo = "mesa-mirror"; }; - withUpdateScript = !final.stdenv.is32bit; + withUpdateScript = !is32bit; version = builtins.substring 0 (builtins.stringLength prev.mesa.version) current.rev; postOverride = prevAttrs: { @@ -38,7 +48,7 @@ gitOverride (current: { ./opencl.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch ./gbm-backend.patch - ]; + ] ++ optional is32bit problematicCommit; # expose gbm backend and rename vendor (if necessary) outputs = if gbmDriver From b45d00e4f5a96dcfc98bb796dac1a202d0e229d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 12:31:51 -0300 Subject: [PATCH 4/7] yt-dlp_git: adopt new version.py fields --- pkgs/yt-dlp-git/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/yt-dlp-git/default.nix b/pkgs/yt-dlp-git/default.nix index dcb75e4e6..c4c6b9c6a 100644 --- a/pkgs/yt-dlp-git/default.nix +++ b/pkgs/yt-dlp-git/default.nix @@ -40,7 +40,11 @@ in UPDATE_HINT = None - CHANNEL = 'chaotic-nyx' + CHANNEL = 'master' + + ORIGIN = 'chaotic-cx/nyx' + + _pkg_version = '${datedVersion}' " > yt_dlp/version.py ''; }; From 92f80746fe6475ad4ba96da0f1cbab340d6016cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 12:34:47 -0300 Subject: [PATCH 5/7] gamescope_git: 20231121223853-e384c4e -> 20231122142219-4a067fb --- pkgs/gamescope-git/default.nix | 8 -------- pkgs/gamescope-git/version.json | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/gamescope-git/default.nix b/pkgs/gamescope-git/default.nix index 5d111db34..e05efd1d7 100644 --- a/pkgs/gamescope-git/default.nix +++ b/pkgs/gamescope-git/default.nix @@ -22,14 +22,6 @@ gitOverride { ref = "master"; postOverride = prevAttrs: { - patches = prevAttrs.patches ++ [ - # allows usage with latest wlroots - (final.fetchpatch2 { - url = "https://github.com/ValveSoftware/gamescope/commit/d4ca57e1f4afe0b0798bf71406b1430a915a7bb3.patch"; - hash = "sha256-XG8114bHGuhW7WmXufPMVf2yFKml8A4uTP3ucvIiH2I="; - }) - ]; - # erase wlroots replacement since we're fetching submodules. postUnpack = ""; }; diff --git a/pkgs/gamescope-git/version.json b/pkgs/gamescope-git/version.json index 9ff0932d5..524214ef9 100644 --- a/pkgs/gamescope-git/version.json +++ b/pkgs/gamescope-git/version.json @@ -1,5 +1,5 @@ { - "version": "unstable-20231121223853-e384c4e", - "rev": "e384c4e066a51cae3c22722e8c9409aae5a826bd", - "hash": "sha256-WF/JVm6ZUGG6I7hY/vcOlFjYA7IcW37f0ZZu0lcwN1I=" + "version": "unstable-20231122142219-4a067fb", + "rev": "4a067fb4ebe2291a1acaab77205cc1ed3bd19e86", + "hash": "sha256-lHg9QGBV6Nhsu9Zdy3NlumUt19QzN6kMnr0ZLVgmaWs=" } From bef4043dbbc7047baad688aa0c04ff818d8f17cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 13:30:01 -0300 Subject: [PATCH 6/7] gamescope_git: fix build --- pkgs/gamescope-git/default.nix | 12 +++++++++++- pkgs/gamescope-git/use-pkgconfig.patch | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/gamescope-git/use-pkgconfig.patch diff --git a/pkgs/gamescope-git/default.nix b/pkgs/gamescope-git/default.nix index e05efd1d7..d58e78b1f 100644 --- a/pkgs/gamescope-git/default.nix +++ b/pkgs/gamescope-git/default.nix @@ -1,4 +1,4 @@ -{ final, prev, gitOverride, ... }: +{ final, prev, gitOverride, nyxUtils, ... }: gitOverride { newInputs = with final; { @@ -22,6 +22,16 @@ gitOverride { ref = "master"; postOverride = prevAttrs: { + buildInputs = with final; [ xorg.xcbutilwm xorg.xcbutilerrors ] ++ prevAttrs.buildInputs; + + patches = + (nyxUtils.removeByBaseName "use-pkgconfig.patch" prevAttrs.patches) + ++ [ ./use-pkgconfig.patch ]; + + postInstall = prevAttrs.postInstall + '' + rm -r $out/include $lib/lib/pkgconfig $lib/lib/libwlroots.a + ''; + # erase wlroots replacement since we're fetching submodules. postUnpack = ""; }; diff --git a/pkgs/gamescope-git/use-pkgconfig.patch b/pkgs/gamescope-git/use-pkgconfig.patch new file mode 100644 index 000000000..77a984313 --- /dev/null +++ b/pkgs/gamescope-git/use-pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/meson.build b/meson.build +index 1311784..77043ac 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,7 +6,6 @@ project( + default_options: [ + 'cpp_std=c++14', + 'warning_level=2', +- 'force_fallback_for=wlroots,libliftoff,vkroots', + ], + ) From b9e6d158c77d593f1fb678f9dbd8d5deedb16a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 22 Nov 2023 13:41:58 -0300 Subject: [PATCH 7/7] Revert "telegram-desktop_git: 20231119034632-a92e9f7 -> 20231122081845-b60e50d" This reverts commit ab0b67af68d883ccb7e3ad11ebfb330e72c428b6. --- pkgs/telegram-desktop-git/version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/telegram-desktop-git/version.json b/pkgs/telegram-desktop-git/version.json index 32ef7d3db..02cfd7d2f 100644 --- a/pkgs/telegram-desktop-git/version.json +++ b/pkgs/telegram-desktop-git/version.json @@ -1,5 +1,5 @@ { - "version": "unstable-20231122081845-b60e50d", - "rev": "b60e50df105db8baa4e0d578895bf5be1f6d5dda", - "hash": "sha256-AU17GVL8xHMgrfQr0GSjMGuKYB3xp8F1BWfHw9R8pGk=" + "version": "unstable-20231119034632-a92e9f7", + "rev": "a92e9f71623f5593e15600603a927c0cf2a29329", + "hash": "sha256-qilHCo/4kB3inYj2WAAaWYybD91PGq0HE6ezc3SE+/8=" }