Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-27 12:33:48 +00:00
committed by GitHub
67 changed files with 1200 additions and 544 deletions
+4
View File
@@ -284,6 +284,10 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- `nvidia-x11` proprietary kernel modules are now provided separately as `nvidia_x11.mod`, while `nvidia_x11.open` remains the open-source kernel module package.
- `linuxPackages.nvidiaPackages` now follows NVIDIA's official release branches by exposing `production`, `new_feature`, and `beta`. The convenience aliases `latest` (newer of `production` and `new_feature`) and `bleeding_edge` (newer of `latest` and `beta`) are provided; note that `beta` now refers strictly to the beta branch.
- `balatro` now supports the Google Play and Xbox PC versions of the game. Pass the `apk` or `Assets.zip` as `balatro.override { src = "…" }`.
- `uptime-kuma` has been updated to v2, which requires an automated migration that can take a few hours. **A backup is highly recommended.**
@@ -336,6 +336,14 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- [`hardware.nvidia.branch`](#opt-hardware.nvidia.branch) was added to select the NVIDIA driver branch; setting [`hardware.nvidia.package`](#opt-hardware.nvidia.package) overrides this.
- The NixOS NVIDIA module wiring has been updated to match the new `nvidia-x11` output layout.
- `nixos/nvidia` now uses EGL external platform ICD libraries built from source (`egl-gbm`, `egl-wayland`, `egl-wayland2`, `egl-x11`) instead of relying on vendor-provided binaries for these components.
- `hardware.nvidia.moduleParams` was added to configure NVIDIA kernel module parameters declaratively. These parameters are now written to `modprobe` configuration instead of being passed through global kernel command-line parameters.
- [hardware.xpadneo](#opt-hardware.xpadneo.enable) now supports configuring kernel module parameters via a freeform [settings](#opt-hardware.xpadneo.settings) option, with convenience options for [rumble attenuation](#opt-hardware.xpadneo.rumbleAttenuation) and [controller quirks](#opt-hardware.xpadneo.quirks).
- Wine has been updated to the 11.0 branch. Please check the [upstream announcement](https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0) for more details.
+4 -1
View File
@@ -93,7 +93,10 @@ in
];
boot.kernelModules = lib.optional useBbswitch "bbswitch";
boot.extraModulePackages =
lib.optional useBbswitch kernel.bbswitch ++ lib.optional useNvidia kernel.nvidia_x11.bin;
lib.optional useBbswitch kernel.bbswitch
++ lib.optional useNvidia (
if config.hardware.nvidia.open == true then kernel.nvidia_x11.open else kernel.nvidia_x11.mod
);
environment.systemPackages = [
bumblebee
+156 -33
View File
@@ -6,10 +6,12 @@
}:
let
nvidiaEnabled = lib.elem "nvidia" config.services.xserver.videoDrivers;
nvidia_x11 = if nvidiaEnabled || cfg.datacenter.enable then cfg.package else null;
nvidia_x11 = if cfg.enabled then cfg.package else null;
cfg = config.hardware.nvidia;
inherit (config.boot.kernelPackages) nvidiaPackages;
useOpenModules = cfg.open == true;
pCfg = cfg.prime;
@@ -27,7 +29,7 @@ in
enabled = lib.mkOption {
readOnly = true;
type = lib.types.bool;
default = nvidia_x11 != null;
default = nvidiaEnabled || cfg.datacenter.enable;
defaultText = lib.literalMD "`true` if NVIDIA support is enabled";
description = "True if NVIDIA support is enabled";
};
@@ -296,15 +298,63 @@ in
It also drastically increases the time the driver needs to clock down after load
'';
package = lib.mkOption {
default =
config.boot.kernelPackages.nvidiaPackages."${if cfg.datacenter.enable then "dc" else "stable"}";
branch = lib.mkOption {
type =
(lib.types.enum (builtins.attrNames (lib.filterAttrs (_: lib.isDerivation) nvidiaPackages)))
// {
description = "one of the available driver branches in `pkgs/os-specific/linux/nvidia-x11/default.nix`";
};
default = if cfg.datacenter.enable then "dc" else "stable";
defaultText = lib.literalExpression ''
config.boot.kernelPackages.nvidiaPackages."\$\{if cfg.datacenter.enable then "dc" else "stable"}"
if config.hardware.nvidia.datacenter.enable then "dc" else "stable"
'';
example = "config.boot.kernelPackages.nvidiaPackages.legacy_470";
example = "bleeding_edge";
description = ''
The branch of the NVIDIA driver to use.
Note: if {option}`hardware.nvidia.package` is set, it overrides this option.
Commonly interesting branches for end users:
- production, new_feature, beta:
NVIDIA's official production / new feature / beta release branches.
- stable:
The default; the highest stable version.
- latest:
Whichever is newer of `production` and `new_feature`.
- bleeding_edge:
Whichever is newer of `latest` and `beta`.
- legacy_580:
The long-lived 580 series (LTSB), for GPUs that newer driver branches
no longer support (often Maxwell through Volta; roughly GeForce GTX 9xx
through 10xx, plus rare Volta cards like TITAN V).
- vulkan_beta:
The Vulkan developer beta driver, for users interested in testing new
Vulkan features.
'';
};
package = lib.mkOption {
type = lib.types.package;
default = nvidiaPackages.${cfg.branch};
defaultText = lib.literalExpression "config.boot.kernelPackages.nvidiaPackages.\${config.hardware.nvidia.branch}";
example = lib.literalExpression "config.boot.kernelPackages.nvidiaPackages.legacy_470";
description = ''
The NVIDIA driver package to use.
Prefer using {option}`hardware.nvidia.branch` when possible.
If you set this option, it is recommended to pick a package from
`config.boot.kernelPackages.nvidiaPackages` so the driver build matches
your configured kernel.
For custom versions, you can use `nvidiaPackages.mkDriver`; see
`pkgs/os-specific/linux/nvidia-x11/default.nix` for examples.
'';
};
@@ -332,6 +382,20 @@ in
videoAcceleration = lib.mkEnableOption "video acceleration (VA-API)" // {
default = true;
};
moduleParams = lib.mkOption {
type = lib.types.attrsOf (lib.types.attrsOf lib.types.raw);
default = { };
example = ''
{
nvidia = {
NVreg_UsePageAttributeTable = 1;
NVreg_RegistryDwords = "EnableBrightnessControl=1"
};
}
'';
description = "Additional parameters to pass to the NVIDIA kernel module.";
};
};
};
@@ -401,10 +465,52 @@ in
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
'';
hardware.graphics = {
extraPackages = [ nvidia_x11.out ];
extraPackages32 = [ nvidia_x11.lib32 ];
};
hardware.graphics =
let
icd = [
"egl-wayland"
]
# GBM support was added in 495.
++ lib.optionals (lib.versionAtLeast nvidia_x11.version "495") [
"egl-gbm"
]
# ICDs below use a new driver interface, which is added in the 560 series drivers.
++ lib.optionals (lib.versionAtLeast nvidia_x11.version "560") [
"egl-wayland2"
"egl-x11"
];
combineIcdPkgs =
icd: pkgs:
pkgs.symlinkJoin {
name = "nvidia-egl-external-platforms${lib.optionalString pkgs.stdenv.is32bit "-x32"}";
paths = lib.attrVals icd pkgs;
# Remediate reversed priorities in pre-595 drivers,
# https://github.com/NixOS/nixpkgs/pull/497342#issuecomment-4034876793
postBuild = lib.optionalString (lib.versionOlder nvidia_x11.version "595") ''
pushd $out/share/egl/egl_external_platform.d
for f in [0-9][0-9]_*; do
num=''${f:0:2}
rest=''${f:2}
new=$(printf "%02d" $((99 - 10#$num)))
mv -- "$f" "tmp-$new$rest"
done
for f in tmp-*; do
mv -- "$f" "''${f#tmp-}"
done
popd
'';
};
in
{
extraPackages = [
nvidia_x11.out
(combineIcdPkgs icd pkgs)
];
extraPackages32 = [
nvidia_x11.lib32
(combineIcdPkgs icd pkgs.pkgsi686Linux)
];
};
environment.systemPackages = [ nvidia_x11.bin ];
}
@@ -489,6 +595,17 @@ in
-> (useOpenModules && lib.versionAtLeast nvidia_x11.version "595");
message = "NVIDIA driver support for kernel suspend notifiers requires NVIDIA driver version 595 or newer, and the open source kernel modules.";
}
{
assertion =
removeAttrs cfg.moduleParams [
"nvidia"
"nvidia-drm"
"nvidia-modeset"
"nvidia-uvm"
] == { };
message = "You can only use `hardware.nvidia.moduleParams` to set parameters for the kernel modules of NVIDIA drivers.";
}
];
# If Optimus/PRIME is enabled, we:
@@ -680,8 +797,25 @@ in
lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
hardware.nvidia.moduleParams = lib.mkMerge (
lib.optional (offloadCfg.enable || cfg.modesetting.enable) { nvidia-drm.modeset = 1; }
++ lib.optional (
(offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
) { nvidia-drm.fbdev = 1; }
++ lib.optional (cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier) {
nvidia.NVreg_UseKernelSuspendNotifiers = 1;
}
++ lib.optional cfg.powerManagement.enable { nvidia.NVreg_PreserveVideoMemoryAllocations = 1; }
++ lib.optional (
useOpenModules
&& lib.versionAtLeast nvidia_x11.version "515.43.04"
&& lib.versionOlder nvidia_x11.version "545.23.06"
) { nvidia.NVreg_OpenRmEnableUnsupportedGpus = 1; }
++ lib.optional cfg.powerManagement.finegrained { nvidia.NVreg_DynamicPowerManagement = "0x02"; }
);
boot = {
extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.mod ];
# nvidia-uvm is required by CUDA applications.
kernelModules = lib.optionals config.services.xserver.enable [
"nvidia"
@@ -689,27 +823,16 @@ in
"nvidia_drm"
];
# If requested enable modesetting via kernel parameters.
kernelParams =
lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
++ lib.optional (
(offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
) "nvidia-drm.fbdev=1"
++ lib.optional (
cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier
) "nvidia.NVreg_UseKernelSuspendNotifiers=1"
++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
++ lib.optional (
useOpenModules
&& lib.versionAtLeast nvidia_x11.version "515.43.04"
&& lib.versionOlder nvidia_x11.version "545.23.06"
) "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
kernelParams = lib.optional (
config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport
) "ibt=off";
# enable finegrained power management
extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained ''
options nvidia "NVreg_DynamicPowerManagement=0x02"
'';
extraModprobeConfig =
let
mergeParams = lib.concatMapAttrsStringSep " " (k: v: "${k}=${toString v}");
genModprobeLine = module: params: "options ${module} ${mergeParams params}";
in
lib.concatMapAttrsStringSep "\n" genModprobeLine cfg.moduleParams;
};
services.udev.extraRules = lib.optionalString cfg.powerManagement.finegrained (
lib.optionalString (lib.versionOlder config.boot.kernelPackages.kernel.version "5.5") ''
@@ -735,7 +858,7 @@ in
})
# Data Center
(lib.mkIf (cfg.datacenter.enable) {
boot.extraModulePackages = [ nvidia_x11.bin ];
boot.extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.mod ];
systemd = {
tmpfiles.rules =
@@ -15,20 +15,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.tar.gz";
hash = "sha256-9X09uplwx3TPN3WDYprqVAQY5nfsY2VXDnbeqcsvP5s=";
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.tar.gz";
hash = "sha256-eljThvKi5ajNfkWRZXtP5ZmurCLZYMesz1+SeEZQe/s=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.tar.gz";
hash = "sha256-wjX2ZMNcIEIsOrKMhQuG6kq3oF2d+cAnWBo6jJi+QBs=";
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.tar.gz";
hash = "sha256-jnVqDCmBix3njTxDga0aG89C9fvDW70gnE3I/nvHtXA=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.dmg";
hash = "sha256-dN5eiknRaqGJIRWmdQbfO5MriAbGa6SU7Vc6cpAcGJk=";
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.dmg";
hash = "sha256-lPNwVLPSrmlQVFY9AD3+xzYeMG7JZnUTMl43rXjvtWM=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.dmg";
hash = "sha256-kPKuyj/QFzECs9JzSthjYCuxcUbDF/4tiLBhj9R+pgA=";
url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.dmg";
hash = "sha256-0nOcHiGOHS9QoncuJwtD6cl4v34mp9cOx2oOB0tFIOM=";
};
};
# update-script-end: urls
@@ -43,8 +43,8 @@ mkJetBrainsProduct {
productShort = "IDEA";
# update-script-start: version
version = "2026.1";
buildNumber = "261.22158.277";
version = "2026.1.1";
buildNumber = "261.23567.138";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -11,4 +11,15 @@ vimUtils.buildVimPlugin {
postInstall = ''
ln -s ${fzf}/bin/fzf $target/bin/fzf
'';
meta = {
inherit (fzf.meta)
changelog
description
homepage
license
platforms
;
maintainers = [ ];
};
}
@@ -6,5 +6,16 @@
vimUtils.buildVimPlugin {
inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim";
meta.maintainers = with lib.maintainers; [ vcunat ];
meta = {
inherit (meson.meta)
homepage
description
mainProgram
longDescription
license
platforms
;
maintainers = with lib.maintainers; [ vcunat ];
};
}
@@ -17,5 +17,16 @@ vimUtils.buildVimPlugin {
cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
cd vim-plugin
'';
meta.maintainers = with lib.maintainers; [ enderger ];
meta = {
inherit (tup.meta)
description
mainProgram
longDescription
homepage
license
platforms
broken
;
maintainers = with lib.maintainers; [ enderger ];
};
}
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-ngp";
version = "0-unstable-2026-03-31";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-ngp-libretro";
rev = "9abe025fa14a4835a9a4e14a09893520dd3019dc";
hash = "sha256-s/4koTwwgeEUYknpaNruY1l03ZGYSUy8KVxD/hiGs8Q=";
rev = "0c81ce8991a47aac5d0a7d1ae53de75bc7ddf847";
hash = "sha256-+HGzNSkM0bs8DoBCZ3FqxoqjBSwnKvK7K38341vUYco=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox";
version = "0-unstable-2022-07-18";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "dosbox-libretro";
rev = "b7b24262c282c0caef2368c87323ff8c381b3102";
hash = "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=";
rev = "4024bf0048c261db58ef98cb5e16de291c429f4e";
hash = "sha256-sHq4xObXvgpaEnqtjJikN8g/io6FQdZWztifzSGPdH4=";
};
env.CXXFLAGS = "-std=gnu++11";
@@ -6,13 +6,13 @@
}:
mkLibretroCore {
core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus";
version = "0-unstable-2026-03-31";
version = "0-unstable-2026-04-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "snes9x2005";
rev = "10519b751ebc800accf4f95cf767e5533d96c97a";
hash = "sha256-vMkLEEvuYBCtgWZ2ZxWKLeqFDeLoP1CYa68I8Qg2Dx4=";
rev = "b60356971fc9caae02cd0853676dced886a08be7";
hash = "sha256-6IuEFyJEoCHluSAXbk5qRTXku1XJCZ6p04BhdjqZqJQ=";
};
makefile = "Makefile";
@@ -73,8 +73,8 @@ rec {
thunderbird = thunderbird-latest;
thunderbird-latest = common {
version = "149.0.2";
sha512 = "b458139d6345bef6d07b8169aee45daae6935c2d0f540c462b1d54113c8beb2c8f17a73ce077225160dee0d2a0891fa567b57a1e5d488704c5fe0aff264f1967";
version = "150.0";
sha512 = "6e0770de0aeabdd9372b491ae0a6d20238ff154b70982de21c73b903003398f36d8f56c679ca893a1e5646a25add9e9e126ae1b6ee1f836290104b61eb09dac1";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";
+2 -2
View File
@@ -11,13 +11,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "app2unit";
version = "1.3.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "app2unit";
tag = "v${finalAttrs.version}";
sha256 = "sha256-HkwcYYGNReDtPxZumnz3ZDb1sr1JcngAOqs/inO/350=";
sha256 = "sha256-upYW+aTJ6LCHrI0+IOYnA98uDLKPxu/wCi7uUWe/Geg=";
};
passthru.updateScript = nix-update-script { };
+36 -3
View File
@@ -4,15 +4,18 @@
appimageTools,
fetchurl,
makeWrapper,
writeShellApplication,
curl,
common-updater-scripts,
}:
let
pname = "clickup";
version = "3.5.120";
version = "3.5.185";
src = fetchurl {
# Using archive.org because the website doesn't store older versions of the software.
url = "https://web.archive.org/web/20250802083833/https://desktop.clickup.com/linux";
hash = "sha256-LVHgXqTxDTsnVJ3zx74TzaSrEs2OD0wl0eioPd4+484=";
url = "https://web.archive.org/web/20260323060753/https://desktop.clickup.com/linux";
hash = "sha256-szPbhY1vsEG0Zq4TD2I9qVTa4wAUYfoVA2O2xP4HGeE=";
};
appimage = appimageTools.wrapType2 {
@@ -53,6 +56,36 @@ stdenvNoCC.mkDerivation {
runHook postInstall
'';
passthru.updateScript = lib.getExe (writeShellApplication {
name = "update-clickup";
runtimeInputs = [
curl
common-updater-scripts
];
text = ''
upstream_version="$(curl --silent --location --range 0-0 --dump-header - --output /dev/null https://desktop.clickup.com/linux | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
current_version="$(nix-instantiate --eval --strict -A clickup.version | tr -d '"')"
if [[ "$current_version" = "$upstream_version" ]]; then
echo "clickup is already up-to-date at $current_version"
exit 0
fi
echo "Updating clickup from $current_version to $upstream_version"
echo "Saving new version to archive.org..."
archived_url="$(curl --silent --max-time 600 --output /dev/null --dump-header - "https://web.archive.org/save/https://desktop.clickup.com/linux" | grep --ignore-case '^location:' | tr -d '\r' | cut -d' ' -f2)"
if [[ -z "$archived_url" || "$archived_url" != *"web.archive.org/web/"* ]]; then
echo "error: failed to archive URL on archive.org" >&2
exit 1
fi
update-source-version clickup "$upstream_version" "" "$archived_url"
'';
});
meta = {
description = "All in one project management solution";
homepage = "https://clickup.com";
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.467.0";
version = "1.477.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-JSxuYBeMKTiBOSQk4IGcst0YYcXGi4V0D4EkJfEbPzo=";
hash = "sha256-Z3ZMlZrAktNqHpuJhCG9Twng+tIc47NhHQr1DwF2h80=";
stripRoot = false;
};
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "ctlptl";
version = "0.9.2";
version = "0.9.3";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = "ctlptl";
rev = "v${finalAttrs.version}";
hash = "sha256-0Y1baXkb37UKtT/lcoFdunRkxIpSCh+zfkjkZZ9SfXU=";
hash = "sha256-4c/sEWzKhs0PjHmZzVs8jXdWe2GWHYNFGsA9cQF5tOI=";
};
vendorHash = "sha256-b9lzCNjO0rrK/kJlw5dssuQD/cyf/Wu/LJ2YNQ645LE=";
vendorHash = "sha256-nlLx2+NdhqkhpwM7E5PwKcFW+MsJLeSoXWRdtQjFV4Q=";
nativeBuildInputs = [ installShellFiles ];
+352 -183
View File
@@ -4,21 +4,27 @@ version = 3
[[package]]
name = "anstyle"
version = "1.0.11"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "anyhow"
version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
[[package]]
name = "bitflags"
version = "2.9.4"
version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
[[package]]
name = "cc"
version = "1.2.36"
version = "1.2.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -28,24 +34,24 @@ dependencies = [
[[package]]
name = "cfg-if"
version = "1.0.3"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
[[package]]
name = "clap"
version = "4.5.47"
version = "4.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.5.47"
version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
dependencies = [
"anstyle",
"clap_lex",
@@ -54,15 +60,15 @@ dependencies = [
[[package]]
name = "clap_lex"
version = "0.7.5"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
[[package]]
name = "codespan-reporting"
version = "0.12.0"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
dependencies = [
"serde",
"termcolor",
@@ -71,7 +77,7 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.175"
version = "1.0.194"
dependencies = [
"cc",
"cxx-build",
@@ -80,7 +86,7 @@ dependencies = [
"cxxbridge-cmd",
"cxxbridge-flags",
"cxxbridge-macro",
"foldhash",
"foldhash 0.2.0",
"indoc",
"link-cplusplus",
"proc-macro2",
@@ -94,7 +100,7 @@ dependencies = [
[[package]]
name = "cxx-build"
version = "1.0.175"
version = "1.0.194"
dependencies = [
"cc",
"codespan-reporting",
@@ -110,7 +116,7 @@ dependencies = [
[[package]]
name = "cxx-gen"
version = "0.7.175"
version = "0.7.194"
dependencies = [
"codespan-reporting",
"indexmap",
@@ -126,11 +132,12 @@ dependencies = [
"cxx",
"cxx-build",
"cxxbridge-flags",
"serde",
]
[[package]]
name = "cxxbridge-cmd"
version = "1.0.175"
version = "1.0.194"
dependencies = [
"clap",
"codespan-reporting",
@@ -142,17 +149,17 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
version = "1.0.175"
version = "1.0.194"
[[package]]
name = "cxxbridge-macro"
version = "1.0.175"
version = "1.0.194"
dependencies = [
"cxx",
"indexmap",
"prettyplease",
"proc-macro2",
"quote",
"rustversion",
"syn",
]
@@ -166,9 +173,9 @@ dependencies = [
[[package]]
name = "dissimilar"
version = "1.0.10"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
checksum = "aeda16ab4059c5fd2a83f2b9c9e9c981327b18aa8e3b313f7e6563799d4f093e"
[[package]]
name = "equivalent"
@@ -178,9 +185,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys",
@@ -188,15 +195,21 @@ dependencies = [
[[package]]
name = "fastrand"
version = "2.3.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
[[package]]
name = "find-msvc-tools"
version = "0.1.1"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
[[package]]
name = "foldhash"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "foldhash"
@@ -206,14 +219,27 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
[[package]]
name = "getrandom"
version = "0.3.3"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasi",
"r-efi 5.3.0",
"wasip2",
]
[[package]]
name = "getrandom"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
dependencies = [
"cfg-if",
"libc",
"r-efi 6.0.0",
"wasip2",
"wasip3",
]
[[package]]
@@ -227,28 +253,54 @@ name = "hashbrown"
version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
dependencies = [
"foldhash 0.1.5",
]
[[package]]
name = "hashbrown"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "id-arena"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
[[package]]
name = "indexmap"
version = "2.11.0"
version = "2.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
dependencies = [
"equivalent",
"hashbrown",
"hashbrown 0.17.0",
"serde",
"serde_core",
]
[[package]]
name = "indoc"
version = "2.0.6"
version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
dependencies = [
"rustversion",
]
[[package]]
name = "itoa"
version = "1.0.15"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
[[package]]
name = "jobserver"
@@ -256,63 +308,85 @@ version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
dependencies = [
"getrandom",
"getrandom 0.3.4",
"libc",
]
[[package]]
name = "libc"
version = "0.2.175"
name = "leb128fmt"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]]
name = "libc"
version = "0.2.185"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
[[package]]
name = "link-cplusplus"
version = "1.0.11"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c349c75e1ab4a03bd6b33fe6cbd3c479c5dd443e44ad732664d72cb0e755475"
checksum = "7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82"
dependencies = [
"cc",
]
[[package]]
name = "linux-raw-sys"
version = "0.9.4"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
[[package]]
name = "log"
version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "memchr"
version = "2.7.5"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
[[package]]
name = "once_cell"
version = "1.21.3"
version = "1.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "pkg-config"
version = "0.3.32"
version = "0.3.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
[[package]]
name = "prettyplease"
version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
"syn",
]
[[package]]
name = "proc-macro2"
version = "1.0.101"
version = "1.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.40"
version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
dependencies = [
"proc-macro2",
]
@@ -324,10 +398,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "rustix"
version = "1.0.8"
name = "r-efi"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "rustix"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [
"bitflags",
"errno",
@@ -342,12 +422,6 @@ version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "ryu"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "scratch"
version = "1.0.9"
@@ -355,19 +429,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
[[package]]
name = "serde"
version = "1.0.219"
name = "semver"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
[[package]]
name = "serde"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
dependencies = [
"serde_core",
"serde_derive",
]
[[package]]
name = "serde_core"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.219"
version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
@@ -376,23 +466,24 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.143"
version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
"serde_core",
"zmij",
]
[[package]]
name = "serde_spanned"
version = "1.0.0"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
dependencies = [
"serde",
"serde_core",
]
[[package]]
@@ -409,9 +500,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "2.0.106"
version = "2.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
dependencies = [
"proc-macro2",
"quote",
@@ -420,18 +511,18 @@ dependencies = [
[[package]]
name = "target-triple"
version = "0.1.4"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b"
[[package]]
name = "tempfile"
version = "3.21.0"
version = "3.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
"getrandom",
"getrandom 0.4.2",
"once_cell",
"rustix",
"windows-sys",
@@ -448,12 +539,12 @@ dependencies = [
[[package]]
name = "toml"
version = "0.9.5"
version = "1.1.2+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
dependencies = [
"indexmap",
"serde",
"serde_core",
"serde_spanned",
"toml_datetime",
"toml_parser",
@@ -463,33 +554,33 @@ dependencies = [
[[package]]
name = "toml_datetime"
version = "0.7.0"
version = "1.1.1+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
dependencies = [
"serde",
"serde_core",
]
[[package]]
name = "toml_parser"
version = "1.0.2"
version = "1.1.2+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
dependencies = [
"winnow",
]
[[package]]
name = "toml_writer"
version = "1.0.2"
version = "1.1.1+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
[[package]]
name = "trybuild"
version = "1.0.110"
version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e"
checksum = "47c635f0191bd3a2941013e5062667100969f8c4e9cd787c14f977265d73616e"
dependencies = [
"dissimilar",
"glob",
@@ -503,122 +594,200 @@ dependencies = [
[[package]]
name = "unicode-ident"
version = "1.0.18"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
[[package]]
name = "unicode-width"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
[[package]]
name = "wasi"
version = "0.14.3+wasi-0.2.4"
name = "unicode-xid"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "wasip2"
version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
dependencies = [
"wit-bindgen",
"wit-bindgen 0.57.1",
]
[[package]]
name = "wasip3"
version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
"wit-bindgen 0.51.0",
]
[[package]]
name = "wasm-encoder"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
dependencies = [
"leb128fmt",
"wasmparser",
]
[[package]]
name = "wasm-metadata"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
dependencies = [
"anyhow",
"indexmap",
"wasm-encoder",
"wasmparser",
]
[[package]]
name = "wasmparser"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
"bitflags",
"hashbrown 0.15.5",
"indexmap",
"semver",
]
[[package]]
name = "winapi-util"
version = "0.1.10"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys",
]
[[package]]
name = "windows-link"
version = "0.1.3"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
[[package]]
name = "windows-sys"
version = "0.60.2"
version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
dependencies = [
"windows-link",
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
[[package]]
name = "windows_aarch64_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
[[package]]
name = "windows_i686_gnu"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
[[package]]
name = "windows_i686_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
[[package]]
name = "windows_i686_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
[[package]]
name = "windows_x86_64_gnu"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
[[package]]
name = "windows_x86_64_msvc"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
[[package]]
name = "winnow"
version = "0.7.13"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
[[package]]
name = "wit-bindgen"
version = "0.45.1"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
dependencies = [
"wit-bindgen-rust-macro",
]
[[package]]
name = "wit-bindgen"
version = "0.57.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
[[package]]
name = "wit-bindgen-core"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
dependencies = [
"anyhow",
"heck",
"wit-parser",
]
[[package]]
name = "wit-bindgen-rust"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
dependencies = [
"anyhow",
"heck",
"indexmap",
"prettyplease",
"syn",
"wasm-metadata",
"wit-bindgen-core",
"wit-component",
]
[[package]]
name = "wit-bindgen-rust-macro"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
dependencies = [
"anyhow",
"prettyplease",
"proc-macro2",
"quote",
"syn",
"wit-bindgen-core",
"wit-bindgen-rust",
]
[[package]]
name = "wit-component"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
"bitflags",
"indexmap",
"log",
"serde",
"serde_derive",
"serde_json",
"wasm-encoder",
"wasm-metadata",
"wasmparser",
"wit-parser",
]
[[package]]
name = "wit-parser"
version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
dependencies = [
"anyhow",
"id-arena",
"indexmap",
"log",
"semver",
"serde",
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser",
]
[[package]]
name = "zmij"
version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+2 -2
View File
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cxx-rs";
version = "1.0.175";
version = "1.0.194";
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cxx";
tag = finalAttrs.version;
sha256 = "sha256-haAcBBI5ol+gcqKzasyHU43ewGA0L4FlL4o1QlJJukc=";
sha256 = "sha256-PIeF9VuyJOIs1x02YETKIP0+nCG3RZXLMJdFNlgAFzo=";
};
cargoLock.lockFile = ./Cargo.lock;
+5 -5
View File
@@ -19,7 +19,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "26.0.2";
version = "26.0.3";
src =
let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-qAjGYm164/teNcNxZwMNtBNKUOAd/7EjJMk1DtQKGFA=";
aarch64-linux = "sha256-tMCMRMNA1sQprDouHtRKPAE1CHWRII2/p05UqVaPcpE=";
x86_64-darwin = "sha256-2hSrJhlvFr/5AK9VCXU/hZke9oHgde50ng0pEAXV63Y=";
aarch64-darwin = "sha256-YADZ7ttETfs+3HC045eHntLj1x8GREw027GGDSGIeDw=";
x86_64-linux = "sha256-G6Rurk8AtHXRfdMvBMNoJTSzBdQJ5Ncy/7WFt5vr3uI=";
aarch64-linux = "sha256-iZK5sQfdjMlgX8bhyL2q7lleIKR479KhDydqD3kR3sU=";
x86_64-darwin = "sha256-A5upiZ0tts+Pyg1TDhvEVYbGqnAxooUjsZxMG2L9RVQ=";
aarch64-darwin = "sha256-v8CQLQRAOzLY1PqxIEFzaKo3RiLb/i9QhxPQZHSuguI=";
};
in
fetchurl {
+2 -2
View File
@@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs (
inherit steamDisplayName;
pname = "dwproton-bin";
version = "dwproton-10.0-24";
version = "dwproton-10.0-26";
src = fetchzip {
url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
hash = "sha256-3mfJGi2pUwPgWNZCvGD1SNHghS2HThX5Y7TrnJaEYvw=";
hash = "sha256-TkwhJCHPS0PdDIEL5GrxJPR09uO9U2DR8l9KWFLIF2g=";
};
preFixup = ''
+3 -3
View File
@@ -20,13 +20,13 @@
buildGoModule rec {
pname = "easylpac";
version = "0.8.0.2";
version = "0.8.0.3";
src = fetchFromGitHub {
owner = "creamlike1024";
repo = "EasyLPAC";
tag = version;
hash = "sha256-GxcaMyEaPIGf+/wzmmycmFssTkP5Praj4GCYbxbJU28=";
hash = "sha256-q76p0BqrG8opuTClYKLfmM5hdziJIrZCwQmg2NkzW/E=";
};
vendorHash = "sha256-52I8hlnoHPhygwr0dxDP50X2A7Gsh0v/0SGQFH3FG/8=";
@@ -79,6 +79,6 @@ buildGoModule rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ stargate01 ];
mainProgram = "EasyLPAC";
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
};
}
+59
View File
@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchFromGitHub,
eglexternalplatform,
pkg-config,
meson,
ninja,
libGL,
libgbm,
libdrm,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "egl-gbm";
version = "1.1.3";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "egl-gbm";
tag = finalAttrs.version;
hash = "sha256-OoHgvFbyd6JakSKyN7N97FMJHNYV1spj7zy3f1g/PN0=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
libGL
libgbm
libdrm
eglexternalplatform
];
absolutizeEglExternalPlatformIcdJson = true;
strictDeps = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "GBM EGL external platform library";
homepage = "https://github.com/NVIDIA/egl-gbm/";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
ccicnce113424
];
};
})
+14 -5
View File
@@ -8,10 +8,10 @@
ninja,
wayland-scanner,
libGL,
libx11,
libdrm,
wayland,
wayland-protocols,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
];
src = fetchFromGitHub {
owner = "Nvidia";
owner = "NVIDIA";
repo = "egl-wayland";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-a98DzmzCG6DlLJ1HCl/LeD21Q7yyNbTce1poOoAnTjA=";
};
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libGL
libx11
libdrm
wayland
wayland-protocols
@@ -59,11 +58,21 @@ stdenv.mkDerivation (finalAttrs: {
eglexternalplatform
];
absolutizeEglExternalPlatformIcdJson = true;
strictDeps = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "EGLStream-based Wayland external platform";
homepage = "https://github.com/NVIDIA/egl-wayland/";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
maintainers = with lib.maintainers; [ hedning ];
maintainers = with lib.maintainers; [
hedning
ccicnce113424
];
};
})
+66
View File
@@ -0,0 +1,66 @@
{
lib,
stdenv,
fetchFromGitHub,
eglexternalplatform,
pkg-config,
meson,
ninja,
wayland-scanner,
libGL,
libgbm,
libdrm,
wayland,
wayland-protocols,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "egl-wayland2";
version = "1.0.1";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "egl-wayland2";
tag = "v${finalAttrs.version}";
hash = "sha256-Udr+tihx/Si2ynFyM1FW2CIUgTg9SQn7AgrOPpGTxpY=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
];
buildInputs = [
libGL
libgbm
libdrm
wayland
wayland-protocols
eglexternalplatform
];
absolutizeEglExternalPlatformIcdJson = true;
strictDeps = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "Dma-buf-based Wayland external platform library";
homepage = "https://github.com/NVIDIA/egl-wayland2/";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
vancluever
ccicnce113424
];
};
})
+63
View File
@@ -0,0 +1,63 @@
{
lib,
stdenv,
fetchFromGitHub,
eglexternalplatform,
pkg-config,
meson,
ninja,
libGL,
libgbm,
libdrm,
libx11,
libxcb,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "egl-x11";
version = "1.0.5";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "egl-x11";
tag = "v${finalAttrs.version}";
hash = "sha256-Sl/qc39H29wXsb5UYKGK7IciwTlbRBqA9omL2sgXpx0=";
};
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
libGL
libgbm
libdrm
libx11
libxcb
eglexternalplatform
];
absolutizeEglExternalPlatformIcdJson = true;
strictDeps = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "X11/XCB external platform library";
homepage = "https://github.com/NVIDIA/egl-x11/";
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
ccicnce113424
];
};
})
@@ -4,6 +4,9 @@
fetchFromGitHub,
meson,
ninja,
buildPackages,
replaceVars,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -11,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.2.1";
src = fetchFromGitHub {
owner = "Nvidia";
owner = "NVIDIA";
repo = "eglexternalplatform";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-tDKh1oSnOSG/XztHHYCwg1tDB7M6olOtJ8te+uan9ko=";
};
@@ -22,11 +25,24 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
setupHook = replaceVars ./setup-hook.sh {
jq = lib.getExe buildPackages.jq;
sponge = lib.getExe' buildPackages.moreutils "sponge";
};
strictDeps = true;
__structuredAttrs = true;
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
meta = {
description = "EGL External Platform interface";
homepage = "https://github.com/NVIDIA/eglexternalplatform";
license = lib.licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
maintainers = with lib.maintainers; [ hedning ];
maintainers = with lib.maintainers; [
hedning
ccicnce113424
];
};
})
@@ -0,0 +1,43 @@
# shellcheck shell=bash
absolutizeIcdLibraryPath() {
local jsonFile="$1"
local libPath="$2"
if [[ -z "$jsonFile" || -z "$libPath" ]]; then
nixErrorLog "absolutizeIcdLibraryPath: expected <json-file> <library-prefix>"
return 1
fi
if [[ ! -f "$jsonFile" ]]; then
nixErrorLog "absolutizeIcdLibraryPath: JSON file not found: $jsonFile"
return 1
fi
@jq@ --arg lib "$libPath" \
'.ICD.library_path |= $lib + .' \
"$jsonFile" | @sponge@ "$jsonFile"
}
fixupEglExternalPlatformIcdJsonHook() {
case "${absolutizeEglExternalPlatformIcdJson-}" in
1|true|yes) ;;
*) return 0 ;;
esac
local jsonDir="$prefix/share/egl/egl_external_platform.d"
if [[ ! -d "$jsonDir" ]]; then
return 0
fi
local f
for f in "$jsonDir"/*.json; do
if [[ ! -e "$f" ]]; then
continue
fi
absolutizeIcdLibraryPath "$f" "$prefix/lib/"
done
}
fixupOutputHooks+=(fixupEglExternalPlatformIcdJsonHook)
@@ -1,21 +1,21 @@
{
"version": "12.12.1",
"version": "12.12.2",
"sources": {
"aarch64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-aarch64.tar.xz",
"sha256": "07679b57ccb91b00c5de863e7170f89c9f929190b1b10f6a9c449c3d634fed22"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-linux-aarch64.tar.xz",
"sha256": "c9dfdb6abaafb700d3ea8291ecb4b03913db7ee1753c4ae77f595c8653416dc4"
},
"x86_64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-x86_64.tar.xz",
"sha256": "7f50d5d805e3acd401b933aa039d01712237d975c5d8306d46006ae2363d3080"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-linux-x86_64.tar.xz",
"sha256": "c2157e29b3b9e41fb125ed0c607fb79da3f07b9dfcb37671b7bdf0bf6d818058"
},
"aarch64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
"sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-macOS-universal.dmg",
"sha256": "9e41880693c58cbbf694684e4c24d6db69581de9caa06b374e9d7bee65997205"
},
"x86_64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
"sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-macOS-universal.dmg",
"sha256": "9e41880693c58cbbf694684e4c24d6db69581de9caa06b374e9d7bee65997205"
}
}
}
+24 -23
View File
@@ -7,28 +7,7 @@
avx2Support ? stdenv.hostPlatform.avx2Support,
}:
stdenv.mkDerivation rec {
pname = "j";
version = "9.6.2";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
tag = version;
hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU=";
};
nativeBuildInputs = [ which ];
buildInputs = [ gmp ];
patches = [
./fix-install-path.patch
];
enableParallelBuilding = true;
dontConfigure = true;
let
# Emulate jplatform64.sh configuration variables
jplatform =
if stdenv.hostPlatform.isDarwin then
@@ -49,6 +28,28 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.isDarwin then "j64arm" else "j64"
else
"unsupported";
in
stdenv.mkDerivation (finalAttrs: {
pname = "j";
version = "9.7.1";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
tag = finalAttrs.version;
hash = "sha256-fW6Tc0UEPYFTgEFMUxZaVm2NU5LNFqszifqOqfdFJZY=";
};
nativeBuildInputs = [ which ];
buildInputs = [ gmp ];
patches = [
./fix-install-path.patch
];
enableParallelBuilding = true;
dontConfigure = true;
env.NIX_LDFLAGS = "-lgmp";
@@ -94,4 +95,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.all;
mainProgram = "jconsole";
};
}
})
+1
View File
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DUSE_GITHASH=OFF"
"-DINSTALL_LICENSE=OFF"
"-DINSTALL_CADICAL=OFF"
"-DUSE_MIMALLOC=${if enableMimalloc then "ON" else "OFF"}"
];
+3 -3
View File
@@ -12,13 +12,13 @@
buildNpmPackage (finalAttrs: {
pname = "librechat";
version = "0.8.4";
version = "0.8.5";
src = fetchFromGitHub {
owner = "danny-avila";
repo = "LibreChat";
tag = "v${finalAttrs.version}";
hash = "sha256-XiPnTKiSOMezUZuhkaGJ0xHiT7jrz8OYbZrvq5gb/V8=";
hash = "sha256-iU5UoH1rbt+cVEzZAmiSjRKMJdQrKtqtHTT6vf5bGrg=";
};
patches = [
@@ -35,7 +35,7 @@ buildNpmPackage (finalAttrs: {
];
npmDepsFetcherVersion = 2;
npmDepsHash = "sha256-h15rNYl2QYnh7/cJvA7lrRqmXw8Ri2QKTfTr7w7+mMo=";
npmDepsHash = "sha256-mtGqMl+u/BfcrXKiOjtgOcgDFFgBzKt56TvpbrXPG5E=";
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
nodejs = nodejs_22;
+2 -2
View File
@@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
version = "1.16.7";
version = "1.16.8";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
hash = "sha256-571mxEqnPVvuJ/r8hU4brtJhiVPxbBOPXhWL3XWmUTI=";
hash = "sha256-DCLWutoUp7tjPfDw1T/6l2tzk1ntDOBpyJxtD/Clhns=";
};
nativeBuildInputs = [
+18 -3
View File
@@ -1,6 +1,7 @@
{
stdenv,
fetchFromGitHub,
fetchpatch,
lib,
cmake,
pkg-config,
@@ -10,8 +11,8 @@
libqmi,
withDrivers ? true,
withLibeuicc ? true,
withMbim ? true,
withQmi ? true,
withMbim ? stdenv.hostPlatform.isLinux,
withQmi ? stdenv.hostPlatform.isLinux,
nix-update-script,
}:
@@ -32,13 +33,25 @@ stdenv.mkDerivation (finalAttrs: {
env.LPAC_VERSION = finalAttrs.version;
patches = [ ./lpac-version.patch ];
patches = [
./lpac-version.patch
# CMAKE_OSX_ARCHITECTURES is set to "arm64;x86_64", and not overridable without this fix.
# https://github.com/estkme-group/lpac/pull/346
(fetchpatch {
url = "https://github.com/estkme-group/lpac/commit/be86645e596ee34f6d85cd0f3e039d5b31f35856.patch";
hash = "sha256-Y3tL9A1uKjX0x1O2WrQQ9k88Zu+Lpc+MNV9DRYePwgs=";
})
];
cmakeFlags = [
(lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers)
(lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc)
(lib.cmakeBool "LPAC_WITH_APDU_MBIM" withMbim)
(lib.cmakeBool "LPAC_WITH_APDU_QMI" withQmi)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" stdenv.hostPlatform.darwinArch)
];
nativeBuildInputs = [
@@ -48,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
curl
]
++ lib.optionals stdenv.hostPlatform.isLinux [
pcsclite
]
++ optional withMbim libmbim
+2 -2
View File
@@ -7,11 +7,11 @@
appimageTools.wrapType2 rec {
pname = "lunarclient";
version = "3.6.6";
version = "3.6.7";
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
hash = "sha512-9vIR6nNpy2cCtZHQipDJHTIC7qPpxRFmH9LrtwxHyTOJW4BGW6LlEWh+ZEe9FRZyU4iv66iTPlHw53RE9QF+cA==";
hash = "sha512-/RCRbD+OSaxvWDaJL1WqKidz6/N2R5dxb/SE30YIYrBZVHEOC2MaXSk8Oldm7yr7pqC+oXyuJbRRq2G0YAOcgA==";
};
nativeBuildInputs = [ makeWrapper ];
@@ -103,6 +103,7 @@ buildNpmPackage rec {
maintainers = with lib.maintainers; [
joko
liff
yayayayaka
];
};
}
+11 -9
View File
@@ -40,12 +40,22 @@ let
--replace-fail 'defined(__linux__)' '0'
'';
meta = {
description = "SMT solver for Monotonic Theories";
mainProgram = "monosat";
platforms = lib.platforms.unix;
license = if includeGplCode then lib.licenses.gpl2 else lib.licenses.mit;
homepage = "https://github.com/sambayless/monosat";
maintainers = [ lib.maintainers.acairncross ];
};
core = stdenv.mkDerivation {
inherit
pname
version
src
patches
meta
;
postPatch = commonPostPatch + ''
substituteInPlace CMakeLists.txt \
@@ -72,15 +82,6 @@ let
'';
passthru = { inherit python; };
meta = {
description = "SMT solver for Monotonic Theories";
mainProgram = "monosat";
platforms = lib.platforms.unix;
license = if includeGplCode then lib.licenses.gpl2 else lib.licenses.mit;
homepage = "https://github.com/sambayless/monosat";
maintainers = [ lib.maintainers.acairncross ];
};
};
python =
@@ -98,6 +99,7 @@ let
version
src
patches
meta
;
build-system = [
+2 -2
View File
@@ -20,12 +20,12 @@
stdenv.mkDerivation rec {
pname = "poco";
version = "1.15.1";
version = "1.15.2";
src = fetchFromGitHub {
owner = "pocoproject";
repo = "poco";
hash = "sha256-JyjEs5aecKSdrNEaSs4Dzs3mAu2rhhBNAG93VLHdU3E=";
hash = "sha256-Vx3aXKnka32dw0/6kA3000kmze2CMzCWBW8zDl1xqSA=";
tag = "poco-${version}-release";
};
+3 -3
View File
@@ -12,19 +12,19 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rtk";
version = "0.37.1";
version = "0.37.2";
src = fetchFromGitHub {
owner = "rtk-ai";
repo = "rtk";
tag = "v${finalAttrs.version}";
hash = "sha256-uKf3GLabsZ094VviTXF90FohLiyXFqTV/hHlm/l+ICQ=";
hash = "sha256-rNuu8B5TnKZHrbVSV8HkcTeTdcol26259GGJEPEMPZY=";
};
strictDeps = true;
__structuredAttrs = true;
cargoHash = "sha256-Vr1WKy+poeJnqjV7LvekC/jV1jolJDgxwNUp229EEWk=";
cargoHash = "sha256-61+PNuVF8H5+9PHc3MBt8V80ieBBi8HzSC9Gc/WUSzM=";
nativeBuildInputs = [
makeWrapper
+7
View File
@@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs tests/check-runzip.sh
'';
configureFlags = [ "CFLAGS=-std=gnu17" ];
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-int"
"-Wno-error=incompatible-pointer-types"
@@ -39,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
description = "Tool to convert filename encoding inside a ZIP archive";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.raskin ];
# runzip vendors libzip 0.7.1.
knownVulnerabilities = [
"CVE-2015-2331"
"CVE-2017-14107"
];
platforms = lib.platforms.unix;
mainProgram = "runzip";
};
+3 -3
View File
@@ -12,18 +12,18 @@
buildGoModule (finalAttrs: {
pname = "shellhub-agent";
version = "0.24.1";
version = "0.21.7";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${finalAttrs.version}";
hash = "sha256-3WzB7a8RJlsiKDSpuXgXenfa1q5XG5baI57qrFS0kw8=";
hash = "sha256-+dU5NYEeGHU9n8PTmcU9S2XvaygMRIaN3ai7caWdE+I=";
};
modRoot = "./agent";
vendorHash = "sha256-idfUmP2LFcnjmGpA/17phpYtGBiTC/cXjlDd/dkZ1i0=";
vendorHash = "sha256-zBT3kQhn6RhgcP/5FBEhKo1oPl9GgFQqWGsBUgrDwW4=";
ldflags = [
"-s"
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace Makefile \
--replace "-march=native" ""
--replace-fail "-march=native" "" \
--replace-fail "-std=c++11" "-std=c++17"
'';
sourceRoot = "${finalAttrs.src.name}/cpp";
@@ -53,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.linux;
license = lib.licenses.nistSoftware;
maintainers = with lib.maintainers; [
orichter
thillux
];
};
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "src-cli";
version = "7.1.0";
version = "7.2.0";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "src-cli";
rev = version;
hash = "sha256-OC2ElMud6UBDAzCHILb2fd2pO5yy8JsDziTNvSZybIU=";
hash = "sha256-s8KkOjyYoQY2+XBUi5kVc1w9QKuBXhzl5Z0/9/LOYto=";
};
vendorHash = "sha256-oPHDdWDbVuqWeutzHCv7rL9/FrbGkbLQezpZDUFVNfY=";
vendorHash = "sha256-bwCHcPo2cqa6xP+SVXOKq2bqP3AODMS+5rKz18kxdNw=";
subPackages = [
"cmd/src"
+5
View File
@@ -41,6 +41,11 @@ let
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
export DBUS_SESSION_BUS_ADDRESS
exec ${getExe sway} "$@"
elif [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/bus" ]; then
# Prefer the systemd --user bus (dbus-daemon or dbus-broker) over
# spawning a redundant session bus via dbus-run-session.
export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
exec ${getExe sway} "$@"
else
exec ${optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${getExe sway} "$@"
fi
+3 -3
View File
@@ -7,7 +7,7 @@
stdenvNoCC.mkDerivation {
pname = "thunderkittens";
version = "0-unstable-2026-04-07";
version = "0-unstable-2026-04-25";
__structuredAttrs = true;
strictDeps = true;
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
src = fetchFromGitHub {
owner = "HazyResearch";
repo = "ThunderKittens";
rev = "0a3ce9a949fb520ba10cda09cb5ffad7f6a1cc0a";
hash = "sha256-Wk3oafjEkTddn/880dHAg8S7EUDuEbXYnW0dmPTC54g=";
rev = "0b55588d2769dde0c7a9a606ffc015b0ca7a9551";
hash = "sha256-dapEzAxkMK6nO3/1LLgYg1yP3T/Xan+C6A5ZzIOQ0+0=";
};
dontBuild = true;
@@ -43,10 +43,11 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
};
dontWrapQtApps = true;
propagatedBuildInputs =
[ ]
++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
# avoid .dev outputs propagation
lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects.out ]
++ lib.optionals (lib.elem "qt6" variants) [
qt6.qt5compat.out
qt6.qtsvg.out
+3 -3
View File
@@ -6,13 +6,13 @@
}:
python3.pkgs.buildPythonApplication {
pname = "yaookctl";
version = "0-unstable-2026-03-11";
version = "0-unstable-2026-04-24";
src = fetchFromGitLab {
owner = "yaook";
repo = "yaookctl";
rev = "710b87f607a0ac9416367eed65f96965c9816cd5";
hash = "sha256-kDFnFl1/CuLcW080EbtpBd55QOj2qgcKkW4iiXS/2+U=";
rev = "2b66a5bf50b05c68897ab80a17d41d9611d16a1d";
hash = "sha256-cunSKWjOx+R0gTJic1DJRVHx0RG+vXCagbf8kmTrVKY=";
};
pyproject = true;
+11 -10
View File
@@ -8,24 +8,25 @@
linkFarm "zig-packages" [
{
name = "chameleon-3.0.0-bqfnCfhtAAAAxXGw5t9odkb4ayCTTqOcPvL-TgSMUacF";
path = fetchzip {
url = "https://github.com/DonIsaac/chameleon/archive/7c7477fa76da53c2791f9e1f860481f64140ccbc.zip";
hash = "sha256-fbKhLQLE/6aHmpYr8+daxyUSWNpDq5zApHP4brRYvlo=";
name = "chameleon-2.0.1-ZOxajZ17AADmYCpHFqqoGfaXQiRkXM8B5lYJfir9tqsz";
path = fetchgit {
url = "https://github.com/tr1ckydev/chameleon";
rev = "414169dede742d9ac8261d31b9fca6e31a1d7246";
hash = "sha256-/TGzbVh+Z6dPEKtW0M0Tv1vXvc6jmb+kHf6Q0rHmEPE=";
};
}
{
name = "recover-1.1.0-Zd97oqomAADqISI8KEhW_UUjiPSExhw9hzeoNpg1Nveo";
name = "recover-1.3.0-Zd97opwlAAB5ocfOuy8Fxp7_prPehOuEnh0R_8rBsNCk";
path = fetchzip {
url = "https://github.com/dimdin/zig-recover/archive/36133afaa1b085db7063ffc97c08ae0bddc2de4e.zip";
hash = "sha256-0oPP6BLVEIR79Q8KcvOlSeDfNLT+8inmIU6ZkuJWrfU=";
url = "https://github.com/dimdin/zig-recover/archive/refs/tags/1.3.0.tar.gz";
hash = "sha256-3x7ptCcmGjCop703ftS/KWuTlAdcCw431C8Q4VAdLIs=";
};
}
{
name = "smart_pointers-0.0.3-NPos2MOwAABoujUzLcVLofXqRAgYWLc5pG-TKDhyK0cq";
name = "smart_pointers-0.0.4-NPos2JOtAACuxKEoBGQgkmncI0APAPl-QwaI6klLObuP";
path = fetchzip {
url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.3.tar.gz";
hash = "sha256-oSI76wyiAX7YDvKGhzRbZdEvl7+DPLtMb56w0QsYrkg=";
url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.4.tar.gz";
hash = "sha256-gSvAggi0qQgTd9avuqI9AspTGXr+w5ZkgNiI3kf0+dU=";
};
}
]
+8 -5
View File
@@ -3,24 +3,27 @@
stdenv,
fetchFromGitHub,
callPackage,
zig_0_14,
zig_0_15,
versionCheckHook,
}:
let
zig = zig_0_15;
in
stdenv.mkDerivation (finalAttrs: {
pname = "zig-zlint";
version = "0.7.9";
version = "0.8.1";
src = fetchFromGitHub {
name = "zlint"; # tests expect this
owner = "DonIsaac";
repo = "zlint";
tag = "v${finalAttrs.version}";
hash = "sha256-qJPOFMBvkvF10ixE17pV9X5LX3EyCVzzhrMGx1omTzE=";
hash = "sha256-yjMgmO/kjLA9eBPXY+TgfVLyOLIpBtBigItJuon+t9k=";
};
nativeBuildInputs = [
zig_0_14
zig
];
zigBuildFlags = [
@@ -50,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ christoph-heiss ];
mainProgram = "zlint";
inherit (zig_0_14.meta) platforms;
inherit (zig.meta) platforms;
};
})
+3 -2
View File
@@ -35,8 +35,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# Source files
mkdir -p $out/share/zinit
install -m0444 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
install -m0555 share/git-process-output.zsh $out/share/zinit
install -m0444 share/rpm2cpio.zsh $out/share/zinit
mkdir $out/share/zinit/share
install -m0555 share/git-process-output.zsh $out/share/zinit/share
install -m0444 share/rpm2cpio.zsh $out/share/zinit/share
# Autocompletion
installShellCompletion --zsh _zinit
@@ -86,6 +86,7 @@ let
cmakeFlags = [
"-DUSE_GITHASH=OFF"
"-DINSTALL_LICENSE=OFF"
"-DINSTALL_CADICAL=OFF"
"-DUSE_MIMALLOC=ON"
];
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "authlib";
version = "1.6.9";
version = "1.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "lepture";
repo = "authlib";
tag = "v${version}";
hash = "sha256-9H9DF3LmxzUv0M0fxYh6FLtdAA9FgRklceMlGdjlp+g=";
hash = "sha256-vy1IOhwLkETSLSSHCWEgDOq79eZW+qEU9CJOHFMrBWE=";
};
build-system = [ setuptools ];
@@ -62,7 +62,7 @@ buildPythonPackage rec {
meta = {
description = "Library for building OAuth and OpenID Connect servers";
homepage = "https://github.com/lepture/authlib";
changelog = "https://github.com/lepture/authlib/blob/${src.tag}/docs/changelog.rst";
changelog = "https://github.com/lepture/authlib/blob/${src.tag}/docs/upgrades/changelog.rst";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ flokli ];
};
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fitbit-web-api";
version = "2.13.5";
version = "2.15.0";
pyproject = true;
src = fetchFromGitHub {
owner = "allenporter";
repo = "fitbit-web-api";
tag = "v${version}";
hash = "sha256-HqlySvC6EGnetrh0t8shapS/ggSRVoI8xPXta2eBqlk=";
hash = "sha256-1XqUhQQRTlEOIbZGzRx9CvJVAE50Enu+4fQXpOgNPdA=";
};
build-system = [ hatchling ];
@@ -80,12 +80,6 @@ buildPythonPackage (finalAttrs: {
"tests/test_models.py::TestModels::test_gated_delta_masked"
];
disabledTests = [
# ValueError: [rope] dims must be positive but got 0
# Reported upstream: https://github.com/ml-explore/mlx-lm/issues/1089
"test_all_models"
];
meta = {
description = "Run LLMs with MLX";
homepage = "https://github.com/ml-explore/mlx-lm";
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "peakrdl-rust";
version = "0.7.2";
version = "0.7.3";
pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "darsor";
repo = "PeakRDL-rust";
tag = "v${version}";
hash = "sha256-eoEJUX6yvZU8xNA+tMWRmEH3CypohOpyVa6C9FzeehU=";
hash = "sha256-1rdTz3w1SEDFWpTjKIk9eLgj3F09lDOMqqdUf8iDd7g=";
};
build-system = [ uv-build ];
@@ -36,14 +36,14 @@
buildPythonPackage (finalAttrs: {
pname = "plopp";
version = "26.4.1";
version = "26.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "scipp";
repo = "plopp";
tag = finalAttrs.version;
hash = "sha256-fx+jMqso/ISB6KiWVGGBgvsT9vayfe+MCrSciAIyKks=";
hash = "sha256-nluNaOQKkXolGCgx3Pr0m5OQ6vZbWPfdN7kbNKaVU68=";
};
build-system = [
@@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: {
__structuredAttrs = true;
pname = "rtf-tokenize";
version = "1.0.0";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "openstenoproject";
repo = "rtf_tokenize";
tag = finalAttrs.version;
hash = "sha256-zwD2sRYTY1Kmm/Ag2hps9VRdUyQoi4zKtDPR+F52t9A=";
hash = "sha256-bM/DFl1mpHgeBItdyA5Tt+Eo9u82Gz+6qwft2h0bM94=";
};
build-system = [ setuptools ];
@@ -46,6 +46,9 @@ buildPythonPackage (finalAttrs: {
description = "Simple RTF tokenizer package for Python";
homepage = "https://github.com/openstenoproject/rtf_tokenize";
license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/rtf_tokenize/issues/1
maintainers = with lib.maintainers; [ pandapip1 ];
maintainers = with lib.maintainers; [
pandapip1
ShamrockLee
];
};
})
@@ -14,14 +14,14 @@
unittestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "skl2onnx";
version = "1.19.1";
version = "1.20.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-DBBfKjuHpiTdIY0fuY/dGc8b9iFxkNJc5+FUhBJ9Dl0=";
inherit (finalAttrs) pname version;
hash = "sha256-x06oJ9kroYb+ZZaV6PyYnNl7/DIO3OPTK5k2pYeNoQo=";
};
build-system = [ setuptools ];
@@ -55,6 +55,7 @@ buildPythonPackage rec {
meta = {
description = "Convert scikit-learn models to ONNX";
changelog = "https://github.com/onnx/sklearn-onnx/releases/tag/${finalAttrs.version}";
license = with lib.licenses; [ asl20 ];
};
}
})
@@ -24,4 +24,14 @@ buildPythonPackage rec {
pyyaml
versioningit
];
meta = {
inherit (ua-parser.meta)
description
homepage
license
changelog
;
maintainers = [ ];
};
}
+12 -39
View File
@@ -10,23 +10,6 @@ unpackFile() {
}
buildPhase() {
runHook preBuild
if [ -n "$bin" ]; then
# Create the module.
echo "Building linux driver against kernel: $kernel";
cd kernel
unset src # used by the nv makefile
make $makeFlags -j $NIX_BUILD_CORES module
cd ..
fi
runHook postBuild
}
installPhase() {
runHook preInstall
@@ -68,6 +51,7 @@ installPhase() {
rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately
rm -f $i/lib/libnvidia-gtk* # built from source
rm -f $i/lib/libnvidia-wayland-client* # built from source
rm -f $i/lib/libnvidia-egl-* # built from source
if [ "$useGLVND" = "1" ]; then
# Pre-built libglvnd
rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
@@ -96,13 +80,7 @@ installPhase() {
else
sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
fi
# nvidia currently only supports x86_64 and i686
if [ "$i" == "$lib32" ]; then
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json
else
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json
fi
install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json
fi
if [ -e nvidia_layers.json ]; then
@@ -112,17 +90,14 @@ installPhase() {
# EGL
if [ "$useGLVND" = "1" ]; then
mkdir -p "$i/share/egl/egl_external_platform.d"
for icdname in $(find . -name '*_nvidia*.json')
do
cat "$icdname" | jq ".ICD.library_path |= \"$i/lib/\(.)\"" | tee "$i/share/egl/egl_external_platform.d/$icdname"
done
# glvnd icd
mkdir -p "$i/share/glvnd/egl_vendor.d"
mv "$i/share/egl/egl_external_platform.d/10_nvidia.json" "$i/share/glvnd/egl_vendor.d/10_nvidia.json"
for icdname in "10_nvidia.json";
do
cat "$icdname" | jq ".ICD.library_path |= \"$i/lib/\(.)\"" | tee "$i/share/glvnd/egl_vendor.d/$icdname"
done
if [[ -f "$i/share/egl/egl_external_platform.d/15_nvidia_gbm.json" ]]; then
if [[ -f "15_nvidia_gbm.json" ]]; then
mkdir -p $i/lib/gbm
ln -s $i/lib/libnvidia-allocator.so $i/lib/gbm/nvidia-drm_gbm.so
fi
@@ -152,13 +127,6 @@ installPhase() {
mkdir -p $bin/lib/xorg/modules/extensions
cp -p libglx*.so* $bin/lib/xorg/modules/extensions
# Install the kernel module.
mkdir -p $bin/lib/modules/$kernelVersion/misc
for i in $(find ./kernel -name '*.ko'); do
nuke-refs $i
cp $i $bin/lib/modules/$kernelVersion/misc/
done
# Install application profiles.
if [ "$useProfiles" = "1" ]; then
mkdir -p $bin/share/nvidia
@@ -167,6 +135,11 @@ installPhase() {
fi
fi
# Install the proprietary kernel module build files.
if [ -n "$modsrc" ]; then
cp -r kernel $modsrc
fi
if [ -n "$firmware" ]; then
# Install the GSP firmware
install -Dm644 -t $firmware/lib/firmware/nvidia/$version firmware/gsp*.bin
+9 -15
View File
@@ -6,6 +6,7 @@
fetchpatch,
stdenv,
pkgsi686Linux,
kernel,
}:
let
@@ -18,20 +19,9 @@ let
lib32 =
(pkgsi686Linux.callPackage imported {
libsOnly = true;
kernel = null;
}).out;
};
kernel =
# a hacky way of extracting parameters from callPackage
callPackage (
{
kernel,
libsOnly ? false,
}:
if libsOnly then { } else kernel
) { };
selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a;
# https://forums.developer.nvidia.com/t/linux-6-7-3-545-29-06-550-40-07-error-modpost-gpl-incompatible-module-nvidia-ko-uses-gpl-only-symbol-rcu-read-lock/280908/19
@@ -76,6 +66,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
latest = selectHighestVersion production new_feature;
bleeding_edge = selectHighestVersion latest beta;
production = generic {
version = "595.58.03";
sha256_64bit = "sha256-jA1Plnt5MsSrVxQnKu6BAzkrCnAskq+lVRdtNiBYKfk=";
@@ -85,7 +79,7 @@ rec {
persistencedSha256 = "sha256-AtjM/ml/ngZil8DMYNH+P111ohuk9mWw5t4z7CHjPWw=";
};
latest = selectHighestVersion production (generic {
new_feature = generic {
version = "590.48.01";
sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
sha256_aarch64 = "sha256-FOz7f6pW1NGM2f74kbP6LbNijxKj5ZtZ08bm0aC+/YA=";
@@ -93,16 +87,16 @@ rec {
settingsSha256 = "sha256-NWsqUciPa4f1ZX6f0By3yScz3pqKJV1ei9GvOF8qIEE=";
persistencedSha256 = "sha256-wsNeuw7IaY6Qc/i/AzT/4N82lPjkwfrhxidKWUtcwW8=";
patchesOpen = [ kernel_6_19_patch ];
});
};
beta = selectHighestVersion latest (generic {
beta = generic {
version = "595.45.04";
sha256_64bit = "sha256-zUllSSRsuio7dSkcbBTuxF+dN12d6jEPE0WgGvVOj14=";
sha256_aarch64 = "sha256-jl6lQWsgF6ya22sAhYPpERJ9r+wjnWzbGnINDpUMzsk=";
openSha256 = "sha256-uqNfImwTKhK8gncUdP1TPp0D6Gog4MSeIJMZQiJWDoE=";
settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA=";
persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA=";
});
};
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
+24 -40
View File
@@ -41,16 +41,12 @@
pkgsi686Linux,
fetchurl,
fetchzip,
kernel ? null,
kernelModuleMakeFlags ? [ ],
perl,
nukeReferences,
which,
libarchive,
jq,
# Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux.
zstd,
# Whether to build only userspace libraries (without bin/modsrc/firmware
# outputs). Used to support 32-bit binaries on 64-bit Linux.
libsOnly ? false,
# don't include the bundled 32-bit libraries on 64-bit platforms,
# even if its in downloaded binary
@@ -65,7 +61,6 @@
acceptLicense ? config.nvidia.acceptLicense or false,
}:
assert !libsOnly -> kernel != null;
assert lib.versionOlder version "391" -> sha256_32bit != null;
assert useSettings -> settingsSha256 != null;
assert usePersistenced -> persistencedSha256 != null;
@@ -96,7 +91,6 @@ let
--clean "$patch" > "$out"
'';
nameSuffix = lib.optionalString (!libsOnly) "-${kernel.version}";
pkgSuffix = lib.optionalString (lib.versionOlder version "304") "-pkg0";
i686bundled = lib.versionAtLeast version "391" && !disable32Bit;
@@ -143,7 +137,6 @@ let
in
stdenv.mkDerivation (finalAttrs: {
name = "${finalAttrs.pname}-${finalAttrs.version}${nameSuffix}";
pname = "nvidia-${if useFabricmanager then "dc" else "x11"}";
builder = ./builder.sh;
@@ -201,31 +194,13 @@ stdenv.mkDerivation (finalAttrs: {
"out"
]
++ lib.optional i686bundled "lib32"
++ lib.optional (!libsOnly) "bin"
++ lib.optionals (!libsOnly) [
"bin"
"modsrc"
]
++ lib.optional (!libsOnly && firmware) "firmware";
outputDev = if libsOnly then null else "bin";
kernel = if libsOnly then null else kernel.dev;
kernelVersion = if libsOnly then null else kernel.modDirVersion;
makeFlags = lib.optionals (!libsOnly) (
kernelModuleMakeFlags
++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"NV_BUILD_SUPPORTS_HMM=1"
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]
++ lib.optionals stdenv.cc.isClang [
"C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
]
);
hardeningDisable = [
"pic"
"format"
];
dontStrip = true;
dontPatchELF = true;
@@ -233,15 +208,12 @@ stdenv.mkDerivation (finalAttrs: {
libPath32 = lib.optionalString i686bundled (libPathFor pkgsi686Linux);
nativeBuildInputs = [
perl
nukeReferences
which
libarchive
jq
]
++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
disallowedReferences = lib.optionals (!libsOnly) [ kernel.dev ];
# NVIDIA has changed the compression format of their driver to zstd since version 530.30.02
# https://forums.developer.nvidia.com/t/linux-solaris-and-freebsd-driver-530-30-02-beta/244406
++ (if (lib.versionAtLeast version "530") then [ zstd ] else [ which ]);
passthru =
let
@@ -274,9 +246,17 @@ stdenv.mkDerivation (finalAttrs: {
);
in
{
mod = callPackage ./kernel-modules.nix {
open = false;
nvidia_x11 = finalAttrs.finalPackage;
# build files already patched when building the main package, so no need to patch them again
patches = [ ];
inherit broken;
};
open = lib.mapNullable (
hash:
callPackage ./open.nix {
callPackage ./kernel-modules.nix {
open = true;
inherit hash;
nvidia_x11 = finalAttrs.finalPackage;
patches =
@@ -339,11 +319,15 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals (sha256_32bit != null) [ "i686-linux" ]
++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
sourceProvenance = with lib.sourceTypes; [
binaryNativeCode
binaryFirmware
];
maintainers = with lib.maintainers; [
kiskae
edwtjo
];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
inherit broken;
broken = broken && brokenOpen;
};
})
@@ -0,0 +1,81 @@
{
stdenv,
lib,
fetchFromGitHub,
kernel,
kernelModuleMakeFlags,
nvidia_x11,
open,
patches,
broken,
hash ? null,
}:
assert open -> hash != null;
stdenv.mkDerivation {
pname = "nvidia-${if open then "open" else "kernel-modules"}";
version = "${nvidia_x11.version}-${kernel.version}";
src =
if open then
fetchFromGitHub {
owner = "NVIDIA";
repo = "open-gpu-kernel-modules";
tag = nvidia_x11.version;
inherit hash;
}
else
nvidia_x11.modsrc;
inherit patches;
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags =
kernelModuleMakeFlags
++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
"DATE="
"TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
]
++ lib.optionals stdenv.cc.isClang [
"C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
];
buildTargets = [ "modules" ];
installTargets = [ "modules_install" ];
enableParallelBuilding = true;
allowedReferences = [ ];
meta = {
description = "NVIDIA Linux ${lib.optionalString open "Open "}GPU Kernel Modules";
homepage =
if open then "https://github.com/NVIDIA/open-gpu-kernel-modules" else nvidia_x11.meta.homepage;
license =
if open then
with lib.licenses;
[
gpl2Plus
mit
]
else
nvidia_x11.meta.license;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
sourceProvenance =
with lib.sourceTypes;
[
fromSource
]
++ lib.optional (!open) binaryNativeCode;
maintainers = with lib.maintainers; [ nickcao ];
inherit broken;
};
}
@@ -1,59 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
kernel,
kernelModuleMakeFlags,
nvidia_x11,
hash,
patches ? [ ],
broken ? false,
}:
stdenv.mkDerivation {
pname = "nvidia-open";
version = "${kernel.version}-${nvidia_x11.version}";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "open-gpu-kernel-modules";
rev = nvidia_x11.version;
inherit hash;
};
inherit patches;
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags =
kernelModuleMakeFlags
++ [
"IGNORE_PREEMPT_RT_PRESENCE=1"
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
"DATE="
"TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
]
++ lib.optionals stdenv.cc.isClang [
"C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
];
installTargets = [ "modules_install" ];
enableParallelBuilding = true;
meta = {
description = "NVIDIA Linux Open GPU Kernel Module";
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
license = with lib.licenses; [
gpl2Plus
mit
];
platforms = [
"x86_64-linux"
"aarch64-linux"
];
maintainers = with lib.maintainers; [ nickcao ];
inherit broken;
};
}
@@ -17,13 +17,13 @@
buildHomeAssistantComponent rec {
owner = "bramstroker";
domain = "powercalc";
version = "1.20.13";
version = "1.20.14";
src = fetchFromGitHub {
inherit owner;
repo = "homeassistant-powercalc";
tag = "v${version}";
hash = "sha256-Vg/hqDo0dW88VUKEXZcaRMwOAzm8EmbKGwV/xIfB5lQ=";
hash = "sha256-Tm9h6ZHByuiM9XZz3D1TZR3ISbb16l0K1Vy8sJxI4+s=";
};
dependencies = [ numpy ];
@@ -8,13 +8,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "pg_background";
version = "1.9.2";
version = "1.9.3";
src = fetchFromGitHub {
owner = "vibhorkum";
repo = "pg_background";
tag = "v${finalAttrs.version}";
hash = "sha256-R78lB/58/dfZPg4XZ5xGuQ/Ftv+SQzU4aeJop6tslK8=";
hash = "sha256-m5mdXTmml6iX4UKcHeN6uMjypLvHasjD5AXzUhvEHdI=";
};
buildInputs = postgresql.buildInputs;
+3 -3
View File
@@ -12,16 +12,16 @@ let
}:
rustPlatform.buildRustPackage rec {
pname = name;
version = "0.98.0";
version = "0.98.1";
src = fetchFromGitHub {
owner = "n0-computer";
repo = "iroh";
rev = "v${version}";
hash = "sha256-s6+XobcFGw7JquIuUQinmHggxmxQ1iKMpDVe49LpSbI=";
hash = "sha256-rxEkFx2dAEA01CE8zqpCqM2PzxmyRhhSSl3d909pJKQ=";
};
cargoHash = "sha256-GoBG4bI5hufklEC3uoVFE+NURTEHhb4ZtXFYd9nsCls=";
cargoHash = "sha256-zg15Vq9Abzia5GlmSMLcWN/P7lk9ekyhPyPfAbuu8Vs=";
buildFeatures = cargoFeatures;
cargoBuildFlags = [
+9 -2
View File
@@ -10516,12 +10516,19 @@ with pkgs;
};
};
}).overrideAttrs
{
(old: {
pname = "vim-darwin";
meta = {
inherit (old.meta)
description
homepage
license
mainProgram
outputsToInstall
;
platforms = lib.platforms.darwin;
};
};
});
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };