Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-01 17:05:22 +00:00
committed by GitHub
38 changed files with 625 additions and 601 deletions
+13 -2
View File
@@ -1322,13 +1322,24 @@ let
: 1\. Function argument
*/
pushDownProperties =
let
mapAttrsIfAttrs =
f: val:
if isAttrs val then
mapAttrs f val
else
# This does not actually work, since arriving here means we have e.g.
# (lib.mkIf cond nonAttrs), while an attrset is expected. However,
# avoiding the mapAttrs call here gives better errors later.
val;
in
cfg:
if cfg._type or "" == "merge" then
concatMap pushDownProperties cfg.contents
else if cfg._type or "" == "if" then
map (mapAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
map (mapAttrsIfAttrs (n: v: mkIf cfg.condition v)) (pushDownProperties cfg.content)
else if cfg._type or "" == "override" then
map (mapAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
map (mapAttrsIfAttrs (n: v: mkOverride cfg.priority v)) (pushDownProperties cfg.content)
# FIXME: handle mkOrder?
else
[ cfg ];
+2
View File
@@ -171,6 +171,8 @@ checkConfigError() {
# Shorthand meta attribute does not duplicate the config
checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix
checkConfigError "In module .*test-push-down-non-attrs.nix., you're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config ./test-push-down-non-attrs.nix
checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix
# Check that a module argument is passed, also when a default is available
@@ -0,0 +1,5 @@
{ lib, ... }:
{
config = lib.mkIf true true;
}
@@ -499,13 +499,13 @@
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
},
"hashicorp_aws": {
"hash": "sha256-/Eti2S6QIHmteilt0wFverousbOapfjBhWrxeCUpOQw=",
"hash": "sha256-EaNOYM4qpWiAsemTOMpFFwJLcrlOxMVgjuECh4KhUsM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.37.0",
"rev": "v6.38.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-tsAxy5dt8mKtfR2o8dNgFSdjgjfIXD0ye004wPZ6fTk="
"vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk="
},
"hashicorp_awscc": {
"hash": "sha256-68SdqhF4RA/rjVm89yAZb8MRdDPrcqrQ6lc3tJTIeng=",
File diff suppressed because it is too large Load Diff
@@ -39,7 +39,7 @@ def urlopen(url_or_request):
with urlopen(f'{GAME_URL}/data.json') as response:
data = json.load(response)
GAME_ID = data['id']
IS_FREE = 'price' not in data
IS_FREE = 'price' not in data or data['price'] == '$0.00'
def api(path, params={}, download=False):
url = f'{ENDPOINT}{path}?{urllib.parse.urlencode({'api_key': API_KEY, **params})}'
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-careful";
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "RalfJung";
repo = "cargo-careful";
rev = "v${finalAttrs.version}";
hash = "sha256-huo5KFb+qoPVHNrnR+vb97iNinGaU5d3NbFhAgGCzCk=";
hash = "sha256-xnAPMSMpdnFF6hUU+SR+kyWsLNuD2dXYp0/qDF8QRfA=";
};
cargoHash = "sha256-mjGUSwqyqgnGwKjznj8KedIzOJi4GDldJEL0fzpuvec=";
cargoHash = "sha256-UiN2cWqwn+sJ56pODBilirw6jVnVz+rIsPuYVaNaSfM=";
meta = {
description = "Tool to execute Rust code carefully, with extra checking along the way";
+3 -3
View File
@@ -12,18 +12,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cdk8s-cli";
version = "2.204.9";
version = "2.205.6";
src = fetchFromGitHub {
owner = "cdk8s-team";
repo = "cdk8s-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-FV9/v8/UFrLtNPIZCh8No8A7n5oIzd9BlyjP1np8VZY=";
hash = "sha256-ZHorjCZbZ8Lu7DwhAbCC/uKNrg+rYwL75NCjKskh/JM=";
};
yarnOfflineCache = fetchYarnDeps {
inherit (finalAttrs) src;
hash = "sha256-4/1euuWSaZcRO2gwMj55g+m+K46D/bEd+yFJojGap5k=";
hash = "sha256-VAy3k99JB2j4MUCwXKyxSl+9OmGC1/xoJBF1/Xvuc54=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
"version": "10.0.5",
"hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
},
{
"pname": "Serilog",
@@ -41,7 +41,7 @@
},
{
"pname": "Tmds.DBus",
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
"version": "0.91.1",
"hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
}
]
@@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "crossmacro-daemon";
version = "0.9.9";
version = "1.0.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-LYjGuv+LMqug0sba64sGi9U+9XlK/A4CO+9H/6drgMw=";
hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
};
projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj";
+28 -28
View File
@@ -1,8 +1,8 @@
[
{
"pname": "Avalonia",
"version": "11.3.12",
"hash": "sha256-T2y8aoKUSfXqmV2RL1QStytzJkc/SZYfIdJihB5UWR0="
"version": "11.3.13",
"hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
},
{
"pname": "Avalonia.BuildServices",
@@ -11,53 +11,53 @@
},
{
"pname": "Avalonia.Controls.ColorPicker",
"version": "11.3.12",
"hash": "sha256-zNpmfOTfw+gKZp8VPpfHe2hjqhrRmExf7lxqLf5OvDg="
"version": "11.3.13",
"hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
},
{
"pname": "Avalonia.Diagnostics",
"version": "11.3.12",
"hash": "sha256-iDH6DjRKqm4YLXBq2JGg9IkkEGm3Rq1FQWyr/L+VaVA="
"version": "11.3.13",
"hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
},
{
"pname": "Avalonia.Fonts.Inter",
"version": "11.3.12",
"hash": "sha256-yr4/zpUbmQuVzdupV5v87qNO24sPOVhnnJ1SeiLxMx8="
"version": "11.3.13",
"hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4="
},
{
"pname": "Avalonia.FreeDesktop",
"version": "11.3.12",
"hash": "sha256-NTcYVHn13lFQjTNezmpmPGjxsBzryXorK0K6hl4ZZto="
"version": "11.3.13",
"hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw="
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "11.3.12",
"hash": "sha256-dF93nP1Cd7ZdzrO7ScGHchxYxCjWN45AjiqiO1J+cmU="
"version": "11.3.13",
"hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
},
{
"pname": "Avalonia.Skia",
"version": "11.3.12",
"hash": "sha256-gRMjH7igRIm22zQV0WxtwFHe8AiMTcaPlR0sC5lJy+w="
"version": "11.3.13",
"hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "11.3.12",
"hash": "sha256-4TTsW7zLF0Z9C1lzPsPfekHpHrSx7RB7I63j/cKUX8U="
"version": "11.3.13",
"hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM="
},
{
"pname": "Avalonia.Themes.Simple",
"version": "11.3.12",
"hash": "sha256-EIuAcUmoL7/y4lUfdSg120/l/v3zQytC2rfr0b6jKiM="
"version": "11.3.13",
"hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
},
{
"pname": "Avalonia.X11",
"version": "11.3.12",
"hash": "sha256-SEc0GaZTh1eGNFWHT6lGiN6LD0qE+ubTK7Efl0H/Q2w="
"version": "11.3.13",
"hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg="
},
{
"pname": "CommunityToolkit.Mvvm",
"version": "8.4.0",
"hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
"version": "8.4.2",
"hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU="
},
{
"pname": "HarfBuzzSharp",
@@ -91,13 +91,13 @@
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "10.0.3",
"hash": "sha256-h/wiSaVtRCIGdkv6/soA41Dhdlmu2I9hjv/swP8OjDk="
"version": "10.0.5",
"hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "10.0.3",
"hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
"version": "10.0.5",
"hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
},
{
"pname": "Serilog",
@@ -161,8 +161,8 @@
},
{
"pname": "Tmds.DBus",
"version": "0.90.3",
"hash": "sha256-/yBQpjsIqbY4JFBxxVKXPR2S/N1TMLG5QPXvScSCdEk="
"version": "0.91.1",
"hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4="
},
{
"pname": "Tmds.DBus.Protocol",
+2 -2
View File
@@ -29,13 +29,13 @@
buildDotnetModule rec {
pname = "crossmacro";
version = "0.9.9";
version = "1.0.1";
src = fetchFromGitHub {
owner = "alper-han";
repo = "CrossMacro";
tag = "v${version}";
hash = "sha256-LYjGuv+LMqug0sba64sGi9U+9XlK/A4CO+9H/6drgMw=";
hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks=";
};
projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj";
+3 -3
View File
@@ -24,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.20.1";
version = "0.20.2";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "flare";
tag = finalAttrs.version;
hash = "sha256-DVbN+VUk7K2CBwQ4rOGIJj+KYOlB9TeDUGE+s5docok=";
hash = "sha256-LjUd+tq4nBJtBXeOH1SyjKS37R8f5rVvDk+jTR/Mdvs=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-/3xcouWXUxoVFHV05eD4IEuQbPAn+iFIwB8tP+jJm+4=";
hash = "sha256-dXPCyHc6+iS4YMIVy0vOkPG57GEW1ce5sSgyw6k0M3U=";
};
nativeBuildInputs = [
@@ -1,13 +0,0 @@
diff --git a/_scripts/build.js b/_scripts/build.js
index ee1b7fa1c..1a4c9c6b2 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
arch = Arch.arm64
}
- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
+ targets = Platform.MAC.createTarget(['dir'], arch)
} else if (platform === 'win32') {
let arch = Arch.x64
+5 -5
View File
@@ -20,13 +20,13 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "freetube";
version = "0.23.15";
version = "0.24.0";
src = fetchFromGitHub {
owner = "FreeTubeApp";
repo = "FreeTube";
tag = "v${finalAttrs.version}-beta";
hash = "sha256-tYRvR75qbJwt6U4KzT9jrJjO5UznpoALqhUTDkeUlzI=";
hash = "sha256-4XyN7ENsDwLNB/dt7pp8z0sbdmHSNIyVEHlp5GXIues=";
};
# Darwin requires writable Electron dist
@@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
(replaceVars ./patch-build-script.patch {
electron-version = electron.version;
})
./darwin-targets.patch
./targets.patch
];
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-sxDlPB3CWbFAm3WZ6AlwuVu/4UFR9Stl3q0wpkUXPPU=";
hash = "sha256-9rO/XYfOf1TEQOpb5clCfdTiuDeynpnk6L4WpcIIWGk=";
};
nativeBuildInputs = [
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
makeWrapper ${lib.getExe electron} $out/bin/freetube \
--add-flags "$out/share/freetube/resources/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg
''
@@ -1,13 +1,13 @@
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 14d0d9df1..c5fc569c8 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -1,6 +1,8 @@
const { name, productName } = require('../package.json')
diff --git a/_scripts/ebuilder.config.mjs b/_scripts/ebuilder.config.mjs
index bef1f6f1d..d2ee86611 100644
--- a/_scripts/ebuilder.config.mjs
+++ b/_scripts/ebuilder.config.mjs
@@ -2,6 +2,8 @@ import packageDetails from '../package.json' with { type: 'json' }
const config = {
/** @type {import('electron-builder').Configuration} */
export default {
+ electronVersion: "@electron-version@",
+ electronDist: "electron-dist",
appId: `io.freetubeapp.${name}`,
copyright: 'Copyleft © 2020-2025 freetubeapp@protonmail.com',
appId: `io.freetubeapp.${packageDetails.name}`,
copyright: 'Copyleft © 2020-2026 freetubeapp@protonmail.com',
// asar: false,
+22
View File
@@ -0,0 +1,22 @@
diff --git a/_scripts/build.mjs b/_scripts/build.mjs
index 1617f1ad5..b9a1de43b 100644
--- a/_scripts/build.mjs
+++ b/_scripts/build.mjs
@@ -14,7 +14,7 @@ if (platform === 'darwin') {
arch = Arch.arm64
}
- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
+ targets = Platform.MAC.createTarget(['dir'], arch)
} else if (platform === 'win32') {
let arch = Arch.x64
@@ -34,7 +34,7 @@ if (platform === 'darwin') {
arch = Arch.armv7l
}
- targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
+ targets = Platform.LINUX.createTarget(['dir'], arch)
}
const output = await build({ targets, config, publish: 'never' })
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "git-gamble";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitLab {
owner = "pinage404";
repo = "git-gamble";
rev = "version/${finalAttrs.version}";
hash = "sha256-b7jGrt8uJ9arH4EEsOOPCIcQmhwrrJb8uXcSsZPFrNQ=";
hash = "sha256-6pH1gqZaMhXlm1JNu2D7JPO8KF9bA/DxqzM7t+2BUwQ=";
};
cargoHash = "sha256-lf66me4ot5lvrz2JTj8MreaHyVwOcFSVfPGX9lBTKug=";
cargoHash = "sha256-LKwhkZstsccnpg347xtryukx2d6AFbCJVJBB3bnN3bc=";
nativeCheckInputs = [ gitMinimal ];
preCheck = ''
+2 -2
View File
@@ -16,14 +16,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "hydrus";
version = "663";
version = "665";
pyproject = false;
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
tag = "v${finalAttrs.version}";
hash = "sha256-xIQx3aCLbFtdiugLDZsZpsv6TOUj84f6U+80rDZ9mZk=";
hash = "sha256-NMSZ+5slYyfrZlDig/A2QkfZBphtccmlbrsldoL/Tvk=";
};
nativeBuildInputs = [
+2 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
writeShellApplication,
curl,
gnugrep,
@@ -22,13 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -Dm444 *.ttf -t "$out/share/fonts/truetype/"
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
passthru = {
updateScript = lib.getExe (writeShellApplication {
+3 -3
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# Fix boost 1.83+ compatibility
# https://github.com/microsoft/LightGBM/issues/6786
# https://github.com/lightgbm-org/LightGBM/issues/6786
# Patch taken from https://github.com/conda-forge/lightgbm-feedstock/pull/69
(fetchpatch {
name = "fix-boost-sha1";
@@ -219,8 +219,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "Gradient boosting framework that uses tree based learning algorithms";
mainProgram = "lightgbm";
homepage = "https://github.com/microsoft/LightGBM";
changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/lightgbm-org/LightGBM";
changelog = "https://github.com/lightgbm-org/LightGBM/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ nviets ];
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mbake";
version = "1.4.5";
version = "1.4.6";
pyproject = true;
src = fetchFromGitHub {
owner = "EbodShojaei";
repo = "bake";
tag = "v${finalAttrs.version}";
hash = "sha256-ZUcSEWwPR9w/xD+xbaQcKf+4QNwUu3WXMxXvkUm4+SQ=";
hash = "sha256-pA72tKQ3ji2VlW+7rFGNW3yPZmBS9JHqVF0/gpUUqAk=";
};
build-system = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "spicedb";
version = "1.50.0";
version = "1.51.0";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
tag = "v${finalAttrs.version}";
hash = "sha256-ixV2BINcZgcl17g58Qsi6t7nbjmJ86MBEcl12AEMHfg=";
hash = "sha256-kKdBS9Rl0nHRE3Nv/B5KF8SRlG4dnGmpVt8qaE3idMI=";
};
vendorHash = "sha256-C3GqC0isMM8XP8K6BLd7I3UFxXPHs2Vmm0+LCroH6k4=";
vendorHash = "sha256-9VWTJyAOJD7YivzNcVOYYF3eWnR7Fhb/neSVx9pNM7g=";
ldflags = [
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"
+2 -2
View File
@@ -24,7 +24,7 @@
buildGoModule (finalAttrs: {
pname = "tailscale";
version = "1.96.4";
version = "1.96.5";
outputs = [
"out"
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
owner = "tailscale";
repo = "tailscale";
tag = "v${finalAttrs.version}";
hash = "sha256-VnAEfY8W+2QPnQLvVFJA7/XyvSnppSdRvgAOgpmRFGM=";
hash = "sha256-vYYb+2OtuXftjGGG0zWJesHccrClB8YZpclv9KzNN/c=";
};
vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4=";
+3 -3
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ty";
version = "0.0.26";
version = "0.0.27";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ty";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-Q4xYL+MbFnzLFUbfqY5yrepBD7tIujwr9tTPp0H2J/U=";
hash = "sha256-PhPEUNoEGw5tKm1HDHAjJQcYsV6H/b2IpOosSD+sbMA=";
};
# For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoBuildFlags = [ "--package=ty" ];
cargoHash = "sha256-la+8mIFxoTmGUkiIhCZLSP5pRZmOVrenhLjK/yCSz5I=";
cargoHash = "sha256-ARSE/TnZ6vRAb6v8XFathQfpCxfzqYaphKRfhIzHUtc=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -53,13 +53,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.4.5.2";
version = "1.4.5.3";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-VlnKeZlf6oMROHfJ5cnvUXSQequosul6BhrjBP/IoUU=";
hash = "sha256-UZktBlSADFowMuGoWH98Dhg9nD5hYjs19melnx996gg=";
};
prePatch = ''
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "8.3.2";
version = "8.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "appcenter";
tag = version;
hash = "sha256-K8XqWHR9TLkekPvx8VuigIWnqMRJcNf/rkfzUQAE0iU=";
hash = "sha256-8OgGeht0K7MpV9o2MOOt/XvTWHvvQGH+4bLzsWCsFqg=";
};
nativeBuildInputs = [
@@ -27,6 +27,14 @@
ucx,
# passthru.updateScript
gitUpdater,
withGdrcopy ? true,
withIbgda ? true,
withLibfabric ? true,
withMpi ? true,
withNccl ? true,
withPmix ? true,
withUcx ? true,
}:
let
inherit (lib)
@@ -38,6 +46,8 @@ let
getLib
licenses
maintainers
optional
optionals
teams
;
in
@@ -64,13 +74,14 @@ backendStdenv.mkDerivation (finalAttrs: {
cmake
ninja
# NOTE: mpi is in nativeBuildInputs because it contains compilers and is only discoverable by CMake
# when a nativeBuildInput.
mpi
# NOTE: Python is required even if not building nvshmem4py:
# https://github.com/NVIDIA/nvshmem/blob/131da55f643ac87c810ba0bc51d359258bf433a1/CMakeLists.txt#L173
python3Packages.python
]
++ optionals withMpi [
# NOTE: mpi is in nativeBuildInputs because it contains compilers and is only discoverable by CMake
# when a nativeBuildInput.
mpi
];
# NOTE: Hardcoded standard versions mean CMake doesn't respect values we provide, so we need to patch the files.
@@ -98,12 +109,22 @@ backendStdenv.mkDerivation (finalAttrs: {
cuda_nvml_dev
cuda_nvrtc
cuda_nvtx
gdrcopy
libfabric
libnvjitlink
nccl
pmix
rdma-core
]
++ optionals withLibfabric [
libfabric
]
++ optionals withGdrcopy [
gdrcopy
]
++ optionals withNccl [
nccl
]
++ optionals withPmix [
pmix
]
++ optionals withUcx [
ucx
];
@@ -113,49 +134,51 @@ backendStdenv.mkDerivation (finalAttrs: {
env.CUDA_HOME = (getBin cuda_nvcc).outPath;
# https://docs.nvidia.com/nvshmem/release-notes-install-guide/install-guide/nvshmem-install-proc.html#other-distributions
cmakeFlags = [
(cmakeFeature "NVSHMEM_PREFIX" (placeholder "out"))
cmakeFlags = lib.concatLists [
[
(cmakeFeature "NVSHMEM_PREFIX" (placeholder "out"))
(cmakeFeature "CUDA_HOME" (getBin cuda_nvcc).outPath)
(cmakeFeature "CMAKE_CUDA_COMPILER" (getExe cuda_nvcc))
(cmakeFeature "CUDA_HOME" (getBin cuda_nvcc).outPath)
(cmakeFeature "CMAKE_CUDA_COMPILER" (getExe cuda_nvcc))
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
(cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
(cmakeBool "NVSHMEM_USE_NCCL" true)
(cmakeFeature "NCCL_HOME" (getDev nccl).outPath)
(cmakeBool "NVSHMEM_BUILD_TESTS" true)
(cmakeBool "NVSHMEM_BUILD_EXAMPLES" true)
(cmakeBool "NVSHMEM_USE_GDRCOPY" true)
(cmakeFeature "GDRCOPY_HOME" (getDev gdrcopy).outPath)
(cmakeBool "NVSHMEM_BUILD_DEB_PACKAGE" false)
(cmakeBool "NVSHMEM_BUILD_RPM_PACKAGE" false)
# TODO: Looks like a nightmare to package and depends on things we haven't packaged yet
# https://github.com/NVIDIA/nvshmem/tree/131da55f643ac87c810ba0bc51d359258bf433a1/nvshmem4py
(cmakeBool "NVSHMEM_BUILD_PYTHON_LIB" false)
# NOTE: unsupported because it requires Clang
(cmakeBool "NVSHMEM_BUILD_BITCODE_LIBRARY" false)
]
[ (cmakeBool "NVSHMEM_USE_NCCL" withNccl) ]
(optional withNccl (cmakeFeature "NCCL_HOME" (getDev nccl).outPath))
[ (cmakeBool "NVSHMEM_USE_GDRCOPY" withGdrcopy) ]
(optional withGdrcopy (cmakeFeature "GDRCOPY_HOME" (getDev gdrcopy).outPath))
# NOTE: Make sure to use mpi from buildPackages to match the spliced version created through nativeBuildInputs.
(cmakeBool "NVSHMEM_MPI_SUPPORT" true)
(cmakeFeature "MPI_HOME" (getLib buildPackages.mpi).outPath)
[ (cmakeBool "NVSHMEM_MPI_SUPPORT" withMpi) ]
(optional withMpi (cmakeFeature "MPI_HOME" (getLib buildPackages.mpi).outPath))
# TODO: Doesn't UCX need to be built with some argument when we want to use it with libnvshmem?
(cmakeBool "NVSHMEM_UCX_SUPPORT" true)
(cmakeFeature "UCX_HOME" (getDev ucx).outPath)
[ (cmakeBool "NVSHMEM_UCX_SUPPORT" withUcx) ]
(optional withUcx (cmakeFeature "UCX_HOME" (getDev ucx).outPath))
(cmakeBool "NVSHMEM_LIBFABRIC_SUPPORT" true)
(cmakeFeature "LIBFABRIC_HOME" (getDev libfabric).outPath)
[ (cmakeBool "NVSHMEM_LIBFABRIC_SUPPORT" withLibfabric) ]
(optional withLibfabric (cmakeFeature "LIBFABRIC_HOME" (getDev libfabric).outPath))
(cmakeBool "NVSHMEM_IBGDA_SUPPORT" true)
# NOTE: no corresponding _HOME variable for IBGDA.
[ (cmakeBool "NVSHMEM_IBGDA_SUPPORT" withIbgda) ]
(cmakeBool "NVSHMEM_PMIX_SUPPORT" true)
(cmakeFeature "PMIX_HOME" (getDev pmix).outPath)
(cmakeBool "NVSHMEM_BUILD_TESTS" true)
(cmakeBool "NVSHMEM_BUILD_EXAMPLES" true)
(cmakeBool "NVSHMEM_BUILD_DEB_PACKAGE" false)
(cmakeBool "NVSHMEM_BUILD_RPM_PACKAGE" false)
# TODO: Looks like a nightmare to package and depends on things we haven't packaged yet
# https://github.com/NVIDIA/nvshmem/tree/131da55f643ac87c810ba0bc51d359258bf433a1/nvshmem4py
(cmakeBool "NVSHMEM_BUILD_PYTHON_LIB" false)
# NOTE: unsupported because it requires Clang
(cmakeBool "NVSHMEM_BUILD_BITCODE_LIBRARY" false)
[ (cmakeBool "NVSHMEM_PMIX_SUPPORT" withPmix) ]
(optional withPmix (cmakeFeature "PMIX_HOME" (getDev pmix).outPath))
];
postInstall = ''
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "led-ble";
version = "1.1.7";
version = "1.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "led-ble";
tag = "v${version}";
hash = "sha256-6vQPsZvBvoLlxzgfnvjnUdkN24tpBZHr62AFcy3s4gE=";
hash = "sha256-98nAtv2p6WNxg6wwlGviVRzaKGCWGZNqPG4k3jwQpjw=";
};
build-system = [ poetry-core ];
@@ -127,8 +127,8 @@ buildPythonPackage rec {
meta = {
description = "Fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework";
homepage = "https://github.com/Microsoft/LightGBM";
changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}";
homepage = "https://github.com/lightgbm-org/LightGBM";
changelog = "https://github.com/lightgbm-org/LightGBM/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ teh ];
};
@@ -1,13 +1,12 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
nodejs,
fetchPypi,
pythonRelaxDepsHook,
notebook,
ipywidgets,
ipykernel,
numpy,
runCommand,
jupyter-packaging,
jupyter-core,
notebook-shim,
@@ -18,32 +17,24 @@
pillow,
ase,
}:
let
nodeModules = runCommand "nglview-node-modules" { } ''
mkdir -p $out/node_modules/@jupyter-widgets/base
cat > $out/node_modules/@jupyter-widgets/base/package.json <<EOF
{
"name": "@jupyter-widgets/base",
"version": "4.1.1",
"main": "lib/index.js"
}
EOF
'';
in
buildPythonPackage rec {
pname = "nglview";
version = "4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "nglviewer";
repo = "nglview";
tag = "v${version}";
hash = "sha256-Dacsg3+asY0THJ5qrM7+IZCnc2rhCOrbOfN7Xai63Ac=";
src = fetchPypi {
inherit pname version;
hash = "sha256-LAz/LFseKgpy4zkwh85ErgMIUkxapflTV4EtPtvCboM=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
# NGLview demands numpy < 2.3, but nixpkgs ships >= 2.4
pythonRelaxDeps = [ "numpy" ];
build-system = [
nodejs
jupyter-packaging
jupyter-core
notebook-shim
@@ -58,12 +49,6 @@ buildPythonPackage rec {
numpy
];
preBuild = ''
cd js
cp -r ${nodeModules}/node_modules .
cd ..
'';
pythonImportsCheck = [ "nglview" ];
nativeCheckInputs = [
@@ -80,15 +65,10 @@ buildPythonPackage rec {
"test_movie_maker"
];
postInstall = ''
mkdir -p $out/share/jupyter/nbextensions
cp -r nglview/static $out/share/jupyter/nbextensions/nglview-js-widgets
'';
meta = {
description = "IPython/Jupyter widget to interactively view molecular structures and trajectories";
homepage = "https://github.com/nglviewer/nglview";
changelog = "https://github.com/nglviewer/nglview/releases/tag/${src.tag}";
changelog = "https://github.com/nglviewer/nglview/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ guelakais ];
};
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "niquests";
version = "3.18.2";
version = "3.18.3";
pyproject = true;
src = fetchFromGitHub {
owner = "jawah";
repo = "niquests";
tag = "v${version}";
hash = "sha256-lZMUm1rYCsNSMz/cKTqynaLqb1P75JJCFMDZ9onFS4g=";
hash = "sha256-8XR1TZ2VbUVbXb6dEBS3yr+FB4L6Gbhhx3hoYlHfcoA=";
};
build-system = [ hatchling ];
@@ -45,14 +45,14 @@ let
in
buildPythonPackage rec {
pname = "pymdown-extensions";
version = "10.20";
version = "10.21.2";
pyproject = true;
src = fetchFromGitHub {
owner = "facelessuser";
repo = "pymdown-extensions";
tag = version;
hash = "sha256-ei1qbWDH/gpyj111TXeUR3uxmpg+wbfuPscqahjIEOU=";
hash = "sha256-BKnrq8m+xQYZs6V+x+3al7yS8531UvvaC4V+ny+f+Qg=";
};
build-system = [ hatchling ];
@@ -67,13 +67,6 @@ buildPythonPackage rec {
pyyaml
];
disabledTests = [
# test artifact mismatch
"test_toc_tokens"
# Tests fails with AssertionError
"test_windows_root_conversion"
];
pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions;
passthru.tests = {
@@ -86,6 +79,7 @@ buildPythonPackage rec {
};
meta = {
changelog = "https://github.com/facelessuser/pymdown-extensions/blob/${src.tag}/docs/src/markdown/about/changelog.md";
description = "Extensions for Python Markdown";
homepage = "https://facelessuser.github.io/pymdown-extensions/";
license = with lib.licenses; [
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "solarlog-cli";
version = "0.7.0";
version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "dontinelli";
repo = "solarlog_cli";
tag = "v${version}";
hash = "sha256-ryhC2RpLK7olglgOOmja4LzUpVyi6vt6vj3EntUYZx0=";
hash = "sha256-sZ3H2x4QkDMjxo50HHEktfdjOwwGqdPr8tiUq6AafS4=";
};
build-system = [ hatchling ];
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "srpenergy";
version = "1.3.7";
version = "1.3.8";
pyproject = true;
src = fetchFromGitHub {
owner = "lamoreauxlab";
repo = "srpenergy-api-client-python";
tag = version;
hash = "sha256-bdBF5y9hRj4rceUD5qjHOM9TIaHGElJ36YjWCJgCzX8=";
hash = "sha256-V0WDY1tWt5O/35wDDE0e89bqspcKMtl9/QK2A7NIZu8=";
};
postPatch = ''
@@ -34,6 +34,11 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# requires an account
"quickstart_test.py"
];
pythonImportsCheck = [ "srpenergy.client" ];
meta = {
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ttp-templates";
version = "0.3.7";
version = "0.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "dmulyalin";
repo = "ttp_templates";
tag = version;
hash = "sha256-Pntm/wUv/K0ci8U/+nBUVszuX8KT95gyp+i2N6NshKo=";
hash = "sha256-lGlg8AgP7VtwZm5xfpEzs1VJSbfBdYns/l4ROP0LtEQ=";
};
nativeBuildInputs = [ poetry-core ];
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "ucsmsdk";
version = "0.9.24";
version = "0.9.25";
pyproject = true;
src = fetchFromGitHub {
owner = "CiscoUcs";
repo = "ucsmsdk";
tag = "v${version}";
hash = "sha256-c2Tvm4xMyda9PoL7VWMCo7/RjSVcHBJQMh4GeTzgz5I=";
hash = "sha256-hpGWaBlzfb5rcmgnmVQFGGH5T/EJRdilIH4Q83Ml8XQ=";
};
build-system = [ setuptools ];
+2 -2
View File
@@ -23,8 +23,8 @@ let
[ ];
in
buildNodejs {
version = "25.8.2";
sha256 = "3efb19e757dc59bb21632507200d2de782369d5226a68955e9372c925fdf2471";
version = "25.9.0";
sha256 = "8f78af3ee55fb278668b5f801db58bd1a38ea161318eb5ce2128ddbc9cd813aa";
patches =
(
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then