diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 6572ca12e2d5..83f2b5da36df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild (finalAttrs: { pname = "ebuild-mode"; - version = "1.82"; + version = "1.83"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Rb1L++Ln7jGmdIpXTIBg7x64hHAm0b/yJqILKllCNQs="; + hash = "sha256-xZA3Vkh8frgXzyGZs5UELdBh0vrcsXJN/2aJX56QH0Y="; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index e48cc56a2c3e..fae91613fd19 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -773,7 +773,7 @@ let mozc = super.mozc.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace src/unix/emacs/mozc.el \ - --replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"' + --replace '"mozc_emacs_helper"' '"${pkgs.mozc}/bin/mozc_emacs_helper"' ''; }); diff --git a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix index e68f0a702232..d2e8dcbddf83 100644 --- a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "oxc"; name = "oxc-vscode"; - version = "1.56.0"; - hash = "sha256-wosNcp6CaS7WrH3NwXnsnEdABG2G9BZxRflh+lhr9+Q="; + version = "1.57.0"; + hash = "sha256-kz4YqPcDjBX7hT3O7odPQgYmGMO34VGw16d6mpzXq7c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3ee9ec16f3af..d77a12b33f9c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1310,13 +1310,13 @@ "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" }, "temporalio_temporalcloud": { - "hash": "sha256-8jui3CeYBu2xWHO5SgLvVKBfh2icUCQrKAFoRwdrev8=", + "hash": "sha256-gWboOWDlfoMIlfmeGOom83T/ymMW8leqO0tzrG5xhmk=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.3.0", + "rev": "v1.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" + "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg=" }, "tencentcloudstack_tencentcloud": { "hash": "sha256-hBKPD0hQ9kjypeG8Q8xLD2pKGnyWjKAKGnImYG9hsq8=", diff --git a/pkgs/by-name/dl/dlpack/package.nix b/pkgs/by-name/dl/dlpack/package.nix new file mode 100644 index 000000000000..e8c0db107313 --- /dev/null +++ b/pkgs/by-name/dl/dlpack/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + stdenv, + + # nativeBuildInputs + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "dlpack"; + version = "1.3"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "dmlc"; + repo = "dlpack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kIHBgTYaHEmweRBFtRl1pXhOyQ5TEwU8dLUssTMEnpc="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # no tests + doCheck = false; + + meta = { + description = "Open in-memory tensor structure for sharing tensors among frameworks"; + homepage = "https://github.com/dmlc/dlpack"; + downloadPage = "https://github.com/dmlc/dlpack/releases"; + changelog = "https://github.com/dmlc/dlpack/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ prince213 ]; + }; +}) diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 3859417670f0..5b903277b5a0 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.39.0"; + version = "4.40.0"; src = fetchFromGitHub { owner = "DNSControl"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-2pesk5yT7YPROZiX7bqjRhQi4bk3YS0nxSkP+RjZ1so="; + hash = "sha256-1W37AZT3VJ84onz0HCJLZb/uGSuWVdsahBAIY5g1ssA="; }; - vendorHash = "sha256-pzdOW+L/w74ANaCKXWQviBMDlSTOfebAVE7Cdd+lZLo="; + vendorHash = "sha256-MH06qnCc9YSBmPWGuoh+8V1gRxaKw8W5ejhrNeceZSE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix index e399239f37d9..939523e02ce0 100644 --- a/pkgs/by-name/fe/feishu-cli/package.nix +++ b/pkgs/by-name/fe/feishu-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "feishu-cli"; - version = "1.25.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "riba2534"; repo = "feishu-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kdGSptmdBqtlgDhwSqx4kv47uNS1LcBDkfYWVR6vRwY="; + hash = "sha256-oaq0/+tUK2eWX+8BEGk/oAN4eIxZ9/qW6pildPxZPRw="; }; - vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8="; + vendorHash = "sha256-HzyP2IZL+lNgf9n7A1681lfWcH6eAb6IrqPWvAsq25Q="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix index c73462bb1cbc..e582b795899f 100644 --- a/pkgs/by-name/gi/git-graph/package.nix +++ b/pkgs/by-name/gi/git-graph/package.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command line tool to show clear git graphs arranged for your branching model"; homepage = "https://github.com/mlange-42/git-graph"; license = lib.licenses.mit; - broken = stdenv.hostPlatform.isDarwin; maintainers = with lib.maintainers; [ cafkafk matthiasbeyer diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 41e80d294946..542c21fd4601 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gosec"; - version = "2.26.1"; + version = "2.27.0"; src = fetchFromGitHub { owner = "securego"; repo = "gosec"; rev = "v${finalAttrs.version}"; - hash = "sha256-/iurQn0fNTonpSSFf1llmFA5+CYSb/vYFGE0JKbcL90="; + hash = "sha256-X+jF98POuFlHY6PjTn3t3GQHwNDgHKW4ZnzN9LjjunE="; }; - vendorHash = "sha256-57fYXBbir4jPiYPtTH1iVNFPWZWfq/Sx21Z4jC3fEWs="; + vendorHash = "sha256-kgUM93dbZMdj039kmtjo/DGQdVCe0UhSb1ucZF3Xjeg="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/io/ios-deploy/package.nix b/pkgs/by-name/io/ios-deploy/package.nix index 21b6fc5b4f9c..ad7aed063795 100644 --- a/pkgs/by-name/io/ios-deploy/package.nix +++ b/pkgs/by-name/io/ios-deploy/package.nix @@ -6,7 +6,7 @@ }: let - privateFrameworks = "/Library/Apple/System/Library/PrivateFrameworks"; + privateFrameworks = "/System/Library/PrivateFrameworks"; in stdenv.mkDerivation (finalAttrs: { pname = "ios-deploy"; @@ -23,9 +23,10 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild awk '{ print "\""$0"\\n\""}' src/scripts/lldb.py >> src/ios-deploy/lldb.py.h + cp -RL ${privateFrameworks}/MobileDevice.framework MobileDevice.framework clang src/ios-deploy/ios-deploy.m \ -framework Foundation \ - -F${privateFrameworks} -framework MobileDevice \ + -F. -framework MobileDevice \ -o ios-deploy runHook postBuild diff --git a/pkgs/by-name/jo/journalist/package.nix b/pkgs/by-name/jo/journalist/package.nix index 55dfce15d4dd..4857d336fbfa 100644 --- a/pkgs/by-name/jo/journalist/package.nix +++ b/pkgs/by-name/jo/journalist/package.nix @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { hash = "sha256-3MnkndG2c4P3oprIRbzj26oAutEmAgsUx8mjlaDLrkI="; }; - vendorHash = "sha256-2EJ96dhhU7FZxMkHOmQo79WCHu8U1AGgFf47FIuQdek=s"; + vendorHash = "sha256-2EJ96dhhU7FZxMkHOmQo79WCHu8U1AGgFf47FIuQdek="; ldflags = [ "-s" diff --git a/pkgs/by-name/li/libcdr/package.nix b/pkgs/by-name/li/libcdr/package.nix index ffe4268e7513..5aae3f0ce3cf 100644 --- a/pkgs/by-name/li/libcdr/package.nix +++ b/pkgs/by-name/li/libcdr/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcdr"; - version = "0.1.8"; + version = "0.1.9"; src = fetchurl { url = "https://dev-www.libreoffice.org/src/libcdr-${finalAttrs.version}.tar.xz"; - hash = "sha256-ztZ3yDALKckdMAS7Hd3wuZdhv1VEmRwmwu6PQn6HGTw="; + hash = "sha256-97tqvdfyJoIPKIqT3Y0HdZgzwCUNniAq+Q+bMSxGZaM="; }; strictDeps = true; diff --git a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix index 1f7c69560cc5..b88aff468db2 100644 --- a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_hcl"; - version = "0.112.2"; + version = "0.113.1"; src = fetchFromGitHub { owner = "Yethal"; repo = "nu_plugin_hcl"; tag = finalAttrs.version; - hash = "sha256-yarqYNv/J7q5061MrS+kCiDAhi34x5wikX2qfLkd1T8="; + hash = "sha256-4rbYbyIYy3WEn2hSkreohVWJ8zhQHI/cdBN5xO4YKdY="; }; - cargoHash = "sha256-8OosaIX7tgKX2M2H4Pn8hVJJtT4bat1ByFjnFAtoI5w="; + cargoHash = "sha256-lFlG86yGR61jgmKxTp2FYir2o0vEAVeoPk1owDGGWLM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/re/recordbox/fix-glycin-paths.patch b/pkgs/by-name/re/recordbox/fix-glycin-paths.patch deleted file mode 100644 index 27b4b1401588..000000000000 --- a/pkgs/by-name/re/recordbox/fix-glycin-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs -index 08db832..4f44b21 100644 ---- a/vendor/glycin/src/sandbox.rs -+++ b/vendor/glycin/src/sandbox.rs -@@ -202,7 +202,7 @@ impl Sandbox { - - args.push(self.exec()); - -- ("bwrap".into(), args, Some(seccomp_memfd)) -+ ("@bwrap@".into(), args, Some(seccomp_memfd)) - } - SandboxMechanism::FlatpakSpawn => { - let memory_limit = Self::memory_limit(); -@@ -299,8 +299,8 @@ impl Sandbox { - "/", - // Make /usr available as read only - "--ro-bind", -- "/usr", -- "/usr", -+ "/nix/store", -+ "/nix/store", - // Make tmpfs dev available - "--dev", - "/dev", diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index 0f63ee9a58a0..fec7c9434630 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -3,7 +3,6 @@ stdenv, appstream-glib, blueprint-compiler, - bubblewrap, cargo, dbus, desktop-file-utils, @@ -15,39 +14,32 @@ hicolor-icon-theme, lcms2, libadwaita, + libglycin, libseccomp, libxml2, meson, ninja, nix-update-script, pkg-config, - replaceVars, rustPlatform, rustc, sqlite, wrapGAppsHook4, }: - -let - glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { - bwrap = "${bubblewrap}/bin/bwrap"; - }; -in - stdenv.mkDerivation (finalAttrs: { pname = "recordbox"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromCodeberg { owner = "edestcroix"; repo = "Recordbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-9rrVlD+ODl+U9bPzbXGLQBLkbnfAm4SmJHRcVife33A="; + hash = "sha256-HskhMZy8y61c/j/F5e5aM41AQ8t+TCUq/iY23SFB92o="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-W60X69/fEq/X6AK1sbT6rb+SsF/oPzfUvrar0fihr88="; + hash = "sha256-xHukIMUG5himj1umKn+IKM7kJ29MH/pt/jPEHd2EeT0="; }; strictDeps = true; @@ -60,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { glib # For `glib-compile-schemas` gtk4 # For `gtk-update-icon-cache` libxml2 # For `xmllint` + libglycin.patchVendorHook meson ninja pkg-config @@ -70,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libglycin.setupHook + glycin-loaders dbus gtk4 hicolor-icon-theme @@ -92,22 +87,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug"; - # Workaround copied from https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74 - preConfigure = '' - # Dirty approach to add patches after cargoSetupPostUnpackHook - # We should eventually use a cargo vendor patch hook instead - pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${glycinPathsPatch} - popd - ''; - preFixup = '' - # Needed for the glycin crate to find loaders. - # https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" - ) - ''; - checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/rh/rhvoice/package.nix b/pkgs/by-name/rh/rhvoice/package.nix index ae54561acdce..409e31190028 100644 --- a/pkgs/by-name/rh/rhvoice/package.nix +++ b/pkgs/by-name/rh/rhvoice/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "rhvoice"; - version = "1.16.5"; + version = "1.18.4"; src = fetchFromGitHub { owner = "RHVoice"; repo = "RHVoice"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-4l4S4MUnVGN/El1BBuZvzPPcavUefjMyBk1hk0ux7zo="; + hash = "sha256-CwwWZE60YxLL4kZBHdNqI/gk5yi6MFAJ2pg8LApwwl4="; }; patches = [ diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index da37008fa74b..9c6d5d96d8e9 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "26.2.26"; + version = "26.4.30"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; tag = "v${finalAttrs.version}"; - hash = "sha256-dOkk2LGFtuCvec8NGoSIjAXQsCZcnx2fB3h6KWFeHj4="; + hash = "sha256-qDW7d0pWYd8ZofXKCEfXl4/XQ9tfEjhJf8avf4tM0q8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 6fbe0aa2f2a5..8b9bd40f6520 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "supabase-cli"; - version = "2.101.0"; + version = "2.102.0"; __structuredAttrs = true; @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { owner = "supabase"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-bsABVdMrRjr0Ndc6q0KgwRwr5PfLZOXMm9rr7RlTf38="; + hash = "sha256-vJCAem5qAiF9H2xYe8r1lE56W4k60VgNFcTFPY9xP9I="; }; # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli. sourceRoot = "${finalAttrs.src.name}/apps/cli-go"; - vendorHash = "sha256-FMRq2t28Wbxi//eWarjdLauaVz1iIZA2OuF03Y1QOFY="; + vendorHash = "sha256-O+dFhk+JLKs+hqxh/6VHDTxZ/TBUl4LBGEuFBHgAyS8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ta/tango-icon-theme/package.nix b/pkgs/by-name/ta/tango-icon-theme/package.nix index e2d7277ee0d7..4e430bcbd5a7 100644 --- a/pkgs/by-name/ta/tango-icon-theme/package.nix +++ b/pkgs/by-name/ta/tango-icon-theme/package.nix @@ -18,27 +18,33 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://tango.freedesktop.org/releases/tango-icon-theme-${finalAttrs.version}.tar.gz"; - sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f"; + hash = "sha256-bpjYAy1X2BisyQfsR+anGIUf8lGufCmq+4aHQ+tlyI4="; }; patches = [ ./rsvg-convert.patch ]; - nativeBuildInputs = [ + depsBuildBuild = [ pkg-config + ]; + + nativeBuildInputs = [ intltool gtk3 - ]; - buildInputs = [ - iconnamingutils - imagemagick librsvg + imagemagick + iconnamingutils + gnome-icon-theme + hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; # still missing parent icon themes: cristalsvg + strictDeps = true; + dontDropIconThemeCache = true; configureFlags = [ "--enable-png-creation" ]; @@ -47,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: { gtk-update-icon-cache $out/share/icons/Tango ''; + __structuredAttrs = true; + meta = { description = "Basic set of icons"; homepage = "https://tango.freedesktop.org/Tango_Icon_Library"; diff --git a/pkgs/by-name/to/torrserver/package.nix b/pkgs/by-name/to/torrserver/package.nix index 20d4d6c45daa..d5863bdd746d 100644 --- a/pkgs/by-name/to/torrserver/package.nix +++ b/pkgs/by-name/to/torrserver/package.nix @@ -7,15 +7,15 @@ }: buildGo126Module rec { pname = "torrserver"; - version = "141"; + version = "141.4"; src = fetchFromGitHub { owner = "YouROK"; repo = "TorrServer"; tag = "MatriX.${version}"; - sha256 = "sha256-OeAAYyxfZxcx0ANeRAWJTrZMNWtdrM/pwXyO5QNTwYo="; + sha256 = "sha256-wTcHBD4rfcuZWSZjwqAXwlAp6qFQWacjqvXl9L7CnnQ="; }; - vendorHash = "sha256-rjdE9yf6S3ZovEeRO0+5sJsy9PRdFFejFDhkgJLMz58="; + vendorHash = "sha256-IPVaGgjcQp6+jw2nbzZZ4ZiQYzqw7zs5RM07J5ON4Bw="; modRoot = "server"; subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/xc/xcape/package.nix b/pkgs/by-name/xc/xcape/package.nix index b13d3d4e7779..20ecf58592bd 100644 --- a/pkgs/by-name/xc/xcape/package.nix +++ b/pkgs/by-name/xc/xcape/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, + fetchpatch, pkg-config, libx11, libxtst, @@ -11,15 +12,20 @@ stdenv.mkDerivation { pname = "xcape"; - version = "unstable-2018-03-01"; + version = "1.2"; - src = fetchFromGitHub { - owner = "alols"; - repo = "xcape"; - rev = "a34d6bae27bbd55506852f5ed3c27045a3c0bd9e"; - sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8"; + src = fetchurl { + url = "http://deb.debian.org/debian/pool/main/x/xcape/xcape_1.2.orig.tar.gz"; + hash = "sha256-on7YhP2U8DBYr2Wjnt/jrz8vj7t2upkgACp2vgf7KCE="; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/x/xcape/1.2-3/debian/patches/0001-Fix-cross-building-by-removing-hard-coded-pkg-config.patch"; + hash = "sha256-uQNy7EIQdAO5iHYNA2pBoDltNrn1xrfAAjN/ZdGGa4s="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index 5c63319bb74e..01e8f819be54 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { # `xvfb` inherits `version` and `src` from here, leading to many rebuilds. If # necessary, these can be moved out of lockstep in order to merge updates # quickly. - version = "21.1.22"; + version = "21.1.23"; outputs = [ "out" @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM="; + hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix index f765440f13f6..d14e35338776 100644 --- a/pkgs/by-name/xv/xvfb/package.nix +++ b/pkgs/by-name/xv/xvfb/package.nix @@ -3,6 +3,7 @@ { lib, stdenv, + fetchurl, meson, ninja, pkg-config, @@ -37,7 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xvfb"; - inherit (xorg-server) src version; + # TODO: rebuild avoidance. revert on staging. + # inherit (xorg-server) src version; + version = "21.1.22"; + src = fetchurl { + url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-GiQsiRfEm6KczB9gIWE9iiuYBd0NJxpmrp0J9LC7BrM="; + }; strictDeps = true; diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix index 0a36d9525919..3cbc38b3f223 100644 --- a/pkgs/by-name/xw/xwayland/package.nix +++ b/pkgs/by-name/xw/xwayland/package.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwayland"; - version = "24.1.11"; + version = "24.1.12"; src = fetchurl { url = "mirror://xorg/individual/xserver/xwayland-${finalAttrs.version}.tar.xz"; - hash = "sha256-JxFaGogZB4QJv2/s/rdyToE3vTZCbecAWls6rgohOP8="; + hash = "sha256-bfAsURuSwbmEhzTZ0bA6TCT4N1ujytpE6WhKIbX3jiE="; }; postPatch = '' diff --git a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix index 2f29c1beab9e..5616fd7bd5d7 100644 --- a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix +++ b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix @@ -1,9 +1,7 @@ { - autoAddDriverRunpath, backendStdenv, catch2_3, cmake, - cuda_cccl, cuda_cudart, cuda_nvcc, cuda_nvrtc, @@ -13,19 +11,19 @@ gitUpdater, lib, libcublas, - ninja, nlohmann_json, + + withSamples ? true, + withTests ? true, }: let inherit (lib) licenses maintainers teams; inherit (lib.lists) optionals; inherit (lib.strings) cmakeBool - cmakeFeature optionalString ; in -# TODO(@connorbaker): This should be a hybrid C++/Python package. backendStdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; strictDeps = true; @@ -34,13 +32,13 @@ backendStdenv.mkDerivation (finalAttrs: { name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "cudnn-frontend"; - version = "1.16.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "cudnn-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-+8aBl9dKd2Uz50XoOr91NRyJ4OGJtzfDNNNYGQJ9b94="; + hash = "sha256-I6el8e6Jo1l/S5eqxWiH2KksNxw4hJ+av5qj/yqJjI8="; }; # nlohmann_json should be the only vendored dependency. @@ -59,59 +57,56 @@ backendStdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] - ++ optionals finalAttrs.doCheck [ + ++ optionals withSamples [ "legacy_samples" "samples" + ] + ++ optionals withTests [ "tests" ]; nativeBuildInputs = [ - autoAddDriverRunpath # Needed for samples because it links against CUDA::cuda_driver cmake cuda_nvcc - ninja ]; buildInputs = [ - cuda_cccl cuda_cudart + ] + ++ optionals (withSamples || withTests) [ + catch2_3 + cuda_nvrtc + cudnn + libcublas ]; cmakeFlags = [ - (cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) - (cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") - (cmakeBool "CUDNN_FRONTEND_BUILD_SAMPLES" finalAttrs.doCheck) - (cmakeBool "CUDNN_FRONTEND_BUILD_TESTS" finalAttrs.doCheck) - (cmakeBool "CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS" false) - ]; - - checkInputs = [ - cudnn - cuda_nvrtc - catch2_3 - libcublas + (cmakeBool "CUDNN_FRONTEND_BUILD_SAMPLES" withSamples) + (cmakeBool "CUDNN_FRONTEND_BUILD_TESTS" withTests) ]; enableParallelBuilding = true; propagatedBuildInputs = [ nlohmann_json + cuda_nvrtc # nvrtc.h ]; - # TODO(@connorbaker): I'm using this incorrectly to build the executables which would allow us to test functionality, - # rather than to indicate the checkPhase will actually run. - doCheck = true; - - postInstall = optionalString finalAttrs.doCheck '' - moveToOutput "bin/legacy_samples" "$legacy_samples" - moveToOutput "bin/samples" "$samples" - moveToOutput "bin/tests" "$tests" - if [[ -e "$out/bin" ]] - then - nixErrorLog "The bin directory in \$out should no longer exist." - exit 1 - fi - ''; + postInstall = + optionalString withSamples '' + moveToOutput "bin/legacy_samples" "$legacy_samples" + moveToOutput "bin/samples" "$samples" + '' + + optionalString withTests '' + moveToOutput "bin/tests" "$tests" + '' + + '' + if [[ -e "$out/bin" ]] + then + nixErrorLog "The bin directory in \$out should no longer exist." + exit 1 + fi + ''; passthru.updateScript = gitUpdater { inherit (finalAttrs) pname version; @@ -119,11 +114,13 @@ backendStdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A c++ wrapper for the cudnn backend API"; + description = "Python and C++ Graph API with SOTA attention (SDPA / Flash Attention), MoE grouped GEMM fusions, and FP8/MXFP8 kernels for Hopper and Blackwell GPUs"; homepage = "https://github.com/NVIDIA/cudnn-frontend"; + downloadPage = "https://github.com/NVIDIA/cudnn-frontend/releases"; + changelog = "https://github.com/NVIDIA/cudnn-frontend/releases/tag/${finalAttrs.src.tag}"; license = licenses.mit; # Supports cuDNN 8.5.0 and newer: - # https://github.com/NVIDIA/cudnn-frontend/blob/11b51e9c5ad6cc71cd66cb873e34bc922d97d547/README.md?plain=1#L32 + # https://github.com/NVIDIA/cudnn-frontend/blob/v1.24.0/README.md?plain=1#L83 platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix index 98de452073da..a0359051aa20 100644 --- a/pkgs/development/python-modules/biopandas/default.nix +++ b/pkgs/development/python-modules/biopandas/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk="; }; + postPatch = '' + substituteInPlace biopandas/mmtf/pandas_mmtf.py --replace-fail \ + 'int(np.argwhere(np.array(model_indices) > ch_idx)[0]) + 1' \ + 'int(np.argwhere(np.array(model_indices) > ch_idx)[0][0]) + 1' + ''; + pythonRelaxDeps = [ "looseversion" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 66c477b3f3e2..1b3acbf0b4fb 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { pname = "databricks-sdk"; - version = "0.108.0"; + version = "0.113.0"; pyproject = true; __structuredAttrs = true; @@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-WancthAPYJ3pZEgKSD3nAR21BhHNh2sWd2e6R/nSGHQ="; + hash = "sha256-pe7Dh9P54AnyOtnBU4a7gRwg/dyC9OSwzbKOo+9kCtY="; }; build-system = [ diff --git a/pkgs/development/python-modules/nvidia-cudnn-frontend/default.nix b/pkgs/development/python-modules/nvidia-cudnn-frontend/default.nix new file mode 100644 index 000000000000..4fe7bf603996 --- /dev/null +++ b/pkgs/development/python-modules/nvidia-cudnn-frontend/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + nvidia-cudnn-frontend, + + # build-system + cmake, + ninja, + pybind11, + setuptools, + + # nativeBuildInputs + cudaPackages, + + # buildInputs + dlpack, + + # propagatedBuildInputs + nlohmann_json, + + # tests + looseversion, + pytestCheckHook, + torch, +}: +buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs: { + inherit (cudaPackages.cudnn-frontend) + version + src + meta + ; + + pname = "nvidia-cudnn-frontend"; + pyproject = true; + __structuredAttrs = true; + + postPatch = + cudaPackages.cudnn-frontend.postPatch + + '' + substituteInPlace pyproject.toml \ + --replace-fail '"ninja==1.11.1.1"' '"ninja"' \ + --replace-fail '"pybind11[global]>=2.13,<3"' '"pybind11"' + + sed -i '/cmake_args =/a\\f"-DCUDNN_FRONTEND_USE_SYSTEM_DLPACK=ON",' setup.py + '' + + '' + substituteInPlace python/cudnn/__init__.py \ + --replace-fail \ + 'os.path.join(sysconfig.get_path("purelib"), "nvidia/cudnn/lib/libcudnn.so.*[0-9]")' \ + '"${lib.getLib cudaPackages.cudnn}/lib/libcudnn.so"' + ''; + + build-system = [ + cmake + ninja + pybind11 + setuptools + ]; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cudaPackages.cuda_nvcc + ]; + + buildInputs = [ + cudaPackages.cuda_cudart + cudaPackages.cuda_nvrtc # nvrtc.h + cudaPackages.cudnn + dlpack + ]; + + propagatedBuildInputs = [ + nlohmann_json + ]; + + pythonImportsCheck = [ "cudnn" ]; + + # requires GPU + doCheck = false; + nativeCheckInputs = [ + looseversion + pytestCheckHook + torch + ]; + + enabledTestPaths = [ + "test/" + ]; + + passthru.gpuCheck = nvidia-cudnn-frontend.overridePythonAttrs { + requiredSystemFeatures = [ "cuda" ]; + doCheck = true; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eac2c61ad0c..11b1347f0439 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11469,6 +11469,8 @@ self: super: with self; { nvdlib = callPackage ../development/python-modules/nvdlib { }; + nvidia-cudnn-frontend = callPackage ../development/python-modules/nvidia-cudnn-frontend { }; + nvidia-cutlass = callPackage ../development/python-modules/nvidia-cutlass { }; nvidia-cutlass-dsl = callPackage ../development/python-modules/nvidia-cutlass-dsl { };