From 544da1ba50d9cbf51a18ca0abf1db66b3baa7460 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 17 Oct 2025 12:22:00 -0400 Subject: Gentoo desktop --- files/nixpkgs-patches/.gitignore | 0 files/nixpkgs-patches/425312.diff | 143 ------ files/nixpkgs-patches/425843.diff | 504 --------------------- .../4c3870b23dded4e75292be48bdb03cd870fb1719.diff | 21 - 4 files changed, 668 deletions(-) delete mode 100644 files/nixpkgs-patches/.gitignore delete mode 100644 files/nixpkgs-patches/425312.diff delete mode 100644 files/nixpkgs-patches/425843.diff delete mode 100644 files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff (limited to 'files/nixpkgs-patches') diff --git a/files/nixpkgs-patches/.gitignore b/files/nixpkgs-patches/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/files/nixpkgs-patches/425312.diff b/files/nixpkgs-patches/425312.diff deleted file mode 100644 index f895dae..0000000 --- a/files/nixpkgs-patches/425312.diff +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch b/pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch -similarity index 100% -rename from pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch -rename to pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch -diff --git a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch b/pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -similarity index 70% -rename from pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch -rename to pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -index a9db3e64580827..55f386bb31906a 100644 ---- a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch -+++ b/pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch -@@ -1,17 +1,17 @@ - diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq --index bcb384e..dbaf1b5 100755 -+index 28d0754..3eaac58 100755 - --- a/scripts/msmtpq/msmtpq - +++ b/scripts/msmtpq/msmtpq --@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then -- fi -+@@ -182,6 +182,8 @@ if [ -n "$MSMTPQ_LOG" ] ; then -+ unset msmptq_log_dir - fi -- [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" --+ -+ - +JOURNAL=@journal@ -- ## ====================================================================================== -++ -+ umask 077 # set secure permissions on created directories and files - -- ## msmtpq can use the following environment variables : --@@ -144,6 +146,7 @@ on_exit() { # unlock the queue on exit if the lock was -+ declare -i CNT # a count of mail(s) currently in the queue -+@@ -214,6 +216,7 @@ on_exit() { # unlock the queue on exit if the lock was - ## display msg to user, as well - ## - log() { -@@ -19,7 +19,7 @@ index bcb384e..dbaf1b5 100755 - local ARG RC PFX - PFX="$('date' +'%Y %d %b %H:%M:%S')" - # time stamp prefix - "2008 13 Mar 03:59:45 " --@@ -161,10 +164,19 @@ log() { -+@@ -233,10 +236,19 @@ log() { - done - fi - -diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/by-name/ms/msmtp/package.nix -similarity index 84% -rename from pkgs/applications/networking/msmtp/default.nix -rename to pkgs/by-name/ms/msmtp/package.nix -index 60946106d0ddf1..c801fa83ee9b98 100644 ---- a/pkgs/applications/networking/msmtp/default.nix -+++ b/pkgs/by-name/ms/msmtp/package.nix -@@ -9,6 +9,7 @@ - bash, - coreutils, - gnugrep, -+ gnused, - gnutls, - gsasl, - libidn2, -@@ -20,6 +21,8 @@ - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, - systemd, - withScripts ? true, -+ withLibnotify ? true, -+ libnotify, - gitUpdater, - binlore, - msmtp, -@@ -28,13 +31,13 @@ - let - inherit (lib) getBin getExe optionals; - -- version = "1.8.26"; -+ version = "1.8.30"; - - src = fetchFromGitHub { - owner = "marlam"; - repo = "msmtp"; - rev = "msmtp-${version}"; -- hash = "sha256-MV3fzjjyr7qZw/BbKgsSObX+cxDDivI+0ZlulrPFiWM="; -+ hash = "sha256-aM2qId08zvT9LbncCQYHsklbvHVtcZJgr91JTjwpQ/0="; - }; - - meta = with lib; { -@@ -112,13 +115,17 @@ let - msmtpq = { - scripts = [ "bin/msmtpq" ]; - interpreter = getExe bash; -- inputs = [ -- binaries -- coreutils -- gnugrep -- netcat-gnu -- which -- ] ++ optionals withSystemd [ systemd ]; -+ inputs = -+ [ -+ binaries -+ coreutils -+ gnugrep -+ gnused -+ netcat-gnu -+ which -+ ] -+ ++ optionals withSystemd [ systemd ] -+ ++ optionals withLibnotify [ libnotify ]; - execer = - [ - "cannot:${getBin binaries}/bin/msmtp" -@@ -126,9 +133,15 @@ let - ] - ++ optionals withSystemd [ - "cannot:${getBin systemd}/bin/systemd-cat" -+ ] -+ ++ optionals withLibnotify [ -+ "cannot:${getBin libnotify}/bin/notify-send" - ]; - fix."$MSMTP" = [ "msmtp" ]; -- fake.external = [ "ping" ] ++ optionals (!withSystemd) [ "systemd-cat" ]; -+ fake.external = -+ [ "ping" ] -+ ++ optionals (!withSystemd) [ "systemd-cat" ] -+ ++ optionals (!withLibnotify) [ "notify-send" ]; - keep.source = [ "~/.msmtpqrc" ]; - }; - -diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix -index 1f6cde48853370..2d89e07134d294 100644 ---- a/pkgs/top-level/all-packages.nix -+++ b/pkgs/top-level/all-packages.nix -@@ -13308,10 +13308,6 @@ with pkgs; - - taxi-cli = with python3Packages; toPythonApplication taxi; - -- msmtp = callPackage ../applications/networking/msmtp { -- autoreconfHook = buildPackages.autoreconfHook269; -- }; -- - imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { - lua = lua5; - }; diff --git a/files/nixpkgs-patches/425843.diff b/files/nixpkgs-patches/425843.diff deleted file mode 100644 index ded8544..0000000 --- a/files/nixpkgs-patches/425843.diff +++ /dev/null @@ -1,504 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index 18f999dd83599c..8242549b63007b 100644 ---- a/pkgs/development/libraries/mesa/common.nix -+++ b/pkgs/development/libraries/mesa/common.nix -@@ -5,14 +5,14 @@ - # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa - rec { - pname = "mesa"; -- version = "25.1.6"; -+ version = "25.2.0-rc1"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-SHYYezt2ez9awvIATEC6wVMZMuJUsOYXxlugs1Q6q7U="; -+ hash = "sha256-iVDnJ0MoLQbpEpjfRUy3MV6pjhMTqUMxR4yf9jkuXKw="; - }; - - meta = { -diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix -index db9ec527358508..ee10017b9d5aa0 100644 ---- a/pkgs/development/libraries/mesa/default.nix -+++ b/pkgs/development/libraries/mesa/default.nix -@@ -44,62 +44,53 @@ - enablePatentEncumberedCodecs ? true, - withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, - -- galliumDrivers ? -- [ -- "asahi" # Apple AGX, built on non-aarch64 for cross tools -- "d3d12" # WSL emulated GPU (aka Dozen) -- "iris" # new Intel (Broadwell+) -- "llvmpipe" # software renderer -- "nouveau" # Nvidia -- "panfrost" # ARM Mali Midgard and up (T/G series), built on non-ARM for cross tools -- "r300" # very old AMD -- "r600" # less old AMD -- "radeonsi" # new AMD (GCN+) -- "softpipe" # older software renderer -- "svga" # VMWare virtualized GPU -- "virgl" # QEMU virtualized GPU (aka VirGL) -- "zink" # generic OpenGL over Vulkan, experimental -- ] -- ++ lib.optionals (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) [ -- "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) -- "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -- "lima" # ARM Mali 4xx -- "vc4" # Broadcom VC4 (Raspberry Pi 0-3) -- ] -- ++ lib.optionals stdenv.hostPlatform.isAarch64 [ -- "tegra" # Nvidia Tegra SoCs -- "v3d" # Broadcom VC5 (Raspberry Pi 4) -- ] -- ++ lib.optionals stdenv.hostPlatform.isx86 [ -- "crocus" # Intel legacy, x86 only -- "i915" # Intel extra legacy, x86 only -- ], -+ # We enable as many drivers as possible here, to build cross tools -+ # and support emulation use cases (emulated x86_64 on aarch64, etc) -+ galliumDrivers ? [ -+ "asahi" # Apple AGX -+ "crocus" # Intel legacy -+ "d3d12" # WSL emulated GPU (aka Dozen) -+ "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) -+ "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -+ "i915" # Intel extra legacy -+ "iris" # new Intel (Broadwell+) -+ "lima" # ARM Mali 4xx -+ "llvmpipe" # software renderer -+ "nouveau" # Nvidia -+ "panfrost" # ARM Mali Midgard and up (T/G series) -+ "r300" # very old AMD -+ "r600" # less old AMD -+ "radeonsi" # new AMD (GCN+) -+ "softpipe" # older software renderer -+ "svga" # VMWare virtualized GPU -+ "tegra" # Nvidia Tegra SoCs -+ "v3d" # Broadcom VC5 (Raspberry Pi 4) -+ "vc4" # Broadcom VC4 (Raspberry Pi 0-3) -+ "virgl" # QEMU virtualized GPU (aka VirGL) -+ "zink" # generic OpenGL over Vulkan, experimental -+ ], - vulkanDrivers ? - [ - "amd" # AMD (aka RADV) -- "asahi" # Apple AGX, built on non-aarch64 for cross tools -- "intel" # new Intel (aka ANV) -- "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) -- "nouveau" # Nouveau (aka NVK) -- "swrast" # software renderer (aka Lavapipe) -- ] -- ++ -- lib.optionals -- (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") -- [ -- # QEMU virtualized GPU (aka VirGL) -- # Requires ATOMIC_INT_LOCK_FREE == 2. -- "virtio" -- ] -- ++ lib.optionals stdenv.hostPlatform.isAarch64 [ -+ "asahi" # Apple AGX - "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) - "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) -+ # "gfxstream" # Android virtualized GPU, breaks on some targets, doesn't seem useful? - "imagination-experimental" # PowerVR Rogue (currently N/A) -+ "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) -+ "intel" # new Intel (aka ANV) -+ "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) -+ "nouveau" # Nouveau (aka NVK) - "panfrost" # ARM Mali Midgard and up (T/G series) -+ "swrast" # software renderer (aka Lavapipe) - ] -- ++ lib.optionals stdenv.hostPlatform.isx86 [ -- "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) -- ], -+ ++ lib.optionals -+ (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") -+ [ -+ # QEMU virtualized GPU (aka VirGL) -+ # Requires ATOMIC_INT_LOCK_FREE == 2. -+ "virtio" -+ ], - eglPlatforms ? [ - "x11" - "wayland" -@@ -117,40 +108,26 @@ - }: - - let -- rustDeps = [ -- { -- pname = "paste"; -- version = "1.0.14"; -- hash = "sha256-+J1h7New5MEclUBvwDQtTYJCHKKqAEOeQkuKy+g0vEc="; -- } -- { -- pname = "proc-macro2"; -- version = "1.0.86"; -- hash = "sha256-9fYAlWRGVIwPp8OKX7Id84Kjt8OoN2cANJ/D9ZOUUZE="; -- } -- { -- pname = "quote"; -- version = "1.0.33"; -- hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; -- } -- { -- pname = "syn"; -- version = "2.0.68"; -- hash = "sha256-nGLBbxR0DFBpsXMngXdegTm/o13FBS6QsM7TwxHXbgQ="; -- } -- { -- pname = "unicode-ident"; -- version = "1.0.12"; -- hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8="; -- } -- ]; -+ rustDeps = lib.importJSON ./wraps.json; -+ -+ handleRustDep = dep: '' -+ ( -+ echo "Preparing Rust dependency wrap ${dep.pname}-${dep.version}..." -+ -+ wrapDir=subprojects/packagefiles/${dep.pname} -+ outDir=subprojects/${dep.pname}-${dep.version} -+ -+ mkdir -p $outDir -+ tar -C $outDir -xf ${fetchCrate (dep // { unpack = false; })} --strip-components=1 -+ cp $wrapDir/meson.build $outDir - -- copyRustDep = dep: '' -- cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version} -- cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/ -+ for patch in $wrapDir/*.patch; do -+ patch -d $outDir -i $(readlink -f $patch) -p1 -+ done -+ ) - ''; - -- copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); -+ copyRustDeps = lib.concatStringsSep "\n" (builtins.map handleRustDep rustDeps); - - needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; - -@@ -227,13 +204,6 @@ stdenv.mkDerivation { - (lib.mesonEnable "gbm" true) - (lib.mesonBool "libgbm-external" true) - -- (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK -- -- # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, -- # so we're keeping it for now. Should be removed when that's no longer the case. -- # See: https://github.com/NixOS/nixpkgs/pull/392492 -- (lib.mesonEnable "gallium-xa" true) -- - (lib.mesonBool "teflon" true) # TensorFlow frontend - - # Enable all freedreno kernel mode drivers. (For example, virtio can be -@@ -241,9 +211,6 @@ stdenv.mkDerivation { - # is ignored when freedreno is not being built. - (lib.mesonOption "freedreno-kmds" "msm,kgsl,virtio,wsl") - -- # Enable Intel RT stuff when available -- (lib.mesonEnable "intel-rt" stdenv.hostPlatform.isx86_64) -- - # Required for OpenCL - (lib.mesonOption "clang-libdir" "${lib.getLib llvmPackages.clang-unwrapped}/lib") - -@@ -251,15 +218,16 @@ stdenv.mkDerivation { - (lib.mesonBool "gallium-rusticl" true) - (lib.mesonOption "gallium-rusticl-enable-drivers" "auto") - -- # meson auto_features enables this, but we do not want it -- (lib.mesonEnable "android-libbacktrace" false) -- (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) -- - # Enable more sensors in gallium-hud - (lib.mesonBool "gallium-extra-hud" true) - - # Disable valgrind on targets where it's not available - (lib.mesonEnable "valgrind" withValgrind) -+ -+ # meson auto_features enables these, but we do not want them -+ (lib.mesonEnable "gallium-mediafoundation" false) # Windows only -+ (lib.mesonEnable "android-libbacktrace" false) # Android only -+ (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) - ] - ++ lib.optionals enablePatentEncumberedCodecs [ - (lib.mesonOption "video-codecs" "all") -diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch -index 9d40da82f85649..d71f168d83cf12 100644 ---- a/pkgs/development/libraries/mesa/opencl.patch -+++ b/pkgs/development/libraries/mesa/opencl.patch -@@ -1,23 +1,23 @@ - diff --git a/meson.build b/meson.build --index c150bff74ff..37fa7f0531b 100644 -+index 393f3ac1b93..fbc90b5645e 100644 - --- a/meson.build - +++ b/meson.build --@@ -1850,7 +1850,7 @@ endif -+@@ -1836,7 +1836,7 @@ endif - - dep_clang = null_dep -- if with_clc or with_gallium_clover -+ if with_clc - - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') - + llvm_libdir = get_option('clang-libdir') - - dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) - --diff --git a/meson_options.txt b/meson_options.txt --index 82324617884..4bde97a8568 100644 -+diff --git a/meson.options b/meson.options -+index b1cdb06fcc9..3e8861979ae 100644 - --- a/meson.options - +++ b/meson.options --@@ -738,3 +738,10 @@ option( -- 'none', 'dri2' -- ], -+@@ -856,3 +856,10 @@ option( -+ value : false, -+ description : 'Build virtgpu_kumquat (only useful with gfxstream currently)' - ) - + - +option( -@@ -26,24 +26,11 @@ index 82324617884..4bde97a8568 100644 - + value : '', - + description : 'Locations to search for clang libraries.' - +) --diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build --index ab2c83556a8..a59e88e122f 100644 ----- a/src/gallium/targets/opencl/meson.build --+++ b/src/gallium/targets/opencl/meson.build --@@ -56,7 +56,7 @@ if with_opencl_icd -- configuration : _config, -- input : 'mesa.icd.in', -- output : 'mesa.icd', --- install : true, --+ install : false, -- install_tag : 'runtime', -- install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), -- ) - diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build --index 35833dc7423..41a95927cab 100644 -+index 2b214adbbf5..7f919397ad5 100644 - --- a/src/gallium/targets/rusticl/meson.build - +++ b/src/gallium/targets/rusticl/meson.build --@@ -63,7 +63,7 @@ configure_file( -+@@ -64,7 +64,7 @@ configure_file( - configuration : _config, - input : 'rusticl.icd.in', - output : 'rusticl.icd', -diff --git a/pkgs/development/libraries/mesa/update-wraps.py b/pkgs/development/libraries/mesa/update-wraps.py -new file mode 100644 -index 00000000000000..037dfc0397b24b ---- /dev/null -+++ b/pkgs/development/libraries/mesa/update-wraps.py -@@ -0,0 +1,50 @@ -+import base64 -+import binascii -+import configparser -+import json -+import pathlib -+import sys -+import urllib.parse -+ -+ -+def to_sri(hash: str): -+ raw = binascii.unhexlify(hash) -+ b64 = base64.b64encode(raw).decode() -+ return f"sha256-{b64}" -+ -+ -+def main(dir: str): -+ result = [] -+ for file in (pathlib.Path(dir) / "subprojects").glob("*.wrap"): -+ name = file.stem -+ parser = configparser.ConfigParser() -+ _ = parser.read(file) -+ sections = parser.sections() -+ if "wrap-file" not in sections: -+ continue -+ -+ url = parser.get("wrap-file", "source_url") -+ if "crates.io" not in url: -+ continue -+ -+ parsed = urllib.parse.urlparse(url) -+ path = parsed.path.split("/") -+ assert path[4] == name -+ version = path[5] -+ -+ hash = to_sri(parser.get("wrap-file", "source_hash")) -+ -+ result.append({ -+ "pname": name, -+ "version": version, -+ "hash": hash, -+ }) -+ -+ here = pathlib.Path(__file__).parent -+ with (here / "wraps.json").open("w") as fd: -+ json.dump(result, fd, indent=4) -+ _ = fd.write("\n") -+ -+ -+if __name__ == '__main__': -+ main(*sys.argv[1:]) -diff --git a/pkgs/development/libraries/mesa/wraps.json b/pkgs/development/libraries/mesa/wraps.json -new file mode 100644 -index 00000000000000..5b185c2d56239b ---- /dev/null -+++ b/pkgs/development/libraries/mesa/wraps.json -@@ -0,0 +1,137 @@ -+[ -+ { -+ "pname": "errno", -+ "version": "0.3.12", -+ "hash": "sha256-zqFO+TVeO+qwY3A6qdqxWv0l8GZ8NBMQweUnS7HQ2hg=" -+ }, -+ { -+ "pname": "quote", -+ "version": "1.0.35", -+ "hash": "sha256-KR7Jq179k0qvUDpkZsXVJRU10QjudHRyw5d8xazIaO8=" -+ }, -+ { -+ "pname": "pest", -+ "version": "2.8.0", -+ "hash": "sha256-GY23RTHVjHCjYcQiAe/efiWR6XbVGMr3ZipH3Fcg57Y=" -+ }, -+ { -+ "pname": "equivalent", -+ "version": "1.0.1", -+ "hash": "sha256-VEOAfW3/aTc9Qzq571N4rY31DKYpjK8V3m5S4kqvVNU=" -+ }, -+ { -+ "pname": "syn", -+ "version": "2.0.87", -+ "hash": "sha256-JapM40bQOm3NaN2LQBC8t05U5iyQxXPzlMRurpmroy0=" -+ }, -+ { -+ "pname": "remain", -+ "version": "0.2.12", -+ "hash": "sha256-GtXgESMMrSdNBTJGDFq2mCjqR651aBtCqEFmPv/695Q=" -+ }, -+ { -+ "pname": "unicode-ident", -+ "version": "1.0.12", -+ "hash": "sha256-M1S5rD+uH/Z1XLbbU2g622YWNPZ1V5Qt6k+s6+wP7ks=" -+ }, -+ { -+ "pname": "cfg-if", -+ "version": "1.0.0", -+ "hash": "sha256-uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=" -+ }, -+ { -+ "pname": "bitflags", -+ "version": "2.9.1", -+ "hash": "sha256-G45WmF7GLRfpwQAdyJyI7NfcCOR+ul7Hwpx7Xu7N6Wc=" -+ }, -+ { -+ "pname": "pest_derive", -+ "version": "2.8.0", -+ "hash": "sha256-1yXZz9eeh9zMk0Gi7znRtvY1PWjEszwXf+u+GkAsl8U=" -+ }, -+ { -+ "pname": "rustc-hash", -+ "version": "2.1.1", -+ "hash": "sha256-NXcD1BNltLJ8WQ4+2R6rsbZj8HxMCECV5gy+1DYt/w0=" -+ }, -+ { -+ "pname": "ucd-trie", -+ "version": "0.1.6", -+ "hash": "sha256-7WRikv/IGI746k0eDgFQ+xWlwuEq2bj8GRrnqKfzxLk=" -+ }, -+ { -+ "pname": "indexmap", -+ "version": "2.2.6", -+ "hash": "sha256-Fo+3Fd2kchXjYJEsCWZJ0j1Yvzkqxi9zkZ6DF0XkDyY=" -+ }, -+ { -+ "pname": "paste", -+ "version": "1.0.14", -+ "hash": "sha256-3jFFrwgCTeqfqZFPOBoXuPxgNN+wDzqEAT9/9D8p7Uw=" -+ }, -+ { -+ "pname": "hashbrown", -+ "version": "0.14.1", -+ "hash": "sha256-ff2mKhL1Xa6uUBX4GwuuoUU5HLRSD4bCSPxhXXJkDRI=" -+ }, -+ { -+ "pname": "libc", -+ "version": "0.2.168", -+ "hash": "sha256-Wq6ymB4GBsoR15cY+LsBFk8dbtdQgBgtOr8Bfm0kS20=" -+ }, -+ { -+ "pname": "thiserror-impl", -+ "version": "2.0.11", -+ "hash": "sha256-Jq/BuuqKmJM37rUrbnKgOXgM5Fw+38ycW50RL+6xc8I=" -+ }, -+ { -+ "pname": "once_cell", -+ "version": "1.8.0", -+ "hash": "sha256-aS/LY7ZLF1gCngqW7mPgSc6MWUhYfy9yCN8EYl5fa1Y=" -+ }, -+ { -+ "pname": "rustix", -+ "version": "1.0.7", -+ "hash": "sha256-xx6D1q/n/2SJDsa3HWppu4phCreM42SzNSh2u0yAEmY=" -+ }, -+ { -+ "pname": "pest_generator", -+ "version": "2.8.0", -+ "hash": "sha256-230Bcmvoq2arMvnfRnrosRSJBmhbvnXILR5l1/Wz+EE=" -+ }, -+ { -+ "pname": "thiserror", -+ "version": "2.0.11", -+ "hash": "sha256-1FLyhLc+bXbdNnWKDIaEsdW+MfkridB/1YIhdXMiBvw=" -+ }, -+ { -+ "pname": "proc-macro2", -+ "version": "1.0.86", -+ "hash": "sha256-XnGejfZl3w0cj7/SOAFXRHNhUdREXsCDa45iiq4QO3c=" -+ }, -+ { -+ "pname": "zerocopy", -+ "version": "0.8.13", -+ "hash": "sha256-Z5FKtFHzv9Lmnl6dLvOFhITnB01j8gT9Fm7DkbVN4h0=" -+ }, -+ { -+ "pname": "roxmltree", -+ "version": "0.20.0", -+ "hash": "sha256-bCC2eTtcL6ZVOyUBVLeNbQ2zfnJwCuNfrZOHpG9IfJc=" -+ }, -+ { -+ "pname": "zerocopy-derive", -+ "version": "0.8.13", -+ "hash": "sha256-eYjXOkMDyiid8DMWvEkOk0rM83Gva8dFOTzzwsXE8l0=" -+ }, -+ { -+ "pname": "pest_meta", -+ "version": "2.8.0", -+ "hash": "sha256-f5+DJHBJSQbR/KUyn4q1eRzGC+sjDHSBXf9UHL0rXKA=" -+ }, -+ { -+ "pname": "log", -+ "version": "0.4.27", -+ "hash": "sha256-E9wt81HjICeDof4NRDdfcpX/tASSZ7DzAYNG3BIqHZQ=" -+ } -+] -diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix -index 49f4838a058bda..6e14ad71a2b48c 100644 ---- a/pkgs/servers/x11/xorg/overrides.nix -+++ b/pkgs/servers/x11/xorg/overrides.nix -@@ -829,7 +829,6 @@ self: super: - }); - - xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { -- buildInputs = attrs.buildInputs ++ [ mesa ]; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 - meta = attrs.meta // { - platforms = [ diff --git a/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff b/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff deleted file mode 100644 index 950ee0e..0000000 --- a/files/nixpkgs-patches/4c3870b23dded4e75292be48bdb03cd870fb1719.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix -index d6377d6de7dabd..18f999dd83599c 100644 ---- a/pkgs/development/libraries/mesa/common.nix -+++ b/pkgs/development/libraries/mesa/common.nix -@@ -5,14 +5,14 @@ - # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa - rec { - pname = "mesa"; -- version = "25.1.5"; -+ version = "25.1.6"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "mesa"; - repo = "mesa"; - rev = "mesa-${version}"; -- hash = "sha256-AZAd1/wiz8d0lXpim9obp6/K7ySP12rGFe8jZrc9Gl0="; -+ hash = "sha256-SHYYezt2ez9awvIATEC6wVMZMuJUsOYXxlugs1Q6q7U="; - }; - - meta = { -- cgit v1.2.3-101-g0448