Merge master into staging-next

Changed files
+758 -641
maintainers
nixos
modules
services
ttys
pkgs
applications
audio
pd-plugins
editors
vscode
extensions
fstarlang.fstar-vscode-assistant
networking
cluster
terraform-providers
video
window-managers
by-name
ag
agenda
ai
airwindows
br
broot
ch
chirpstack-rest-api
cl
clever-tools
co
code-cursor
ct
do
en
enzyme
ge
gi
gitea-mcp-server
go
gofumpt
gotenberg
gu
guile-hoot
gum
ht
httptoolkit
is
issue2md
le
lefthook
li
libation
lilex
ll
llama-cpp
lo
local-content-share
me
melange
mo
monocle
ne
netbootxyz-efi
nv
nvidia-modprobe
oh
ol
ollama
pa
papeer
paretosecurity
pb
qu
quill-log
ru
rundeck
sa
satisfactorymodmanager
sc
schemacrawler
scrcpy
si
sigtop
sl
slipshow
st
strawberry
ta
tana
tauno-monitor
te
terramate
tl
tlclient
tr
tracexec
traefik
ty
typos
vu
vulkan-cts
xe
xr
xrizer
ze
zed-editor
zi
zipline
development
python-modules
canonical-sphinx-extensions
celery-types
django-ninja
django-stubs
django-stubs-ext
djangorestframework-stubs
ibis
imbalanced-learn
jupyter-docprovider
langgraph-cli
libretranslate
oslo-serialization
pyfwup
pytest-ansible
python-constraint
pytorch-lightning
sagemaker-core
srctools
trl
tuya-device-sharing-sdk
ultralytics
rocm-modules
misc
apulse
servers
nosql
influxdb
top-level
+11 -6
maintainers/maintainer-list.nix
···
githubId = 9874955;
name = "Elnu";
};
-
elohmeier = {
-
email = "elo-nixos@nerdworks.de";
-
github = "elohmeier";
-
githubId = 2536303;
-
name = "Enno Lohmeier";
-
};
elpdt852 = {
email = "nix@pdtpartners.com";
github = "elpdt852";
···
githubId = 7512804;
name = "Martin Langlotz";
+
stapelberg = {
+
name = "Michael Stapelberg";
+
github = "stapelberg";
+
githubId = 55506;
+
email = "michael+nix@stapelberg.ch";
+
};
starcraft66 = {
name = "Tristan Gosselin-Hane";
email = "starcraft66@gmail.com";
···
github = "toyboot4e";
githubId = 47905926;
name = "toyboot4e";
+
};
+
tphanir = {
+
github = "tphanir";
+
name = "phani";
+
githubId = 125972587;
tpw_rules = {
name = "Thomas Watson";
+15 -24
nixos/modules/services/ttys/kmscon.nix
···
}:
let
inherit (lib)
-
mapAttrs
mkIf
+
mkEnableOption
mkOption
+
mkPackageOption
optional
optionals
types
···
{
options = {
services.kmscon = {
-
enable = mkOption {
-
description = ''
-
Use kmscon as the virtual console instead of gettys.
-
kmscon is a kms/dri-based userspace virtual terminal implementation.
-
It supports a richer feature set than the standard linux console VT,
-
including full unicode support, and when the video card supports drm
-
should be much faster.
-
'';
-
type = types.bool;
-
default = false;
-
};
+
enable = mkEnableOption ''
+
kmscon as the virtual console instead of gettys.
+
kmscon is a kms/dri-based userspace virtual terminal implementation.
+
It supports a richer feature set than the standard linux console VT,
+
including full unicode support, and when the video card supports drm
+
should be much faster.
+
'';
+
+
package = mkPackageOption pkgs "kmscon" { };
-
hwRender = mkOption {
-
description = "Whether to use 3D hardware acceleration to render the console.";
-
type = types.bool;
-
default = false;
-
};
+
hwRender = mkEnableOption "3D hardware acceleration to render the console.";
fonts = mkOption {
description = "Fonts used by kmscon, in order of priority.";
···
nullOr (nonEmptyListOf fontType);
};
-
useXkbConfig = mkOption {
-
description = "Configure keymap from xserver keyboard settings.";
-
type = types.bool;
-
default = false;
-
};
+
useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings.";
extraConfig = mkOption {
description = "Extra contents of the kmscon.conf file.";
···
};
config = mkIf cfg.enable {
-
systemd.packages = [ pkgs.kmscon ];
+
systemd.packages = [ cfg.package ];
systemd.services."kmsconvt@" = {
after = [
···
serviceConfig.ExecStart = [
""
''
-
${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
+
${cfg.package}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
''
];
+17
pkgs/README.md
···
Import From Derivation can be worked around in some cases by committing generated intermediate files to version control and reading those instead.
+
## `overrideAttrs` and `overridePythonAttrs`
+
+
Please do not introduce new uses of `overrideAttrs` or `overridePythonAttrs` in Nixpkgs.
+
These functions are useful for out-of-tree code because they allow easy overriding a package without changing its source in Nixpkgs, but when contributing to Nixpkgs you *can* change the source of other packages. So instead of using the escape hatch that is overriding, you should try to provide proper support for the functionality you need, in ways that are visible and can be understood and accounted for by the maintainers of the patched package.
+
Using `overrideAttrs` and `overridePythonAttrs` in Nixpkgs causes maintainability problems:
+
+
* It's easy for multiple packages to end up duplicating basically the same override without noticing.
+
* It's not clear when working on an overridden package that it's being overridden elsewhere in Nixpkgs, so `overrideAttrs` and `overridePythonAttrs` are fragile and can break accidentally when the overridden package is changed.
+
* Package maintainers will not be requested for review of overrides, even though they are likely to have important knowledge about the package.
+
* It is easy for overridden packages to be forgotten and remain around long after they are no longer necessary.
+
* Dependency closures end up being bigger than necessary due to unnecessarily including multiple versions of the same package.
+
+
Instead, keep all instances of the same package next to each other, and try to minimize how many different instances of a package are in Nixpkgs.
+
If you need a patch applied to a dependency, discuss with the maintainer of that dependency whether it would be acceptable to apply to the main version of the package.
+
If you need a different version of a dependency, first try modifying your package to work with the version in Nixpkgs — it's often not very hard! — and if that's not possible, try to factor out a function that can build multiple versions of the package, including the main version.
+
If you need to enable or disable optional functionality of a dependency, add an explicit flag to the package and use `override` instead.
+
## Sources
Always fetch source files using [Nixpkgs fetchers](https://nixos.org/manual/nixpkgs/unstable/#chap-pkgs-fetchers).
+11 -27
pkgs/applications/audio/pd-plugins/zexy/default.nix
···
{
lib,
stdenv,
-
fetchurl,
-
autoconf,
-
automake,
+
fetchFromGitLab,
puredata,
}:
stdenv.mkDerivation rec {
pname = "zexy";
-
version = "2.2.4";
+
version = "2.4.3";
-
src = fetchurl {
-
url = "https://puredata.info/downloads/zexy/releases/${version}/${pname}-${version}.tar.gz";
-
sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp";
+
src = fetchFromGitLab {
+
domain = "git.iem.at";
+
owner = "pd";
+
repo = "zexy";
+
tag = "v${version}";
+
hash = "sha256-9f0uYBDBq5lcN/N0uJwC/HBEFcj9b8ZtBHnPAce2s/A=";
};
-
nativeBuildInputs = [
-
autoconf
-
automake
-
];
buildInputs = [ puredata ];
-
preBuild = ''
-
export LD=$CXX
-
cd src/
-
for i in ${puredata}/include/pd/*; do
-
ln -s $i .
-
done
-
./bootstrap.sh
-
./configure --enable-lpt=no --prefix=$out
-
'';
-
-
postInstall = ''
-
mv $out/lib/pd/extra/zexy $out
-
rm -rf $out/lib
-
'';
+
makeFlags = [ "PDLIBDIR=$(out)" ];
meta = {
description = "Swiss army knife for puredata";
-
homepage = "http://puredata.info/downloads/zexy";
-
license = lib.licenses.gpl2;
+
homepage = "https://git.iem.at/pd/zexy";
+
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux;
};
+4 -4
pkgs/applications/editors/vscode/extensions/default.nix
···
mktplcRef = {
name = "catppuccin-vsc";
publisher = "catppuccin";
-
version = "3.17.0";
-
hash = "sha256-udDbsXAEsJUt3WUU8aBvCi8Pu+8gu+xQkimlmvRZ9pg=";
+
version = "3.18.0";
+
hash = "sha256-57c0HRdEABLz03qozeQgFJH1NaWUbA+7tDJv0V4At8M=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog";
···
mktplcRef = {
name = "databricks";
publisher = "databricks";
-
version = "2.10.2";
-
hash = "sha256-lZXC6tAgylqODtCElR+bM+AyL7+HXdzO/JnjkJ+2dM4=";
+
version = "2.10.3";
+
hash = "sha256-t3PZiKvctJEzABuX5p1AdNXj8bYDhfFMJnYVnpbDyqk=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
+2 -2
pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
···
mktplcRef = {
name = "fstar-vscode-assistant";
publisher = "FStarLang";
-
version = "0.19.2";
-
hash = "sha256-4EerlsxIBjKIpeSS388Nw40eD5tBL+cN5uNAsfu+gio=";
+
version = "0.20.0";
+
hash = "sha256-GVlXzKXZmkewRIAHPpiHQsHFfPlNI2GswBdhfFtzgrA=";
};
meta = {
description = "Interactive editing mode VS Code extension for F*";
+8 -8
pkgs/applications/networking/cluster/terraform-providers/providers.json
···
"vendorHash": "sha256-i3NwpixAXi9PzciiwTtHB8yrzLWv67gHiDY4HshAbBo="
},
"awscc": {
-
"hash": "sha256-RMOLAJyoIVIlg4GgU6rCSASgcZlvFMmLjFPqc5Lrdp8=",
+
"hash": "sha256-1ZOxJyjDVLhbVEdiSIWF+eNVZ9g2coyz1Bq1TWYq768=",
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
"owner": "hashicorp",
"repo": "terraform-provider-awscc",
-
"rev": "v1.53.0",
+
"rev": "v1.55.0",
"spdx": "MPL-2.0",
-
"vendorHash": "sha256-VNWa7ynbqhaPXrnZBmWLsMOExnjBRD7+gp89tMReNAY="
+
"vendorHash": "sha256-5wuQnIWk+idOhfFRlFrnupSP4PUTd3QUJdUIdlzCJR8="
},
"azuread": {
"hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",
···
"vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
},
"checkly": {
-
"hash": "sha256-4AQbt0BN/fYm1JEsXqY3zFhofTCyS+l80TPtmAePC7Y=",
+
"hash": "sha256-hZn0kNk2CtgaCfwrrnbBhdAO54d5QoP40rmxSliqJN0=",
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
"owner": "checkly",
"repo": "terraform-provider-checkly",
-
"rev": "v1.12.0",
+
"rev": "v1.13.0",
"spdx": null,
-
"vendorHash": "sha256-8ZfA3GYJk2pe627u9XB2m6qmD5wHAxtUYzivVK6u+YI="
+
"vendorHash": "sha256-BPkpXDckVv/rtR1WCqKthmTCPzy+yAjgqUFYY3RT/+E="
},
"ciscoasa": {
"hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=",
···
"vendorHash": null
},
"sakuracloud": {
-
"hash": "sha256-ec3ZGe0wyvN7ZLREmgots3lvTwNaaUCjGGwmogwy6VQ=",
+
"hash": "sha256-8fNQ1g+XAu0K0adZSCLwhuLNk4qxUbcDNVYXVhOwNk8=",
"homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
"owner": "sacloud",
"repo": "terraform-provider-sakuracloud",
-
"rev": "v2.29.0",
+
"rev": "v2.29.1",
"spdx": "Apache-2.0",
"vendorHash": "sha256-Icua01a4ILF+oAO5nMeCGPZrWc3V/SVObWydO72CU3I="
},
+3 -3
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
···
buildLua {
pname = "mpv-playlistmanager";
-
version = "0-unstable-2025-03-16";
+
version = "0-unstable-2025-09-03";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
-
rev = "a2755132c18c050269e5fea6093672f0a36ed7db";
-
hash = "sha256-v+zQiRXPtFXSq3Em3sA37zltUGPhGCpONJ25F2Jxe4w=";
+
rev = "b11621e1dc4afd24b41b887aff0748146176c4c1";
+
hash = "sha256-0+ISjWb8aGdRjsFOPURBZzTmJ4X8ayzYfnxYICDmizA=";
};
passthru.updateScript = unstableGitUpdater { };
-2
pkgs/applications/video/obs-studio/plugins/default.nix
···
obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+
-
obs-webkitgtk = callPackage ./obs-webkitgtk.nix { };
-
pixel-art = callPackage ./pixel-art.nix { };
wlrobs = callPackage ./wlrobs.nix { };
+2 -2
pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
···
stdenv.mkDerivation rec {
pname = "obs-text-pthread";
-
version = "2.0.6";
+
version = "2.0.7";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-text-pthread";
rev = version;
-
sha256 = "sha256-lDGji2ZdK5XoBKLRdgYCIDPndVkhIZltc94wWFRTLCA=";
+
sha256 = "sha256-YjMZfDSO5VRIY+HBGniNV3HG5vs+zbiqfbrPKs9v804=";
};
nativeBuildInputs = [
-52
pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
···
-
{
-
lib,
-
stdenv,
-
fetchFromGitHub,
-
obs-studio,
-
webkitgtk_4_1,
-
glib-networking,
-
meson,
-
cmake,
-
pkg-config,
-
ninja,
-
wrapGAppsHook3,
-
}:
-
-
stdenv.mkDerivation {
-
pname = "obs-webkitgtk";
-
version = "unstable-2023-11-10";
-
-
src = fetchFromGitHub {
-
owner = "fzwoch";
-
repo = "obs-webkitgtk";
-
rev = "ddf230852c3c338e69b248bdf453a0630f1298a7";
-
hash = "sha256-DU2w9dRgqWniTE76KTAtFdxIN82VKa/CS6ZdfNcTMto=";
-
};
-
-
buildInputs = [
-
obs-studio
-
webkitgtk_4_1
-
glib-networking
-
];
-
-
nativeBuildInputs = [
-
meson
-
cmake
-
pkg-config
-
ninja
-
wrapGAppsHook3
-
];
-
-
postPatch = ''
-
substituteInPlace ./obs-webkitgtk.c \
-
--replace 'g_file_read_link("/proc/self/exe", NULL)' "g_strdup(\"$out/lib/obs-plugins\")"
-
'';
-
-
meta = with lib; {
-
description = "Yet another OBS Studio browser source";
-
homepage = "https://github.com/fzwoch/obs-webkitgtk";
-
maintainers = with maintainers; [ j-hui ];
-
license = licenses.gpl2Only;
-
platforms = platforms.linux;
-
};
-
}
+1 -1
pkgs/applications/window-managers/i3/status.nix
···
meta = {
description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar";
homepage = "https://i3wm.org";
-
maintainers = [ ];
+
maintainers = with lib.maintainers; [ stapelberg ];
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
mainProgram = "i3status";
+6 -13
pkgs/by-name/ag/agenda/package.nix
···
stdenv,
fetchFromGitHub,
nix-update-script,
+
desktop-file-utils,
pantheon,
meson,
ninja,
-
python3,
pkg-config,
vala,
gettext,
···
stdenv.mkDerivation rec {
pname = "agenda";
-
version = "1.1.2";
+
version = "1.2.1";
src = fetchFromGitHub {
owner = "dahenson";
repo = "agenda";
-
rev = version;
-
sha256 = "sha256-tzGcqCxIkoBNskpadEqv289Sj5bij9u+LdYySiGdop8=";
+
tag = version;
+
hash = "sha256-CjlGkG43FFDdKGuwevBeCCazOzLcH114bqihMWTykC8=";
};
nativeBuildInputs = [
+
desktop-file-utils
gettext
glib # for glib-compile-schemas
meson
ninja
pkg-config
-
python3
vala
wrapGAppsHook3
];
···
pantheon.granite
];
-
postPatch = ''
-
chmod +x meson/post_install.py
-
patchShebangs meson/post_install.py
-
'';
-
-
doCheck = true;
-
passthru = {
updateScript = nix-update-script { };
};
···
maintainers = with maintainers; [ xiorcale ];
teams = [ teams.pantheon ];
platforms = platforms.linux;
-
license = licenses.gpl3;
+
license = licenses.gpl3Plus;
mainProgram = "com.github.dahenson.agenda";
};
}
+3 -3
pkgs/by-name/ai/airwindows/package.nix
···
}:
stdenv.mkDerivation {
pname = "airwindows";
-
version = "0-unstable-2025-08-10";
+
version = "0-unstable-2025-08-24";
src = fetchFromGitHub {
owner = "airwindows";
repo = "airwindows";
-
rev = "b00a82a01a4d7e243370a1c6c912e9b3b7d51245";
-
hash = "sha256-qjffMca9vS2DnN++IKdCfl+bCgVLSgXmKY8ZYmB1tVQ=";
+
rev = "05cb274c275139dc3fd12922b88fa0a101595d99";
+
hash = "sha256-MPGkB2WkP5wpAc1FFKY4+9Itj6JM76FoaDikxVeMGsQ=";
};
# we patch helpers because honestly im spooked out by where those variables
+3 -3
pkgs/by-name/br/broot/package.nix
···
rustPlatform.buildRustPackage (finalAttrs: {
pname = "broot";
-
version = "1.47.0";
+
version = "1.48.0";
src = fetchFromGitHub {
owner = "Canop";
repo = "broot";
tag = "v${finalAttrs.version}";
-
hash = "sha256-BX54J43bUa73WCxCmYQ2VgXhURRiJG5Do1ofsFFY38Y=";
+
hash = "sha256-mNAdmIlOL+lgXi7TE0vpqPypwCrI/ZQlvm5TX174hQU=";
};
-
cargoHash = "sha256-7F93oPDXHznwkZZVqdgEuIb5sxa7uElBkwUr/PDIsdo=";
+
cargoHash = "sha256-uCqAy8SZgDvLJD5r8tyxZXl+1POW0J1sx61Wd8+qwf0=";
nativeBuildInputs = [
installShellFiles
+3 -3
pkgs/by-name/ch/chirpstack-rest-api/package.nix
···
}:
buildGoModule rec {
pname = "chirpstack-rest-api";
-
version = "4.13.0";
+
version = "4.14.1";
src = fetchFromGitHub {
owner = "chirpstack";
repo = "chirpstack-rest-api";
rev = "v${version}";
-
hash = "sha256-uJF8VZO3hAdjcvmc370Gw1qJqmOlYCzRJNYYGUImKgE=";
+
hash = "sha256-DHDrnChRikVDJhdCcoHlFn3sYfjEvWpzUsMkuIoqQiw=";
};
-
vendorHash = "sha256-rnlsWvA98OT6gd4yw7kF5h+6obQ3UwmZLldujEOIWBw=";
+
vendorHash = "sha256-BthdLFhzrAiZTI/afsNgKhgCj1QQHabU37sH9ovIDdU=";
ldflags = [
"-s"
+3 -3
pkgs/by-name/cl/clever-tools/package.nix
···
buildNpmPackage rec {
pname = "clever-tools";
-
version = "3.14.0";
+
version = "3.14.1";
nodejs = nodejs_20;
···
owner = "CleverCloud";
repo = "clever-tools";
rev = version;
-
hash = "sha256-gBmYbnKsnqZ4KqjJhNmLB7lzIh3MztmcFVAPtz0dB2A=";
+
hash = "sha256-3nCfo54p7O4Oik3fTf842IahEQnu26oPS5aOgHdhJKg=";
};
-
npmDepsHash = "sha256-e3H3nLZZHZ+FX0JTPZXX+YknudnzcAKV6o2bqecZTBA=";
+
npmDepsHash = "sha256-NWi+LJWLT2z3980d3rxBkNYzmMS6JwuP49ltGtKRd5c=";
nativeBuildInputs = [
installShellFiles
+9 -9
pkgs/by-name/co/code-cursor/package.nix
···
sources = {
x86_64-linux = fetchurl {
-
url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/x64/Cursor-1.5.5-x86_64.AppImage";
-
hash = "sha256-eq/AQcAONs6HBpRdx2yf4MFTQ1cm/rOeaZZTq8YUF8s=";
+
url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/x64/Cursor-1.5.11-x86_64.AppImage";
+
hash = "sha256-PlZPgcDe6KmEcQYDk1R4uXh1R34mKuPLBh/wbOAYrAY=";
};
aarch64-linux = fetchurl {
-
url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/linux/arm64/Cursor-1.5.5-aarch64.AppImage";
-
hash = "sha256-709MYaAnoYI+k1CPkfVzL0PvrJ4zw4wSHZvbuqLlXMQ=";
+
url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/linux/arm64/Cursor-1.5.11-aarch64.AppImage";
+
hash = "sha256-a1M9KumU8wLN5t6hrqMfkcbfPyt9maqCsAW8xTS+0BY=";
};
x86_64-darwin = fetchurl {
-
url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/x64/Cursor-darwin-x64.dmg";
-
hash = "sha256-A13mVAw8mgjGlGegAzkeUi536keZwcJZkbO4ZzfMmXs=";
+
url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/x64/Cursor-darwin-x64.dmg";
+
hash = "sha256-HotafPJPDywp9UAnQUsQurfxtfPepZWAegAmwNp9J2Q=";
};
aarch64-darwin = fetchurl {
-
url = "https://downloads.cursor.com/production/823f58d4f60b795a6aefb9955933f3a2f0331d7b/darwin/arm64/Cursor-darwin-arm64.dmg";
-
hash = "sha256-Pc1pG1Vj9bf8H6Gt2bR8JANo/6oZza+L3Zlrihpg1dk=";
+
url = "https://downloads.cursor.com/production/2f2737de9aa376933d975ae30290447c910fdf46/darwin/arm64/Cursor-darwin-arm64.dmg";
+
hash = "sha256-LZxahFX3e7YQtUPcjxKYsOrjZSuPKyPKyIrJxC5XYLw=";
};
};
···
inherit useVSCodeRipgrep;
commandLineArgs = finalCommandLineArgs;
-
version = "1.5.5";
+
version = "1.5.11";
pname = "cursor";
# You can find the current VSCode version in the About dialog:
+2 -2
pkgs/by-name/ct/ctags-lsp/package.nix
···
}:
buildGoModule rec {
pname = "ctags-lsp";
-
version = "0.7.0";
+
version = "0.8.1";
vendorHash = null;
src = fetchFromGitHub {
owner = "netmute";
repo = "ctags-lsp";
tag = "v${version}";
-
hash = "sha256-yueT8Q/mJTvQ3fqE4237E93W4ToEi0IzSus/xoto6vA=";
+
hash = "sha256-S+9DT4lcZTcm2dppYbkFklDKzeoOhta2b1OuDytE5sU=";
};
nativeBuildInputs = [ makeWrapper ];
+36 -14
pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch
···
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
-
index 1a30d61..bea8d7c 100644
-
--- a/CMakeLists.txt
+
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt
+
index ac0488e..a3724bc 100644
+
--- a/CMakeLists.txt.orig
+++ b/CMakeLists.txt
-
@@ -50,13 +50,6 @@ include(FetchContent)
+
@@ -50,14 +50,6 @@ include(FetchContent)
set(CMAKE_VERBOSE_MAKEFILE ON)
···
-if (NOT Git_FOUND)
- message(FATAL_ERROR "Required package 'Git' not found on system.")
-endif ()
-
+
-
#======================================== LIB IMPORTS =============================================#
# ======= #
-
@@ -68,28 +61,9 @@ include_directories(${OPENSSL_INCLUDE_DIR})
-
# ============== #
-
# JSON-C library #
-
# ============== #
+
# OpenSSL #
+
@@ -65,40 +57,17 @@ endif ()
+
find_package(OpenSSL REQUIRED)
+
include_directories(${OPENSSL_INCLUDE_DIR})
+
+
-# ============== #
+
-# JSON-C library #
+
-# ============== #
-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc")
-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}")
-
···
- PREFIX "${JSONC_DOWNLOAD_PATH}"
- SOURCE_DIR "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build"
- GIT_REPOSITORY "https://github.com/json-c/json-c.git"
+
- GIT_TAG "json-c-0.18-20240915"
- CMAKE_ARGS "-DBUILD_STATIC_LIBS=ON"
- "-DBUILD_SHARED_LIBS=OFF"
- "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}"
- "-DHAVE_ARC4RANDOM=OFF"
- "-DCMAKE_BUILD_TYPE=release"
+
- "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-)
-
-set(JSONC_LIBRARIES
- ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a
-
- bsd
+
-# bsd
-)
+
-
+
# ============ #
+
# Curl library #
+
# ============ #
+
find_package(CURL REQUIRED)
+
include_directories(${CURL_INCLUDE_DIR})
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(JSONC REQUIRED json-c)
+include_directories(${JSONC_INCLUDE_DIRS})
-
-
# ============ #
-
# Curl library #
-
@@ -408,7 +382,7 @@ add_subdirectory(docs)
+
+
+
+
+
# ================================ #
+
# nCurses - for the user interface #
+
# ================================ #
+
@@ -410,7 +379,7 @@ add_subdirectory(docs)
#endforeach()
add_executable(ctune ${SOURCE_FILES})
···
include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include)
add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER})
+
@@ -450,4 +419,4 @@ if(TARGET uninstall)
+
+
add_custom_target(uninstall
+
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeUninstall.cmake)
+
-endif()
+
\ No newline at end of file
+
+endif()
+2 -2
pkgs/by-name/ct/ctune/package.nix
···
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ctune";
-
version = "1.3.3";
+
version = "1.3.4";
src = fetchFromGitHub {
owner = "An7ar35";
repo = "ctune";
tag = "v${finalAttrs.version}";
-
hash = "sha256-jiRUEUmcjuylJj23ZFJS0BNS4NIdzuVL4AmO6CNaxHY=";
+
hash = "sha256-36Y19CbUnv8NtvZjCMKod/Y/Ofjgr9BsxgMMdoMK+hU=";
};
nativeBuildInputs = [
+2 -2
pkgs/by-name/do/dool/package.nix
···
stdenv.mkDerivation rec {
pname = "dool";
-
version = "1.3.6";
+
version = "1.3.8";
src = fetchFromGitHub {
owner = "scottchiefbaker";
repo = "dool";
rev = "v${version}";
-
hash = "sha256-4q57MIQBnXm1zfOXQyIec/T9HWDtX7nZWYMJa4YkSS8=";
+
hash = "sha256-aIGYv8UAC3toQe21xdtPUnsnrJhzbvQLfN/pPU3L2J0=";
};
buildInputs = [
+2 -2
pkgs/by-name/en/enzyme/package.nix
···
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
-
version = "0.0.191";
+
version = "0.0.195";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
-
hash = "sha256-fNTfep7Edl2Bg0Kqq7xDgpzb2u1LECvBMArRFfxHWR0=";
+
hash = "sha256-3plYgsXsP/7fexjyEGIowYBymk+ikdJumQdqBcm1Ljg=";
};
postPatch = ''
+13 -3
pkgs/by-name/ge/gemini-cli/package.nix
···
buildNpmPackage,
fetchFromGitHub,
nix-update-script,
+
ripgrep,
}:
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
-
version = "0.2.2";
+
version = "0.3.4";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
-
hash = "sha256-ykNgtHtH+PPCycRn9j1lc8UIEHqYj54l0MTeVz6OhsQ=";
+
hash = "sha256-nlDXWAfFmhRwfZ46knUeF5ar6huPFLJ5wSxcts4bjfM=";
};
patches = [
# FIXME: remove once https://github.com/google-gemini/gemini-cli/pull/5336 is merged
+
# FIXME: PR is merged though package is failing without the patch
./restore-missing-dependencies-fields.patch
+
# removes @lvce-editor/ripgrep and make upstream code to use ripgrep from nixpkgs
+
./replace-npm-s-ripgrep-with-local.patch
];
-
npmDepsHash = "sha256-gpNt581BHDA12s+3nm95UOYHjoa7Nfe46vgPwFr7ZOU=";
+
npmDepsHash = "sha256-q7E5YEMjHs9RvfT4ctzltqHr/+cCh3M+G6D2MkLiJFg=";
+
+
buildInputs = [
+
ripgrep
+
];
preConfigure = ''
mkdir -p packages/generated
···
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core
+
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-a2a-server
rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-test-utils
rm -f $out/share/gemini-cli/node_modules/gemini-cli-vscode-ide-companion
cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli
cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core
+
cp -r packages/a2a-server $out/share/gemini-cli/node_modules/@google/gemini-cli-a2a-server
ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini
chmod +x "$out/bin/gemini"
+114
pkgs/by-name/ge/gemini-cli/replace-npm-s-ripgrep-with-local.patch
···
+
From aee25e0140635d1d9c51b6b171c2a311c2061f1d Mon Sep 17 00:00:00 2001
+
From: Sergey Volkov <taranarmo@gmail.com>
+
Date: Sun, 7 Sep 2025 13:12:02 +0200
+
Subject: [PATCH] replace npm's ripgrep with local
+
+
---
+
package-lock.json | 28 ----------------------------
+
package.json | 1 -
+
packages/core/package.json | 1 -
+
packages/core/src/tools/ripGrep.ts | 4 ++--
+
4 files changed, 2 insertions(+), 32 deletions(-)
+
+
diff --git a/package-lock.json b/package-lock.json
+
index 7448c7e6..809cb322 100644
+
--- a/package-lock.json
+
+++ b/package-lock.json
+
@@ -11,7 +11,6 @@
+
"packages/*"
+
],
+
"dependencies": {
+
- "@lvce-editor/ripgrep": "^1.6.0",
+
"simple-git": "^3.28.0",
+
"strip-ansi": "^7.1.0"
+
},
+
@@ -1603,32 +1602,6 @@
+
"integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==",
+
"license": "MIT"
+
},
+
- "node_modules/@lvce-editor/ripgrep": {
+
- "version": "1.6.0",
+
- "resolved": "https://registry.npmjs.org/@lvce-editor/ripgrep/-/ripgrep-1.6.0.tgz",
+
- "integrity": "sha512-880taWBVULNXmcPHXdxnFUI0FvLErBOjY9OigMXEsLZ2Q1rjcm6LixOkaccKWC8qFMpzm/ldkO7WOMK+ZRfk5Q==",
+
- "hasInstallScript": true,
+
- "license": "MIT",
+
- "dependencies": {
+
- "@lvce-editor/verror": "^1.6.0",
+
- "execa": "^9.5.2",
+
- "extract-zip": "^2.0.1",
+
- "fs-extra": "^11.3.0",
+
- "got": "^14.4.5",
+
- "path-exists": "^5.0.0",
+
- "tempy": "^3.1.0",
+
- "xdg-basedir": "^5.1.0"
+
- }
+
- },
+
- "node_modules/@lvce-editor/ripgrep/node_modules/path-exists": {
+
- "version": "5.0.0",
+
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+
- "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+
- "license": "MIT",
+
- "engines": {
+
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+
- }
+
- },
+
"node_modules/@lvce-editor/verror": {
+
"version": "1.7.0",
+
"resolved": "https://registry.npmjs.org/@lvce-editor/verror/-/verror-1.7.0.tgz",
+
@@ -14693,7 +14666,6 @@
+
"version": "0.3.4",
+
"dependencies": {
+
"@google/genai": "1.13.0",
+
- "@lvce-editor/ripgrep": "^1.6.0",
+
"@modelcontextprotocol/sdk": "^1.11.0",
+
"@opentelemetry/api": "^1.9.0",
+
"@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0",
+
diff --git a/package.json b/package.json
+
index 232ee82c..7efc1072 100644
+
--- a/package.json
+
+++ b/package.json
+
@@ -92,7 +92,6 @@
+
"yargs": "^17.7.2"
+
},
+
"dependencies": {
+
- "@lvce-editor/ripgrep": "^1.6.0",
+
"simple-git": "^3.28.0",
+
"strip-ansi": "^7.1.0"
+
},
+
diff --git a/packages/core/package.json b/packages/core/package.json
+
index a8ef7a22..37fbd775 100644
+
--- a/packages/core/package.json
+
+++ b/packages/core/package.json
+
@@ -21,7 +21,6 @@
+
],
+
"dependencies": {
+
"@google/genai": "1.13.0",
+
- "@lvce-editor/ripgrep": "^1.6.0",
+
"@modelcontextprotocol/sdk": "^1.11.0",
+
"@opentelemetry/api": "^1.9.0",
+
"@opentelemetry/exporter-logs-otlp-grpc": "^0.203.0",
+
diff --git a/packages/core/src/tools/ripGrep.ts b/packages/core/src/tools/ripGrep.ts
+
index b851c2cd..fa846a38 100644
+
--- a/packages/core/src/tools/ripGrep.ts
+
+++ b/packages/core/src/tools/ripGrep.ts
+
@@ -8,7 +8,7 @@ import fs from 'node:fs';
+
import path from 'node:path';
+
import { EOL } from 'node:os';
+
import { spawn } from 'node:child_process';
+
-import { rgPath } from '@lvce-editor/ripgrep';
+
+
+
import type { ToolInvocation, ToolResult } from './tools.js';
+
import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
+
import { SchemaValidator } from '../utils/schemaValidator.js';
+
@@ -293,7 +293,7 @@ class GrepToolInvocation extends BaseToolInvocation<
+
+
try {
+
const output = await new Promise<string>((resolve, reject) => {
+
- const child = spawn(rgPath, rgArgs, {
+
+ const child = spawn('rg', rgArgs, {
+
windowsHide: true,
+
});
+
+
--
+
2.50.1
+
+2 -2
pkgs/by-name/gi/gitea-mcp-server/package.nix
···
}:
buildGoModule (finalAttrs: {
pname = "gitea-mcp-server";
-
version = "0.3.1";
+
version = "0.3.2";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "gitea-mcp";
tag = "v${finalAttrs.version}";
-
hash = "sha256-wtQMwIm4bQ75t93cWnwEyzpcIA1ZlI2XOVrQJrX0xXo=";
+
hash = "sha256-BuSkrQl7HVZxsMF0w6F2Nf9QEuWpZV6pxChcvSgV0Eo=";
};
vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs=";
+3 -3
pkgs/by-name/go/gofumpt/package.nix
···
buildGoModule (finalAttrs: {
pname = "gofumpt";
-
version = "0.8.0";
+
version = "0.9.0";
src = fetchFromGitHub {
owner = "mvdan";
repo = "gofumpt";
rev = "v${finalAttrs.version}";
-
hash = "sha256-37wYYB0k8mhQq30y1oo77qW3bIqqN/K/NG1RgxK6dyI=";
+
hash = "sha256-5+dc60PyU41NBKOmkp6IwhN+dPliaT38eUcyBNbPIbg=";
};
-
vendorHash = "sha256-T6/xEXv8+io3XwQ2keacpYYIdTnYhTTUCojf62tTwbA=";
+
vendorHash = "sha256-ziqhBWkfWQ0T+gLFqv352PtNcpyCTRFHBfV6iilVGLs=";
env.CGO_ENABLED = "0";
+3 -3
pkgs/by-name/go/gotenberg/package.nix
···
in
buildGo125Module rec {
pname = "gotenberg";
-
version = "8.22.0";
+
version = "8.23.0";
outputs = [
"out"
···
owner = "gotenberg";
repo = "gotenberg";
tag = "v${version}";
-
hash = "sha256-LrkJlUkcvW8ky9e2Ltj13wxcL0rvaE4NfVJrcrgPHL4=";
+
hash = "sha256-sZALMMnOmewhhukPoW6sIw80uPHu+rAZmgYdlZdVH7A=";
};
-
vendorHash = "sha256-JHsuCYx9Ec/w8LBT2R4LxlrfjYyYve0+4/Xq0U1sq5I=";
+
vendorHash = "sha256-fAAaX8E4di6ppU8osLPs6wnAe+e6ogOwp6dQAr42Mes=";
postPatch = ''
find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \;
+12 -13
pkgs/by-name/gu/guile-hoot/package.nix
···
{
lib,
stdenv,
-
fetchFromGitLab,
+
fetchFromGitea,
autoreconfHook,
guile,
pkg-config,
texinfo,
+
nix-update-script,
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "guile-hoot";
-
version = "0.6.0";
+
version = "0.6.1";
-
src = fetchFromGitLab {
+
src = fetchFromGitea {
+
domain = "codeberg.org";
owner = "spritely";
-
repo = "guile-hoot";
-
rev = "v${version}";
-
hash = "sha256-xPU4uLyh3gd2ubyGednCqB3uzKrabhXQhs6vBc8z0ps=";
+
repo = "hoot";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-Y3UWKSjJQnYh+06p+Oi0Fa0ul2T8QWemgNm9A0su5WQ=";
};
nativeBuildInputs = [
···
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
-
configureFlags = [
-
"--with-guile-site-dir=$(out)/${guile.siteDir}"
-
"--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
-
];
+
passthru.updateScript = nix-update-script { };
meta = {
description = "Scheme to WebAssembly compiler backend for GNU Guile and a general purpose WASM toolchain";
-
homepage = "https://gitlab.com/spritely/guile-hoot";
+
homepage = "https://codeberg.org/spritely/hoot";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ jinser ];
platforms = lib.platforms.unix;
};
-
}
+
})
+3 -3
pkgs/by-name/gu/gum/package.nix
···
buildGoModule rec {
pname = "gum";
-
version = "0.16.2";
+
version = "0.17.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "gum";
rev = "v${version}";
-
hash = "sha256-Qs7I9AdJx1FwQK+stgLJbXAIiL+zOYCDf1u+kT7u+Bg=";
+
hash = "sha256-TbheGevUrUKwT97JayW7rfAEgAfRnpOvHyvAxt27sIg=";
};
-
vendorHash = "sha256-jCJUT7RXXPMgKgP48qip8MxcNB+EkrxUruOAj9WRSQA=";
+
vendorHash = "sha256-9vHlQuJA5g5sonfxe+whXDdkROuE3lZzOPYq74tJZtE=";
nativeBuildInputs = [
installShellFiles
+3 -3
pkgs/by-name/ht/httptoolkit/package.nix
···
in
buildNpmPackage rec {
pname = "httptoolkit";
-
version = "1.22.0";
+
version = "1.22.1";
src = fetchFromGitHub {
owner = "httptoolkit";
repo = "httptoolkit-desktop";
tag = "v${version}";
-
hash = "sha256-8zvY/40hcZcoMojARktf5dpCsFFQk6h7P5KwukbEnjw=";
+
hash = "sha256-6iiXOBVtPLdW9MWUcu2Hggm7uPHudASebRPQ34JJTMQ=";
};
-
npmDepsHash = "sha256-yDXakndCGelLNTHD0atsb5MlWFiG8vINfNvsTTAXRTE=";
+
npmDepsHash = "sha256-n4he0Z9XPQIZ8vZcWA7Vo36Oz5RGPGdnV2VJVu5OZRg=";
makeCacheWritable = true;
+2 -2
pkgs/by-name/is/issue2md/package.nix
···
buildGoModule (finalAttrs: {
pname = "issue2md";
-
version = "1.0.0";
+
version = "1.2.0";
src = fetchFromGitHub {
owner = "bigwhite";
repo = "issue2md";
tag = "v${finalAttrs.version}";
-
hash = "sha256-QBEHjFu+YWHPeSZSQT1lzTNSIyLQYXEIi+XopdHN710=";
+
hash = "sha256-jwMaXiGcdNCQZJ2xht1oAcFJohFJiTH3lV3+opZ677g=";
};
vendorHash = null;
+3 -3
pkgs/by-name/le/lefthook/package.nix
···
let
pname = "lefthook";
-
version = "1.12.3";
+
version = "1.12.4";
in
buildGoModule {
inherit pname version;
···
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
-
hash = "sha256-Gx9mM7FEEgnglHLiL3SKAfwTqNPLV4iGvJMVHuMsnuU=";
+
hash = "sha256-GP1pd+ZEJxArjWHtNM+wU/nCzQIvfqCIvRMcWc+iUiw=";
};
-
vendorHash = "sha256-2gYu11NeDtOIVYoFoux0/UbSI63pPp7nOjD2V4fq8ik=";
+
vendorHash = "sha256-n+5tIEI/s32w8oWws6loFrtc8CSb2d368uqKZRkVuJs=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
pkgs/by-name/li/libation/package.nix
···
buildDotnetModule rec {
pname = "libation";
-
version = "12.5.1";
+
version = "12.5.3";
src = fetchFromGitHub {
owner = "rmcrackan";
repo = "Libation";
tag = "v${version}";
-
hash = "sha256-X+87r1ObQ1qrnPfhuUR4aZdCdnTOC8udbJ22tr3zKEQ=";
+
hash = "sha256-4XBbpjxcC5SWLGz0SLKF70G6Gk5bKqKvEwD/My7siUA=";
};
sourceRoot = "${src.name}/Source";
+2 -2
pkgs/by-name/li/lilex/package.nix
···
}:
stdenvNoCC.mkDerivation rec {
pname = "lilex";
-
version = "2.601";
+
version = "2.610";
src = fetchurl {
url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
-
hash = "sha256-qlgaFNxYExerLPtDCYJW17ph97EWcAhICN6Fnpfljlg=";
+
hash = "sha256-iU0NLIy0wAFFBDSYmjo7tjKQ+I1GJ1hZTkcByxePYGM=";
};
nativeBuildInputs = [ unzip ];
-1
pkgs/by-name/ll/llama-cpp/package.nix
···
mainProgram = "llama";
maintainers = with maintainers; [
dit7ya
-
elohmeier
philiptaron
xddxdd
];
+2 -2
pkgs/by-name/lo/local-content-share/package.nix
···
buildGoModule (finalAttrs: {
pname = "local-content-share";
-
version = "34";
+
version = "35";
src = fetchFromGitHub {
owner = "Tanq16";
repo = "local-content-share";
tag = "v${finalAttrs.version}";
-
hash = "sha256-3evUm6J/oGoDiuzVf63byKWbmHf7EAf/JElE7r/yfb8=";
+
hash = "sha256-pFYkq1QqGugOVT0uMPC11ChXtxMwGv4JZKGWIqK7y3s=";
};
vendorHash = null;
+2 -2
pkgs/by-name/me/melange/package.nix
···
buildGoModule rec {
pname = "melange";
-
version = "0.31.0";
+
version = "0.31.1";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = "melange";
rev = "v${version}";
-
hash = "sha256-tNMnS0fq7uqIbfQkjj84SA3L4EFGvnRjIOHRZBptK5M=";
+
hash = "sha256-yCBzeGvGKjYFTkWSPGuFSDH4j+NhfooZgTAVkMHTHsI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
+5 -3
pkgs/by-name/mo/monocle/package.nix
···
rustPlatform.buildRustPackage (finalAttrs: {
pname = "monocle";
-
version = "0.8.0";
+
version = "0.9.0";
src = fetchFromGitHub {
owner = "bgpkit";
repo = "monocle";
tag = "v${finalAttrs.version}";
-
hash = "sha256-vpGCYU/vW4cQFuAWxa+ZkuKLB4NSs5tPW2iWVE8iPAk=";
+
hash = "sha256-7p7asmCHKFAHElYuRKs6BPG7Al3J36sJEss+hDEVQRI=";
};
-
cargoHash = "sha256-1wouA1REbPHm/v4ZB76gfgDPweNV3nztf6XxKdu42GQ=";
+
cargoHash = "sha256-nGeAHIn076WkVnab7lUn4K1/TQ01Bgk/huxm12pzzkQ=";
# require internet access
checkFlags = [
···
"--skip=datasets::rpki::validator::tests::test_list_asn"
"--skip=datasets::rpki::validator::tests::test_list_prefix"
"--skip=datasets::rpki::validator::tests::test_validation"
+
"--skip=filters::search::tests::test_build_broker_with_filters"
+
"--skip=filters::search::tests::test_pagination_logic"
];
doInstallCheck = true;
+2 -2
pkgs/by-name/ne/netbootxyz-efi/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "netboot.xyz-efi";
-
version = "2.0.87";
+
version = "2.0.88";
src = fetchurl {
url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${finalAttrs.version}/netboot.xyz.efi";
-
hash = "sha256-8kd17ChqLuVH5/OdPc2rVDKEDWHl9ZWLh8k+EBrCGH8=";
+
hash = "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E=";
};
dontUnpack = true;
+2 -2
pkgs/by-name/nv/nvidia-modprobe/package.nix
···
}:
stdenv.mkDerivation rec {
pname = "nvidia-modprobe";
-
version = "580.76.05";
+
version = "580.82.07";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-modprobe";
rev = version;
-
hash = "sha256-NGVd+uur4jYcnmhIuK5qy0ktm95da89adUQpJbRT3VI=";
+
hash = "sha256-KJxuAgE816N0gkWSzXPsTSGFNbFukKT3dDhUzqn6fBE=";
};
nativeBuildInputs = [ gnum4 ];
+3 -3
pkgs/by-name/oh/oha/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "oha";
-
version = "1.9.0";
+
version = "1.10.0";
src = fetchFromGitHub {
owner = "hatoo";
repo = "oha";
tag = "v${version}";
-
hash = "sha256-ZUZee+jEhTaVGwYtNvYHckdLxb9axOsLUYkKrd07Zvg=";
+
hash = "sha256-xzzlW0oYjlvOItSTmMM5wBlPd7JcmLvpJ+Bf0cCh4ao=";
};
-
cargoHash = "sha256-HUy41huDWTmpdPkcCB4Kti7oAI7M5q5gB8u/UZlLrU4=";
+
cargoHash = "sha256-k3NlPGtWyj8mTvH+FIasiwrf7JjyY2yKJVTHFjPnIEI=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
-1
pkgs/by-name/ol/ollama/package.nix
···
maintainers = with maintainers; [
abysssol
dit7ya
-
elohmeier
prusnak
];
};
+3 -3
pkgs/by-name/pa/papeer/package.nix
···
buildGoModule rec {
pname = "papeer";
-
version = "0.8.4";
+
version = "0.8.5";
src = fetchFromGitHub {
owner = "lapwat";
repo = "papeer";
rev = "v${version}";
-
hash = "sha256-dkOLlWeG6ixbqLJU/1x2R1meKpcXb63C8EXH5FlD38k=";
+
hash = "sha256-9cHbXo/kpe9S6MQE4wzgCZ4+m9gwGmckRmNhI+1zrS8=";
};
-
vendorHash = "sha256-3QRSdkx9p0H+zPB//bpWCBKKjKjrx0lHMk5lFm+U7pA=";
+
vendorHash = "sha256-ZPkaS2obfeWS5/tWSkDe+Lua95mvoNXeNx3JEXrx/Es=";
doCheck = false; # uses network
+2 -2
pkgs/by-name/pa/paretosecurity/package.nix
···
webkitgtk_4_1
];
pname = "paretosecurity";
-
version = "0.3.2";
+
version = "0.3.3";
src = fetchFromGitHub {
owner = "ParetoSecurity";
repo = "agent";
rev = finalAttrs.version;
-
hash = "sha256-TXKymCFr2lrbgmbCxI3vIKx61nbOaRmuUTwNn7k0Hm0=";
+
hash = "sha256-IZrpGwm+j1jcKtcM23lcycOlLUuGerF41fWanWBgr40=";
};
vendorHash = "sha256-DlCGCheJHa4HPM7kfX/UbOfLukAiaoP7QZnabkZVASM=";
+50
pkgs/by-name/pb/pbc/package.nix
···
+
{
+
lib,
+
stdenv,
+
fetchurl,
+
gmp,
+
flex,
+
bison,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "pbc";
+
version = "1.0.0";
+
+
src = fetchurl {
+
url = "https://crypto.stanford.edu/pbc/files/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+
hash = "sha256-GCdaNnKDB3uv419EMgBJnjsZxKN1SVPaKhsvDWtZItw=";
+
};
+
+
outputs = [
+
"out"
+
"dev"
+
];
+
+
buildInputs = [
+
gmp
+
];
+
nativeBuildInputs = [
+
bison
+
flex
+
];
+
+
strictDeps = true;
+
+
env = {
+
LEX = "flex";
+
LEXLIB = "-lfl";
+
ac_cv_lib_fl_yywrap = "yes";
+
};
+
+
meta = {
+
description = "Pairing-based cryptography library by Stanford";
+
homepage = "https://crypto.stanford.edu/pbc/";
+
license = with lib.licenses; [
+
lgpl3Only
+
asl20
+
];
+
maintainers = with lib.maintainers; [ tphanir ];
+
platforms = lib.platforms.unix;
+
};
+
})
+2 -2
pkgs/by-name/qu/quill-log/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "quill-log";
-
version = "10.0.1";
+
version = "10.1.0";
src = fetchFromGitHub {
owner = "odygrd";
repo = "quill";
tag = "v${finalAttrs.version}";
-
hash = "sha256-MLdCw+erKFYajZ4gB1KXNjd3wNMVez1OPASQyn4DXtM=";
+
hash = "sha256-nCU+7y2ssvV8VDxQ51fjG4d/vsmWRkHpWWoUaXNTQcQ=";
};
nativeBuildInputs = [ cmake ];
+2 -2
pkgs/by-name/ru/rundeck/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "rundeck";
-
version = "5.14.1-20250818";
+
version = "5.15.0-20250902";
src = fetchurl {
url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-
hash = "sha256-x+Le75dX5NcnOAMK77VyKltbwqNy0tfpXB/HeXKCS4A=";
+
hash = "sha256-3Nlpd0Sl6NCH+TNPNnh7NJxzOZUNQvKupyFOQOdJsto=";
};
nativeBuildInputs = [ makeWrapper ];
+6 -3
pkgs/by-name/sa/satisfactorymodmanager/package.nix
···
stdenv,
buildGoModule,
fetchFromGitHub,
-
nodejs,
+
nodejs_20,
pnpm_8,
wails,
wrapGAppsHook3,
···
copyDesktopItems,
}:
+
let
+
# NodeJS 22.18.0 broke our build, not sure why
+
wails' = wails.override { nodejs = nodejs_20; };
+
in
buildGoModule rec {
pname = "satisfactorymodmanager";
version = "3.0.3";
···
'';
nativeBuildInputs = [
-
nodejs
pnpm_8.configHook
-
wails
+
wails'
wrapGAppsHook3
copyDesktopItems
];
+1 -1
pkgs/by-name/sc/schemacrawler/package.nix
···
lgpl3Only
];
platforms = platforms.unix;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
})
+3 -3
pkgs/by-name/sc/scrcpy/package.nix
···
}:
let
-
version = "3.3.1";
+
version = "3.3.2";
prebuilt_server = fetchurl {
name = "scrcpy-server";
inherit version;
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-
hash = "sha256-oPcLIKpJmPv2WMlBGM1sjatqu7Bkejvas0TXC8Hry7g=";
+
hash = "sha256-LuXKCGPvRA9bfHWFa7R1xSg9CoNZyzcLHBYTFP0p39k=";
};
in
stdenv.mkDerivation rec {
···
owner = "Genymobile";
repo = "scrcpy";
tag = "v${version}";
-
hash = "sha256-WotmLbktFLVpoRSmlxj7RLRYDhVQ7AWp4Awgry7kgIM=";
+
hash = "sha256-rwEsJlYlOIdgQfniAXdE2sg0WdI1ZxWxZV6MTFQoueg=";
};
# display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
+3 -3
pkgs/by-name/si/sigtop/package.nix
···
buildGoModule rec {
name = "sigtop";
-
version = "0.21.0";
+
version = "0.22.0";
src = fetchFromGitHub {
owner = "tbvdm";
repo = "sigtop";
rev = "v${version}";
-
sha256 = "sha256-xW+fwyXNM11KoU3cCfPzAjBsz6yQlTHkmDWitoq1p1k=";
+
sha256 = "sha256-EvdO7fGnNdu1/f61c4k2dpeMUqKaq9xKGgevAQ+f3q0=";
};
-
vendorHash = "sha256-V47Z96ZoIgDQbGocpAJ/4oiK6uJXY8XTndsAifETbCc=";
+
vendorHash = "sha256-EAMnuDm3Lmw2i4sumgCTE58JCtMq9QeT6pjtmC/PKMA=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libsecret ];
+2 -2
pkgs/by-name/sl/slipshow/package.nix
···
ocamlPackages.buildDunePackage rec {
pname = "slipshow";
-
version = "0.5.0";
+
version = "0.6.0";
src = fetchFromGitHub {
owner = "panglesd";
repo = "slipshow";
tag = "v${version}";
-
hash = "sha256-Q/ga5sQ3QfoRzlC7TD7HVKig+nxxk92hizDqYzJlW1Y=";
+
hash = "sha256-cmBq9RYjvl355+tV+Nf7XmDzgbOqusCjVrqoC34R5CI=";
};
postPatch = ''
+2 -2
pkgs/by-name/st/strawberry/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "strawberry";
-
version = "1.2.12";
+
version = "1.2.13";
src = fetchFromGitHub {
owner = "jonaski";
repo = "strawberry";
rev = finalAttrs.finalPackage.version;
-
hash = "sha256-09aUhouuE9SFHwtNeB4QtrAhKrP8m3ZbO+t4EKvxhMo=";
+
hash = "sha256-0peM1d8ks4yYwK9+3bUf713MjEzI25TSexyFIP/r3b0=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
+2 -2
pkgs/by-name/ta/tana/package.nix
···
stdenv.cc.cc
stdenv.cc.libc
];
-
version = "1.0.41";
+
version = "1.0.43";
in
stdenv.mkDerivation {
pname = "tana";
···
src = fetchurl {
url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-
hash = "sha256-x1L0Al/3RDVuAIqA/5ntnU0Iz77N3sPyD0dNHpi+S74=";
+
hash = "sha256-jYidVJgVqm2O/WZT03NseO557R8eT1/js+PwqzDucKw=";
};
nativeBuildInputs = [
+2 -2
pkgs/by-name/ta/tauno-monitor/package.nix
···
}:
python3Packages.buildPythonApplication rec {
pname = "tauno-monitor";
-
version = "0.2.16";
+
version = "0.2.17";
pyproject = false;
src = fetchFromGitHub {
owner = "taunoe";
repo = "tauno-monitor";
tag = "v${version}";
-
hash = "sha256-0fwZc/aAdHsw8/Wa+Efi9lcvoWuJeJvTUaUUGzR1C+E=";
+
hash = "sha256-klYL9A2E7MsgzX9Aj0nrmaKWjvzI3giZVZVvFot16XU=";
};
nativeBuildInputs = [
+3 -3
pkgs/by-name/te/terramate/package.nix
···
buildGoModule rec {
pname = "terramate";
-
version = "0.14.4";
+
version = "0.14.5";
src = fetchFromGitHub {
owner = "terramate-io";
repo = "terramate";
rev = "v${version}";
-
hash = "sha256-36AZBi4QYmYc+0e6LsWkGmanf13hyCJZU7kusP/zwlQ=";
+
hash = "sha256-SS+N/jwI7im906HJiUKcq3Ac1epHkP7186ihbndsHSw=";
};
-
vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU=";
+
vendorHash = "sha256-qM6BeCCf60VJhhHKDoHahqQfXH4VZjP8QdfGcF2egaA=";
# required for version info
nativeBuildInputs = [ git ];
+54 -58
pkgs/by-name/tl/tlclient/package.nix
···
testers,
}:
-
stdenv.mkDerivation (
-
finalAttrs:
-
let
-
version = "4.18.0";
-
buildNum = "3768";
-
in
-
{
-
pname = "tlclient";
-
version = "${version}-${buildNum}";
-
-
src = fetchurl {
-
url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz";
-
hash = "sha256-fTezGhn0UESEQRPrHYVZNcplV48wb5X/xqplIfLRLAA=";
-
};
-
-
nativeBuildInputs = [
-
autoPatchelfHook
-
];
+
let
+
version = "4.19.0";
+
buildNum = "4005";
+
in
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "tlclient";
+
version = "${version}-${buildNum}";
-
buildInputs = [
-
alsa-lib
-
libX11
-
pcsclite
-
];
+
src = fetchurl {
+
url = "https://www.cendio.com/downloads/clients/tl-${finalAttrs.version}-client-linux-dynamic-x86_64.tar.gz";
+
hash = "sha256-shlhu0m+TPgw3ndR70QdJ6Z0AyJdI/xmHJv+ZbFVokE=";
+
};
-
dontConfigure = true;
-
dontBuild = true;
+
nativeBuildInputs = [
+
autoPatchelfHook
+
];
-
installPhase = ''
-
runHook preInstall
+
buildInputs = [
+
alsa-lib
+
libX11
+
pcsclite
+
];
-
mkdir -p "$out"
-
cp -R lib "$out/"
-
cp -R lib/tlclient/share "$out/"
+
dontConfigure = true;
+
dontBuild = true;
-
install -Dm644 "lib/tlclient/EULA.txt" "$out/share/licenses/tlclient/EULA.txt"
-
install -m644 "lib/tlclient/open_source_licenses.txt" "$out/share/licenses/tlclient/open_source_licenses.txt"
-
substituteInPlace "$out/share/applications/thinlinc-client.desktop" \
-
--replace-fail "/opt/thinlinc/bin/" ""
+
installPhase = ''
+
runHook preInstall
-
install -Dm644 "etc/tlclient.conf" "$out/etc/tlclient.conf"
-
install -Dm755 bin/tlclient* -t "$out/bin"
-
install -Dm644 "lib/tlclient/thinlinc_128.png" "$out/share/icons/hicolor/128x128/apps/thinlinc-client.png"
+
rm etc/ssh_known_hosts
+
rm --recursive lib/tlclient/lib
+
substituteInPlace lib/tlclient/share/applications/thinlinc-client.desktop \
+
--replace-fail "/opt/thinlinc/bin/" ""
+
cp --recursive . $out
+
cp --recursive $out/lib/tlclient/share $out/share
+
install -D --mode=0644 $out/lib/tlclient/EULA.txt $out/share/licenses/tlclient/EULA.txt
+
install -D --mode=0644 $out/lib/tlclient/open_source_licenses.txt $out/share/licenses/tlclient/open_source_licenses.txt
-
runHook postInstall
-
'';
+
runHook postInstall
+
'';
-
passthru.tests.version = testers.testVersion {
-
package = finalAttrs.finalPackage;
-
version = "${version} build ${buildNum}";
-
};
+
passthru.tests.version = testers.testVersion {
+
package = finalAttrs.finalPackage;
+
version = "${version} build ${buildNum}";
+
};
-
meta = {
-
description = "Linux remote desktop client built on open source technology";
-
license = {
-
fullName = "Cendio End User License Agreement 3.2";
-
url = "https://www.cendio.com/thinlinc/docs/legal/eula";
-
free = false;
-
};
-
homepage = "https://www.cendio.com/";
-
changelog = "https://www.cendio.com/thinlinc/docs/relnotes/${version}/";
-
maintainers = with lib.maintainers; [ felixalbrigtsen ];
-
platforms = with lib.platforms; linux ++ darwin ++ windows;
-
broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64);
-
mainProgram = "tlclient";
+
meta = {
+
description = "Linux remote desktop client built on open source technology";
+
license = {
+
fullName = "Cendio end-user license agreement";
+
url = "https://www.cendio.com/thinlinc/docs/legal/eula";
+
free = false;
};
-
}
-
)
+
homepage = "https://www.cendio.com/";
+
changelog = "https://www.cendio.com/thinlinc/docs/relnotes/${version}/";
+
maintainers = with lib.maintainers; [
+
felixalbrigtsen
+
kyehn
+
];
+
platforms = with lib.platforms; linux ++ darwin ++ windows;
+
broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64);
+
mainProgram = "tlclient";
+
};
+
})
+4 -14
pkgs/by-name/tr/tracexec/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "tracexec";
-
version = "0.12.0";
+
version = "0.13.0-unstable-2025-09-07";
src = fetchFromGitHub {
owner = "kxxt";
repo = "tracexec";
-
tag = "v${version}";
-
hash = "sha256-j1zgHDO5bmJAXi9KvkHqenm/QfM9DmD9yNqF6TxJ9sY=";
+
rev = "dbb9b733370f5200df2a0de7f007312c23431480";
+
hash = "sha256-M2ZIfWupnFxQZvr5cl8V0xtLgh+xBcaHHVsHIoio7nI=";
};
-
# remove if updating to rust 1.85
-
postPatch = ''
-
substituteInPlace Cargo.toml \
-
--replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]' \
-
--replace-fail 'rust-version = "1.85"' ""
-
'';
-
-
# remove if updating to rust 1.85
-
env.RUSTC_BOOTSTRAP = 1;
-
-
cargoHash = "sha256-XuuLuIeD/S60by/hg1fR+ML3PtIyX9JNrEvgGzI3UiM=";
+
cargoHash = "sha256-cyzSxibLw6sb0V3ueNcp55OhFQ5jUNJWcSF8uYnzG2M=";
hardeningDisable = [ "zerocallusedregs" ];
+3 -3
pkgs/by-name/tr/traefik/package.nix
···
buildGo124Module (finalAttrs: {
pname = "traefik";
-
version = "3.5.0";
+
version = "3.5.1";
# Archive with static assets for webui
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-
hash = "sha256-xsTf6DASRUlV1dJooZQjIBmdtdeLYZwVTvznZ7LxoZ4=";
+
hash = "sha256-rmw9D0nYBFsxBhlVyxUHOSszSeVl0Wme7Pj/pCvPxsA=";
stripRoot = false;
};
-
vendorHash = "sha256-rs68UCXzi4JfZqdJpr4kPqmpfZU4CIC8AK2YCXy0i14=";
+
vendorHash = "sha256-Juf5LYB/o1hyTIZB5NQrJBOLdkEjL1mOsBgndF3vpd8=";
subPackages = [ "cmd/traefik" ];
+3 -3
pkgs/by-name/ty/typos/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "typos";
-
version = "1.35.5";
+
version = "1.35.6";
src = fetchFromGitHub {
owner = "crate-ci";
repo = "typos";
tag = "v${version}";
-
hash = "sha256-fXgid1pLhIb1xxvKlOQ2T3o/5tsmIiv4zIqvBwsXAnU=";
+
hash = "sha256-THkmrZJt5+qtaErqceG9dppo0LPNq6fHdvLAHmie3/o=";
};
-
cargoHash = "sha256-8MbxBghyg7ZoqYYftIiUBvxewFvCa/5clvyiNyeLGyQ=";
+
cargoHash = "sha256-V/OYr+XWSP43O2ShVpd9n0i/D3BW3qjkoOgZNj/+H40=";
passthru.updateScript = nix-update-script { };
+3 -1
pkgs/by-name/vu/vulkan-cts/package.nix
···
cp -a external/vulkancts/modules/vulkan/deqp-vk $out/bin/
cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/
cp -a external/vulkancts/modules/vulkan/vk-default $out/
+
'';
+
postFixup = ''
+
patchelf --add-rpath "${vulkan-loader}/lib" --add-needed "libvulkan.so" $out/bin/deqp-vk
wrapProgram $out/bin/deqp-vk \
-
--add-flags '--deqp-vk-library-path=${vulkan-loader}/lib/libvulkan.so' \
--add-flags "--deqp-archive-dir=$out/archive-dir"
'';
+24 -32
pkgs/by-name/xe/xemu/package.nix
···
SDL2_image,
fetchFromGitHub,
gettext,
+
git,
glib,
gtk3,
cmake,
···
stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
-
version = "0.8.96";
+
version = "0.8.97";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
tag = "v${finalAttrs.version}";
-
hash = "sha256-42DnlnaSWVazmct9AL1/QaVqNgYe5NCMVHRJY6axo98=";
-
fetchSubmodules = true;
+
hash = "sha256-xx3f4khNV4CwtM9R2NQ2usDc/ScGEaZ3EbyDv1jaHtQ=";
+
nativeBuildInputs = [
+
git
+
meson
+
];
# also fetch required git submodules
postFetch = ''
cd "$out"
export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-
${lib.getExe meson} subprojects download \
+
meson subprojects download \
SPIRV-Reflect VulkanMemoryAllocator berkeley-softfloat-3 berkeley-testfloat-3 genconfig glslang imgui \
implot json keycodemapdb nv2a_vsh_cpu tomlplusplus volk xxhash || true
find subprojects -type d -name .git -prune -execdir rm -r {} +
'';
};
-
+
__structuredAttrs = true;
nativeBuildInputs = [
SDL2
meson
···
++ (with python3Packages; [
python
pyyaml
+
distlib
]);
buildInputs = [
···
strictDeps = true;
postPatch = ''
-
patchShebangs .
+
patchShebangs scripts
substituteInPlace ./scripts/xemu-version.sh \
--replace-fail 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'"
···
substituteInPlace ./build.ninja --replace /usr/bin/env $(which env)
'';
-
installPhase =
-
let
-
installIcon = resolution: ''
-
install -Dm644 -T ../ui/icons/xemu_${resolution}.png \
-
$out/share/icons/hicolor/${resolution}/apps/xemu.png
-
'';
-
in
-
''
-
runHook preInstall
+
installPhase = ''
+
runHook preInstall
-
install -Dm755 -T qemu-system-i386 $out/bin/xemu
-
''
-
+ (lib.concatMapStringsSep "\n" installIcon [
-
"16x16"
-
"24x24"
-
"32x32"
-
"48x48"
-
"128x128"
-
"256x256"
-
"512x512"
-
])
-
+ "\n"
-
+ ''
-
install -Dm644 -T ../ui/xemu.desktop $out/share/applications/xemu.desktop
+
install -Dm755 -T qemu-system-i386 $out/bin/xemu
+
+
for resolution in 16x16 24x24 32x32 48x48 128x128 256x256 512x512
+
do
+
install -Dm644 -T ../ui/icons/xemu_$resolution.png \
+
$out/share/icons/hicolor/$resolution/apps/xemu.png
+
done
-
runHook postInstall
-
'';
+
install -Dm644 -T ../ui/xemu.desktop $out/share/applications/xemu.desktop
+
+
runHook postInstall
+
'';
meta = {
homepage = "https://xemu.app/";
···
platforms = lib.platforms.linux;
};
})
-
# TODO: investigate failure when using __structuredAttrs
+28 -9
pkgs/by-name/xr/xrizer/package.nix
···
{
fetchFromGitHub,
+
fetchpatch2,
lib,
libGL,
libxkbcommon,
···
rustPlatform,
shaderc,
vulkan-loader,
+
stdenv,
}:
rustPlatform.buildRustPackage rec {
pname = "xrizer";
-
version = "0.2";
+
version = "0.3";
src = fetchFromGitHub {
owner = "Supreeeme";
repo = "xrizer";
tag = "v${version}";
-
hash = "sha256-0RICNxF8RBHthve69Z9msTg2+jegg5K4aHYRF0YZ8a4=";
+
hash = "sha256-o6/uGbczYp5t6trjFIltZAMSM61adn+BvNb1fBhBSsk=";
};
-
cargoHash = "sha256-87JcULH1tAA487VwKVBmXhYTXCdMoYM3gOQTkM53ehE=";
+
patches = [
+
(fetchpatch2 {
+
name = "xrizer-fix-flaky-tests.patch";
+
url = "https://github.com/Supreeeme/xrizer/commit/f58d797e75a8d920982abeaeedee83877dd3c493.diff?full_index=1";
+
hash = "sha256-TI++ZY7QX1iaj3WT0woXApSY2Tairraao5kzF77ewYY=";
+
})
+
];
+
+
cargoHash = "sha256-kXcnD98ZaqRAA3jQvIoWSRC37Uq8l5PUYEzubxfMuUI=";
nativeBuildInputs = [
pkg-config
···
'';
postInstall = ''
-
mkdir -p $out/lib/xrizer/bin/linux64
-
ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/bin/linux64/vrclient.so"
+
mkdir -p $out/lib/xrizer/$platformPath
+
ln -s "$out/lib/libxrizer.so" "$out/lib/xrizer/$platformPath/vrclient.so"
'';
+
+
platformPath =
+
{
+
"aarch64-linux" = "bin/linuxarm64";
+
"i686-linux" = "bin";
+
"x86_64-linux" = "bin/linux64";
+
}
+
."${stdenv.hostPlatform.system}";
passthru.updateScript = nix-update-script { };
···
homepage = "https://github.com/Supreeeme/xrizer";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ Scrumplex ];
-
# TODO: support more systems
-
# To do so, we need to map systems to the format openvr expects.
-
# i.e. x86_64-linux -> linux64, aarch64-linux -> linuxarm64
-
platforms = [ "x86_64-linux" ];
+
platforms = [
+
"x86_64-linux"
+
"i686-linux"
+
"aarch64-linux"
+
];
};
}
+10
pkgs/by-name/ze/zed-editor/package.nix
···
# We rename it ourselves for now, until upstream fixes the issue
substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
+
+
# The generate-licenses script wants a specific version of cargo-about eventhough
+
# newer versions work just as well.
+
substituteInPlace script/generate-licenses \
+
--replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
'';
cargoHash = "sha256-ehFq0e5G+3242nMHFIDFXVhZCyjwxfMckjhKQ7Iwbu0=";
···
checkFlags = [
# Flaky: unreliably fails on certain hosts (including Hydra)
"--skip=zed::tests::test_window_edit_state_restoring_enabled"
+
# The following tests are flaky on at least x86_64-linux and aarch64-darwin,
+
# where they sometimes fail with: "database table is locked: workspaces".
+
"--skip=zed::tests::test_open_file_in_many_spaces"
+
"--skip=zed::tests::test_open_non_existing_file"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Flaky: unreliably fails on certain hosts (including Hydra)
"--skip=zed::open_listener::tests::test_open_workspace_with_directory"
+
"--skip=zed::open_listener::tests::test_open_workspace_with_nonexistent_files"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Fails on certain hosts (including Hydra) for unclear reason
+11 -5
pkgs/by-name/zi/zipline/package.nix
···
pnpm_10,
nodejs_24,
makeWrapper,
+
prisma,
prisma-engines,
ffmpeg,
openssl,
···
stdenv.mkDerivation (finalAttrs: {
pname = "zipline";
-
version = "4.2.3";
+
version = "4.3.0";
src = fetchFromGitHub {
owner = "diced";
repo = "zipline";
tag = "v${finalAttrs.version}";
-
hash = "sha256-WyL/ItY/hvmBDRBB063QAIATPT51bPChkFKH7i32sz0=";
+
hash = "sha256-/UNSAvXfVeybFGFFQaVklAbKGT64pa37DmUilzo5ss4=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git_head
···
'';
};
+
postPatch = ''
+
substituteInPlace src/lib/db/migration/index.ts \
+
--replace-fail "pnpm prisma" ${lib.getExe' prisma "prisma"}
+
'';
+
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
-
fetcherVersion = 1;
-
hash = "sha256-LDLcde+p0wjy1BddiNxJwFLS/7O9jGpMNapojZIipeA=";
+
fetcherVersion = 2;
+
hash = "sha256-TCbtaxc8AEpFhaHpK+NIrLPR6dQ+iFIEfEfwKob61yI=";
};
buildInputs = [
···
mkdir -p $out/{bin,share/zipline}
-
cp -r build generated node_modules prisma .next mimes.json code.json package.json $out/share/zipline
+
cp -r build node_modules prisma mimes.json code.json package.json $out/share/zipline
mkBin() {
makeWrapper ${lib.getExe nodejs_24} "$out/bin/$1" \
+2 -2
pkgs/development/python-modules/canonical-sphinx-extensions/default.nix
···
buildPythonPackage rec {
pname = "canonical-sphinx-extensions";
-
version = "0.0.33";
+
version = "0.0.34";
pyproject = true;
src = fetchPypi {
pname = "canonical_sphinx_extensions";
inherit version;
-
hash = "sha256-Rb4FK1e0pb+fub58Fq61i3kMhRm/nekHNr91zft8iJY=";
+
hash = "sha256-y9wiXj4FOkOt3Pt2EFbX5xO+f8V5eaI0G6LzuGbdY0o=";
};
build-system = [
+1 -1
pkgs/development/python-modules/celery-types/default.nix
···
description = "PEP-484 stubs for Celery";
homepage = "https://github.com/sbdchd/celery-types";
license = licenses.mit;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
}
+1 -1
pkgs/development/python-modules/django-ninja/default.nix
···
description = "Web framework for building APIs with Django and Python type hints";
homepage = "https://django-ninja.dev";
license = licenses.mit;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
}
+1 -1
pkgs/development/python-modules/django-stubs-ext/default.nix
···
homepage = "https://github.com/typeddjango/django-stubs";
changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}";
license = licenses.mit;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
}
+1 -1
pkgs/development/python-modules/django-stubs/default.nix
···
homepage = "https://github.com/typeddjango/django-stubs";
changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}";
license = licenses.mit;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
}
+1 -1
pkgs/development/python-modules/djangorestframework-stubs/default.nix
···
homepage = "https://github.com/typeddjango/djangorestframework-stubs";
changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${src.tag}";
license = licenses.mit;
-
maintainers = with maintainers; [ elohmeier ];
+
maintainers = with maintainers; [ ];
};
}
+2 -2
pkgs/development/python-modules/ibis/default.nix
···
buildPythonPackage rec {
pname = "ibis";
-
version = "3.2.0";
+
version = "3.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
···
owner = "dmulholl";
repo = "ibis";
rev = version;
-
hash = "sha256-EPz9zHnxR75WoRaiHKJNiCRWFwU1TBpC4uHz62jUOqM=";
+
hash = "sha256-9ELOAQhD6KXyTN2U0lGmNxxSzx9o2QIt+CNa6i8o5xs=";
};
checkPhase = ''
+3 -4
pkgs/development/python-modules/imbalanced-learn/default.nix
···
tensorflow,
threadpoolctl,
pytestCheckHook,
-
sklearn-compat,
python,
}:
buildPythonPackage rec {
pname = "imbalanced-learn";
-
version = "0.13.0";
+
version = "0.14.0";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "scikit-learn-contrib";
repo = "imbalanced-learn";
tag = version;
-
hash = "sha256-osmALi5vTV+3kgldY/VhYkNvpXX11KwJ/dIX/5E7Uhc=";
+
hash = "sha256-1R7jHOkTO3zK9bkUvvOPQ420ofqIO7J1rqixFEbApR0=";
};
build-system = [
···
scikit-learn
scipy
threadpoolctl
-
sklearn-compat
];
optional-dependencies = {
···
disabledTests = [
# Broken upstream test https://github.com/scikit-learn-contrib/imbalanced-learn/issues/1131
"test_estimators_compatibility_sklearn"
+
"test_balanced_bagging_classifier_with_function_sampler"
];
meta = {
+2 -2
pkgs/development/python-modules/jupyter-docprovider/default.nix
···
buildPythonPackage rec {
pname = "jupyter-docprovider";
-
version = "2.1.0";
+
version = "2.1.1";
pyproject = true;
src = fetchPypi {
pname = "jupyter_docprovider";
inherit version;
-
hash = "sha256-ivZhxlMAM0V3+i4mpltghvv2Z01ilt3rv6/XTUGMlNM=";
+
hash = "sha256-cwPzUoU0d9ipbj3mEADzCpt97n98AjfVUsrupPRER3k=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/langgraph-cli/default.nix
···
buildPythonPackage rec {
pname = "langgraph-cli";
-
version = "0.4.0";
+
version = "0.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
tag = "cli==${version}";
-
hash = "sha256-/SPrX5O7Tt7fhATqN2fS7wSM+CJTY3QLmlUbfaCoFzo=";
+
hash = "sha256-me9Qn7wwDsls419LOoRnYgIgmCblqLEFwNdH3I/tv0U=";
};
sourceRoot = "${src.name}/libs/cli";
+2 -2
pkgs/development/python-modules/libretranslate/default.nix
···
buildPythonPackage rec {
pname = "libretranslate";
-
version = "1.7.2";
+
version = "1.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "LibreTranslate";
repo = "LibreTranslate";
tag = "v${version}";
-
hash = "sha256-PTr42XtZMruWWdFEc6TX4jbWH5Vypgbx2Dhxy6ZG1Y4=";
+
hash = "sha256-eX/CZlHqUkarrilE4UoTMF8U/b7hn6F3nMxYnDPQ238=";
};
build-system = [
+2 -2
pkgs/development/python-modules/oslo-serialization/default.nix
···
buildPythonPackage rec {
pname = "oslo-serialization";
-
version = "5.7.0";
+
version = "5.8.0";
pyproject = true;
src = fetchPypi {
pname = "oslo_serialization";
inherit version;
-
hash = "sha256-vcTT3Ze4BjmzUF5G2apDn8lQKIFBd/MLkXQ+gTZsO+c=";
+
hash = "sha256-WHGmKyP5jKzVUYSClBrm0qmD4pNu1S1UOtCGhdxtI0M=";
};
build-system = [
+2 -2
pkgs/development/python-modules/pyfwup/default.nix
···
buildPythonPackage rec {
pname = "pyfwup";
-
version = "0.5.2";
+
version = "0.5.3";
pyproject = true;
···
owner = "greatscottgadgets";
repo = "pyfwup";
tag = version;
-
hash = "sha256-Kyc3f8beTg0W1+U7SvZuNPN1pdsco9rBUfoEtR7AI44=";
+
hash = "sha256-Dy/mO5dWvuuzas9XPY8ibZCuPUP8NGaUVt0j2cvhZrM=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/pytest-ansible/default.nix
···
buildPythonPackage rec {
pname = "pytest-ansible";
-
version = "25.6.3";
+
version = "25.8.0";
pyproject = true;
disabled = pythonOlder "3.10";
···
owner = "ansible";
repo = "pytest-ansible";
tag = "v${version}";
-
hash = "sha256-NOvVzZCqbPbzbDgrs94qgS82c+8U+ysyH/LdQRsawt4=";
+
hash = "sha256-y90dvIY0Kvjvc7SYXgtAwNsP/D64k4pJ6rH+v79D1dM=";
};
postPatch = ''
+23 -2
pkgs/development/python-modules/python-constraint/default.nix
···
lib,
buildPythonPackage,
fetchFromGitHub,
+
setuptools,
+
poetry-core,
+
cython,
# Check inputs
pytestCheckHook,
+
pytest-cov-stub,
+
tomli,
+
pep440,
}:
buildPythonPackage rec {
pname = "python-constraint";
version = "2.4.0";
-
format = "setuptools";
+
pyproject = true;
src = fetchFromGitHub {
owner = "python-constraint";
···
sha256 = "sha256-Vi+dD/QmHfUrL0l5yTb7B1ILuXj3HYfT0QINdyfoqFo=";
};
-
nativeCheckInputs = [ pytestCheckHook ];
+
build-system = [
+
setuptools
+
poetry-core
+
cython
+
];
+
+
nativeCheckInputs = [
+
pytestCheckHook
+
pytest-cov-stub
+
tomli
+
pep440
+
];
+
+
disabledTestPaths = [
+
"tests/test_util_benchmark.py"
+
];
meta = with lib; {
description = "Constraint Solving Problem resolver for Python";
+2 -2
pkgs/development/python-modules/pytorch-lightning/default.nix
···
buildPythonPackage rec {
pname = "pytorch-lightning";
-
version = "2.5.4";
+
version = "2.5.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Lightning-AI";
repo = "pytorch-lightning";
tag = version;
-
hash = "sha256-BScZ1JlJeJ067C5AwWnD0thJvUcsCryp3k/oZsWlwJ8=";
+
hash = "sha256-8CDVvgaxnFWO4Fl5lW/+cn/1WZCgVXYys86iOVNYUfY=";
};
preConfigure = ''
+2 -2
pkgs/development/python-modules/sagemaker-core/default.nix
···
buildPythonPackage rec {
pname = "sagemaker-core";
-
version = "1.0.55";
+
version = "1.0.57";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "sagemaker-core";
tag = "v${version}";
-
hash = "sha256-Qt7AgS9x9hgM6Qs5trfP6wEAKAuR6aOMz2VFtLdmXt8=";
+
hash = "sha256-FV8cFA/LDbIVNBIvAo7VRajexbxvqpwKk2hiY1xbehI=";
};
build-system = [
+2 -2
pkgs/development/python-modules/srctools/default.nix
···
}:
let
pname = "srctools";
-
version = "2.6.0";
+
version = "2.6.1";
in
buildPythonPackage {
inherit pname version;
···
src = fetchPypi {
inherit pname version;
-
hash = "sha256-QHPRSgu3i443kLeLeJXVpPP0hqMbsi4lScAYHrrfWEM=";
+
hash = "sha256-EPdK8IALfcPhfzHiAR2FC821Z0Igkik9+mpky3eIsoM=";
};
build-system = [
+2 -2
pkgs/development/python-modules/trl/default.nix
···
buildPythonPackage rec {
pname = "trl";
-
version = "0.21.0";
+
version = "0.22.2";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "trl";
tag = "v${version}";
-
hash = "sha256-9jbbbiGa/2NqHKe9rxDRyzfaWyy7tsoeHaMlpg0Oxk0=";
+
hash = "sha256-ZfIdPEG2+JcRUgVDtdQueE/F4DwNVPx+kAxqaXaUSk4=";
};
build-system = [
+1 -1
pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix
···
version = "0.2.4";
in
buildPythonPackage {
-
format = "setuptools";
inherit pname version;
+
pyproject = true;
src = fetchPypi {
inherit pname version;
+4 -2
pkgs/development/python-modules/ultralytics/default.nix
···
opencv-python,
pandas,
pillow,
+
polars,
psutil,
py-cpuinfo,
pyyaml,
···
buildPythonPackage rec {
pname = "ultralytics";
-
version = "8.3.174";
+
version = "8.3.193";
pyproject = true;
src = fetchFromGitHub {
owner = "ultralytics";
repo = "ultralytics";
tag = "v${version}";
-
hash = "sha256-wQ16e67ldrV8KwAXoLyxqzx9DG+LAmU5Mt+65dQzUkY=";
+
hash = "sha256-5+QSRQcfzxy/m197wUgMc6C1EwcNLpfZLN5V3cSrY8c=";
};
build-system = [ setuptools ];
···
opencv-python
pandas
pillow
+
polars
psutil
py-cpuinfo
pyyaml
+145 -198
pkgs/development/rocm-modules/6/aotriton/default.nix
···
lib,
stdenv,
fetchFromGitHub,
+
fetchpatch,
cmake,
rocm-cmake,
clr,
-
rocblas,
-
rocsolver,
-
gtest,
-
msgpack,
-
libxml2,
python3,
-
python3Packages,
-
openmp,
-
hipblas-common,
-
hipblas,
-
nlohmann_json,
-
triton-llvm,
-
rocmlir,
-
lapack-reference,
ninja,
-
ncurses,
-
libffi,
-
zlib,
-
zstd,
xz,
+
writableTmpDirAsHomeHook,
pkg-config,
-
buildTests ? false,
-
buildBenchmarks ? false,
-
buildSamples ? false,
-
gpuTargets ? [
+
gpuTargets ? clr.localGpuTargets or clr.gpuTargets,
+
# for passthru.tests
+
aotriton,
+
hello,
+
}:
+
let
+
supportedTargets = lib.lists.intersectLists [
# aotriton GPU support list:
# https://github.com/ROCm/aotriton/blob/main/v2python/gpu_targets.py
"gfx90a"
"gfx942"
+
"gfx950"
"gfx1100"
-
"gfx1101"
-
],
-
}:
-
-
stdenv.mkDerivation (
-
finalAttrs:
-
let
-
py = python3.withPackages (ps: [
-
ps.pyyaml
-
ps.distutils
-
ps.setuptools
-
ps.packaging
-
ps.numpy
-
ps.wheel
-
ps.filelock
-
ps.iniconfig
-
ps.pluggy
-
ps.pybind11
-
]);
-
gpuTargets' = lib.concatStringsSep ";" gpuTargets;
-
compiler = "amdclang++";
-
cFlags = "-O3 -DNDEBUG";
-
cxxFlags = "${cFlags} -Wno-c++11-narrowing";
-
triton-llvm' = triton-llvm;
-
in
-
{
-
pname = "aotriton";
-
version = "0.9.2b";
-
-
src = fetchFromGitHub {
-
owner = "ROCm";
-
repo = "aotriton";
-
rev = "${finalAttrs.version}";
-
hash = "sha256-1Cf0olD3zRg9JESD6s/WaGifm3kfD12VUvjTZHpmGAE=";
-
fetchSubmodules = true;
-
};
-
env.CXX = compiler;
-
env.ROCM_PATH = "${clr}";
-
requiredSystemFeatures = [ "big-parallel" ];
-
-
outputs = [
-
"out"
-
]
-
++ lib.optionals buildTests [
-
"test"
-
]
-
++ lib.optionals buildBenchmarks [
-
"benchmark"
-
]
-
++ lib.optionals buildSamples [
-
"sample"
-
];
+
"gfx1151"
+
"gfx1150"
+
"gfx1201"
+
"gfx1200"
+
] gpuTargets;
+
supportedTargets' = lib.concatStringsSep ";" supportedTargets;
+
anySupportedTargets = supportedTargets != [ ];
+
in
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "aotriton";
+
version = "0.10b";
-
# Need an empty cuda.h for this to compile
-
# Better than pulling in unfree cuda headers
-
postPatch = ''
-
touch third_party/triton/third_party/nvidia/include/cuda.h
+
src = fetchFromGitHub {
+
owner = "ROCm";
+
repo = "aotriton";
+
tag = finalAttrs.version;
+
hash = "sha256-stAHnsqChkNv69wjlhM/qUetrJpNwI1i7rGnPMwsNz0=";
+
leaveDotGit = true;
+
# fetch all submodules except unused triton submodule that is ~500MB
+
postFetch = ''
+
cd $out
+
git reset --hard HEAD
+
for submodule in $(git config --file .gitmodules --get-regexp path | awk '{print $2}' | grep '^third_party/' | grep -v '^third_party/triton$'); do
+
git submodule update --init --recursive "$submodule"
+
done
+
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
+
};
-
doCheck = false;
-
doInstallCheck = false;
+
cmakeBuildType = "RelWithDebInfo";
+
separateDebugInfo = true;
+
__structuredAttrs = true;
+
strictDeps = true;
+
# Only set big-parallel when we are building kernels, no-image mode build is faster
+
requiredSystemFeatures = if anySupportedTargets then [ "big-parallel" ] else [ ];
-
nativeBuildInputs = [
-
cmake
-
rocm-cmake
-
pkg-config
-
py
-
clr
-
ninja
-
];
+
env = {
+
ROCM_PATH = "${clr}";
+
CFLAGS = "-w -g1 -gz -Wno-c++11-narrowing";
+
CXXFLAGS = finalAttrs.env.CFLAGS;
+
};
-
buildInputs = [
-
rocblas
-
rocsolver
-
hipblas-common
-
hipblas
-
openmp
-
libffi
-
ncurses
-
xz
-
nlohmann_json
-
rocmlir
+
nativeBuildInputs = [
+
cmake
+
rocm-cmake
+
pkg-config
+
python3
+
ninja
+
clr
+
writableTmpDirAsHomeHook # venv wants to cache in ~
+
];
-
msgpack
-
libxml2
-
python3Packages.msgpack
-
zlib
-
zstd
-
]
-
++ lib.optionals buildTests [
-
gtest
-
]
-
++ lib.optionals (buildTests || buildBenchmarks) [
-
lapack-reference
-
];
+
buildInputs = [
+
clr
+
xz
+
]
+
++ (with python3.pkgs; [
+
wheel
+
packaging
+
pyyaml
+
numpy
+
filelock
+
iniconfig
+
pluggy
+
pybind11
+
pandas
+
triton
+
]);
-
env.TRITON_OFFLINE_BUILD = 1;
-
env.LLVM_SYSPATH = "${triton-llvm'}";
-
env.JSON_SYSPATH = nlohmann_json;
-
env.MLIR_DIR = "${triton-llvm'}/lib/cmake/mlir";
-
env.CXXFLAGS = "-I/build/source/third_party/triton/third_party/nvidia/backend/include";
+
patches = [
+
# CMakeLists.txt: AOTRITON_INHERIT_SYSTEM_SITE_TRITON flag
+
(fetchpatch {
+
url = "https://github.com/ROCm/aotriton/commit/9734c3e999c412a07d2b35671998650942b26ed4.patch";
+
hash = "sha256-tBmjjhRJmLv3K6F2+4OcMuwf8dH7efPPECMQjh6QdUA=";
+
})
+
];
-
# Fix up header issues in triton: https://github.com/triton-lang/triton/pull/3985/files
-
preConfigure = ''
-
mkdir third_party/triton/third_party/nvidia/backend/include/
-
touch third_party/triton/third_party/nvidia/backend/include/cuda.h
-
find third_party/triton -type f -exec sed -i 's|[<]cupti.h[>]|"cupti.h"|g' {} +
-
find third_party/triton -type f -exec sed -i 's|[<]cuda.h[>]|"cuda.h"|g' {} +
+
# Excerpt from README:
+
# Note: do not run ninja separately, due to the limit of the current build system,
+
# ninja install will run the whole build process unconditionally.
+
dontBuild = true;
+
# This builds+installs
+
installPhase = ''
+
runHook preInstall
+
ninja -v install
+
runHook postInstall
+
'';
+
# tests are intended to be ran manually as test/ python scripts and need accelerator
+
doCheck = false;
+
doInstallCheck = false;
-
sed -i '2s;^;set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON CACHE BOOL "ON")\n;' CMakeLists.txt
-
sed -i '2s;^;set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON")\n;' CMakeLists.txt
-
sed -i '2s;^;set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON CACHE BOOL "ON")\n;' third_party/triton/CMakeLists.txt
-
sed -i '2s;^;set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON")\n;' third_party/triton/CMakeLists.txt
-
substituteInPlace third_party/triton/python/setup.py \
-
--replace-fail "from distutils.command.clean import clean" "import setuptools;from distutils.command.clean import clean" \
-
--replace-fail 'system == "Linux"' 'False'
-
# Fix 'ld: error: unable to insert .comment after .comment'
-
substituteInPlace v2python/ld_script.py \
-
--replace-fail 'INSERT AFTER .comment;' ""
+
# Need to set absolute paths to VENV and its PYTHON or
+
# build fails with "AOTRITON_INHERIT_SYSTEM_SITE_TRITON is enabled
+
# but triton is not available … no such file or directory"
+
# Set via a preConfigure hook so a valid absolute path can be
+
# picked if nix-shell is used against this package
+
preConfigure = ''
+
cmakeFlagsArray+=(
+
"-DVENV_DIR=$(pwd)/aotriton-venv/"
+
"-DVENV_BIN_PYTHON=$(pwd)/aotriton-venv/bin/python"
+
)
+
'';
-
cmakeFlagsArray+=(
-
'-DCMAKE_C_FLAGS_RELEASE=${cFlags}'
-
'-DCMAKE_CXX_FLAGS_RELEASE=${cxxFlags}'
-
)
-
prependToVar cmakeFlags "-GNinja"
-
mkdir -p /build/tmp-home
-
export HOME=/build/tmp-home
-
'';
+
cmakeFlags = [
+
# Disable building kernels if no supported targets are enabled
+
(lib.cmakeBool "AOTRITON_NOIMAGE_MODE" (!anySupportedTargets))
+
# Use preinstalled triton from our python's site-packages
+
(lib.cmakeBool "AOTRITON_INHERIT_SYSTEM_SITE_TRITON" true)
+
# Manually define CMAKE_INSTALL_<DIR>
+
# See: https://github.com/NixOS/nixpkgs/pull/197838
+
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+
]
+
++ lib.optionals anySupportedTargets [
+
# Note: build will warn "AMDGPU_TARGETS was not set, and system GPU detection was unsuccsesful."
+
# but this can safely be ignored, aotriton uses a different approach to pass targets
+
(lib.cmakeFeature "AOTRITON_TARGET_ARCH" supportedTargets')
+
];
-
# Excerpt from README:
-
# Note: do not run ninja separately, due to the limit of the current build system,
-
# ninja install will run the whole build process unconditionally.
-
dontBuild = true;
-
-
installPhase = ''
-
runHook preInstall
-
ninja -v install
-
runHook postInstall
-
'';
-
-
cmakeFlags = [
-
"-Wno-dev"
-
"-DAOTRITON_NOIMAGE_MODE=ON" # FIXME: Should be able to build with object code but generate_shim is failing
-
"-DCMAKE_BUILD_TYPE=Release"
-
"-DCMAKE_VERBOSE_MAKEFILE=ON"
-
"-DVIRTUALENV_PYTHON_EXENAME=${lib.getExe py}"
-
"-DCMAKE_CXX_COMPILER=${compiler}"
-
# Manually define CMAKE_INSTALL_<DIR>
-
# See: https://github.com/NixOS/nixpkgs/pull/197838
-
"-DCMAKE_INSTALL_BINDIR=bin"
-
"-DCMAKE_INSTALL_LIBDIR=lib"
-
"-DCMAKE_INSTALL_INCLUDEDIR=include"
-
"-DAMDGPU_TARGETS=${gpuTargets'}"
-
"-DGPU_TARGETS=${gpuTargets'}"
-
]
-
++ lib.optionals buildTests [
-
"-DBUILD_CLIENTS_TESTS=ON"
-
]
-
++ lib.optionals buildBenchmarks [
-
"-DBUILD_CLIENTS_BENCHMARKS=ON"
-
]
-
++ lib.optionals buildSamples [
-
"-DBUILD_CLIENTS_SAMPLES=ON"
-
];
-
-
postInstall =
-
lib.optionalString buildTests ''
-
mkdir -p $test/bin
-
mv $out/bin/hipblas-test $test/bin
-
''
-
+ lib.optionalString buildBenchmarks ''
-
mkdir -p $benchmark/bin
-
mv $out/bin/hipblas-bench $benchmark/bin
-
''
-
+ lib.optionalString buildSamples ''
-
mkdir -p $sample/bin
-
mv $out/bin/example-* $sample/bin
-
''
-
+ lib.optionalString (buildTests || buildBenchmarks || buildSamples) ''
-
rmdir $out/bin
+
passthru.tests = {
+
# regression test that aotriton so doesn't crash in static constructor
+
# currently known to fail on rocm toolchain but fine with default stdenv
+
ld-preload-into-hello = stdenv.mkDerivation {
+
name = "aotriton-basic-load-test";
+
nativeBuildInputs = [ hello ];
+
buildCommand = ''
+
set -e
+
LD_PRELOAD=${
+
aotriton.override {
+
gpuTargets = [ ];
+
}
+
}/lib/libaotriton_v2.so ${hello}/bin/hello > /dev/null
+
echo "ld-preload-into-hello" > $out
'';
-
meta = with lib; {
-
description = "ROCm Ahead of Time (AOT) Triton Math Library ";
-
homepage = "https://github.com/ROCm/aotriton";
-
license = with licenses; [ mit ];
-
teams = [ teams.rocm ];
-
platforms = platforms.linux;
};
-
}
-
)
+
};
+
+
meta = {
+
description = "ROCm Ahead of Time (AOT) Triton Math Library";
+
homepage = "https://github.com/ROCm/aotriton";
+
license = lib.licenses.mit;
+
teams = [ lib.teams.rocm ];
+
platforms = lib.platforms.linux;
+
# ld: error: unable to insert .comment after .comment
+
broken = stdenv.cc.isClang;
+
};
+
})
+2 -1
pkgs/development/rocm-modules/6/default.nix
···
python3Packages,
triton-llvm,
openmpi,
+
stdenv,
rocmGpuArches ? [ ],
}:
···
# Replaces hip, opencl-runtime, and rocclr
clr = self.callPackage ./clr { };
-
aotriton = self.callPackage ./aotriton { };
+
aotriton = self.callPackage ./aotriton { inherit stdenv; };
hipify = self.callPackage ./hipify {
inherit (llvm)
+2 -2
pkgs/misc/apulse/default.nix
···
stdenv.mkDerivation rec {
pname = "apulse";
-
version = "0.1.13";
+
version = "0.1.14";
src = fetchFromGitHub {
owner = "i-rinat";
repo = pname;
rev = "v${version}";
-
sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn";
+
sha256 = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI=";
};
nativeBuildInputs = [
+2 -2
pkgs/servers/nosql/influxdb/default.nix
···
# https://github.com/influxdata/flux/pull/5542
../influxdb2/fix-unsigned-char.patch
];
-
# Don't fail on missing code documentation
+
# Don't fail on missing code documentation and allow dead_code/lifetime warnings
postPatch = ''
substituteInPlace flux-core/src/lib.rs \
-
--replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
+
--replace-fail "deny(warnings, missing_docs))]" "deny(warnings), allow(dead_code, mismatched_lifetime_syntaxes))]"
'';
sourceRoot = "${src.name}/libflux";
+1 -3
pkgs/top-level/all-packages.nix
···
zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
-
zexy = callPackage ../applications/audio/pd-plugins/zexy {
-
autoconf = buildPackages.autoconf269;
-
};
+
zexy = callPackage ../applications/audio/pd-plugins/zexy { };
zed-editor-fhs = zed-editor.fhs;