Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-02-21 12:05:51 +00:00
committed by GitHub
38 changed files with 6419 additions and 168 deletions
+17 -3
View File
@@ -398,9 +398,23 @@ checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-at
checkConfigOutput '^"mergedName.<id>.nested"$' config.result ./name-merge-attrsWith-1.nix
checkConfigError 'The option .mergedName. in .*\.nix. is already declared in .*\.nix' config.mergedName ./name-merge-attrsWith-2.nix
# Test the attrsOf functor.wrapped warning
# shellcheck disable=2016
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `type.functor.wrapped` attribute of the option `mergedLazyLazy` is accessed, use `type.nestedTypes.elemType` instead.' options.mergedLazyLazy.type.functor.wrapped ./lazy-attrsWith.nix
# Test type.functor.wrapped deprecation warning
# should emit the warning on:
# - merged types
# - non-merged types
# - nestedTypes elemType
# attrsWith
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
# listOf
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix
# Even with multiple assignments, a type error should be thrown if any of them aren't valid
checkConfigError 'A definition for option .* is not of type .*' \
+44
View File
@@ -0,0 +1,44 @@
{ lib, ... }:
let
inherit (lib) types mkOption;
inherit (types)
# attrsOf uses attrsWith internally
attrsOf
listOf
;
in
{
imports = [
# Module A
(
{ ... }:
{
options.attrsWith = mkOption {
type = attrsOf (listOf types.str);
};
options.mergedAttrsWith = mkOption {
type = attrsOf (listOf types.str);
};
options.listOf = mkOption {
type = listOf (listOf types.str);
};
options.mergedListOf = mkOption {
type = listOf (listOf types.str);
};
}
)
# Module B
(
{ ... }:
{
options.mergedAttrsWith = mkOption {
type = attrsOf (listOf types.str);
};
options.mergedListOf = mkOption {
type = listOf (listOf types.str);
};
}
)
];
}
+11 -2
View File
@@ -86,7 +86,7 @@ let
else
{ elemType = merged; };
wrappedDeprecationMessage = { loc }: lib.warn ''
The deprecated `type.functor.wrapped` attribute of the option `${showOption loc}` is accessed, use `type.nestedTypes.elemType` instead.
The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${lib.optionalString (loc != null) "of the option `${showOption loc}` "}is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead.
'' payload.elemType;
};
@@ -227,7 +227,16 @@ rec {
{ _type = "option-type";
inherit
name check merge emptyValue getSubOptions getSubModules substSubModules
typeMerge functor deprecationMessage nestedTypes descriptionClass;
typeMerge deprecationMessage nestedTypes descriptionClass;
functor =
if functor ? wrappedDeprecationMessage then
functor // {
wrapped = functor.wrappedDeprecationMessage {
loc = null;
};
}
else
functor;
description = if description == null then name else description;
};
+6
View File
@@ -3267,6 +3267,12 @@
githubId = 17880;
name = "Bodil Stokke";
};
body20002 = {
email = "body20002.test@gmail.com";
github = "body20002";
githubId = 33910565;
name = "Abdallah Gamal";
};
boj = {
email = "brian@uncannyworks.com";
github = "boj";
+5 -1
View File
@@ -95,6 +95,10 @@ import ./make-test-python.nix ({ pkgs, ... }:
catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")
caclientcaddy.wait_for_unit("caddy.service")
catester.succeed("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"")
# It's hard to know when caddy has finished the ACME
# dance with step-ca, so we keep trying to curl
# until succeess.
catester.wait_until_succeeds("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"")
'';
})
+3 -3
View File
@@ -146,10 +146,10 @@ in
emacs30 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "30.0.93";
version = "30.1-rc1";
variant = "mainline";
rev = "30.0.93";
hash = "sha256-lcpB4lKD3tjvCn646hUyAskxWNCQwEJ0RX/ZddRBRRU=";
rev = "30.1-rc1";
hash = "sha256-eUEeSCr58uVPxTJMhRZvVSEbfrJ6n59iuYxR6LQkWJw=";
patches = fetchpatch: [
(builtins.path {
name = "inhibit-lexical-cookie-warning-67916.patch";
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-86P0PsOyLtHfGE4HaTvH0nSVs3IialAmw+gyajfJrRE=";
hash = "sha256-esoX4BibxMZv5KHwVJoJ94uDzwL9/OqKrmyvtprbUsc=";
};
nativeBuildInputs = [
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.19.3";
version = "0.20.1";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
hash = "sha256-0LK79CdZF3JGuxUgM3V4HhZ4rpVoXEQ9YG8vdAn+cyA=";
hash = "sha256-OgCNVNzAtVsYrAf3ZAB0n8LoKm8+naZ8KEdW3nVzMos=";
};
doCheck = false;
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.32.4";
version = "2.33.0";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-t2XW75PuoZAZ0Nw2CMnP73BwJSpt5BtzGJLAM5zqbrI=";
hash = "sha256-4fZzSCEiaauym+Bq327Aj4+XIRaUwIUmzc+63k35Yf4=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-UP1SDAaoGD1iYqb0RKCZgB22CuE2OU8FW7YFPxiY42w=";
vendorHash = "sha256-9WbGLpj3O9Wk58QyuGaGoLlQ4pwra+63bWwCMFqb/uI=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
@@ -9,7 +9,9 @@ python3Packages.buildPythonApplication rec {
sha256 = "1h0phf3s6ljffxw0bs73k041wildaz01h37iv5mxhami41wrh4qf";
};
pythonPath = with python3Packages; [ enum-compat i3ipc docopt ];
pythonRemoveDeps = [ "enum-compat" ];
pythonPath = with python3Packages; [ i3ipc docopt ];
doCheck = false;
+2 -2
View File
@@ -56,13 +56,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "amnezia-vpn";
version = "4.8.3.1";
version = "4.8.3.2";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amnezia-client";
tag = finalAttrs.version;
hash = "sha256-U/fVO9GcSdxFg5r57vX5Ylgu6CMjG4GKyInIgBNUiEw=";
hash = "sha256-PUI83egVH0P5b+4aMll91LqQ9v5WlJF8prrbqO9+mC8=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "ctlptl";
version = "0.8.38";
version = "0.8.39";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-2WxtuFrEeYErkUQaT7laPzSjEYAszbb4zHRH7/hWXD0=";
hash = "sha256-RZdS1Gl8CGzvgRiPKie+Pv4kCHdRmGp1DbCjswhLAxg=";
};
vendorHash = "sha256-qft+39m583ifp/seEErSGprh9JGpFFvm/EyzCVUmIwQ=";
vendorHash = "sha256-NAL6O5042cWE56vDONyIfuKSfi1hWuRr4C7Dwfz7PzE=";
nativeBuildInputs = [ installShellFiles ];
+5 -1
View File
@@ -59,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
# Make it look for shaders in the right place
# Make it look for data in the right place
./scripts-path.patch
./shaders-path.patch
# patch relative gamescopereaper path with absolute
./gamescopereaper.patch
@@ -69,8 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
# so `placeholder "out"` ends up pointing to the wrong place
postPatch = ''
substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
substituteInPlace src/Script/Script.cpp --replace-fail "@out@" "$out"
# Patching shebangs in the main `libdisplay-info` build
patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
# Replace gamescopereeaper with absolute path
substituteInPlace src/Utils/Process.cpp --subst-var-by "gamescopereaper" "$out/bin/gamescopereaper"
patchShebangs default_scripts_install.sh
@@ -0,0 +1,13 @@
diff --git a/src/Script/Script.cpp b/src/Script/Script.cpp
index a104ee9..f7cfc8b 100644
--- a/src/Script/Script.cpp
+++ b/src/Script/Script.cpp
@@ -130,7 +130,7 @@ namespace gamescope
}
else
{
- RunFolder( "/usr/share/gamescope/scripts", true );
+ RunFolder( "@out@/share/gamescope/scripts", true );
RunFolder( "/etc/gamescope/scripts", true );
}
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "geonkick";
version = "3.5.1";
version = "3.5.2";
src = fetchFromGitLab {
owner = "Geonkick-Synthesizer";
repo = pname;
rev = "v${version}";
hash = "sha256-4nJ4yn64C44ExduPX2Iypf9Rw9MlAXFkmX5KZxySPSs=";
hash = "sha256-QtBzrYW/yYnWSXyHV63gKzgdAR5kamij9Z0g+15CTPg=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,17 +6,17 @@
buildGoModule rec {
pname = "gopls";
version = "0.17.1";
version = "0.18.0";
src = fetchFromGitHub {
owner = "golang";
repo = "tools";
rev = "gopls/v${version}";
hash = "sha256-NLUIFNooOOA4LEL5nZNdP9TvDkQUqLjKi44kZtOxeuI=";
hash = "sha256-YFAJH3jepOcgAdnSBP0G0e/GoNx9crLuQxgUFDBecwY=";
};
modRoot = "gopls";
vendorHash = "sha256-wH3YRiok3YWNzw9ejXMMitq58SxrNWXiKYKz2Hf0ZlM=";
vendorHash = "sha256-gz46W1uvA4LBe8UaKH9arAKJt1QtbbGLrF4LSwI6M4o=";
# https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
ldflags = [ "-X main.version=v${version}" ];
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "lazysql";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
hash = "sha256-APbfaAHufpEaBdXO13afmdnpSA98LhXUhYZ6TK/gazk=";
hash = "sha256-jFQvtC6D7B0p+zh3Mv3QjMTHIolc1VbKqEpXe0WxQAM=";
};
vendorHash = "sha256-ef3GngaaoNEJAOF5IlTQhTrO5P22w5p7G91TYJasfGk=";
vendorHash = "sha256-LLOUTml/mz7edCUy82k+S5PfpFovgUTQr0BoQQXiVGs=";
ldflags = [
"-X main.version=${version}"
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "minetest-mapserver";
version = "4.9.1";
version = "4.9.2";
src = fetchFromGitHub {
owner = "minetest-mapserver";
repo = "mapserver";
rev = "v${version}";
hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY=";
hash = "sha256-wo3/7axVkEcnqkOG29KE136EeMt/FW63q68UlpIA3z8=";
};
vendorHash = "sha256-P3+M1ciRmFbOFnjy1+oWPhngPYFe/5o6Cs8pRlYNx2Q=";
File diff suppressed because it is too large Load Diff
+111
View File
@@ -0,0 +1,111 @@
{
stdenv,
lib,
buildNpmPackage,
electron_34,
fetchFromGitHub,
jq,
makeDesktopItem,
}:
let
electron = electron_34;
description = "Visualizer for neural network, deep learning and machine learning models";
icon = "netron";
in
buildNpmPackage rec {
pname = "netron";
version = "8.1.8";
src = fetchFromGitHub {
owner = "lutzroeder";
repo = "netron";
tag = "v${version}";
hash = "sha256-h03nqBE82mw/XpUOnnQwUxhjXpBF9Ysc1fVTBQpMIS4=";
};
# Upstream doesn't ship package-lock.json in their sources
# https://github.com/lutzroeder/netron/issues/1430
postPatch = ''
cp ${./package-lock.json} package-lock.json
'';
npmDepsHash = "sha256-oS/s2ZcqynPTJDjoY4hIHEaBKyci/AfaCqpSHhBZB+s=";
nativeBuildInputs = [
jq
];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
preBuild = ''
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
echo 'ERROR: electron version mismatch'
exit 1
fi
'';
# Do not run the default build script, it tries to do way too much that
# wouldn't work on NixOS and require patching.
dontNpmBuild = true;
postBuild = ''
npm exec electron-builder -- \
--dir \
--c.electronDist=${electron.dist} \
--c.electronVersion=${electron.version}
'';
installPhase = ''
runHook preInstall
mkdir $out
pushd dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked
mkdir -p $out/opt/netron
cp -r locales resources{,.pak} $out/opt/netron
popd
makeWrapper '${lib.getExe electron}' "$out/bin/netron" \
--add-flags $out/opt/netron/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--set-default ELECTRON_IS_DEV 0 \
--inherit-argv0
pushd source
for icon in icon.*; do
dir=$out/share/icons/hicolor/"''${icon%.*}"/apps
mkdir -p "$dir"
cp "$icon" "$dir"/${icon}.png
done
popd
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "Netron";
exec = "netron %U";
inherit icon;
comment = description;
desktopName = "Netron";
categories = [ "Development" ];
})
];
meta = {
changelog = "https://github.com/lutzroeder/netron/releases/tag/v${version}";
inherit description;
homepage = "https://netron.app";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ flokli ];
mainProgram = "netron";
platforms = electron.meta.platforms;
badPlatforms = [
# Fails on darwin
lib.systems.inspect.patterns.isDarwin
];
};
}
+3 -3
View File
@@ -7,19 +7,19 @@
}:
let
pname = "open-webui";
version = "0.5.15";
version = "0.5.16";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-+Omw+DMpCEBTLWeS6zLmyO9VnVB5jnHvzORFjL4/zxw=";
hash = "sha256-ki8Ac/xMs+wD5GWEgPTe+uIXrYnWtaOwLIxmxscz5sw=";
};
frontend = buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-7r9NE692DzuHScVBR07NbE/c8MKjOotWCcWThHHrpHA=";
npmDepsHash = "sha256-e6pVy06h3QjFTSV62ZsaBrZO+atZbKGsBcCY/gQ2mQo=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
+4 -4
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.118.3";
version = "2025.221.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-+Z/lF7RjJGkzlauQlMCMOjvXArWjEg0mGu7HTe2S7Xs=";
hash = "sha256-YLm918nB0LVMCLFsmOihgI3ZhPhvPo2TGZ1ULpmpPM0=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-/kF09xFrH0zlN2kpzxIwvMC+W6pR0Lc8hlxOmwYn2mI=";
hash = "sha256-ZtGC5sOHEu6i2APlHR57Y1+accWNZ9DBurEENTPwUJI=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-bnffUtzs5IsWKhAGeGTt+UHMmlTWbbT79Ac4fKhXK9s=";
hash = "sha256-V6JJShVGE4GXGI8FvDhyWuHUnlI+p3JLW/NN+u+Vikc=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
+85 -80
View File
@@ -311,73 +311,73 @@
},
{
"pname": "MessagePack",
"version": "3.1.1",
"hash": "sha256-8ClMtDZrSJHc51HNUn/vqGAZlVHIs63BcMnjLczLU6k="
"version": "3.1.3",
"hash": "sha256-OBn7iltr/rdE7ZKmv0MCUQSS+6OJKUYtlHdTbhEwzzE="
},
{
"pname": "MessagePack.Annotations",
"version": "3.1.1",
"hash": "sha256-WGuowO8AJ4nGfSBYtu+qJgP6QqS5mJMHtP/rRHl2Q6w="
"version": "3.1.3",
"hash": "sha256-o+T3u+xaHtW1c7AeWysCmIDUfN8lRhes2LoW5iQBafs="
},
{
"pname": "MessagePackAnalyzer",
"version": "3.1.1",
"hash": "sha256-V3YSKLjq4mEp8aIGQwPSOvqgCU7xotG0tWOjOqFg7wQ="
"version": "3.1.3",
"hash": "sha256-5t4Av4CQ8HI7y9aAw+2qcOp+fsY0/3PdaFPJeCEAXQ0="
},
{
"pname": "Microsoft.AspNetCore.Connections.Abstractions",
"version": "9.0.0",
"hash": "sha256-4o05T9dNf3mBRo2QC+wa2N2n+78bOi3ShzaiauOWXZU="
"version": "9.0.2",
"hash": "sha256-xmPIOJ1MgI7LRLfQBexgBRLSNUEPNjksjpUxqDrOylM="
},
{
"pname": "Microsoft.AspNetCore.Http.Connections.Client",
"version": "9.0.0",
"hash": "sha256-eK92e37pNx+GIAUYsW4XS42JVrTj3LyKSURxburvOCE="
"version": "9.0.2",
"hash": "sha256-2TOp4D4zc5qX8XeY0MyYq6s2diaKeTO0PlWvGuIUeo8="
},
{
"pname": "Microsoft.AspNetCore.Http.Connections.Common",
"version": "9.0.0",
"hash": "sha256-IkEyefTMiD4LLwzGSCroueZVHfR06Am3QSE/ufWRq2M="
"version": "9.0.2",
"hash": "sha256-IGjbK3tcvlUkdoI+/6VygAwpBd0Yqn+40FbgOv0UGDU="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Client",
"version": "9.0.0",
"hash": "sha256-yXqMffVsnSBf/VDzHln1QNXOsYLoeAC5QlmjpqlTgxc="
"version": "9.0.2",
"hash": "sha256-hnvCWtgjKqnOO1q4xvJpZaUjS+I6wu1RkUxqS2ez96w="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Client.Core",
"version": "9.0.0",
"hash": "sha256-tgXFINCIRruKZAB0wfCLTeKHcAEhSalQmkHX/Zfs1iw="
"version": "9.0.2",
"hash": "sha256-5EuEV8zXfbYoERlCtx7yqzEMT+SVlHfLQj4QFabEye8="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Common",
"version": "9.0.0",
"hash": "sha256-en6periuk86BXYnnJVy5zfeIqlAKjFVliR6DO5J2UiA="
"version": "9.0.2",
"hash": "sha256-lEW6uQ87Ml+XqjNHVQfzPQaEL4wERi2bOB6S763DN3w="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
"version": "9.0.0",
"hash": "sha256-7x5ZJ7NP0+fnVtKPX7EFBgKqVifIw4qqAZWJTzzM2fE="
"version": "9.0.2",
"hash": "sha256-AVBp8mGbVdRjyIpo5LNMpnmV8G5uROw4Ko+gTbtnhc4="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.MessagePack",
"version": "9.0.0",
"hash": "sha256-2z9pE9ZYqTV2Y8dITi1famb37/sn//QytznGR1Mp9zk="
"version": "9.0.2",
"hash": "sha256-wfYf4wIJ6hwBD4tacI5dWfAMDBYM6aBohEfQUV4ary0="
},
{
"pname": "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson",
"version": "9.0.0",
"hash": "sha256-4O9K6+55QL5vV5ywvUFPSefpozcY/xeVjeCFiH3kvIE="
"version": "9.0.2",
"hash": "sha256-g2UwkpwGu+birT76nUcJ+GlN31QN8yL02bFOP1zYWkk="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "9.0.0",
"hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U="
"version": "9.0.2",
"hash": "sha256-D+MR5Rzxn+aFPVJWF83pc0dTWnQes658xBM4bPZ6HPc="
},
{
"pname": "Microsoft.Bcl.TimeProvider",
"version": "9.0.0",
"hash": "sha256-m3IMExnLJeARejxaFiJyTxLHDoaVv/B75/EEFSPlWWo="
"version": "9.0.2",
"hash": "sha256-qce+art6dBZTx78LwKfGULXXkwL73nCnn0x4kSGDtC4="
},
{
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -391,8 +391,8 @@
},
{
"pname": "Microsoft.Data.Sqlite.Core",
"version": "9.0.0",
"hash": "sha256-zxVvQSpfECqsjawJVIUBuE82pG5mN2F7iPCRLoK7Q4c="
"version": "9.0.2",
"hash": "sha256-ZUVDe+oy7fAWcnQDRdhkVeN7YZkJewwqBNaxdZcykiM="
},
{
"pname": "Microsoft.Diagnostics.NETCore.Client",
@@ -411,8 +411,8 @@
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.0",
"hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
"version": "9.0.2",
"hash": "sha256-icRtfbi0nDRUYDErtKYx0z6A1gWo5xdswsSM6o4ozxc="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
@@ -421,8 +421,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "9.0.0",
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
"version": "9.0.2",
"hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -441,8 +441,8 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "9.0.0",
"hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
"version": "9.0.2",
"hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
@@ -451,13 +451,13 @@
},
{
"pname": "Microsoft.Extensions.Features",
"version": "9.0.0",
"hash": "sha256-dggXnp8B+17+54anZ3iqZA/amBODUZQe2E9MYgtdV28="
"version": "9.0.2",
"hash": "sha256-LHvTuI3JilE9g+ODoyjDJkj4AhF0OUHRyN7mMT7bokc="
},
{
"pname": "Microsoft.Extensions.Logging",
"version": "9.0.0",
"hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
"version": "9.0.2",
"hash": "sha256-vPCb4ZoiwZUSGJIOhYiLwcZLnsd0ZZhny6KQkT88nI0="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -466,8 +466,8 @@
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "9.0.0",
"hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
"version": "9.0.2",
"hash": "sha256-mCxeuc+37XY0bmZR+z4p1hrZUdTZEg+FRcs/m6dAQDU="
},
{
"pname": "Microsoft.Extensions.ObjectPool",
@@ -481,8 +481,8 @@
},
{
"pname": "Microsoft.Extensions.Options",
"version": "9.0.0",
"hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
"version": "9.0.2",
"hash": "sha256-y2jZfcWx/H6Sx7wklA248r6kPjZmzTTLGxW8ZxrzNLM="
},
{
"pname": "Microsoft.Extensions.Primitives",
@@ -491,8 +491,8 @@
},
{
"pname": "Microsoft.Extensions.Primitives",
"version": "9.0.0",
"hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
"version": "9.0.2",
"hash": "sha256-zy/YNMaY47o6yNv2WuYiAJEjtoOF8jlWgsWHqXeSm4s="
},
{
"pname": "Microsoft.NET.StringTools",
@@ -596,23 +596,23 @@
},
{
"pname": "OpenTabletDriver",
"version": "0.6.5",
"hash": "sha256-tn24wONDXJOL3lhSOGI1ZS1sVsdKGr798r35DgmU+pA="
"version": "0.6.5.1",
"hash": "sha256-/awjEXQ2F8Zoj/2xZJnSg8pBP6hN0zet0lycALfjVoM="
},
{
"pname": "OpenTabletDriver.Configurations",
"version": "0.6.5",
"hash": "sha256-+6y3GkGaIYqEgzAV/Q04vxvB5UyrsT7NQR5mIWOIhCI="
"version": "0.6.5.1",
"hash": "sha256-4NFcoDlDrNKnaV+Vz6nGKGhZzxPB6ykEAiauHrDRfGU="
},
{
"pname": "OpenTabletDriver.Native",
"version": "0.6.5",
"hash": "sha256-QLWzpV1YeMozcR38guHv5rT8cNnuwm92NGAvdXua1U4="
"version": "0.6.5.1",
"hash": "sha256-04Oh5wYEj1qRq6RIoSM9bDTzwFKJS3LKo9d25FAyseI="
},
{
"pname": "OpenTabletDriver.Plugin",
"version": "0.6.5",
"hash": "sha256-czzfFsCBu9989ML7FvDUZrBtaf3K4bBhmuaU9Y1h3vk="
"version": "0.6.5.1",
"hash": "sha256-9N8+hq2ZoAiZlU6pk214zu3e4l50s40bgYUK3Aw7w7k="
},
{
"pname": "PolySharp",
@@ -651,8 +651,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2025.117.0",
"hash": "sha256-kEYVwig05l5qmS/4OAATHwYCFMyToVt/EGhwtUfV7sg="
"version": "2025.220.1",
"hash": "sha256-nzEZ6c0woNWxhbwu4kyMwxQy20TElqFgK0ugZWFqgCo="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2024.1224.0",
"hash": "sha256-EtruxGvWQQzWGtpQAb58j6Hdsv2GKNf/eSwPV3qti/Q="
"version": "2025.217.0",
"hash": "sha256-ERVop92Ss/SdmcN7m1sxQRqC8Sxr9NaL3v/V3JxqUq4="
},
{
"pname": "ppy.osuTK.NS20",
@@ -681,8 +681,8 @@
},
{
"pname": "ppy.SDL3-CS",
"version": "2025.104.0",
"hash": "sha256-qsszZxBGVycfukowE0fxNtM1EZFqKyssZJoOzB5K80g="
"version": "2025.220.0",
"hash": "sha256-A43tJzQ779wQ76wkCxvZ39w3KapZwhUpKe1P4RcOvCQ="
},
{
"pname": "ppy.Veldrid",
@@ -991,13 +991,13 @@
},
{
"pname": "Sentry",
"version": "5.0.0",
"hash": "sha256-kafv0LOBPgYpX7YHU3RK7XmwVn9wuPfHZufw39aeFec="
"version": "5.1.1",
"hash": "sha256-Ud0rRSJZDxxs1gQSXeiuoAdxmHqPH6mfnJ0TPTKyryg="
},
{
"pname": "SharpCompress",
"version": "0.38.0",
"hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="
"version": "0.39.0",
"hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
},
{
"pname": "SharpFNT",
@@ -1064,6 +1064,11 @@
"version": "4.5.1",
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{
"pname": "System.Buffers",
"version": "4.6.0",
"hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
},
{
"pname": "System.Collections",
"version": "4.0.11",
@@ -1111,8 +1116,8 @@
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "9.0.0",
"hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE="
"version": "9.0.2",
"hash": "sha256-vhlhNgWeEosMB3DyneAUgH2nlpHORo7vAIo5Bx5Dgrc="
},
{
"pname": "System.Diagnostics.Tools",
@@ -1191,13 +1196,13 @@
},
{
"pname": "System.IO.Packaging",
"version": "9.0.0",
"hash": "sha256-uIMItgRrAKHBUes9A17SqNFwTd7gjFjUsfD92v4rie4="
"version": "9.0.2",
"hash": "sha256-633GG/fTf5MHhi5RrCiuD5q2JzWUUeuDashmYWIBrXo="
},
{
"pname": "System.IO.Pipelines",
"version": "9.0.0",
"hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
"version": "9.0.2",
"hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE="
},
{
"pname": "System.Linq",
@@ -1261,8 +1266,8 @@
},
{
"pname": "System.Net.ServerSentEvents",
"version": "9.0.0",
"hash": "sha256-WOMFdUD4R7a+4OU6R0+Ch/yQ9LoepxBrMBBiq2Pnb7s="
"version": "9.0.2",
"hash": "sha256-XZi2duryjNRtvyFrLlX2u8WlSlBbE8ccTS6X72P/kY4="
},
{
"pname": "System.Net.Sockets",
@@ -1536,13 +1541,13 @@
},
{
"pname": "System.Text.Encodings.Web",
"version": "9.0.0",
"hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="
"version": "9.0.2",
"hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8="
},
{
"pname": "System.Text.Json",
"version": "9.0.0",
"hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
"version": "9.0.2",
"hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
},
{
"pname": "System.Text.RegularExpressions",
@@ -1566,8 +1571,8 @@
},
{
"pname": "System.Threading.Channels",
"version": "9.0.0",
"hash": "sha256-depIorJqzjyWew0+aBRgbGh88KWivbp9RrtWZHFr+pI="
"version": "9.0.2",
"hash": "sha256-Ubs57l7OtgMyC/N1qiAFcfqAxqghRVXs9tB7Jws30t8="
},
{
"pname": "System.Threading.Tasks",
@@ -1641,7 +1646,7 @@
},
{
"pname": "ZstdSharp.Port",
"version": "0.8.1",
"hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="
"version": "0.8.4",
"hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
}
]
+2 -2
View File
@@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.118.3";
version = "2025.221.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-sObk/T5QywneLVvBIekR0vJ1VbXbHKr9ByiKPF1MwBY=";
hash = "sha256-94+l3J0VjQ1mnvmRwVzy/wZPIsyc2aYIx/1Tp79oPbQ=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "redocly";
version = "1.27.2";
version = "1.28.0";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
hash = "sha256-79zB7ydbgS+9us+saFiYBPHILoATP00x+Y1hAgPsPk4=";
hash = "sha256-TCBPcYbyMlmz7O1c/6/72I3Tb9ZnhBc5W5S/yDQ0AHo=";
};
npmDepsHash = "sha256-EYhX1zAio+f1PGfQUQIFkc9Ve9jLIG7/1xgOI0JAZ5s=";
npmDepsHash = "sha256-soAnln7K3vNMCDTGPX+j2qaatvoWTrhFzL7hjHuE6QQ=";
npmBuildScript = "prepare";
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "sqldef";
version = "0.17.28";
version = "0.17.29";
src = fetchFromGitHub {
owner = "sqldef";
repo = "sqldef";
rev = "v${version}";
hash = "sha256-DfH+5QArv3aI3ECQ5XK/mjNsKbZ4yEEY3LFZPuPvxDo=";
hash = "sha256-+mk666M6VRSIer59IaiEMJ/Im6HdyQoWX2z9KHH/7jU=";
};
proxyVendor = true;
+3 -3
View File
@@ -6,7 +6,7 @@
installShellFiles,
}:
let
version = "0.28.2";
version = "0.28.3";
in
buildGoModule {
pname = "step-cli";
@@ -16,7 +16,7 @@ buildGoModule {
owner = "smallstep";
repo = "cli";
tag = "v${version}";
hash = "sha256-noANDVupzaoWfnESsu3ucd3ZvD3K/56YvYonyp2n0ho=";
hash = "sha256-vR/RwTfka0c5pBfX9i2e7wms6ApL+bAdDrjEcKm07XM=";
# this file change depending on git branch status (via .gitattributes)
# https://github.com/NixOS/nixpkgs/issues/84312
postFetch = ''
@@ -35,7 +35,7 @@ buildGoModule {
rm command/certificate/remote_test.go
'';
vendorHash = "sha256-rxUzvT5vEzZ5G+YGFEw4L25ZlwEn0wTZJgjsdfloFx8=";
vendorHash = "sha256-+HDdrm7N8weEX/hMt2vsxEQq1CNZP9Jj2UKA+7JN1Io=";
nativeBuildInputs = [ installShellFiles ];
+16 -3
View File
@@ -3,6 +3,7 @@
stdenv,
rustPlatform,
fetchFromGitHub,
fetchpatch,
installShellFiles,
pkg-config,
libgit2,
@@ -18,17 +19,29 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.12.18";
version = "0.12.20";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
tag = "v${version}";
hash = "sha256-/QalLr4kerOe+KooKY+Vq6FaGJyzGvaUHhUSu+LTphA=";
hash = "sha256-MFAbG0K71LbMAZKZ0Bo9ms6UTPNetORmHlBwYAusUtE=";
};
patches = [
# Fixes:
# cargo metadata failure: error: Package `tinymist-std v0.12.20 (/build/source/crates/tinymist-std)` does not have feature `wasm-bindgen`.
# It has an optional dependency with that name, but that dependency uses the "dep:" syntax in the features table, so it does not have an implicit feature with that name.
# https://github.com/Myriad-Dreamin/tinymist/pull/1363
(fetchpatch {
name = "fix-cargo-features";
url = "https://github.com/Myriad-Dreamin/tinymist/pull/1363/commits/96e0a15fa20f09734f2b8152977a1137f5469761.patch";
hash = "sha256-W3HzV0GGhGuX/V4rox32LSw6YJ2BLTAG16bF2pZ+xYs=";
})
];
useFetchCargoVendor = true;
cargoHash = "sha256-D4UWFg22lnkqozsWAQydNSnOpDlw5AUhGCHHfuyihfU=";
cargoHash = "sha256-mk6JQEDgY8ERKq7dy+HlU7go4ImeJpGONOBSjjHdD4g=";
nativeBuildInputs = [
installShellFiles
@@ -0,0 +1,47 @@
{
stdenv,
fetchFromGitHub,
lib,
xdg-desktop-portal,
ninja,
meson,
pkg-config,
inih,
systemd,
scdoc,
}:
stdenv.mkDerivation {
pname = "xdg-desktop-portal-termfilechooser";
version = "0.4.0";
src = fetchFromGitHub {
owner = "hunkyburrito";
repo = "xdg-desktop-portal-termfilechooser";
rev = "c35af27e323a492cbb3b19bdd135657ae523caef";
hash = "sha256-9bxhKkk5YFBhR2ylcDzlvt4ltYuF174w00EJK5r3aY0=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
scdoc
];
buildInputs = [
xdg-desktop-portal
inih
systemd
];
mesonFlags = [ "-Dsd-bus-provider=libsystemd" ];
meta = with lib; {
description = "xdg-desktop-portal backend for choosing files with your favorite file chooser";
homepage = "https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with lib.maintainers; [ body20002 ];
mainProgram = "xdg-desktop-portal-termfilechooser";
};
}
@@ -13,9 +13,11 @@
cudaPackages,
cudaSupport ? config.cudaSupport,
fetchurl,
fetchpatch,
gfortran,
gpuTargets ? [ ], # Non-CUDA targets, that is HIP
rocmPackages_5,
rocmPackages_5 ? null,
rocmPackages,
lapack,
lib,
libpthreadstubs,
@@ -46,8 +48,8 @@ let
inherit (effectiveCudaPackages) cudaAtLeast flags cudaOlder;
# move to newer ROCm version once supported
rocmPackages = rocmPackages_5;
effectiveRocmPackages =
if strings.versionOlder version "2.8.0" then rocmPackages_5 else rocmPackages;
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
# of the first list *from* the second list. That means:
@@ -57,7 +59,7 @@ let
# NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like flags.realArches.
# For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must
# remove it.
rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets;
rocmArches = lists.map (x: strings.removePrefix "gfx" x) effectiveRocmPackages.clr.gpuTargets;
supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets;
unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches;
@@ -91,7 +93,7 @@ let
cudaArchitectures = (builtins.map flags.dropDot flags.cudaCapabilities);
minArch' = builtins.head (builtins.sort strings.versionOlder cudaArchitectures);
in
# "75" -> "750" Cf. https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-273
# "75" -> "750" Cf. https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L200-L201
"${minArch'}0";
in
@@ -115,14 +117,26 @@ stdenv.mkDerivation {
"test"
];
patches = lib.optionals (version == "2.9.0") [
# get ROCm version directly
# https://github.com/icl-utk-edu/magma/pull/27
(fetchpatch {
url = "https://github.com/icl-utk-edu/magma/commit/10fe816b763c41099fa1c978a79d6869246671cf.patch";
hash = "sha256-qSY5ACMHyHofJdQKyPqx8sI8GbPD6IZezmCd8qOS5OM=";
})
];
# Fixup for the python test runners
postPatch = ''
patchShebangs ./testing/run_{tests,summarize}.py
substituteInPlace ./testing/run_tests.py \
--replace-fail \
"print >>sys.stderr, cmdp, \"doesn't exist (original name: \" + cmd + \", precision: \" + precision + \")\"" \
"print(f\"{cmdp} doesn't exist (original name: {cmd}, precision: {precision})\", file=sys.stderr)"
'';
postPatch =
''
patchShebangs ./testing/run_{tests,summarize}.py
''
+ lib.optionalString (strings.versionOlder version "2.9.0") ''
substituteInPlace ./testing/run_tests.py \
--replace-fail \
"print >>sys.stderr, cmdp, \"doesn't exist (original name: \" + cmd + \", precision: \" + precision + \")\"" \
"print(f\"{cmdp} doesn't exist (original name: {cmd}, precision: {precision})\", file=sys.stderr)"
'';
nativeBuildInputs =
[
@@ -160,12 +174,15 @@ stdenv.mkDerivation {
cuda_cccl # <nv/target>
]
)
++ lists.optionals rocmSupport [
rocmPackages.clr
rocmPackages.hipblas
rocmPackages.hipsparse
rocmPackages.llvm.openmp
];
++ lists.optionals rocmSupport (
with effectiveRocmPackages;
[
clr
hipblas
hipsparse
llvm.openmp
]
);
cmakeFlags =
[
@@ -186,8 +203,8 @@ stdenv.mkDerivation {
(strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts
]
++ lists.optionals rocmSupport [
(strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc")
(strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc")
(strings.cmakeFeature "CMAKE_C_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc")
(strings.cmakeFeature "CMAKE_CXX_COMPILER" "${effectiveRocmPackages.clr}/bin/hipcc")
];
# Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.
@@ -230,7 +247,8 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Matrix Algebra on GPU and Multicore Architectures";
license = licenses.bsd3;
homepage = "http://icl.cs.utk.edu/magma/index.html";
homepage = "https://icl.utk.edu/magma/";
changelog = "https://github.com/icl-utk-edu/magma/blob/v${version}/ReleaseNotes";
platforms = platforms.linux;
maintainers = with maintainers; [ connorbaker ];
@@ -240,7 +258,12 @@ stdenv.mkDerivation {
(cudaSupport && !static)
|| !(cudaSupport || rocmSupport) # At least one back-end enabled
|| (cudaSupport && rocmSupport) # Mutually exclusive
|| (cudaSupport && cudaOlder "9.0")
|| (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null);
|| (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null)
|| (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null)
|| (
rocmSupport
&& strings.versionAtLeast version "2.8.0"
&& strings.versionOlder rocmPackages.clr.version "6.3"
);
};
}
@@ -1,7 +1,7 @@
# NOTE: Order matters! Put the oldest version first, and the newest version last.
# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest.
# You can update the supportedGpuTargets by looking at the CMakeLists.txt file.
# HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386
# HIP is here: https://github.com/icl-utk-edu/magma/blob/v2.9.0/CMakeLists.txt#L290
# CUDA works around magma's wrappers and uses FindCUDAToolkit directly
[
{
@@ -66,4 +66,35 @@
"1033"
];
}
{
version = "2.9.0";
hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw=";
supportedGpuTargets = [
"700"
"701"
"702"
"703"
"704"
"705"
"801"
"802"
"803"
"805"
"810"
"900"
"902"
"904"
"906"
"908"
"909"
"90c"
"1010"
"1011"
"1012"
"1030"
"1031"
"1032"
"1033"
];
}
]
@@ -0,0 +1,99 @@
{
lib,
buildPythonPackage,
fetchPypi,
# build-system
hatchling,
hatch-vcs,
# dependencies
aiohttp,
backoff,
bokeh,
boto3,
click,
dask,
distributed,
fabric,
filelock,
gilknocker,
httpx,
importlib-metadata,
invoke,
ipywidgets,
jmespath,
jsondiff,
paramiko,
pip,
pip-requirements-parser,
prometheus-client,
rich,
toml,
typing-extensions,
wheel,
# tests
versionCheckHook,
}:
buildPythonPackage rec {
pname = "coiled";
version = "1.79.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-PRBmM0YN2MPHRMzDmV9nYhP+Jr0tOxkXgHDnW8pN9ug=";
};
build-system = [
hatchling
hatch-vcs
];
dependencies = [
aiohttp
backoff
bokeh
boto3
click
dask
distributed
fabric
filelock
gilknocker
httpx
importlib-metadata
invoke
ipywidgets
jmespath
jsondiff
paramiko
pip
pip-requirements-parser
prometheus-client
rich
toml
typing-extensions
wheel
];
pythonImportsCheck = [
"coiled"
];
nativeCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Python client for coiled.io dask clusters";
homepage = "https://www.coiled.io/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ daspk04 ];
mainProgram = "coiled";
};
}
@@ -3,10 +3,15 @@
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
# build-system
setuptools,
# dependencies
beautifulsoup4,
enum-compat,
pyserial,
# tests
pytestCheckHook,
}:
@@ -32,9 +37,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
pythonRemoveDeps = [ "enum-compat" ];
dependencies = [
beautifulsoup4
enum-compat
pyserial
];
@@ -0,0 +1,69 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
pkg-config,
rustc,
rustPlatform,
# tests
numpy,
pytestCheckHook,
pytest-benchmark,
pytest-rerunfailures,
}:
buildPythonPackage rec {
pname = "gilknocker";
version = "0.4.1.post6";
pyproject = true;
src = fetchFromGitHub {
owner = "milesgranger";
repo = "gilknocker";
tag = "v${version}";
hash = "sha256-jJOI7hlm6kcqfBbM56y5mKD+lJe0g+qAQpDF7ePM+GM=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU=";
};
nativeBuildInputs =
with rustPlatform;
[
cargoSetupHook
maturinBuildHook
]
++ [
pkg-config
rustc
];
pythonImportsCheck = [
"gilknocker"
];
nativeCheckInputs = [
numpy
pytestCheckHook
pytest-benchmark
pytest-rerunfailures
];
meta = {
description = "Knock on the Python GIL, determine how busy it is";
homepage = "https://github.com/milesgranger/gilknocker";
changelog = "https://github.com/milesgranger/gilknocker/releases/tag/v${version}";
license = with lib.licenses; [
mit
unlicense
];
maintainers = with lib.maintainers; [ daspk04 ];
};
}
@@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "orbax-checkpoint";
version = "0.11.4";
version = "0.11.6";
pyproject = true;
src = fetchFromGitHub {
owner = "google";
repo = "orbax";
tag = "v${version}";
hash = "sha256-zKQcqDW0dOQIGNllrK6bPdTr8mkKU6eevdfvMGssd9w=";
hash = "sha256-2bnm9D+ywhploTmtZ+frwf8VuTjczBVN+wqcfe3x77I=";
};
sourceRoot = "${src.name}/checkpoint";
@@ -1,13 +1,12 @@
{
lib,
black,
buildPythonPackage,
fetchFromGitHub,
hatchling,
pytest,
pytestCheckHook,
pythonOlder,
black,
ruff,
pytestCheckHook,
}:
buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
version = "0.0.15";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "pydantic";
repo = "pytest-examples";
@@ -39,6 +36,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "pytest_examples" ];
disabledTests = [
# Fails with AssertionError because formatting is different than expected
"test_black_error"
"test_black_error_dot_space"
"test_black_error_multiline"
];
meta = {
description = "Pytest plugin for testing examples in docstrings and markdown files";
homepage = "https://github.com/pydantic/pytest-examples";
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cni-plugin-flannel";
version = "1.5.1-flannel3";
version = "1.6.2-flannel1";
src = fetchFromGitHub {
owner = "flannel-io";
repo = "cni-plugin";
rev = "v${version}";
sha256 = "sha256-uYjBRfcNop84pbFoXxFa73GzC6U5wMxix3fTRFn7FsM=";
sha256 = "sha256-mhDUpQf1HQLx4vn+Ju5jN5DYgkdsAs8CcmZbBqEITB4=";
};
vendorHash = "sha256-ZBd7ngYfsmdSGHE9a0kiEB7SeYc9RfaU9MILK2r3cyg=";
vendorHash = "sha256-0LgdvXNejEAgJZ9ufN3HJ+hXjUtrL0iqaQg9SpeCThM=";
ldflags = [
"-s"
+4
View File
@@ -2528,6 +2528,8 @@ self: super: with self; {
cogapp = callPackage ../development/python-modules/cogapp { };
coiled = callPackage ../development/python-modules/coiled { };
coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { };
colanderalchemy = callPackage ../development/python-modules/colanderalchemy { };
@@ -5307,6 +5309,8 @@ self: super: with self; {
gidgethub = callPackage ../development/python-modules/gidgethub { };
gilknocker = callPackage ../development/python-modules/gilknocker { };
gin-config = callPackage ../development/python-modules/gin-config { };
gios = callPackage ../development/python-modules/gios { };