Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-03-09 18:18:46 +00:00
committed by GitHub
88 changed files with 955 additions and 2161 deletions
+6 -3
View File
@@ -46,12 +46,15 @@ function runChecklist({
classify(pull_request.base.ref).type.includes('development'),
'PR touches only files of packages in `pkgs/by-name/`.': allByName,
'PR is at least one of:': {
'Approved by a committer.': committers.intersection(approvals).size > 0,
'Approved by a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).':
committers.intersection(approvals).size > 0,
'Backported via label.':
pull_request.user.login === 'nixpkgs-ci[bot]' &&
pull_request.head.ref.startsWith('backport-'),
'Opened by a committer.': committers.has(pull_request.user.id),
'Opened by r-ryantm.': pull_request.user.login === 'r-ryantm',
'Opened by a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).':
committers.has(pull_request.user.id),
'Opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).':
pull_request.user.login === 'r-ryantm',
},
}
+13
View File
@@ -6107,6 +6107,12 @@
githubId = 10701143;
name = "David Crompton";
};
davidkern = {
email = "nixpkgs-davidkern@proton.me";
github = "davidkern";
githubId = 1548554;
name = "David Kern";
};
davidlghellin = {
email = "hola@devel0pez.com";
github = "davidlghellin";
@@ -14279,6 +14285,13 @@
githubId = 2037002;
name = "Konstantinos";
};
kosslan = {
email = "kosslan@kosslan.dev";
matrix = "@kosslan:kosslan.dev";
github = "kosslan";
githubId = 98048456;
name = "kosslan";
};
kotatsuyaki = {
email = "kotatsuyaki@mail.kotatsu.dev";
github = "kotatsuyaki";
@@ -7,7 +7,7 @@ You can quickly check your edits with the following:
```ShellSession
$ cd /path/to/nixpkgs
$ $EDITOR doc/nixos/manual/... # edit the manual
$ $EDITOR nixos/doc/manual/... # edit the manual
$ nix-build nixos/release.nix -A manual.x86_64-linux
```
@@ -185,6 +185,7 @@ in
]
++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
++ (utils.removePackagesByName [
bluejay
nemo
eom
pluma
@@ -199,6 +200,7 @@ in
gammastep
grim
killall
mesa-demos # eglinfo
slurp
swaybg
swayidle
@@ -247,7 +249,7 @@ in
programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet.
programs.nm-applet.indicator = true; # Budgie uses AppIndicators.
hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel.
hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and Bluejay.
xdg.portal.enable = mkDefault true; # for BCC's Applications panel.
xdg.portal.extraPortals = with pkgs; [
@@ -247,7 +247,6 @@ in
locations = {
"= /favicon.ico".alias = "${finalPackage}/${python.sitePackages}/weblate/static/favicon.ico";
"/static/".alias = "${finalPackage.static}/";
"/media/".alias = "/var/lib/weblate/media/";
"/".proxyPass = "http://unix:///run/weblate.socket";
};
};
+2 -1
View File
@@ -56,7 +56,8 @@ in
environment.etc."xdg/weblate".text = ''
[weblate]
url = https://${serverDomain}/api/
key = ${apiToken}
[keys]
https://${serverDomain}/api/ = ${apiToken}
'';
networking.hosts."${nodes.server.networking.primaryIPAddress}" = [ "${serverDomain}" ];
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-dev";
publisher = "saoudrizwan";
version = "3.66.0";
hash = "sha256-5aSmGAY6Myd5V4bciVo8FcxpBLKtQtddx8HvZdIMhsQ=";
version = "3.71.0";
hash = "sha256-TzEydphPZ/OmIRJYslFJuk26f97mcIukPDS0WUxMOt4=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore rec {
core = "np2kai";
version = "0-unstable-2026-02-08";
version = "0-unstable-2026-03-08";
src = fetchFromGitHub {
owner = "AZO234";
repo = "NP2kai";
rev = "44c8a8c61640f2d5476af5224dbd88a36079f45d";
hash = "sha256-aWiFCG47ckN+b+wdxsXQmnLwGYfkhxkjYv7EMQTFgkU=";
rev = "36df8cd8b1397ec372d9a6f2f30d892b6f30e2b8";
hash = "sha256-JHKZ/FwxF9CQ6piGpnAxLqISUC4lz89jRWDIjxtxBQs=";
fetchSubmodules = true;
};
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "pcsx-rearmed";
version = "0-unstable-2026-02-23";
version = "0-unstable-2026-03-08";
src = fetchFromGitHub {
owner = "libretro";
repo = "pcsx_rearmed";
rev = "5a8cedf59569a9f99caf5fda3b6d0b46a5d376a4";
hash = "sha256-orGU73BWcLaT2CqbdWZAT+5YOYSIb+0b1L4zQVGFZs0=";
rev = "6eb679d064a1efe92af79fe9970c0591c8da02d4";
hash = "sha256-InGMQTGCnbRMLQE5GVDF3aqnH0NY9EjDgJHoh00KGDk=";
};
dontConfigure = true;
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "stella";
version = "0-unstable-2026-02-25";
version = "0-unstable-2026-03-02";
src = fetchFromGitHub {
owner = "stella-emu";
repo = "stella";
rev = "e0e8857f986bce1200881928193629a2105ae65d";
hash = "sha256-Nw+G8VMS7YWfzgssvk5U2M506vVkgkA4Bnym0wpyfbw=";
rev = "b89c2fecb2a00449c484f47ff8437bce2db1b5b9";
hash = "sha256-/cWHUlr9msupT6acfUub1Jr7LCPlasFD7ZCrS9kvCnI=";
};
makefile = "Makefile";
@@ -526,11 +526,11 @@
"vendorHash": null
},
"hashicorp_azurerm": {
"hash": "sha256-iaPwUzwoyxRrb8K6oqIlZxvJ0qiDmWvdh0pgQeDWn6I=",
"hash": "sha256-sg6CJVQJybbYghcp8dBhm2B7xvmsuUS7Je2jmGZHwZE=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v4.62.0",
"rev": "v4.63.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1274,11 +1274,11 @@
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
},
"sysdiglabs_sysdig": {
"hash": "sha256-mzDVPOEu5nIOYykKvudGmByt0sY0Xl+FuSuQruQXTi0=",
"hash": "sha256-TKdZaE3FJ3vE+wxCrqaIuON1sKW/EJAZ1YE73v23K9I=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
"rev": "v3.4.3",
"rev": "v3.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
},
@@ -1,42 +1,42 @@
{
"linux-canary": {
"hash": "sha256-HL6QPiKDg8io8Uhb2u2wDi+5FvwkZzHh4cqBJ6t4qOg=",
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.873/discord-canary-0.0.873.tar.gz",
"version": "0.0.873"
"hash": "sha256-+OgSY9bh0hiO3z4RO5cePGnB92DO9tcjPiswt5fhQCM=",
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.889/discord-canary-0.0.889.tar.gz",
"version": "0.0.889"
},
"linux-development": {
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.94/discord-development-0.0.94.tar.gz",
"version": "0.0.94"
"hash": "sha256-wybYWGNo7FhKC7W3zPEKBc4VO5UulCaRacjjKqbleQE=",
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.97/discord-development-0.0.97.tar.gz",
"version": "0.0.97"
},
"linux-ptb": {
"hash": "sha256-X8PZkMhFYmWjeKPAvxtyBgrQAofkEpD1ow9gzm7v0LQ=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.178/discord-ptb-0.0.178.tar.gz",
"version": "0.0.178"
"hash": "sha256-47k+PQf1A79cSIBLktcB8olCoV5DnxTjPg+Dx5YSb8w=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.181/discord-ptb-0.0.181.tar.gz",
"version": "0.0.181"
},
"linux-stable": {
"hash": "sha256-AyKUq2GJjMam2r7oQjdQBhBsTYbhVtnUaTeLP4emRIE=",
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.125/discord-0.0.125.tar.gz",
"version": "0.0.125"
"hash": "sha256-cef++sTEiqq1H+mHYyIw5Z/Tj1dAoLtKQRw7OSB/axY=",
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.127/discord-0.0.127.tar.gz",
"version": "0.0.127"
},
"osx-canary": {
"hash": "sha256-MPE+EQEvvodFJy0kLT2VQUpMJh3wuh15nhena1LeDuI=",
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.977/DiscordCanary.dmg",
"version": "0.0.977"
"hash": "sha256-VbyhJjp2EblclRnYfzuAVnOx1cdVtbcZYunJivNSA1I=",
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.994/DiscordCanary.dmg",
"version": "0.0.994"
},
"osx-development": {
"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.107/DiscordDevelopment.dmg",
"version": "0.0.107"
"hash": "sha256-85i2vjOj4JhoKwcACyXzUKwonb5qndYoy+4AjrXtaLE=",
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.111/DiscordDevelopment.dmg",
"version": "0.0.111"
},
"osx-ptb": {
"hash": "sha256-CbdKYcJE1Yn8s27f9QXHMVmF6U1URnUdmz5M8ilzZWU=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.210/DiscordPTB.dmg",
"version": "0.0.210"
"hash": "sha256-oxj36f0N9hGcMSurQdgJfFHKgEdv9xL1+SSmszcct68=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.213/DiscordPTB.dmg",
"version": "0.0.213"
},
"osx-stable": {
"hash": "sha256-AGFwdporeTx5D8zb7Gf5ECIM3jv4T6Z1W0BxHZ0NA8o=",
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.377/Discord.dmg",
"version": "0.0.377"
"hash": "sha256-3tNPV9Xk0yZQTV3yhHsYxEOJCFC1Kk2dzO2Wy7GNkCc=",
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.379/Discord.dmg",
"version": "0.0.379"
}
}
+4 -2
View File
@@ -4,6 +4,7 @@
fetchFromGitHub,
libx11,
cairo,
cpio,
lv2,
libsndfile,
pkg-config,
@@ -11,20 +12,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bangr";
version = "1.6.2";
version = "1.6.4";
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BAngr";
tag = finalAttrs.version;
fetchSubmodules = true;
sha256 = "sha256-tit0lF/LqHu3eAtkJj4lo3FfvArOy56JqjtxrzCLJdo=";
sha256 = "sha256-od1UPriojDQHrAWzCYjuNoz27MRGIe+NvntUEFgGGWE=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libx11
cairo
cpio
lv2
libsndfile
];
+3 -3
View File
@@ -11,16 +11,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "biome";
version = "2.4.4";
version = "2.4.6";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "@biomejs/biome@${finalAttrs.version}";
hash = "sha256-d7FSqOOAcJ/llq+REPOCvJAbHFanLzgOuwcOURf+NPg=";
hash = "sha256-xwnNTefv3E6Y27G8cSRNs9adXwzP2w3XK6xX1QEs60g=";
};
cargoHash = "sha256-g8ov3SrcpHuvdg7qbbDMbhYMSAGCxJgQyWY+W/Sh/pM=";
cargoHash = "sha256-Uf+W+f17DMKOYR/KYiyEd+RU/bPMq+itbpHfCAq+7R4=";
nativeBuildInputs = [ pkg-config ];
@@ -5,7 +5,6 @@
replaceVars,
accountsservice,
budgie-desktop,
cheese,
colord,
colord-gtk,
cups,
@@ -19,8 +18,6 @@
glibc,
gnome,
gst_all_1,
gnome-bluetooth_1_0,
gnome-color-manager,
gnome-desktop,
gnome-settings-daemon,
gsettings-desktop-schemas,
@@ -72,20 +69,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-control-center";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-control-center";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-sdAzReZVAZ5omLOhly/l3buiw01eem+k9+3RbVPzS2g=";
hash = "sha256-UiKMYLQ44U4w9MdSTp/AJg3scOoSCeG6gXUBCrM9pc8=";
};
patches = [
(replaceVars ./paths.patch {
budgie_desktop = budgie-desktop;
gcm = gnome-color-manager;
inherit
cups
libgnomekbd
@@ -117,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
glib-networking
gnome-desktop
gst_all_1.gstreamer
cheese
gnome-bluetooth_1_0
gnome-settings-daemon
gsettings-desktop-schemas
gsound
@@ -1,42 +1,3 @@
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index a2f90b093..7801b4a5e 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -587,7 +587,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)
/* run with modal set */
argv = g_ptr_array_new_with_free_func (g_free);
- g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
g_ptr_array_add (argv, g_strdup ("--device"));
g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
g_ptr_array_add (argv, g_strdup ("--parent-window"));
@@ -940,7 +940,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
/* open up gcm-viewer as a info pane */
argv = g_ptr_array_new_with_free_func (g_free);
- g_ptr_array_add (argv, g_strdup ("gcm-viewer"));
+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));
g_ptr_array_add (argv, g_strdup ("--profile"));
g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
g_ptr_array_add (argv, g_strdup ("--parent-window"));
@@ -1186,15 +1186,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
static void
gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
{
- g_autofree gchar *s = NULL;
-
/* get profile */
g_debug ("selected profile = %s",
cd_profile_get_filename (profile));
/* allow getting profile info */
- if (cd_profile_get_filename (profile) != NULL &&
- (s = g_find_program_in_path ("gcm-viewer")) != NULL)
+ if (cd_profile_get_filename (profile) != NULL)
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
else
gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
index b6b7ab9d0..31f268e91 100644
--- a/panels/datetime/tz.h
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-desktop-view";
version = "10.10.1";
version = "10.10.2";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-desktop-view";
rev = "v${finalAttrs.version}";
hash = "sha256-ro+/Aqsyr9py3SEdsRg+eiQLDkFI0wI4MMdCyH02E3U=";
hash = "sha256-XwfNbrK9+FCYtO2tiz5TfHsJmctFbcEaUORiVs/aynE=";
};
nativeBuildInputs = [
+5 -10
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
accountsservice,
alsa-lib,
budgie-desktop-services,
@@ -39,11 +38,13 @@
vala,
validatePkgConfig,
wrapGAppsHook3,
xdg-desktop-portal,
}:
let
pythonEnv = python3.withPackages (
pp: with pp; [
dbus-python
psutil
pygobject3
systemd-python
@@ -52,14 +53,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "budgie-desktop";
version = "10.10.1";
version = "10.10.2";
src = fetchFromGitHub {
owner = "BuddiesOfBudgie";
repo = "budgie-desktop";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-6SRnub0FMRE9AcHwsnYH4WMdG2kqEpl5dfHy56FwrGU=";
hash = "sha256-Eaq7/LY65HpyPRfR57FWDPqkVqBbymlHHQHFUvxER20=";
};
outputs = [
@@ -70,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./plugins.patch
# Don't use scaling factors
# https://github.com/BuddiesOfBudgie/budgie-desktop/pull/864
(fetchpatch {
url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/03d18336c3d50d14e3e81ef03ef8ebd548d8e00c.patch";
hash = "sha256-pO1t3nnyYX2XDqH6wr+00MHsM0fAT0MOSuk+lN+2CNY=";
})
];
nativeBuildInputs = [
@@ -130,6 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/session/budgie-desktop.in \
--replace-fail "@bindir@/org.buddiesofbudgie.Services" "${lib.getExe budgie-desktop-services}" \
--replace-fail "@libexecdirroot@/xdg-desktop-portal" "${xdg-desktop-portal}/libexec/xdg-desktop-portal" \
--replace-fail "@gsd_libexecdir@/budgie-session-compositor-ready" "${budgie-session}/libexec/budgie-session-compositor-ready"
chmod +x src/bridges/labwc/labwc_bridge.py
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "cameradar";
version = "6.1.0";
version = "6.1.1";
src = fetchFromGitHub {
owner = "Ullaakut";
repo = "cameradar";
tag = "v${finalAttrs.version}";
hash = "sha256-C1GScKbOgHAU57B3q7A8Rv37Ny+7p+/L3ZwyiDN0kA0=";
hash = "sha256-wJiHCJHG8S+iGFd9jFyavyxAtJ5FGlbvfFcGQfwpi9Y=";
};
vendorHash = "sha256-jIOQwVnlXbvzqGLPv/zTuSg5GaEWpmTyXEZO73jFGxM=";
vendorHash = "sha256-1jqGRwgbfcOq6fE3h9RJSeLRlFkd4w4L/2RwscA0zZ0=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "chisel";
version = "1.11.4";
version = "1.11.5";
src = fetchFromGitHub {
owner = "jpillora";
repo = "chisel";
tag = "v${finalAttrs.version}";
hash = "sha256-g0UjjzH22ri/tYMO8HDQ6zjis9z6ojRsQJIP5AGhjfM=";
hash = "sha256-9b4y09eStfVLGRGUHw1GicBWsWHy7j9nwhQ3kfmB8Wc=";
};
vendorHash = "sha256-hqHd+62csVjHY2oAvi5fwlI0LbjR/LSDg6b1SMwe8Fw=";
+3 -3
View File
@@ -1,6 +1,6 @@
import ./generic.nix {
version = "26.2.3.2-stable";
rev = "ba231782911b5f53713dc4a9ad6a7fcf5ac4bf89";
hash = "sha256-252cNixB1ca8m4AvtB2097+OhlSmG7Diz0MMyqxvExc=";
version = "26.2.4.23-stable";
rev = "94012846cb561e16e733935e23aceaea30f4b367";
hash = "sha256-Tkt8RcuXCYGy6wAbdlt2rI1eT1zMMtbposBv4T5efb4=";
lts = false;
}
+2 -2
View File
@@ -8,13 +8,13 @@
}:
buildGoModule (finalAttrs: {
pname = "cocoon";
version = "0.8.5";
version = "0.9.0";
src = fetchFromGitHub {
owner = "haileyok";
repo = "cocoon";
tag = "v${finalAttrs.version}";
hash = "sha256-2+K4KiF0N+Y+J5dS4xQZuYlxr6OYzNloVXjxyGnEHh4=";
hash = "sha256-MmDUTFcXonAwHzeeIBxTk4KOVuCNHmaBFHMqHkf4+Yc=";
};
ldflags = [
+7 -4
View File
@@ -1,5 +1,6 @@
{
lib,
stdenv,
fetchFromGitHub,
buildGoModule,
makeBinaryWrapper,
@@ -32,10 +33,12 @@ buildGoModule (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/diffnav \
--prefix PATH : ${lib.makeBinPath [ delta ]}
installShellCompletion --cmd diffnav \
--bash <($out/bin/diffnav completion bash) \
--fish <($out/bin/diffnav completion fish) \
--zsh <($out/bin/diffnav completion zsh)
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd diffnav \
--bash <($out/bin/diffnav completion bash) \
--fish <($out/bin/diffnav completion fish) \
--zsh <($out/bin/diffnav completion zsh)
'';
meta = {
+4 -1
View File
@@ -66,7 +66,10 @@ stdenvNoCC.mkDerivation {
description = "Cloud-native edge and service proxy";
license = lib.licenses.asl20;
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
maintainers = with lib.maintainers; [ katexochen ];
maintainers = with lib.maintainers; [
katexochen
charludo
];
mainProgram = "envoy";
platforms = [
"x86_64-linux"
+2
View File
@@ -52,6 +52,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
lxml
caldav
pycryptodomex
urllib3
requests
];
dontWrapGApps = true;
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fd";
version = "10.4.0";
version = "10.4.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "fd";
rev = "v${finalAttrs.version}";
hash = "sha256-EepsBVsu9a5Ax4BmpZwD22MJAPTFBMxlfuxFBCQ8vGU=";
hash = "sha256-wmlnQyRWo7qxtRQFZywsr0eX7kVmcjyqyV5NG9VtUP0=";
};
cargoHash = "sha256-ejjuQydDbHqYBEnzoDE/WS+lac14eVxxurMMW2+xleA=";
cargoHash = "sha256-MhSc96zkkCb+TKYr0ixDSYq44qgxjkvnwEzSdIwZNBo=";
nativeBuildInputs = [ installShellFiles ];
+5 -3
View File
@@ -16,13 +16,13 @@
}:
let
pname = "feishin";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "jeffvli";
repo = "feishin";
tag = "v${version}";
hash = "sha256-PICVNItpMALffpJvQQXLlHcYu1yDtEUclGYjO25f6ew=";
hash = "sha256-DVlZ1ucCr8nP/TMvS2GBxjimdm8cie155vWoYMx7gbM=";
};
electron = electron_39;
@@ -42,7 +42,7 @@ buildNpmPackage {
src
;
fetcherVersion = 3;
hash = "sha256-K9mwEJA0fZXI2OnVo5y4Zmox3mwO8qLvgLiBaoyYAkg=";
hash = "sha256-LeoOksMWZjhVkEjTn5sS2xuX3QxGX8O7iC/3suVwiug=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -120,6 +120,8 @@ buildNpmPackage {
--set DISABLE_AUTO_UPDATES 1 \
--inherit-argv0
install -Dm644 org.jeffvli.feishin.metainfo.xml $out/share/metainfo/org.jeffvli.feishin.metainfo.xml
for size in 32 64 128 256 512 1024; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
ln -s \
+5 -3
View File
@@ -5,6 +5,7 @@
cargo,
meson,
ninja,
perl,
pkg-config,
gst_all_1,
openssl,
@@ -23,18 +24,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flare";
version = "0.18.4";
version = "0.19.0";
src = fetchFromGitLab {
owner = "schmiddi-on-mobile";
repo = "flare";
tag = finalAttrs.version;
hash = "sha256-6a/up/UbaB9WQEiw8fmuh9Xjz73oBxO2k9jKhKwo0mc=";
hash = "sha256-6wZYwFdgWM4HGUKF4+nx6w2O64tqd0z/yWZk6qwepso=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-wjm3R43iMbXZeMe4dPyreXNqc+3FrDvaEeJJM+IYtz4=";
hash = "sha256-XSnWw+o/sNjAiIZmsSpiVPgpmYnm6MAuJyGN2LzAIjI=";
};
nativeBuildInputs = [
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
desktop-file-utils # for update-desktop-database
meson
ninja
perl
pkg-config
wrapGAppsHook4
rustPlatform.cargoSetupHook
+4 -4
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "11.0.10";
hash = "sha256-vATc7pBOejBfZKNj3WsQeFWr1xKpIB4ODv4TPRrwdg0=";
npmDepsHash = "sha256-Qs1aZxgjlsjdxfBpa4pOrwEfDfb/96L49uJd29Ysn/I=";
vendorHash = "sha256-TVp4WxrGBlKVaPIbsj4EP/3pt5iseXLY7xIVum71ZXU=";
version = "11.0.11";
hash = "sha256-UZJW6C3Vn/e1KJEiyUI3o+/2xvKubjv+j1Lujmse//w=";
npmDepsHash = "sha256-kh7/xZPr5Y8CzGs8hop0a9JNPzmB3w2FPpCb+xOCz0c=";
vendorHash = "sha256-BL6wa+f+qFbDuHImMvAgwsqOTfV6Zt4oMBrOBI1sh1o=";
lts = true;
nixUpdateExtraArgs = [
"--override-filename"
+4 -4
View File
@@ -1,8 +1,8 @@
import ./generic.nix {
version = "14.0.2";
hash = "sha256-jgRyFfbzJ0Camotkn7f/tvSi7jKIhqEpGVZV8xw5uDQ=";
npmDepsHash = "sha256-gyEr5uNZfBELxbvQeZ48xqtay7ObQL4dQaFO9yPC2Hg=";
vendorHash = "sha256-RusaQJXToLGL0pdJtCZBQvlTQfDXoaD6dhHNmHQ5Ozk=";
version = "14.0.3";
hash = "sha256-WE0CUwF5GBUr6+kUeHyPa0XPy5uigol/74eQhQQjBQA=";
npmDepsHash = "sha256-tJmX6VO7T6T4egy+Z2RZhe+/6ZfS6ZHFETfALmfAli4=";
vendorHash = "sha256-TpRVaXNlfnmFu8EdvKN8/mioLeQkghCy0nMWvRB6sYQ=";
lts = false;
nixUpdateExtraArgs = [
"--override-filename"
+2 -2
View File
@@ -80,13 +80,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "frr";
version = "10.5.1";
version = "10.5.2";
src = fetchFromGitHub {
owner = "FRRouting";
repo = "frr";
rev = "frr-${finalAttrs.version}";
hash = "sha256-sTPYIaaF/OfmBMIRS4nRV2Pay03u8R1nUsqMjFH4cFo=";
hash = "sha256-/SO4KELX5NQzbkeoO6QIY6NMUI30ABTRqcAztIAv6/Y=";
};
# Without the std explicitly set, we may run into abseil-cpp
+3 -3
View File
@@ -6,7 +6,7 @@
}:
let
version = "0.17.87";
version = "0.17.88";
in
buildGoModule {
pname = "gqlgen";
@@ -16,10 +16,10 @@ buildGoModule {
owner = "99designs";
repo = "gqlgen";
tag = "v${version}";
hash = "sha256-e5YWX9+1b6bQtaeWcLMX5LxjbZrbGOcjoQTe5T8n1Kk=";
hash = "sha256-AUQUQfxLO595e2ySBMzCt13nD7eiP8Et6kRe+GmCWyU=";
};
vendorHash = "sha256-vbOzKcrdjNsddvwN7PeyFixnQbdT2nGMZN5nFbwhcMI=";
vendorHash = "sha256-Wqk0QVsvr70deuBbwKA/9aYdL+DuWWZ9wqgz3MFvjXI=";
subPackages = [ "." ];
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "hermit";
version = "0.49.4";
version = "0.50.0";
src = fetchFromGitHub {
rev = "v${finalAttrs.version}";
owner = "cashapp";
repo = "hermit";
hash = "sha256-6HgynZmXdX0voB6dFkNshfRnjzrpJUJ518F4yBhExAQ=";
hash = "sha256-2deJGcMZgZIA55Da/7W4y9ib73elQs+2Df/jf62N0EE=";
};
vendorHash = "sha256-KEwbADLm7oTChoLyx/0SykQX1Fy4bJxNbYcGmfEka7Q=";
vendorHash = "sha256-2sNtok5J1kBvJZ0I1FOq1ZP54TsZbzqu/M3v1nA12m8=";
subPackages = [ "cmd/hermit" ];
@@ -7,15 +7,15 @@
}:
let
timestamp = "202601291528";
timestamp = "202602261110";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jdt-language-server";
version = "1.56.0";
version = "1.57.0";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
hash = "sha256-mISS8aQ1C+Uqr75TjcBPXE2uCK0OHyqjUxdiLtLb48Y=";
hash = "sha256-9/+pP+G7vqldrBPdl83NJcWC1uVttnJY2g3M6yMCYB4=";
};
sourceRoot = ".";
+4 -3
View File
@@ -8,16 +8,16 @@
}:
buildGoModule (finalAttrs: {
pname = "jjui";
version = "0.9.12";
version = "0.10.0";
src = fetchFromGitHub {
owner = "idursun";
repo = "jjui";
tag = "v${finalAttrs.version}";
hash = "sha256-CBNMoVALCLWQ9bsrQilnx8djLufLNt8p9iK+HnpUPgc=";
hash = "sha256-wGal1aulnbacP6Ovms82XKPMbUvH/rs9Rg/B40E3uls=";
};
vendorHash = "sha256-nXUaqkCz3QERqevwGk94sRrrPgJoJOPWXYc7iBOMAdY=";
vendorHash = "sha256-egPW+YgRkdOdnzei5J2JmSt/98fpoo1lphsoQIK41Lg=";
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
@@ -37,6 +37,7 @@ buildGoModule (finalAttrs: {
changelog = "https://github.com/idursun/jjui/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
adamcstephens
adda
];
mainProgram = "jjui";
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "kubecm";
version = "0.35.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "sunny0826";
repo = "kubecm";
rev = "v${finalAttrs.version}";
hash = "sha256-QShGRgszcsutSA9sOBXNvAwdTIqHOsMYQQPIXfA8z/M=";
hash = "sha256-5wTxVzpvwD6jx6Cfa0ChIi8wQCrnqzZM2jvwGpQdq50=";
};
vendorHash = "sha256-TyJpFN8JEWpzCHKUX3iYUHhTOOAp5I1YEzhUkWPXx8A=";
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lightningcss";
version = "1.31.0";
version = "1.32.0";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
tag = "v${finalAttrs.version}";
hash = "sha256-K5NgIUYKQVUTQUpoHIrLOobyBkAwNgd3ehzpOOoiFQQ=";
hash = "sha256-JqAzBPYbJq52exCpVTdhd90BQGsbfMOx68PD1xUripg=";
};
cargoHash = "sha256-aL8qrv+ff2tGMLwq9dncTV74DiZLWChHaSS4WhWUj4Q=";
cargoHash = "sha256-zndBkOJ/U6lLaOJn273TabMAPbz96hQeWs4cPKFDGro=";
patches = [
# Backport fix for build error for lightningcss-napi
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "16.3.0";
version = "16.3.2";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-akE8lXnx6W31S+DmkMPRgyvmy6CMZ6y/+LAxSK5Glf4=";
hash = "sha256-k/6h3fcsdjpLwi6QoY/SD67ShGp6nB5OZf5mgoxUa0M=";
};
npmDepsHash = "sha256-IU6QfnmQRVuTt9akIpBOwghzk6i7pGOFlnPlzMYxAqU=";
npmDepsHash = "sha256-amvXt6QNDhdknuj5y0M/m5VXucCDQHSjP65fsB7iY7o=";
dontNpmBuild = true;
+3 -3
View File
@@ -9,16 +9,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mini-calc";
version = "4.0.3";
version = "4.0.4";
src = fetchFromGitHub {
owner = "vanilla-extracts";
repo = "calc";
tag = finalAttrs.version;
hash = "sha256-NR5SJpJW7L6VGu6tCyzt0hhQ5Wnvx3TKlq3MAK4EcLM=";
hash = "sha256-GvWWFTJfgPn26BXVl4MV65pubpIg1y544oHvycTcrGo=";
};
cargoHash = "sha256-LejKPnp4GvGykMTFZM9WVQIa0EMueeit5XfSuE1uiPQ=";
cargoHash = "sha256-tPrACzeUaBK/981ReGWwwfuhBki8Bfebmp7xCLPzXDo=";
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
+3 -3
View File
@@ -8,12 +8,12 @@
buildLua {
pname = "manga-reader";
version = "0-unstable-2026-01-16";
version = "0-unstable-2026-03-03";
src = fetchFromGitHub {
owner = "Dudemanguy";
repo = "mpv-manga-reader";
rev = "a93e03bc837d501760dd38155c8e945d66a3a3ed";
hash = "sha256-UG1MRtwljoKi6kct8mDZSHxz9mzQ1qHnqohX7e5nj40=";
rev = "2e8c21a82eb5fbe0b6feb64375e396d27bd8d5fa";
hash = "sha256-Q6ekBvGsHSiZtO9QYnv5zAoAdkqrcFvmSJQsjVTuwSg=";
};
passthru.updateScript = unstableGitUpdater { };
+3 -3
View File
@@ -14,13 +14,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "openasar";
version = "0-unstable-2026-02-23";
version = "0-unstable-2026-03-04";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "31dfb7bcc0dfecc9e4ef62b65fbc5dcbc34d04fc";
hash = "sha256-/Uc5u7YT2LxRkUtPyZ9Y9MQvKDmwQUSmexQFby9MWzI=";
rev = "a75870297df907d43ac6565385b0af4a781cf6fe";
hash = "sha256-tEKt2Qfk29HP448keMb7JR4+iTR3AXCho7PdkF0D1i0=";
};
postPatch = ''
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "padthv1";
version = "1.3.2";
version = "1.4.0";
src = fetchurl {
url = "mirror://sourceforge/padthv1/padthv1-${finalAttrs.version}.tar.gz";
hash = "sha256-sXpJjD79+rLrWHwpAxACjR+8KVGbQss8qKGMTN7nb9M=";
hash = "sha256-Rru6nIPTdXmBD5sXHQXaB4gjWrlB6F6CYHPTjY7ekuo=";
};
nativeBuildInputs = [
+4 -4
View File
@@ -19,16 +19,16 @@
rustPlatform.buildRustPackage {
pname = "par-lang";
version = "0-unstable-2026-02-27";
version = "0-unstable-2026-03-03";
src = fetchFromGitHub {
owner = "faiface";
repo = "par-lang";
rev = "7c93277a1595bfb6bc6845377a1c6b53b85eeee1";
hash = "sha256-zDivcXpCJaXL/7LuiSUOhi8fMXqdhp5gBMjI6nTgik8=";
rev = "a5777923d4c94480b614c3e8cfceffe6923d1a1a";
hash = "sha256-QGqwgSIcYc7PI/e7dZ+bWo7lrGEzvKEO2FCwtpwbFVI=";
};
cargoHash = "sha256-Z0aTVloZY3UQWkL3+cMqxfzACLwD7OayjBPZbQ0bk1c=";
cargoHash = "sha256-taLTRYB1Crvx0wz3IRvkPRImaRIs0mGscOjLFBkhkgE=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -7,13 +7,13 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "polarity";
version = "latest-unstable-2026-02-20";
version = "latest-unstable-2026-03-07";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "630a1bb3b97c7c1a13087407a50cc78316a2526e";
hash = "sha256-IuT1LJiMEOS+c4dUamCpboDNqHGDVxsjYBJ4NEmLZa4=";
rev = "589d3efe086b78cc095af4b745cf61e61f93fb2a";
hash = "sha256-dssf0sTRQYRfggftd3eSlkEu2ZwFglk8thmDFnL6odA=";
};
cargoHash = "sha256-FrCOsgbb0xQH3cKnWqa2n17uDpppnSd0PyVrrCPXCYw=";
+77
View File
@@ -0,0 +1,77 @@
{
lib,
stdenv,
cmake,
ninja,
kdePackages,
libsForQt5,
fetchFromGitHub,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "qtengine";
version = "0.2.1";
src = fetchFromGitHub {
owner = "kossLAN";
repo = "qtengine";
tag = finalAttrs.version;
hash = "sha256-aJ5ZdIX10nmhzMLjP6QMuFJHvljJD+xcojuKZjPkr70=";
};
outputs = [
"out"
"qt5"
];
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [
kdePackages.qtbase
kdePackages.kconfig
kdePackages.kcolorscheme
kdePackages.kiconthemes
];
# Workaround for Qt5/Qt6 dual support, similar to breeze (pkgs/kde/plasma/breeze)
cmakeFlags = [
"-DQT6_PLUGINDIR=${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}"
"-DQT5_PLUGINDIR=${placeholder "qt5"}/${libsForQt5.qtbase.qtPluginPrefix}"
"-DQT5_LIBDIR=${placeholder "qt5"}/lib"
"-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5"
"-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core"
"-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus"
"-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui"
"-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets"
"-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml"
"-DQt5ThemeSupport_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5ThemeSupport"
"-DQt5ThemeSupport_LIBRARY=${libsForQt5.qtbase.out}/lib/libQt5ThemeSupport.a"
"-DQt5ThemeSupport_INCLUDE_DIR=${libsForQt5.qtbase.dev}/include/QtThemeSupport/${libsForQt5.qtbase.version}"
"-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network"
"-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml"
"-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick"
"-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels"
"-DQt5QuickControls2_DIR=${libsForQt5.qtquickcontrols2.dev}/lib/cmake/Qt5QuickControls2"
"-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth"
"-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs"
"-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config"
"-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets"
"-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons"
"-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons"
"-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes"
"-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons"
];
dontWrapQtApps = true;
meta = {
description = "Minimal Qt platform theme";
homepage = "https://github.com/kossLAN/qtengine";
license = lib.licenses.bsd2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ kosslan ];
};
})
+2 -2
View File
@@ -16,7 +16,7 @@
stdenv,
}:
let
version = "2.60.1629";
version = "2.62.1641";
urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
in
stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-s+rM9jzkL+m1GW2+seI/OnBHMbfeijNJ4CoXOaWJmi8=";
hash = "sha256-DX05i4bgTar2d2xHyEqFXNlQ86FladX/xoEC4YLIxnI=";
};
dontConfigure = true;
+2 -2
View File
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "slepc";
version = "3.24.2";
version = "3.24.3";
src = fetchFromGitLab {
owner = "slepc";
repo = "slepc";
tag = "v${finalAttrs.version}";
hash = "sha256-P6UjCvlXelEGp+ReNGbolcVIV9eQTmcOJDLjmJOZJeQ=";
hash = "sha256-eCCdADdhatarzordwPKpJPIQbFWYngMlJvMBoVcTOWk=";
};
postPatch = ''
+4 -1
View File
@@ -33,7 +33,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/virtee/snpguest";
changelog = "https://github.com/virtee/snpguest/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ katexochen ];
maintainers = with lib.maintainers; [
katexochen
charludo
];
mainProgram = "snpguest";
platforms = [ "x86_64-linux" ];
};
+4 -1
View File
@@ -57,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/virtee/snphost/";
changelog = "https://github.com/virtee/snphost/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ katexochen ];
maintainers = with lib.maintainers; [
katexochen
charludo
];
mainProgram = "snphost";
platforms = [ "x86_64-linux" ];
};
+3 -3
View File
@@ -9,13 +9,13 @@
}:
let
pname = "sql-studio";
version = "0.1.48";
version = "0.1.50";
src = fetchFromGitHub {
owner = "frectonz";
repo = "sql-studio";
tag = version;
hash = "sha256-D/yLALIvzus9u8qUw5oLX+mEVzKgGfdZPEWkMEfM5tg=";
hash = "sha256-sXlOnqzi3N+56sdJdkpcVq1mKgdhhu0KdU1Xdoyr10w=";
};
ui = buildNpmPackage {
@@ -35,7 +35,7 @@ in
rustPlatform.buildRustPackage {
inherit pname version src;
cargoHash = "sha256-CfyR1MNKgQlj0bii6U+En15sVnUpHluHXZn77P3KYgU=";
cargoHash = "sha256-+hf0GtD5lfa//JYFQZFvO+2m9FgOn9jV6NQ0rQejRXg=";
nativeBuildInputs = [ pkg-config ];
+137
View File
@@ -0,0 +1,137 @@
# Tracy Profiler
Upstream: [wolfpld/tracy](https://github.com/wolfpld/tracy)
The Tracy profiler guarantees neither forward nor backward compatibility of its
tracing protocol between releases of the Tracy UI, requiring the UI version to match
the SDK version of the compiled target. Providing a single version of Tracy suffices
for in-tree packages, however developers working on out-of-tree projects need a Tracy
compatible with their build.
To support both scenarios, this provides several versions of Tracy (`tracy_x_xx`)
with the most recent available "by name" as `tracy`.
## Version Retention Guidelines
Older releases of Tracy are provided as a convenience, not a guarantee. Maintainers
should balance relevance to nixpkgs, maintainance burden, and user need.
- Dependants in nixpkgs use `tracy` rather than a pinned version;
- No more than three pinned versions of Tracy are maintained, assuming annual release
cadence of upstream;
- Older versions which block or inconvenience an upgrade to nixpkgs as a whole will be
dropped;
- Exceptions or changes to guidelines are documented here.
As with all packages, maintainers should use their best judgement on what to drop and
what to retain.
## Tracy Dependencies
Tracy uses [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) to manage its dependencies.
CPM normally downloads dependencies during cmake configure, but that is incompatible with a
nixpkg build. This package uses several [Devendoring Strategies](#devendoring-strategies)
to provide dependencies to upstream's cmake build environment.
| Strategy | When to Use |
|-------------------------------|------------------------------------------------------|
| nixpkgs | CPM NAME matches cmake package name |
| nixpkgs FindPackage | CPM NAME or target name differs from nixpkgs |
| nixpkgs src | Need different build options than nixpkgs default |
| vendored | Package not in nixpkgs or incompatible |
### Tracy 0.11.x
| Dependency | Tracy Ver | nixpkgs Ver | Strategy | Notes |
|-------------------|-----------|-------------|-----------------|---------------------------|
| capstone | 5.0.1 | 5.0.6 | nixpkgs | |
| glfw | 3.3.8 | 3.4 | nixpkgs | |
| wayland-protocols | 1.32 | 1.46 | nixpkgs | XML protocol files only |
### Tracy 0.12.x
| Dependency | Tracy Ver | nixpkgs Ver | Strategy | Notes |
|----------------------|------------------|-------------|---------------------|--------------------------------|
| capstone | 6.0.0-Alpha1 | 5.0.6 | vendored | Needs v6 alpha |
| ImGui | 1.91.9b-docking | 1.91.4 | vendored | Needs docking branch |
| nfd | 1.2.1 | 1.2.1 | nixpkgs src | ABI mismatch (NFD_PORTAL) |
| PackageProject.cmake | 1.11.1 | - | vendored | Transitive dep of PPQSort |
| PPQSort | 1.0.5 | - | vendored | Not in nixpkgs |
| zstd | 1.5.6 | 1.5.7 | nixpkgs FindPackage | `Findzstd.cmake` alias |
| wayland-protocols | 1.37 | 1.46 | nixpkgs | XML protocol files only |
### Tracy 0.13.x
| Dependency | Tracy Ver | nixpkgs Ver | Strategy | Notes |
|----------------------|------------------|-------------|-----------------------|--------------------------------|
| base64 | 0.5.2 | - | vendored | Not in nixpkgs |
| capstone | 6.0.0-Alpha5 | 5.0.6 | vendored | Needs v6 alpha |
| curl | 8.17.0 | 8.17.0 | nixpkgs | |
| ImGui | 1.92.5-docking | 1.91.4 | vendored | Needs docking branch |
| html-tidy | 5.8.0 | 5.8.0 | nixpkgs FindPackage | `Findtidy.cmake` shim |
| md4c | 0.5.2 | 0.5.2 | nixpkgs | |
| nfd | 1.2.1 | 1.2.1 | nixpkgs src | ABI mismatch (NFD_PORTAL) |
| nlohmann_json | 3.12.0 | 3.12.0 | nixpkgs FindPackage | `Findjson.cmake` shim |
| PackageProject.cmake | 1.11.1 | - | vendored | Transitive dep of PPQSort |
| PPQSort | 1.0.6 | - | vendored | Not in nixpkgs |
| pugixml | 1.15 | 1.15 | nixpkgs | |
| usearch | 2.21.3 | - | vendored | Not in nixpkgs |
| wayland-protocols | 1.37 | 1.46 | nixpkgs | XML protocol files only |
| zstd | 1.5.6 | 1.5.7 | nixpkgs FindPackage | `Findzstd.cmake` alias |
## Devendoring Strategies
## Strategy: nixpkgs
The CPM `NAME` matches the cmake package name and the package provides cmake config or pkg-config.
### Mechanism
With `CPM_LOCAL_PACKAGES_ONLY=TRUE`, CPM calls `find_package()` before attempting download. If the
nixpkgs package is found, CPM uses it.
### Implementation
Add the nixpkgs dependency to `extrabuildInputs`.
## Strategy: nixpkgs FindPackage
A compatible nixpkgs package exists but either:
- CPM uses a different `NAME` than the cmake package name
- cmake target names differ from what tracy expects
### Mechanism
Find modules in `CMAKE_MODULE_PATH` are tried before config files. When `find_package(foo)` is called, cmake finds our `Findfoo.cmake` which can delegate to the real package and create any necessary aliases.
### Implementation
- Add the nixpkgs dependency to `extrabuildInputs`.
- Create a `Find<dep>.cmake` module in the `cmake` directory and adjust package and target names.
## Strategy: nixpkgs src
Package exists in nixpkgs with compatible source but upstream needs different build options.
### Mechanism
With a `CPM_<dep>_SOURCE` cmake option set, CPM finds the dependency sources in the provided directory.
### Implementation
Add the nixpkgs package `.src` attribute to the `cpmSrcs` list with a `name` attribute matching the
CPM `NAME`.
## Strategy: Vendored Source
Package is not available in nixpkgs or is incompatible.
### Mechansim
Uses the same mechanism as a nixpkg src, except the source is downloaded with a fetcher such as
`fetchFromGithub`.
### Implementation
Add an appropriate fetcher to the `cpmSrcs` list, ensuring that the name matches what CPM expects (case-sensitive).
@@ -0,0 +1,5 @@
# tracy CPM uses NAME `json` but nixpkgs provides `nlohmann_json`.
find_package(nlohmann_json REQUIRED)
set(json_FOUND TRUE)
set(json_VERSION "${nlohmann_json_VERSION}")
@@ -0,0 +1,13 @@
# tracy CPM uses NAME `tidy` and links against `tidy-static`.
# tracy also uses ${tidy_SOURCE_DIR}/include for headers.
# nixpkgs `html-tidy` provides `tidy` via pkg-config.
include(FindPkgConfig)
pkg_check_modules(TIDY REQUIRED IMPORTED_TARGET tidy)
add_library(tidy-static ALIAS PkgConfig::TIDY)
# TIDY_INCLUDE_DIRS is e.g. /nix/store/.../include, we need the parent
list(GET TIDY_INCLUDE_DIRS 0 _tidy_inc)
get_filename_component(tidy_SOURCE_DIR "${_tidy_inc}" DIRECTORY)
set(tidy_FOUND TRUE)
@@ -0,0 +1,7 @@
# nixpkgs `zstd` provides `zstd::libzstd` but tracy links against `libzstd`.
#
# Using CONFIG mode bypasses FindPackage modules, so this won't recurse.
find_package(zstd CONFIG REQUIRED)
add_library(libzstd INTERFACE IMPORTED GLOBAL)
target_link_libraries(libzstd INTERFACE zstd::libzstd)
+226
View File
@@ -0,0 +1,226 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchFromGitLab,
fetchurl,
callPackage,
coreutils,
cmake,
ninja,
pkg-config,
wayland-scanner,
capstone,
dbus,
freetype,
glfw,
onetbb,
withGtkFileSelector ? false,
gtk3,
withWayland ? stdenv.hostPlatform.isLinux,
libglvnd,
libxkbcommon,
wayland,
wayland-protocols,
libffi,
md4c,
pugixml,
curl,
zstd,
nlohmann_json,
nativefiledialog-extended,
html-tidy,
}:
assert withGtkFileSelector -> stdenv.hostPlatform.isLinux;
let
mkTracyPackage =
{
version,
srcHash,
cpmSrcs ? [ ],
patches ? [ ],
extraBuildInputs ? [ ],
}:
stdenv.mkDerivation {
inherit patches;
pname = "tracy";
inherit version;
src = fetchFromGitHub {
name = "tracy";
owner = "wolfpld";
repo = "tracy";
rev = "v${version}";
hash = "${srcHash}";
};
postUnpack = (
lib.strings.concatLines (
lib.lists.forEach cpmSrcs (
s:
# Make CPM sources writable for patches and set CPM_<package>_SOURCE flags
''
cp -R ${s.out} ${s.name}
chmod -R u+w ${s.name}
appendToVar cmakeFlags -DCPM_${s.name}_SOURCE=$(pwd)/${s.name}
''
# PPQSort tries to download CPM.cmake
# Provide it the newer version from tracy instead
+ lib.optionalString (s.name == "PPQSort") ''
cp ./tracy/cmake/CPM.cmake PPQSort/cmake/CPM.cmake
''
)
)
);
nativeBuildInputs = [
cmake
ninja
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]
++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
buildInputs = [
freetype
onetbb
]
++ extraBuildInputs
++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [
libglvnd
libxkbcommon
wayland
wayland-protocols
libffi
]
++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [
glfw
];
cmakeFlags = [
(lib.cmakeBool "DOWNLOAD_CAPSTONE" false)
(lib.cmakeBool "TRACY_STATIC" false)
(lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true)
(lib.cmakeBool "CPM_FIND_DEBUG_MODE" true)
(lib.cmakeFeature "CMAKE_MODULE_PATH" "${./cmake}")
]
++ lib.optional (stdenv.hostPlatform.isLinux && withGtkFileSelector) (
lib.cmakeBool "GTK_FILESELECTOR" true
)
++ lib.optional (stdenv.hostPlatform.isLinux && !withWayland) (lib.cmakeBool "LEGACY" true)
++ lib.optional (stdenv.hostPlatform.isLinux && withWayland) (
lib.cmakeFeature "CPM_wayland-protocols_SOURCE" "${wayland-protocols}/share/wayland-protocols"
);
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-ltbb";
dontUseCmakeBuildDir = true;
postConfigure =
# CPM_<package>_SOURCE flags prevent downloads but cause each of the sub-projects
# to apply the same patches to the same source. The patch tool will return a
# non-zero status, failing the build, even if configured to ignore patch re-application.
#
# The workaround is to first configure the profiler since it includes all of the
# dependencies and then short-circuit the patch command for the remaining projects.
''
cmake -B profiler/build -S profiler $cmakeFlags
appendToVar cmakeFlags -DPATCH_EXECUTABLE=${coreutils}/bin/true
cmake -B capture/build -S capture $cmakeFlags
cmake -B csvexport/build -S csvexport $cmakeFlags
cmake -B import/build -S import $cmakeFlags
cmake -B update/build -S update $cmakeFlags
'';
postBuild = ''
ninja -C capture/build
ninja -C csvexport/build
ninja -C import/build
ninja -C profiler/build
ninja -C update/build
'';
postInstall = ''
install -D -m 0555 capture/build/tracy-capture -t $out/bin
install -D -m 0555 csvexport/build/tracy-csvexport $out/bin
install -D -m 0555 import/build/{tracy-import-chrome,tracy-import-fuchsia} -t $out/bin
install -D -m 0555 profiler/build/tracy-profiler $out/bin/tracy
install -D -m 0555 update/build/tracy-update -t $out/bin
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace extra/desktop/tracy.desktop \
--replace-fail Exec=/usr/bin/tracy Exec=tracy
install -D -m 0444 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
install -D -m 0444 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
install -D -m 0444 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
install -D -m 0444 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
install -D -m 0444 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
'';
meta = {
description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
homepage = "https://github.com/wolfpld/tracy";
license = lib.licenses.bsd3;
mainProgram = "tracy";
maintainers = with lib.maintainers; [
mpickering
nagisa
];
platforms = lib.platforms.linux ++ lib.optionals (!withWayland) lib.platforms.darwin;
};
};
in
rec {
tracy_0_11 = mkTracyPackage (
import ./tracy-0.11.nix {
inherit
lib
stdenv
capstone
;
}
);
tracy_0_12 = mkTracyPackage (
import ./tracy-0.12.nix {
inherit
fetchFromGitHub
fetchFromGitLab
zstd
nativefiledialog-extended
;
}
);
tracy_0_13 = mkTracyPackage (
import ./tracy-0.13.nix {
inherit
fetchFromGitHub
md4c
pugixml
curl
zstd
nlohmann_json
nativefiledialog-extended
html-tidy
;
}
);
tracy_latest = tracy_0_13;
}
+40 -91
View File
@@ -2,7 +2,11 @@
lib,
stdenv,
fetchFromGitHub,
fetchFromGitLab,
fetchurl,
callPackage,
coreutils,
cmake,
ninja,
pkg-config,
@@ -22,109 +26,54 @@
libxkbcommon,
wayland,
wayland-protocols,
libffi,
md4c,
pugixml,
curl,
zstd,
nlohmann_json,
nativefiledialog-extended,
html-tidy,
}:
assert withGtkFileSelector -> stdenv.hostPlatform.isLinux;
(import ./package-versions.nix {
inherit
lib
stdenv
fetchFromGitHub
fetchFromGitLab
fetchurl
callPackage
stdenv.mkDerivation (finalAttrs: {
pname = if withWayland then "tracy-wayland" else "tracy-glfw";
version = "0.11.1";
src = fetchFromGitHub {
owner = "wolfpld";
repo = "tracy";
rev = "v${finalAttrs.version}";
hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
};
patches = lib.optional (
stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11"
) ./dont-use-the-uniformtypeidentifiers-framework.patch;
nativeBuildInputs = [
coreutils
cmake
ninja
pkg-config
]
++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]
++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
wayland-scanner
buildInputs = [
capstone
dbus
freetype
glfw
onetbb
]
++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [
withGtkFileSelector
gtk3
withWayland
libglvnd
libxkbcommon
wayland
wayland-protocols
]
++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [
glfw
];
libffi
cmakeFlags = [
"-DDOWNLOAD_CAPSTONE=off"
"-DTRACY_STATIC=off"
]
++ lib.optional (stdenv.hostPlatform.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON"
++ lib.optional (stdenv.hostPlatform.isLinux && !withWayland) "-DLEGACY=on";
env.NIX_CFLAGS_COMPILE = toString (
[ ]
++ lib.optional stdenv.hostPlatform.isLinux "-ltbb"
# Workaround for https://github.com/NixOS/nixpkgs/issues/19098
++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform.isDarwin) "-fno-lto"
);
dontUseCmakeBuildDir = true;
postConfigure = ''
cmake -B capture/build -S capture $cmakeFlags
cmake -B csvexport/build -S csvexport $cmakeFlags
cmake -B import/build -S import $cmakeFlags
cmake -B profiler/build -S profiler $cmakeFlags
cmake -B update/build -S update $cmakeFlags
'';
postBuild = ''
ninja -C capture/build
ninja -C csvexport/build
ninja -C import/build
ninja -C profiler/build
ninja -C update/build
'';
postInstall = ''
install -D -m 0555 capture/build/tracy-capture -t $out/bin
install -D -m 0555 csvexport/build/tracy-csvexport $out/bin
install -D -m 0555 import/build/{tracy-import-chrome,tracy-import-fuchsia} -t $out/bin
install -D -m 0555 profiler/build/tracy-profiler $out/bin/tracy
install -D -m 0555 update/build/tracy-update -t $out/bin
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace extra/desktop/tracy.desktop \
--replace-fail Exec=/usr/bin/tracy Exec=tracy
install -D -m 0444 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
install -D -m 0444 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
install -D -m 0444 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
install -D -m 0444 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
install -D -m 0444 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
'';
meta = {
description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
homepage = "https://github.com/wolfpld/tracy";
license = lib.licenses.bsd3;
mainProgram = "tracy";
maintainers = with lib.maintainers; [
mpickering
nagisa
];
platforms = lib.platforms.linux ++ lib.optionals (!withWayland) lib.platforms.darwin;
};
})
md4c
pugixml
curl
zstd
nlohmann_json
nativefiledialog-extended
html-tidy
;
}).tracy_latest
+17
View File
@@ -0,0 +1,17 @@
{
lib,
stdenv,
capstone,
}:
{
version = "0.11.1";
srcHash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
patches = lib.optional (
stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11"
) ./dont-use-the-uniformtypeidentifiers-framework.patch;
extraBuildInputs = [
capstone
];
}
+45
View File
@@ -0,0 +1,45 @@
{
fetchFromGitHub,
fetchFromGitLab,
zstd,
nativefiledialog-extended,
}:
{
version = "0.12.2";
srcHash = "sha256-voHql8ETnrUMef14LYduKI+0LpdnCFsvpt8B6M/ZNmc=";
extraBuildInputs = [ zstd ];
cpmSrcs = [
(fetchFromGitHub {
name = "ImGui";
owner = "ocornut";
repo = "imgui";
rev = "v1.91.9b-docking";
hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
})
# Use nixpkgs source but let CPM build with tracy's options (NFD_PORTAL)
(nativefiledialog-extended.src // { name = "nfd"; })
(fetchFromGitHub {
name = "PPQSort";
owner = "GabTux";
repo = "PPQSort";
rev = "v1.0.5";
hash = "sha256-EMZVI/uyzwX5637/rdZuMZoql5FTrsx0ESJMdLVDmfk=";
})
# Transitive from PPQSort
(fetchFromGitHub {
name = "PackageProject.cmake";
owner = "TheLartians";
repo = "PackageProject.cmake";
rev = "v1.11.1";
hash = "sha256-E7WZSYDlss5bidbiWL1uX41Oh6JxBRtfhYsFU19kzIw=";
})
(fetchFromGitHub {
name = "capstone";
owner = "capstone-engine";
repo = "capstone";
rev = "6.0.0-Alpha1";
hash = "sha256-oKRu3P1inWueEMIpL0uI2ayCMHZ9FIVotil4sqwLqH4=";
})
];
}
+71
View File
@@ -0,0 +1,71 @@
{
fetchFromGitHub,
md4c,
pugixml,
curl,
zstd,
nlohmann_json,
nativefiledialog-extended,
html-tidy,
}:
{
version = "0.13.1";
srcHash = "sha256-D4aQ5kSfWH9qEUaithR0W/E5pN5on0n9YoBHeMggMSE=";
extraBuildInputs = [
md4c
pugixml
curl
zstd
nlohmann_json
html-tidy
];
cpmSrcs = [
(fetchFromGitHub {
name = "ImGui";
owner = "ocornut";
repo = "imgui";
rev = "v1.92.5-docking";
hash = "sha256-/jVT7+874LCeSF/pdNVTFoSOfRisSqxCJnt5/SGCXPQ=";
})
# Use nixpkgs source but let CPM build with tracy's options (NFD_PORTAL)
(nativefiledialog-extended.src // { name = "nfd"; })
(fetchFromGitHub {
name = "PPQSort";
owner = "GabTux";
repo = "PPQSort";
rev = "v1.0.6";
hash = "sha256-HgM+p2QGd9C8A8l/VaEB+cLFDrY2HU6mmXyTNh7xd0A=";
})
# Transitive from PPQSort
(fetchFromGitHub {
name = "PackageProject.cmake";
owner = "TheLartians";
repo = "PackageProject.cmake";
rev = "v1.11.1";
hash = "sha256-E7WZSYDlss5bidbiWL1uX41Oh6JxBRtfhYsFU19kzIw=";
})
(fetchFromGitHub {
name = "capstone";
owner = "capstone-engine";
repo = "capstone";
rev = "6.0.0-Alpha5";
hash = "sha256-18PTj4hvBw8RTgzaFGeaDbBfkxmotxSoGtprIjcEuVg=";
})
(fetchFromGitHub {
name = "base64";
owner = "aklomp";
repo = "base64";
rev = "v0.5.2";
hash = "sha256-dIaNfQ/znpAdg0/vhVNTfoaG7c8eFrdDTI0QDHcghXU=";
})
(fetchFromGitHub {
name = "usearch";
owner = "unum-cloud";
repo = "usearch";
rev = "v2.21.3";
fetchSubmodules = true;
hash = "sha256-7IylunAkVNceKSXzCkcpp/kAsI3XoqniHe10u3teUVA=";
})
];
}
+3 -3
View File
@@ -10,19 +10,19 @@
buildGoModule (finalAttrs: {
pname = "trivy";
version = "0.69.1";
version = "0.69.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
tag = "v${finalAttrs.version}";
hash = "sha256-0BzqkLT4puBfBweu+3WIEepkpzr0LyHXL7/DrhjyxNs=";
hash = "sha256-lzFcLyrORA+1LxS4nzJVvilg29GTNiGRmnjJ47ev/yU=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
vendorHash = "sha256-GLHr2bLAt3jIOz+E38fryca3r9QqC31sjSOXXk3UP0w=";
vendorHash = "sha256-aqSB2pakYH713GSbIAHwAL9Gio17MzZtwqfh9sbzDBs=";
subPackages = [ "cmd/trivy" ];
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "troubadix";
version = "26.2.2";
version = "26.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "greenbone";
repo = "troubadix";
tag = "v${finalAttrs.version}";
hash = "sha256-N287cfQcqnlB9c4VM80XU2I2o2+buspkkL8w4zob8Js=";
hash = "sha256-E4pgTZErn9Mdrz66Wz7sf7zEDIN6WbVvHlToj8ozIr0=";
};
pythonRelaxDeps = [
+1
View File
@@ -46,6 +46,7 @@ buildGoModule (finalAttrs: {
maintainers = with lib.maintainers; [
katexochen
malt3
charludo
];
platforms = lib.platforms.unix;
};
+3 -4
View File
@@ -94,7 +94,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
pythonRelaxDeps = [
"certifi"
"crispy-bootstrap5"
"urllib3"
];
dependencies =
@@ -123,9 +122,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
django-cors-headers
django-crispy-forms
django-filter
django-redis
django-otp
django-otp-webauthn
django-otp
django-redis
django
djangorestframework-csv
djangorestframework
@@ -157,6 +156,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
qrcode
rapidfuzz
redis
regex
requests
ruamel-yaml
sentry-sdk
@@ -188,7 +188,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
aliyun-python-sdk-core
];
amazon = [ boto3 ];
# antispam = [ python-akismet ];
# gelf = [ logging-gelf ];
# gerrit = [ git-review ];
google = [
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "xnldorker";
version = "4.1";
version = "4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "xnl-h4ck3r";
repo = "xnldorker";
tag = "v${finalAttrs.version}";
hash = "sha256-k0nTY3n5g7cNsVVWDcdFpCjQVJCErPp/21iz2R/TTGs=";
hash = "sha256-g5o2H5FqP+ytu5eqmGUyn0lD9NQcCJ4+xQCmTk0Qxrg=";
};
pythonRemoveDeps = [
+21 -21
View File
@@ -1,27 +1,27 @@
{ callPackage }:
callPackage ./binary.nix {
version = "1.24.11";
version = "1.24.13";
hashes = {
# Use `print-hashes.sh ${version}` to generate the list below
darwin-amd64 = "c45566cf265e2083cd0324e88648a9c28d0edede7b5fd12f8dc6932155a344c5";
darwin-arm64 = "a9c90c786e75d5d1da0547de2d1199034df6a4b163af2fa91b9168c65f229c12";
freebsd-386 = "99229da13fd74d5cdcb81fae844bf48574c64eae0d2821137f45c848f1453771";
freebsd-amd64 = "de6fdd4eefa06dbb2531ed601ef5f2b88e73f49f89c10bc1078f51a96a7ae88f";
freebsd-arm = "fd7a01515c09ad190c969bd9cd277803c05acfaa7b03c496d3a9d1b8cad72d03";
freebsd-arm64 = "eead4408b88557228fe4b30ee90aa33062d338fa5647c046a5aaca4237839f5a";
freebsd-riscv64 = "3c192d96d57c6330e6a92d70235a4e938345c9b3a50d37cfce60c92dd7240d04";
linux-386 = "bb702d0b67759724dccee1825828e8bae0b5199e3295cac5a98a81f3098fa64a";
linux-amd64 = "bceca00afaac856bc48b4cc33db7cd9eb383c81811379faed3bdbc80edb0af65";
linux-arm64 = "beaf0f51cbe0bd71b8289b2b6fa96c0b11cd86aa58672691ef2f1de88eb621de";
linux-armv6l = "24d712a7e8ea2f429c05bc67287249e0291f2fe0ea6d6ff268f11b7343ad0f47";
linux-loong64 = "45c3cbec9e30071ea1f3323fc30fb1b8497007c992f00ba48fcdcb729f06467c";
linux-mips = "c006942d74a348af080aac3930c3772148761cf1de5d97c3879c30d17b72ccf5";
linux-mips64 = "d054e2fb0873ac1d5502c4a860090bfff130b8fabdeeea311adda658fbc45ac5";
linux-mips64le = "c0274255613b85e2ba45e210e8f07995d51a048f11c7f0b9128dc177472692b3";
linux-mipsle = "5c787fc3ac04c4ebeaa0a6602c8a69eae557fe15d033a07cf22ac44e2489285f";
linux-ppc64 = "3fceb9492469f2155134a834c12b4bf9c1126fbb3cbf5a5ae660648897b8076d";
linux-ppc64le = "f770d0c5d7e7e2edb030133ac7854d9204f4e954e79a176e81362ffedf6ea34c";
linux-riscv64 = "9db9ba8e6b60f3662f55ed78b128175edbe8b9480e657126a5b8f5043ee1e38c";
linux-s390x = "5955ddda3445b2cbfd81b8772044084911f55d0baeb32414da0411f6a377a2d4";
darwin-amd64 = "6cc6549b06725220b342b740497ffd24e0ebdcef75781a77931ca199f46ad781";
darwin-arm64 = "f282d882c3353485e2fc6c634606d85caf36e855167d59b996dbeae19fa7629a";
freebsd-386 = "1e3bd90c1d138a3d4bbc39f3990f59faab5e9d83006b51c5dec17538716d2651";
freebsd-amd64 = "96e3c439befbb365ecde3ae475f9319ef7693d5d66a05992e8f8d29c60a63761";
freebsd-arm = "3d8005886f2dff23357d5d36e7759fdadc642d5207c01bd9e761d5d9e27f3257";
freebsd-arm64 = "67efe294235fd85fc0fb810275dfd402a459c8522f7bf075f63c7047db474f1b";
freebsd-riscv64 = "4973d786b9bc4291063ecc69546e662f18d5fa564745673c7ea39c3febc11cc3";
linux-386 = "a55cb4587b1face90dc9334d8ad44ccd41fade77dcff645a74927eb0adc52272";
linux-amd64 = "1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730";
linux-arm64 = "74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3";
linux-armv6l = "a26b1e54c0fe7b0babc79716a89b830f1cde54f6c6f914a9995d3f0d0bdd0242";
linux-loong64 = "8fd090f77b88b9e6f3807a24fce5187163f0036a30d47abab97a1861321f62ca";
linux-mips = "b879aea34facab984856575ddc3416cfeaa4e3b87a5b23e23ad7acb850bed605";
linux-mips64 = "b652f8f1199fab0e139bd1e41596470cb104b404e829e658d571ad7566148ada";
linux-mips64le = "d1c233a227fd4c5be04d4e8929b4b75e7237556916b8295c0436a1301af8ea12";
linux-mipsle = "4685999157eafa2b731d58e93b50693c34b6efdb2a63755591e785886ca8aaf0";
linux-ppc64 = "0ff9907f079e4f2c4d1c4a30a0acc4bb8b627a7043f49b19dc97eb4491b78fdc";
linux-ppc64le = "5f0dfab58ce15a84d824363c041246c76847a69d14f9ffac16bd5342299ecc14";
linux-riscv64 = "9a8166261489d3f38c7a568785b7012c123e3561779d282d568a72d58506754f";
linux-s390x = "a3e3e2012f9b4d392fab85fd4596bbd798ea8e0ceba259f47023b8cb5ebfffc1";
};
}
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "libquotient";
version = "0.9.5";
version = "0.9.6.1";
outputs = [
"out"
@@ -24,18 +24,9 @@ stdenv.mkDerivation rec {
owner = "quotient-im";
repo = "libQuotient";
rev = version;
hash = "sha256-wdIE5LI4l3WUvpGfoJBL8sjBl2k8NfZTh9CjfJc9FIA=";
hash = "sha256-ea7vOxmc4S7KizbwYp21NryW3BGh+Jn0HOR4qsA1roE=";
};
patches = [
# Qt 6.10 compat
# FIXME: remove in next update
(fetchpatch {
url = "https://github.com/quotient-im/libQuotient/commit/ea83157eed37ff97ab275a5d14c971f0a5a70595.diff";
hash = "sha256-JMdcywGgZ0Gev/Nce4oPiMJQxTBJYPoq+WoT3WLWWNQ=";
})
];
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [
@@ -1,5 +1,6 @@
{
buildOctavePackage,
stdenv,
lib,
fetchurl,
gsl,
@@ -14,7 +15,7 @@ buildOctavePackage rec {
sha256 = "1lvfxbqmw8h1nlrxmvrl6j4xffmbzxfhdpxz3vrc6lg2g4jwaa6h";
};
buildInputs = [
propagatedBuildInputs = [
gsl
];
@@ -23,8 +24,9 @@ buildOctavePackage rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ KarlJoad ];
description = "Octave bindings to the GNU Scientific Library";
# When used in an `octave.withPackages` environment, octave fails to find
# libgsl.so from some reason.
broken = true;
# gsl_sf.cc:1782:11: error: no member named 'is_real_type' in 'octave_value'
# 1782 | if (! ISREAL(args(i)))
# | ^~~~~~~~~~~~~~~
broken = stdenv.hostPlatform.isDarwin;
};
}
@@ -18,14 +18,14 @@
buildPythonPackage (finalAttrs: {
pname = "aiohomeconnect";
version = "0.30.0";
version = "0.31.0";
pyproject = true;
src = fetchFromGitHub {
owner = "MartinHjelmare";
repo = "aiohomeconnect";
tag = "v${finalAttrs.version}";
hash = "sha256-GzVfSNHvJ5qJTnn4GtetIirLT3LApZN0QB5eg/DPyGg=";
hash = "sha256-93IyTpetxFSD1fcX2sWBfvoYzm3xRiczsONoFxKJRts=";
};
build-system = [ setuptools ];
@@ -71,6 +71,10 @@ buildPythonPackage (finalAttrs: {
hatchling
];
pythonRelaxDeps = [
"cryptography"
];
dependencies = [
attrs
cmarkgfm
@@ -22,14 +22,14 @@
buildPythonPackage (finalAttrs: {
pname = "databricks-sdk";
version = "0.94.0";
version = "0.96.0";
pyproject = true;
src = fetchFromGitHub {
owner = "databricks";
repo = "databricks-sdk-py";
tag = "v${finalAttrs.version}";
hash = "sha256-hRQmx33RxN099OXzllgkeC0bvFFbxbPd35GokCO7ZMw=";
hash = "sha256-cwZrewypNltMyr2RPMeyAKJYzy+iwdnfoW/M7uecPaA=";
};
build-system = [
@@ -4,13 +4,13 @@
black,
buildPythonPackage,
fetchFromGitHub,
freezegun,
genson,
graphql-core,
hatch-vcs,
hatchling,
httpx,
inflect,
inline-snapshot,
isort,
jinja2,
openapi-spec-validator,
@@ -18,11 +18,12 @@
prance,
ruff,
pydantic,
pytest-benchmark,
pysnooper,
pytest-mock,
pytestCheckHook,
pyyaml,
toml,
time-machine,
watchfiles,
}:
buildPythonPackage rec {
@@ -57,10 +58,11 @@ buildPythonPackage rec {
packaging
pydantic
pyyaml
toml
];
optional-dependencies = {
all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]);
debug = [ pysnooper ];
graphql = [ graphql-core ];
http = [ httpx ];
ruff = [ ruff ];
@@ -68,15 +70,18 @@ buildPythonPackage rec {
openapi-spec-validator
prance
];
watch = [
watchfiles
];
};
nativeCheckInputs = [
freezegun
pytest-benchmark
inline-snapshot
pytest-mock
pytestCheckHook
time-machine
]
++ lib.concatAttrValues optional-dependencies;
++ optional-dependencies.all;
pythonImportsCheck = [ "datamodel_code_generator" ];
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "django-organizations";
version = "2.5.0";
version = "2.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bennylope";
repo = "django-organizations";
tag = version;
hash = "sha256-lgri6CCITp1oYCwpH8vrUglphXOmwZ3KX5G/L29akrs=";
hash = "sha256-MgXB2gr7tWBXpgVfxLMI0RQWwAbhXlxdzyqk7XdEsWE=";
};
build-system = [ hatchling ];
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "elevenlabs";
version = "2.37.0";
version = "2.38.1";
pyproject = true;
src = fetchFromGitHub {
owner = "elevenlabs";
repo = "elevenlabs-python";
tag = "v${finalAttrs.version}";
hash = "sha256-Du3En4aID1uXJs8DPweUnxNzrM5tnIkXrnzZhuizy6U=";
hash = "sha256-NBznP5XWIPTYmHkzEx6yfQk6n/P6SGS7YMcJnrnOHMU=";
};
build-system = [ poetry-core ];
@@ -27,14 +27,14 @@ let
in
buildPythonPackage (finalAttrs: {
pname = "exllamav3";
version = "0.0.23";
version = "0.0.24";
pyproject = true;
src = fetchFromGitHub {
owner = "turboderp-org";
repo = "exllamav3";
tag = "v${finalAttrs.version}";
hash = "sha256-wAT+zntPxjIjrXaa2ZJpjImRt1V8vFqWfSNjgZYGGJk=";
hash = "sha256-cNYQuGfUpbqSvYD8335zdZbHIqBH0QK1aK+j0WCY+LE=";
};
pythonRelaxDeps = [
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "google-genai";
version = "1.65.0";
version = "1.66.0";
pyproject = true;
src = fetchFromGitHub {
owner = "googleapis";
repo = "python-genai";
tag = "v${version}";
hash = "sha256-hLUERiWSYiESM8DoNQEAUZxS6zcsdxv6ykAEcgDIXn8=";
hash = "sha256-UNaJzxTFzMEa43oRYr1QqtktpggdXYSPFdkhd3qRLlw=";
};
build-system = [
@@ -10,14 +10,14 @@
buildPythonPackage (finalAttrs: {
pname = "identify";
version = "2.6.16";
version = "2.6.17";
pyproject = true;
src = fetchFromGitHub {
owner = "pre-commit";
repo = "identify";
tag = "v${finalAttrs.version}";
hash = "sha256-+iLIU2NfKogFAdbAXXER3G7cDyvcey9pR+0HifQZoh8=";
hash = "sha256-hnVG1TRkq605uFk3PmzqFwnzcYru/4OYbrJYAtDuo0g=";
};
build-system = [ setuptools ];
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "kagglesdk";
version = "0.1.15";
version = "0.1.16";
pyproject = true;
src = fetchFromGitHub {
owner = "Kaggle";
repo = "kagglesdk";
tag = "v${finalAttrs.version}";
hash = "sha256-u945sytmPUEYRNvT8v/O3HBhJoLnECPAT3GdvtBkBV4=";
hash = "sha256-MmgX9gQ8fQU8yE/2qpw1Kz/VslVix3qUhaGkRahSxns=";
};
build-system = [
@@ -29,15 +29,9 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-1zMIcr36VrNX3GT4k7w4sIhAwQSWUuuomf73fnCwueY=";
};
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"pyo3-file-0.15.0" = "sha256-8OVShM+jWHOZ/bOXJI2PEDzmOAFY1MBwbkg5ita25cg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-6kKTLU1YazLpE5V/LqCLC1m8futx8C/X3gkeg8yV3ac=";
};
build-system = [
File diff suppressed because it is too large Load Diff
@@ -8,17 +8,17 @@
buildPythonPackage rec {
pname = "pysequoia";
version = "0.1.29";
version = "0.1.31";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-PWzXXBAKrVZaFtZCYOyMHX5DIickqN9eR6DYhDNBoJo=";
hash = "sha256-1qvMoytvivcVkiBFB6wzt4ejxAbxCAOg+ENRtT8LtdE=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-sZTbPlfkZLWcRmdOWLBw8k0pIukAjQ53C8Zs9gLEW+I=";
hash = "sha256-kr7Gqj4qQ6x/AOXaMoY4kBqP0q3iXLfpzyLQQDb0b8k=";
};
nativeBuildInputs = [
@@ -9,21 +9,21 @@
buildPythonPackage rec {
pname = "yara-x";
version = "1.13.0";
version = "1.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-x";
tag = "v${version}";
hash = "sha256-EEvy0UtmBlgC3b57SOwr7dI49R7PYeFqsZKyzo0zx9w=";
hash = "sha256-gGkBmJoUa9WiIozSwhe18N8i5uSiKsSQ3J1NAT41ro4=";
};
buildAndTestSubdir = "py";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname src version;
hash = "sha256-ihNFGlPhPLCIDvFnMqKA+flD/mv9wcKgQ1txO71xOp4=";
hash = "sha256-j+sIxYPvkI1EnAN7LcBoS4m04rYdKlK48tGO0uFa7KU=";
};
nativeBuildInputs = [
+7 -13
View File
@@ -175,20 +175,9 @@ let
rpp = self.callPackage ./rpp { };
rpp-hip = self.rpp.override {
useOpenCL = false;
useCPU = false;
};
rpp-hip = self.rpp.override { useCPU = false; };
rpp-opencl = self.rpp.override {
useOpenCL = true;
useCPU = false;
};
rpp-cpu = self.rpp.override {
useOpenCL = false;
useCPU = true;
};
rpp-cpu = self.rpp.override { useCPU = true; };
mivisionx = self.callPackage ./mivisionx {
stdenv = origStdenv;
@@ -256,6 +245,11 @@ let
};
}
// lib.optionalAttrs config.allowAliases {
rpp-opencl = throw ''
'rpp-opencl' has been removed as it has been broken for a year and has no consuming packages.
Use 'rpp' or 'rpp-cpu' instead.
''; # Added 2026-03-08
rocmPath = throw ''
'rocm-path' has been removed. If a ROCM_PATH value is required in nixpkgs please
construct one with the minimal set of required deps.
@@ -306,6 +306,29 @@ overrideLlvmPackagesRocm (s: {
stripLen = 1;
})
./perf-increase-namestring-size.patch
# v64i8 shuffle lowering inf loop on VBMI targets, hangs whisper-cpp etc
# https://github.com/NixOS/nixpkgs/issues/497745
(fetchpatch {
# https://github.com/llvm/llvm-project/pull/182832
name = "llvm-x86-v64i8-add-test-coverage.patch";
url = "https://github.com/llvm/llvm-project/commit/0e3a96d0ec01e3575674d72c4e23bf98affdca28.patch";
relative = "llvm";
hash = "sha256-qhRkB8Fjz/fNacuGv1OFkiTNOQ0/QQ9p4pLFudwrTzM=";
})
(fetchpatch {
# https://github.com/llvm/llvm-project/pull/182852
name = "llvm-x86-v64i8-prefer-vpermv3-on-vbmi.patch";
url = "https://github.com/llvm/llvm-project/commit/8f5880d3ae4e5dfc748985d90e5413671028aa3e.patch";
relative = "llvm";
hash = "sha256-4DU6gu/1+iQpzvVYBlTTUKtw77QSRyTja4hdel4D5Cw=";
})
(fetchpatch {
# https://github.com/llvm/llvm-project/pull/183109
name = "llvm-x86-v64i8-skip-repeated-mask-lane-permute-on-vbmi.patch";
url = "https://github.com/llvm/llvm-project/commit/1b9fea021840f17c41ea980300d0fc45e7285909.patch";
relative = "llvm";
hash = "sha256-9Akm78QQr8BIMrVWwDG3poWS1HuQ0hpIQWfke3oADgg=";
})
# TODO: consider reapplying "Don't include aliases in RegisterClassInfo::IgnoreCSRForAllocOrder"
# it was reverted as it's a pessimization for non-GPU archs, but this compiler
# is used mostly for amdgpu
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/2c1e44fc3eacadcafdd4ada3e3184a092b6f26c5.patch";
relative = "amd/comgr";
})
# Fix: CCOB compat patch used coerced (featureless) name for output filename,
# causing CLR's code_obj_map key to miss when looking up device ISA with features
./fix-ccob-compat-output-filename.patch
];
postPatch = ''
@@ -0,0 +1,11 @@
--- a/src/comgr-compiler.cpp
+++ b/src/comgr-compiler.cpp
@@ -1425,7 +1425,7 @@
// Add an output file for each target
SmallString<128> OutputFilePath = OutputDir;
sys::path::append(OutputFilePath,
- OutputPrefix + "-" + CompatEntry + "." + FileExtension);
+ OutputPrefix + "-" + Entry + "." + FileExtension);
BundlerConfig.TargetNames.emplace_back(CompatEntry);
BundlerConfig.OutputFileNames.emplace_back(OutputFilePath);
+3 -22
View File
@@ -12,22 +12,12 @@
boost,
python3Packages,
buildDocs ? false, # Needs internet
useOpenCL ? false,
useCPU ? false,
gpuTargets ? clr.localGpuTargets or [ ],
}:
stdenv.mkDerivation (finalAttrs: {
pname =
"rpp-"
+ (
if (!useOpenCL && !useCPU) then
"hip"
else if (!useOpenCL && !useCPU) then
"opencl"
else
"cpu"
);
pname = "rpp-${if useCPU then "cpu" else "hip"}";
version = "7.2.0";
@@ -59,21 +49,13 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DBACKEND=${if useCPU then "CPU" else "HIP"}"
]
++ lib.optionals (gpuTargets != [ ]) [
"-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
]
++ lib.optionals (!useOpenCL && !useCPU) [
"-DBACKEND=HIP"
]
++ lib.optionals (useOpenCL && !useCPU) [
"-DBACKEND=OCL"
]
++ lib.optionals useCPU [
"-DBACKEND=CPU"
];
postPatch = lib.optionalString (!useOpenCL && !useCPU) ''
postPatch = lib.optionalString (!useCPU) ''
# Bad path
substituteInPlace CMakeLists.txt \
--replace "COMPILER_FOR_HIP \''${ROCM_PATH}/llvm/bin/clang++" "COMPILER_FOR_HIP ${clr}/bin/hipcc"
@@ -95,6 +77,5 @@ stdenv.mkDerivation (finalAttrs: {
license = with lib.licenses; [ mit ];
teams = [ lib.teams.rocm ];
platforms = lib.platforms.linux;
broken = useOpenCL;
};
})
@@ -176,14 +176,14 @@ let
uniqueVersions' = map (x: x.version) uniqueVersionFiles;
releaseVersions = map (x: x.version) (builtins.filter (x: !x.isSnapshot) uniqueVersionFiles);
latestVer = v.latest or v.release or (lib.last uniqueVersions');
releaseVer = v.release or (lib.last releaseVersions);
releaseVer = v.release or (if releaseVersions != [ ] then lib.last releaseVersions else null);
# The very latest version isn't necessarily used by Gradle, so it may not be present in the MITM data.
# In order to generate better metadata xml, if the latest version is known but wasn't fetched by Gradle,
# add it anyway.
uniqueVersions =
uniqueVersions'
++ lib.optional (!builtins.elem releaseVer uniqueVersions') releaseVer
++ lib.optional (releaseVer != null && !builtins.elem releaseVer uniqueVersions') releaseVer
++ lib.optional (!builtins.elem latestVer uniqueVersions' && releaseVer != latestVer) latestVer;
lastUpdated =
@@ -235,7 +235,7 @@ let
''
else
assert !containsSpecialXmlChars latestVer;
assert !containsSpecialXmlChars releaseVer;
assert releaseVer == null || !containsSpecialXmlChars releaseVer;
''
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
@@ -243,7 +243,7 @@ let
<artifactId>${artifactId}</artifactId>
<versioning>
<latest>${latestVer}</latest>
<release>${releaseVer}</release>
${lib.optionalString (releaseVer != null) " <release>${releaseVer}</release>"}
<versions>
${builtins.concatStringsSep "\n" (map (x: " <version>${x}</version>") uniqueVersions)}
</versions>
+5 -2
View File
@@ -2238,8 +2238,11 @@ with pkgs;
tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; };
inherit (callPackages ../by-name/tr/tracy/package-versions.nix { })
tracy_0_11
tracy_0_12
tracy_0_13
;
uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;