Merge release-26.05 into staging-nixos-26.05

This commit is contained in:
nixpkgs-ci[bot]
2026-07-29 00:32:20 +00:00
committed by GitHub
46 changed files with 1464 additions and 1091 deletions

View File

@@ -4605,7 +4605,6 @@
cbarrete = {
github = "cbarrete";
githubId = 62146989;
matrix = "@cedric:cbarrete.com";
name = "Cédric Barreteau";
};
cbleslie = {
@@ -16077,6 +16076,11 @@
githubId = 83420438;
name = "Lewis";
};
lubsch = {
github = "lubsch";
githubId = 33580245;
name = "Benjamin Lohmar";
};
luc65r = {
email = "lucas@ransan.fr";
github = "luc65r";

View File

@@ -519,7 +519,6 @@ with lib.maintainers;
members = [
alejandrosame
aleksi
artturin
emilytrau
ericson2314
jk

View File

@@ -300,6 +300,7 @@ in
serviceConfig = {
Type = "notify";
ExecStart = "${chronyPkg}/bin/chronyd ${toString chronyFlags}";
Restart = "on-failure";
# Proc filesystem
ProcSubset = "pid";

View File

@@ -133,14 +133,19 @@ in
users.groups.vboxuserdev = { };
services.udev.extraRules = ''
# /dev/vboxuser is necessary for VBoxClient to work. Maybe we
# should restrict this to logged-in users.
KERNEL=="vboxuser", OWNER="root", GROUP="vboxuserdev", MODE="0660", TAG+="uaccess"
services.udev.packages = lib.singleton (
pkgs.writeTextFile {
name = "virtualboxGuestAdditions";
text = ''
# /dev/vboxuser is necessary for VBoxClient to work
KERNEL=="vboxuser", OWNER="root", GROUP="vboxuserdev", MODE="0660", TAG+="uaccess"
# Allow systemd dependencies on vboxguest.
SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
'';
# Allow systemd dependencies on vboxguest.
SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
'';
destination = "/etc/udev/rules.d/70-virtualboxGuestAdditions.rules";
}
);
systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session" cfg.verbose;
}

View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "153.0";
version = "153.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "a1af5866e1c9a732818123f2f041bfd5993d093e96dd743b583312fb11d2b39d429df750f9ec22ded64b58a209bb1ecabc7aaf73057d7a64c7349e4da043d66d";
sha512 = "310d1aa27b7902ef5e052962e3b7d2819d0f5f6e596fddeafee53f09e9390d4801f5b654f4ca1e9fd4c15c71241fc31844afaa4d086f82c51b516a401fbe7f40";
};
meta = {

View File

@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
version = "0.50.8";
version = "0.50.17";
# Update only together with 'anytype' package.
# nixpkgs-update: no auto update
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${finalAttrs.version}";
hash = "sha256-h59Vnmv+iB0NbLQPCHPlmHBDaYoFimrZP/4Cv/IQ7b8=";
hash = "sha256-2DXYpBc14z+q+kJNLScWSTqVSObolj/80FrVEwNU4cY=";
};
vendorHash = "sha256-uJ/Z2zxqIne3UuxAglZejoqHV/IchYdPhefL9K51U2I=";
vendorHash = "sha256-n0fcWzUSv4AuAbepWPk5c8DldClQX+Juo3MLca+tLV4=";
subPackages = [ "cmd/grpcserver" ];
tags = [

View File

@@ -24,7 +24,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "anytype";
version = "0.55.5";
version = "0.56.0";
strictDeps = true;
@@ -32,14 +32,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${finalAttrs.version}";
hash = "sha256-9myOd7LTH/NoRY4SjU7+FSSNIhDMGKRPTBOQOURk/Hs=";
hash = "sha256-U4giu+5IjB/cSMszbIDynU9ddbv/pnY3M7GeC876oX8=";
};
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "b96bf7b76f10e764e7a60c7f284854aaabedcec6";
hash = "sha256-+vkProHi25CWxG74QB5eo0Pnwj0u5vXoZeeCoXyMOv4=";
rev = "94dd09449672e352a886b0b3c26a294802176444";
hash = "sha256-AORBgil78wOuzKrLdSekDvDTSjfFqs1L73Spyd/0rfk=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontFixup = true;
outputHash = "sha256-6IHFidjVDDzUOCRXVwjvzcLGKV6dWWS7k2jwrOuJ748=";
outputHash = "sha256-i2GPGi7LgIy8y+//rR0H+vX+bc/v2NKd7xGLargd044=";
outputHashMode = "recursive";
};

View File

@@ -146,6 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
thoughtpolice
lf-
_9999years
cbarrete
];
platforms = [
"x86_64-linux"

View File

@@ -10,10 +10,10 @@
let
pname = "chatzone-desktop";
version = "5.6.2";
version = "5.7.0";
src = fetchurl {
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.2/1175/chatzone-desktop-linux-5.6.2.AppImage";
hash = "sha256-2t3mp0snHn2NxVFCcU1XQ5h3rUCb4gXjKbF43p9W8ZU=";
url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.7.0/1258/chatzone-desktop-linux-5.7.0.AppImage";
hash = "sha256-t8qAdrvs1M9NuaQYZj+pCaYiSb4TZc7rY1rJVjSYaAE=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in

View File

@@ -8,17 +8,17 @@
}:
maven.buildMavenPackage (finalAttrs: {
version = "13.8.0";
version = "13.9.0";
pname = "checkstyle";
src = fetchFromGitHub {
owner = "checkstyle";
repo = "checkstyle";
tag = "checkstyle-${finalAttrs.version}";
hash = "sha256-Nhn65Y6iz55wucAQ/DiF9VWm15O7m7+ZhOM+X4rIHGQ=";
hash = "sha256-1ddajDPf32fauHA3zFTMa6s/cJqrhTI1z4E2GOWRxn4=";
};
mvnHash = "sha256-GhnxhSZX+plwQq9l4av6dqLEVp7HwT5aTVHKoTfaP8c=";
mvnHash = "sha256-T5zXmanif0ttB1srKzYeoXAQQqhRfAUW2V7v7N/I79k=";
nativeBuildInputs = [
maven

View File

@@ -95,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
"s390" = "s390";
"mips" = "mips";
"loongarch" = "loongarch64";
"riscv" = "riscv64";
};
in
[
@@ -147,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
"aarch64-linux"
"armv7l-linux"
"loongarch64-linux"
"riscv64-linux"
];
maintainers = [ lib.maintainers.thoughtpolice ];
};

View File

@@ -17,12 +17,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "dashy-ui";
version = "4.4.2";
version = "4.4.5";
src = fetchFromGitHub {
owner = "lissy93";
repo = "dashy";
tag = finalAttrs.version;
hash = "sha256-4AJx/BoRVYA8dU6HrIvGYWflvppxNsi2PWSpnJLWR0w=";
hash = "sha256-S9x/qMjOwg0M59E0Ck7Ff3TYntXWkxansSNmNzWmJTk=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";

View File

@@ -8,25 +8,25 @@
let
pname = "dbgate";
version = "6.6.9";
version = "7.2.1";
src =
fetchurl
{
aarch64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM=";
hash = "sha256-OkAyKMXOYxvZomVUB5xIpPKR+b4p3+US7TDMIYeCsoo=";
};
x86_64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE=";
hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ=";
};
x86_64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90=";
hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls=";
};
aarch64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU=";
hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps=";
};
}
.${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");

View File

@@ -0,0 +1,33 @@
From 2373861a858fb6ee7d50870ae66a59f05c6cd4bd Mon Sep 17 00:00:00 2001
From: Nadzeya Hutsko <nadzeya@ubuntu.com>
Date: Wed, 22 Jul 2026 20:46:52 +0200
Subject: [PATCH] Fix build with Poppler >= 26.06
poppler 26.06 changed the Page box accessors to return a const reference
instead of a pointer. Take the address of the result, guarded by a
version check so older poppler still builds
---
plug-ins/pdf/pdf-import.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
index 3af268646..35fc6d9e3 100644
--- a/plug-ins/pdf/pdf-import.cpp
+++ b/plug-ins/pdf/pdf-import.cpp
@@ -93,8 +93,13 @@ public :
(Annot *annot, void *user_data) G_GNUC_UNUSED,
void *annotDisplayDecideCbkData G_GNUC_UNUSED)
{
+#if POPPLER_VERSION_MAJOR > 26 || (POPPLER_VERSION_MAJOR == 26 && POPPLER_VERSION_MINOR >= 6)
+ const PDFRectangle *mediaBox = &page->getMediaBox();
+ const PDFRectangle *clipBox = &page->getCropBox ();
+#else
const PDFRectangle *mediaBox = page->getMediaBox();
const PDFRectangle *clipBox = page->getCropBox ();
+#endif
if (page->isOk()) {
real w1 = (clipBox->x2 - clipBox->x1);
--
GitLab

View File

@@ -50,16 +50,21 @@ let
in
stdenv.mkDerivation {
pname = "dia";
version = "unstable-2025-10-26";
version = "0.97.2-unstable-2026-07-24";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "dia";
rev = "efdf829e8afdbbeb371820932769e35415ebe886";
hash = "sha256-VFFU5iJnVJdZ2tkNszZ2ooBD+GiCL6MqanzpEWIJerk=";
rev = "ad68cc378b7a187706bc2648c48b44d16fb80819";
hash = "sha256-ejjSc9GGXD5GsbeRps1T20xifJuzWA1yq/G7jk797Cw=";
};
patches = [
# https://gitlab.gnome.org/GNOME/dia/-/merge_requests/146
./fix-build-with-poppler-26-06.patch
];
postPatch = ''
# Fix build with poppler 25.10.0
substituteInPlace plug-ins/pdf/pdf-import.cpp \

View File

@@ -12,14 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "drawy";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "drawy";
rev = "v${finalAttrs.version}";
hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ=";
tag = "v${finalAttrs.version}";
hash = "sha256-lFI4q5/RKA49rcI2iSJuwYfShgOjM+EAfXM+5ZSG8SA=";
};
__structuredAttrs = true;

View File

@@ -26,8 +26,8 @@
},
{
"pname": "Avalonia",
"version": "12.0.0",
"hash": "sha256-pBn3o40TTYAPtjcfvaVK6wMFNSY7AHEE5wU4zDUj4FA="
"version": "12.0.2",
"hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk="
},
{
"pname": "Avalonia.Angle.Windows.Natives",
@@ -46,8 +46,8 @@
},
{
"pname": "Avalonia.Desktop",
"version": "12.0.0",
"hash": "sha256-M18vFA8cxZDR6RBF32O82n5pQAj70Jr6CpVXUEjtEso="
"version": "12.0.2",
"hash": "sha256-ydFDRX0zTEtJJzjn+TTpcSYL49xBJ3vFi9v3NSOyPww="
},
{
"pname": "Avalonia.Diagnostics",
@@ -56,23 +56,23 @@
},
{
"pname": "Avalonia.FreeDesktop",
"version": "12.0.0",
"hash": "sha256-jOAw9i1K093cfGrNOVZQgXm8nNxaFcRMhbLM3NFrGE8="
"version": "12.0.2",
"hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A="
},
{
"pname": "Avalonia.FreeDesktop.AtSpi",
"version": "12.0.0",
"hash": "sha256-/sXI18zP+SB8kRBZLl1WddrNxsgQRceoB3AiZwQYfWs="
"version": "12.0.2",
"hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI="
},
{
"pname": "Avalonia.HarfBuzz",
"version": "12.0.0",
"hash": "sha256-3S0L0YqiULMBgXbwlJl7qTwhBZl8I/ahM8GF1kcK/hE="
"version": "12.0.2",
"hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE="
},
{
"pname": "Avalonia.Native",
"version": "12.0.0",
"hash": "sha256-QqPWE4I2TxCPHufuNkfx1r35lGN1W+c992gxzrB+RRc="
"version": "12.0.2",
"hash": "sha256-E1uQvsvnVBIyzAyV3803LXMpitPvaoJezCedz6ZeV1A="
},
{
"pname": "Avalonia.Remote.Protocol",
@@ -81,18 +81,18 @@
},
{
"pname": "Avalonia.Remote.Protocol",
"version": "12.0.0",
"hash": "sha256-l/NCO/I3Zavlta14Q198MpYn7jtwMclUWk6cqEgqmTU="
"version": "12.0.2",
"hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0="
},
{
"pname": "Avalonia.Skia",
"version": "12.0.0",
"hash": "sha256-w8i8lTkf3yp78rPxg7LlcsrKF/K3J7ATOTy3D/Bt6CA="
"version": "12.0.2",
"hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU="
},
{
"pname": "Avalonia.Themes.Fluent",
"version": "12.0.0",
"hash": "sha256-wpBWj5EsRPDhsoE+RFGy8Z7wS8lN2s0mW7qFgRaVOOA="
"version": "12.0.2",
"hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU="
},
{
"pname": "Avalonia.Themes.Simple",
@@ -101,13 +101,13 @@
},
{
"pname": "Avalonia.Win32",
"version": "12.0.0",
"hash": "sha256-QDS1fxNQMw3EHfrqihk05emNENjUmxLQyYgNCQp9vwM="
"version": "12.0.2",
"hash": "sha256-yHcePPF2tKc9oussntmAr/4LX3FEkGRRFuzdmlE+NHQ="
},
{
"pname": "Avalonia.X11",
"version": "12.0.0",
"hash": "sha256-WJjJKB2q1s18BVlLDUdPIpLQC2Bhgkl7fkO42Kjv2zU="
"version": "12.0.2",
"hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE="
},
{
"pname": "AWSSDK.Core",
@@ -936,28 +936,28 @@
},
{
"pname": "SkiaSharp",
"version": "3.119.3-preview.1.1",
"hash": "sha256-fIrOUgx8K/qnJaQCPa06BPlkIy3PHRgrhHGkKn5d3qY="
"version": "3.119.4-preview.1.1",
"hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8="
},
{
"pname": "SkiaSharp.NativeAssets.Linux",
"version": "3.119.3-preview.1.1",
"hash": "sha256-JsQ9xmreA1zNaLwEHNPMaFsRygEDhemJCrbkhs8WHvQ="
"version": "3.119.4-preview.1.1",
"hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA="
},
{
"pname": "SkiaSharp.NativeAssets.macOS",
"version": "3.119.3-preview.1.1",
"hash": "sha256-9l1xrgVl6kH2kjW5ffluKv4ec/kqUfVnqlz9OVwP2cQ="
"version": "3.119.4-preview.1.1",
"hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs="
},
{
"pname": "SkiaSharp.NativeAssets.WebAssembly",
"version": "3.119.3-preview.1.1",
"hash": "sha256-5UsssFayYOMcvWNBGJeChLRc9EahpIuuexNhGHnnrhU="
"version": "3.119.4-preview.1.1",
"hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ="
},
{
"pname": "SkiaSharp.NativeAssets.Win32",
"version": "3.119.3-preview.1.1",
"hash": "sha256-MWsHe/NBlbHGtEhUICVuuhpRYSjtU06msLCoglqmVhQ="
"version": "3.119.4-preview.1.1",
"hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM="
},
{
"pname": "SMBLibrary",
@@ -1204,11 +1204,6 @@
"version": "1.5.4",
"hash": "sha256-5rYv675c14DNMne6FUkebyBI+7fWwLCqGs+KQCjbCcI="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.90.3",
"hash": "sha256-jK/98C0WrkVqPPNMx+xkdGK7vhcFmDsMqX7hUmALAWM="
},
{
"pname": "Tmds.DBus.Protocol",
"version": "0.92.0",

View File

@@ -14,9 +14,9 @@
let
# for update.sh easy to handle
ngclientVersion = "0.0.218";
ngclientRev = "67e437adee2fefa9dc2a9464d3748a8512525f71";
ngclientHash = "sha256-1DT/WIaQ+di8vsnsAaA5qYinhvaKImEfGn2pyljXxjw=";
ngclientVersion = "0.0.226";
ngclientRev = "2cc3e2e088ddb4691bb389b0afa89287d399340e";
ngclientHash = "sha256-uMWOunSaV9HNhgH65P2boangZFe/9NCRb5BBqXv9TI0=";
# from Duplicati/Server/webroot/ngclient/package.json
ngclient = buildNpmPackage {
@@ -30,7 +30,7 @@ let
hash = ngclientHash;
};
npmDepsHash = "sha256-yytz5qMhgd/yXr11szuVslTLTjV5XpfNPyLW3mmRM1E=";
npmDepsHash = "sha256-89l/1v8dncwImDgiQic2VN65K/dxIkEPCrsHCty2VV0=";
nativeBuildInputs = [ bun ];
@@ -58,15 +58,15 @@ let
in
buildDotnetModule rec {
pname = "duplicati";
version = "2.3.0.1";
version = "2.3.0.4";
channel = "stable";
buildDate = "2026-04-24";
buildDate = "2026-07-09";
src = fetchFromGitHub {
owner = "duplicati";
repo = "duplicati";
tag = "v${version}_${channel}_${buildDate}";
hash = "sha256-r3Oumo2vrViTNvZDUaVoJyGMBf1/uHS6oAhn9Aegb3s=";
hash = "sha256-pVfcD7bIlZ/ZsMNwjPcg+DY6YFNm191ngEm5SrDukSw=";
stripRoot = true;
};

View File

@@ -9,11 +9,11 @@
}:
let
version = "3.6.13";
etcdSrcHash = "sha256-L6wnvexUxFlN4r2D9rIQPDIYWMvs6DqY8eWU1FToi3M=";
etcdCtlVendorHash = "sha256-UKuxCQi1RriPvX9cM+Nd1jXs/H0smwJJU9CEM/cI/sA=";
etcdUtlVendorHash = "sha256-molkWWxxKLCCbocqVaij1jcHeoYYHSuI/cAfieeZH+0=";
etcdServerVendorHash = "sha256-o58rJPOSeT14SAEjBSbXwPDuAsOT/YNAqZRCM15unJQ=";
version = "3.6.14";
etcdSrcHash = "sha256-kALMdhbZSzc+WLAjiSFQL093TTm/sQ2C2keQch8cB7E=";
etcdCtlVendorHash = "sha256-9aOCatgY5ov/b4NuYlK6osSP06WavUXMnf+UZHG3Qrc=";
etcdUtlVendorHash = "sha256-ABDOp5QenMh4sCrMDQtXdtumcolyVSDb9H2vMWBSQYI=";
etcdServerVendorHash = "sha256-H0C6rPP0QOYQxPmHKw/z90Am/VXQRrp1lDlOI1LHGYQ=";
src = fetchFromGitHub {
owner = "etcd-io";

View File

@@ -9,14 +9,14 @@
}:
buildGoModule (finalAttrs: {
version = "3.7.3";
version = "3.7.4";
pname = "grafana-loki";
src = fetchFromGitHub {
owner = "grafana";
repo = "loki";
rev = "v${finalAttrs.version}";
hash = "sha256-2dqwnM2+9+P/ZIiz5Z9JPN9WicHLRzq9xn6jG1OBqLs=";
hash = "sha256-sTmez6HBu8rQigToUqVFthYIkQ7E+rFVCSH0e8GBQVw=";
};
vendorHash = null;

View File

@@ -47,36 +47,20 @@ let
doCheck = false;
});
# ariadne 0.29+ is missing 'convert_kwargs_to_snake_case'
ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec {
version = "0.28.0";
src =
fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-gW66L7djPo4nHjd/UN18IPYFo956wzSqM+p1AZF/qnw=";
}
// {
tag = version;
};
patches = [ ];
doCheck = false;
});
};
};
in
py.pkgs.buildPythonPackage (finalAttrs: {
pname = "irrd";
version = "4.5.2";
version = "4.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "irrdnet";
repo = "irrd";
tag = "v${finalAttrs.version}";
hash = "sha256-Lr2+3pG22l479mNrn1JFiea+zp+n9qWVX1yTp0Cj4Ds=";
hash = "sha256-XXqG/ygW5EbhKs4T5r9w/6URlv7y37+sjhWagI4n2pg=";
};
pythonRelaxDeps = true;

View File

@@ -86,9 +86,21 @@ buildPythonApplication (finalAttrs: {
];
# Recreate _version.py, deleted at fetch time due to non-reproducibility.
# should be done in postInstall to overwrite what versioneer generates again during the build phase
postInstall = ''
echo 'def get_versions(): return {"version": "${finalAttrs.version}"}' > $out/${python.sitePackages}/kikit/_version.py
# Must include version_json block because versioneer uses regex parsing on this file.
postPatch = ''
cat > kikit/_version.py <<'EOF'
# DO NOT EDIT! nixpkgs GENERATED FILE
import json
version_json = ''''
{
"version": "${finalAttrs.version}"
}
'''' # END VERSION_JSON
def get_versions():
return json.loads(version_json)
EOF
'';
preCheck = ''

View File

@@ -23,13 +23,13 @@
buildGoModule (finalAttrs: {
pname = "kubernetes";
version = "1.36.2";
version = "1.36.3";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
tag = "v${finalAttrs.version}";
hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU=";
hash = "sha256-yqxE+it+uYQrJJs3TJI2D6IQRJizieUQyPQMLIOPWqA=";
};
vendorHash = null;

View File

@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://www.multiprecision.org/mpc/";
license = lib.licenses.lgpl2Plus;
license = lib.licenses.lgpl3Plus;
platforms = lib.platforms.all;
maintainers = [ ];

View File

@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lockbook-desktop";
version = "26.7.16";
version = "26.7.23";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = finalAttrs.version;
hash = "sha256-/aZNHeE0bfW5bYOFEboWUMIl0b4FbkdOKXxMEPUqJF0=";
hash = "sha256-LG6qeFzD1ThBFKfFjy/U012p5DH5FEojQ9W4K+ZA7/o=";
};
cargoHash = "sha256-1cbsmCHNEiN0qxSa+5v5I1/WpFuVgAWuNfMERFviSmU=";
cargoHash = "sha256-syBXLJISsok1hL4vpBforanVi9F0NI90pRslrxRuuL4=";
nativeBuildInputs = [
pkg-config

View File

@@ -1,6 +1,6 @@
{
version = "1.30.4";
hash = "sha256-qpwwCugg18cC4xbwmLKNM3c63z8k1FOoZlzpgvXp5BU=";
npmDepsHash = "sha256-urjsUXcEwMaaaSs0WdH+8/q3h7mr+/lKvXi9x21VYpU=";
vendorHash = "sha256-/0ddo1IwGeLyOQRqgqNmju3qOzwYQTwz4MDf2TBkUDU=";
version = "1.30.5";
hash = "sha256-Iw5lTBREiFJ8M4igxv729gV8o9Sp2dqdpd48369cv3c=";
npmDepsHash = "sha256-aJmcVMZmVM3QJ6Jh5Kf5efDQVqm+W3qvKwxb3FRDbQ8=";
vendorHash = "sha256-o0svdQvYvTAsplFlP2aOChC2JC1mnzJM1QTyu8HcZjI=";
}

View File

@@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.157.1";
version = "1.157.2";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-yDfBtcBvIoWUfD8bqwGgeMvq4XHrr9ptVB6yKJWFX0c=";
hash = "sha256-TUHcNAXrV43+J7jqfstlYdrZrwL5kDCh03yxO+vL/gw=";
};
cargoDeps = rustPlatform.fetchCargoVendor {

View File

@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
floating-point arithmetic (53-bit mantissa).
'';
license = lib.licenses.lgpl2Plus;
license = lib.licenses.lgpl3Plus;
maintainers = [ ];
platforms = lib.platforms.all;

View File

@@ -9,13 +9,13 @@
}:
let
pname = "open-webui";
version = "0.9.6";
version = "0.11.0";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-0d9GfBQY6YtsUbHeO6NTFPFHV6WE51D4fq+NfsM7J5g=";
hash = "sha256-SP5Huefj35PHvVzqS8R/DGSBci/hCHoueEb5RupGVqY=";
};
frontend = buildNpmPackage rec {
@@ -23,14 +23,14 @@ let
inherit version src;
# the backend for run-on-client-browser python execution
# must match lock file in open-webui
pyodideVersion = "0.28.3";
# must match the version that is locked in package-lock.json
pyodideVersion = "314.0.3";
pyodide = fetchurl {
hash = "sha256-fcqubT8VmGoJ8PnmxHE6DA8kv/DJDHToWoFyPxvGCUA=";
hash = "sha256-oCgELZDbqedP377PNuqn1X6IvwrWGNnFBZ6xBAqnYSo=";
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-NhDsqfP95RAbSarM07OSII8vbPYWScRMxtWt+gRQ/4c=";
npmDepsHash = "sha256-9Wa6gP0asGPCoBJh8ufpweOg4zNf7onzBu08iQwgqis=";
npmFlags = [ "--force" ];
@@ -84,6 +84,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
[
accelerate
aiocache
aiodns
aiofiles
aiohttp
aiosqlite
@@ -121,14 +122,17 @@ python3Packages.buildPythonApplication (finalAttrs: {
google-cloud-storage
google-genai
googleapis-common-protos
hiredis
httpx
itsdangerous
joserfc
langchain
langchain-classic
langchain-community
langchain-text-splitters
ldap3
loguru
lxml
markdown
mcp
msoffcrypto-tool
@@ -149,14 +153,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
opentelemetry-sdk
openpyxl
opensearch-py
orjson
pandas
peewee
peewee-migrate
pillow
psutil
psycopg
pyarrow
pycrdt
pydantic
pydub
pyjwt
pymdown-extensions
@@ -164,7 +168,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
pypandoc
pypdf
python-dotenv
python-jose
python-mimeparse
python-multipart
python-pptx
@@ -173,8 +176,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
pytz
pyxlsb
rank-bm25
rapidocr-onnxruntime
rapidocr
redis
regex
requests
restrictedpython
sentence-transformers
@@ -190,6 +194,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
xlrd
youtube-transcript-api
]
++ (with httpx.optional-dependencies; brotli ++ cli ++ http2 ++ socks ++ zstd)
++ uvicorn.optional-dependencies.standard
++ psycopg.optional-dependencies.c
++ pyjwt.optional-dependencies.crypto
++ sqlalchemy.optional-dependencies.asyncio
@@ -213,7 +219,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
azure-search-documents
colbert-ai
elasticsearch
gcp-storage-emulator
moto
oracledb
pinecone-client

View File

@@ -51,13 +51,13 @@ let
};
pname = "pretix";
version = "2026.4.5";
version = "2026.4.6";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
tag = "v${version}";
hash = "sha256-Tj9/fqCjRbjVlH32toSl8XKc1nmIj0gmR0+xRBlvHpY=";
hash = "sha256-mCA8YeaCdbMoanHFVq4fEBTdK1IzKiYh6o2j2ANwwjs=";
};
npmDeps = buildNpmPackage {

View File

@@ -7,7 +7,7 @@
}:
buildDotnetModule (finalAttrs: {
pname = "technitium-dns-server-library";
version = "15.3.0";
version = "15.4.0";
__structuredAttrs = true;
@@ -15,7 +15,7 @@ buildDotnetModule (finalAttrs: {
owner = "TechnitiumSoftware";
repo = "TechnitiumLibrary";
tag = "dns-server-v${finalAttrs.version}";
hash = "sha256-BQWDzMEiChY8uX1wUUZNWFDomGqUyDrZ6+UEncC5G5U=";
hash = "sha256-h6EXPJTlYatT5IiFrIsZC/LJ5exzAAU8H4DZCimkn7Q=";
};
dotnet-sdk = dotnetCorePackages.sdk_10_0;

View File

@@ -10,7 +10,7 @@
}:
buildDotnetModule (finalAttrs: {
pname = "technitium-dns-server";
version = "15.3.0";
version = "15.4.0";
__structuredAttrs = true;
@@ -18,7 +18,7 @@ buildDotnetModule (finalAttrs: {
owner = "TechnitiumSoftware";
repo = "DnsServer";
tag = "v${finalAttrs.version}";
hash = "sha256-nopmnQpozvN0p/SyUCH3Yej/oAhDvNdfJssUA1JyGsk=";
hash = "sha256-EPqaVulPO5giURtlmj4vMDXYFKICrhJa9TQbQ9AaYJ8=";
};
dotnet-sdk = dotnetCorePackages.sdk_10_0;

View File

@@ -14,16 +14,16 @@
buildGoModule (finalAttrs: {
pname = "tinyauth";
version = "5.1.1";
version = "5.1.2";
src = fetchFromGitHub {
owner = "tinyauthapp";
repo = "tinyauth";
tag = "v${finalAttrs.version}";
hash = "sha256-leXqelsPCLixhxqJbL7aDgGIzj1KcZMnR/1UxRPa1bo=";
hash = "sha256-L19CTiEMqyc8f0IyLFzCBnRruZfzGbCeDtvgsWzKVjI=";
};
vendorHash = "sha256-rlMttXywppA39Vip6pIos4tY5434vvtN8dbhVn+S2Kg=";
vendorHash = "sha256-qugLh2PGdKF63/3flVHLAwbvbSJh/lpvDpcNQqz1HZM=";
subPackages = [ "cmd/tinyauth" ];
@@ -55,7 +55,7 @@ buildGoModule (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/frontend";
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-WLPJ1ZH2mEoQKFa6F5TOmTfbcgN5lXKZZHHvgI4mMq4=";
hash = "sha256-f42uvVccZ6/sMIpVLycqEXW08R5jkaE5V15CItSbN9o=";
};
pnpmRoot = "frontend";

View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/curl/trurl/commit/f22a2c45956f35702e437fb83ac05376f1956ec5.patch";
hash = "sha256-7CkUs5tMk77WKc7SlgE2NslHtU5cViKSGhHj3IBlpWo=";
})
# https://github.com/curl/trurl/pull/441
# https://github.com/curl/trurl/pull/441 + fix for more tests
./tests-uppercase-hex.patch
];
@@ -64,7 +64,10 @@ stdenv.mkDerivation rec {
homepage = "https://curl.se/trurl";
changelog = "https://github.com/curl/trurl/releases/tag/trurl-${version}";
license = lib.licenses.curl;
maintainers = with lib.maintainers; [ christoph-heiss ];
maintainers = with lib.maintainers; [
christoph-heiss
diogotcorreia
];
platforms = lib.platforms.all;
mainProgram = "trurl";
};

View File

@@ -1,6 +1,36 @@
diff --git a/tests.json b/tests.json
index 891271c..c8606b0 100644
--- a/tests.json
+++ b/tests.json
@@ -749,6 +749,7 @@
@@ -473,12 +473,27 @@
"https://example.com/#%2e%61%13%Fa"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "https://example.com/#.a%13%fa\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "--url",
+ "https://example.com/#%2e%61%13%Fa"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "https://example.com/#.a%13%FA\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [
@@ -749,12 +764,29 @@
"query=user=me"
]
},
@@ -8,10 +38,15 @@
"expected": {
"stdout": "https://curl.se/hello?user%3dme\n",
"stderr": "",
@@ -761,6 +762,22 @@
"--url",
"https://curl.se/hello",
"--set",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "--url",
+ "https://curl.se/hello",
+ "--set",
+ "query=user=me"
+ ]
+ },
@@ -22,16 +57,10 @@
+ "returncode": 0
+ }
+ },
+ {
+ "input": {
+ "arguments": [
+ "--url",
+ "https://curl.se/hello",
+ "--set",
"fragment= hello"
]
},
@@ -2132,6 +2149,7 @@
{
"input": {
"arguments": [
@@ -2132,12 +2164,33 @@
"query:=a&b&a%26b"
]
},
@@ -39,10 +68,12 @@
"expected": {
"stdout": "http://localhost/ABC%5c%5c?a&b&a%26b\n",
"returncode": 0,
@@ -2141,6 +2159,26 @@
{
"input": {
"arguments": [
"stderr": ""
}
},
+ {
+ "input": {
+ "arguments": [
+ "-s",
+ "scheme:=http",
+ "-s",
@@ -60,13 +91,37 @@
+ "stderr": ""
+ }
+ },
{
"input": {
"arguments": [
@@ -2811,12 +2864,26 @@
"https://example.com/one/t%61o/%2F%42/"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "https://example.com/one/tao/%2fB/\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
"-g",
"{query:b}\\t{query-all:a}\\n{:query:b}\\t{:query-all:a}",
"https://example.org/foo?a=1&b=%23&a=%26#hello"
@@ -2825,11 +2863,27 @@
+ "https://example.com/one/t%61o/%2F%42/"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "https://example.com/one/tao/%2FB/\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [
@@ -2825,12 +2892,28 @@
"path=%61"
]
},
@@ -76,7 +131,7 @@
"stderr": "",
"returncode": 0
}
+ },
},
+ {
+ "input": {
+ "arguments": [
@@ -91,6 +146,115 @@
+ "stderr": "",
+ "returncode": 0
+ }
},
+ },
{
"input": {
"arguments": [
@@ -2991,36 +3074,78 @@
"http://example.com/?a=%5D"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "http://example.com/?a=%5d\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "http://example.com/?a=%5D"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "http://example.com/?a=%5D\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [
"http://example.com/?a=%5D&b=%5D"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "http://example.com/?a=%5d&b=%5d\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "http://example.com/?a=%5D&b=%5D"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "http://example.com/?a=%5D&b=%5D\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [
"sftp://us%65r:pwd;giraffe@odd"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "sftp://user:pwd%3bgiraffe@odd/\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "sftp://us%65r:pwd;giraffe@odd"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "sftp://user:pwd%3Bgiraffe@odd/\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [
@@ -3055,12 +3180,28 @@
"[:password]"
]
},
+ "excludes": ["uppercase-hex"],
"expected": {
"stdout": "pwd%3bgiraffe\n",
"stderr": "",
"returncode": 0
}
},
+ {
+ "input": {
+ "arguments": [
+ "sftp://us%65r:pwd;giraffe@odd",
+ "--get",
+ "[:password]"
+ ]
+ },
+ "required": ["uppercase-hex"],
+ "expected": {
+ "stdout": "pwd%3Bgiraffe\n",
+ "stderr": "",
+ "returncode": 0
+ }
+ },
{
"input": {
"arguments": [

View File

@@ -5,7 +5,7 @@
}:
let
pname = "winbox";
version = "4.2";
version = "4.3";
metaCommon = {
description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
x86_64-zip = callPackage ./build-from-zip.nix {
inherit pname version metaCommon;
hash = "sha256-htyVwuCsCRwvAwsdnbz+Z3E9Tk6kH8U0faGDo9CvyVo=";
hash = "sha256-VzYArCTfOKegbqQxixJ1QkfuxLVMbJCwpXEA1nZ4ekw=";
};
x86_64-dmg = callPackage ./build-from-dmg.nix {
inherit pname version metaCommon;
hash = "sha256-rEBdkLh9+7gzdlQ4uI/SdCAWwWnG2tBQPWTdGcETfsI=";
hash = "sha256-VoHQPjITOFiz3FQceMG644yzNVtf2YMmrHJeC9i6tXA=";
};
in
(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {

View File

@@ -324,6 +324,102 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ns0s++J2adUD/HWuMiYad/g3MITs+twlMnkpFnP7T0w=";
})
# XSA #495
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa495-4.20.patch";
hash = "sha256-SAMu8r0yyPvD3zLCaQL53oNs+ZhV3puKUq4cCofkut8=";
})
# XSA #497
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa497.patch";
hash = "sha256-xftChrVcwMJYgkH22HUlUQXSTPee0ghPRnPVymWJr3o=";
})
# XSA #499
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-1.patch";
hash = "sha256-Xk8+g/mEAtf3HIWqHL2+0iYSihtWy/tohaP6DcLo1+s=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-2.patch";
hash = "sha256-YiDERwBeOvXtgsKjLbpCoLrfYQ1aw/QnXv9i4lKMrDs=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-3.patch";
hash = "sha256-wyEc7GW83Vf++J10s/pqJTghXgqQhwUymPjpryuq8Wg=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-4.patch";
hash = "sha256-bK6VYiMorwGHi25q9tPu5r/YQCMPc6NWBirLAx6oCPg=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-5.patch";
hash = "sha256-Vj5vcpVvuuExK2NvDBP6vrIRjTPsgx8Yv4zVt0ftUnk=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-6.patch";
hash = "sha256-uTBGP6WMfE5FipQ7rzOKY7FxCztQUV6jqbROtHZozoY=";
})
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-7.patch";
hash = "sha256-UsAx2ouUB/BNpCQCObvcjj+DLPuRBqyxlI6QQsPXtWM=";
})
# XSA #500
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa500.patch";
hash = "sha256-cQc/wkaP1wK7dzbdFHmvghK6BcokWrTAtxk0gtIDQ1E=";
})
# XSA #501
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa501.patch";
hash = "sha256-RvdzD/ZCpC7VT0/zzksse/dN5FBl8W/Gul04XQ5EyRg=";
})
# XSA #502
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa502-4.21.patch";
hash = "sha256-hSmNtFwYValGoTwYgoz0uXhQiQV/pZ4rsYRNLAY5Ak8=";
})
# XSA #503
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa503.patch";
hash = "sha256-l64K1LetmngV1V8Vy9fH4dEvUdlAH6ukXwuEMetg83A=";
})
# XSA #504
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa504.patch";
hash = "sha256-uMygMaI824GW0L4obYXfaRIiohiBZpwAvoEO6slOZCE=";
})
# XSA #505
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa505.patch";
hash = "sha256-eZ8CdfzU5Ylyi6BpB4fOJh0VHfHeWa2JsRyhH+sh400=";
})
# XSA #506
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa506.patch";
hash = "sha256-8unTCZE3Kh2JfqDSG5KrgRx9zL9J9pcVzeXnO5vUM0Y=";
})
# XSA #507
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa507.patch";
hash = "sha256-3d5h0evLsFzTAyEDYstvPFcqYLirIZxMWPSY5L868ng=";
})
# XSA #508
(fetchpatch {
url = "https://xenbits.xenproject.org/xsa/xsa508.patch";
hash = "sha256-KhNGfEsVxlxFbnlO+yeeIj8Eo75NE9QOPmg0xlt8U6U=";
})
# patch `libxl` to search for `qemu-system-i386` properly. (Before 4.21)
(fetchpatch {
url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1";

View File

@@ -0,0 +1,47 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
installShellFiles,
nix-update-script,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zsh-patina";
version = "1.7.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "michel-kraemer";
repo = "zsh-patina";
tag = finalAttrs.version;
hash = "sha256-sPlIT3UHtq+5+bpfrSPPfVXTdmqjEq+6k9tPShhG7h0=";
};
cargoHash = "sha256-j2MwEwQhSCUCwANAxr0aZjJ9iS0cGzRRttfK8LONEpg=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
install -Dm644 LICENSE $out/share/licenses/zsh-patina/LICENSE
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd zsh-patina --zsh <($out/bin/zsh-patina completion)
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Zsh syntax highlighter";
homepage = "https://github.com/michel-kraemer/zsh-patina";
changelog = "https://github.com/michel-kraemer/zsh-patina/blob/${finalAttrs.version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ lubsch ];
platforms = lib.platforms.unix;
mainProgram = "zsh-patina";
};
})

View File

@@ -1,6 +1,6 @@
genericBuilder:
genericBuilder {
version = "27.3.4.14";
hash = "sha256-vnD6+KAD2Hm21w+/RB9MxrCbxdFTd2YbE79dd4M5t4U=";
version = "27.3.4.15";
hash = "sha256-viy7cz23K0/8aoZL+lD07j/iIKPv7Cpy0fUR224SrM0=";
}

View File

@@ -1,6 +1,6 @@
genericBuilder:
genericBuilder {
version = "28.5.0.3";
hash = "sha256-OCKR5lryM/jnFFB3hMpud4gQAzPISfK1d0spVXvj358=";
version = "28.5.0.4";
hash = "sha256-mMzRMGBlv385suCvkrOgMgPLee6/j70DwdqRVrBRP+Y=";
}

View File

@@ -1,6 +1,6 @@
genericBuilder:
genericBuilder {
version = "29.0.3";
hash = "sha256-clRU+zrmp8wgCm3rEVUP9y3MmvLzsJGW4RL8qWDZz8A=";
version = "29.0.4";
hash = "sha256-Wq1aQ5a8IBJfY/N3f4AnfoSvodgdFo9lYEWpBy5YYTU=";
}

View File

@@ -89,6 +89,14 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace src/google/protobuf/testing/googletest.cc \
--replace-fail 'tmpnam(b)' '"'$TMPDIR'/foo"'
''
# Adapt https://github.com/protocolbuffers/protobuf/pull/22412 for various
# older versions. sed -z spans newlines, so this can capture and replace
# the full multiline #if macro.
+ lib.optionalString (lib.versionOlder version "32") ''
sed -zi 's/\(#if \w*(clang::musttail)\)[^\n]*\(\\\n[^\n]*\)*/'\
'\1 \&\& (defined(__aarch64__) || defined(__x86_64__) || defined(_M_X64))/' \
src/google/protobuf/port_def.inc
''
# Keep the sentinel macro non-retained for GCC 15+ to match generated
# extension objects in linker arrays and avoid section type conflicts.
+ lib.optionalString (lib.versionAtLeast version "34") ''

View File

@@ -32,7 +32,7 @@
buildPythonPackage (finalAttrs: {
pname = "ansible-core";
version = "2.21.0";
version = "2.21.1";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
owner = "ansible";
repo = "ansible";
tag = "v${finalAttrs.version}";
hash = "sha256-I0XEEGyTMQMpGTApbzVzHRuRAALl+C28GfpW4CeeTIA=";
hash = "sha256-VTU+jhD5W+07FIPVpovQoHjCb4vhLdPZNxCm/MVofV8=";
};
postPatch = ''

View File

@@ -23,6 +23,7 @@
openssl,
withPrefix ? false,
singleBinary ? "symlinks", # you can also pass "shebangs" or false
pkgsStatic,
}:
# Note: this package is used for bootstrapping fetchurl, and thus cannot use
@@ -42,6 +43,11 @@ let
optionalString
;
isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
# stdbuf relies on an LD_PRELOAD shared library, so it is not built in
# static builds; drop it from the binlore override there.
#
# https://github.com/coreutils/coreutils/blob/6e812858bb8b5cc1a4c91b16502a3092ead1d72f/src/stdbuf.c#L389
stdbuf = optionalString (!stdenv.hostPlatform.isStatic) "stdbuf,";
in
stdenv.mkDerivation (finalAttrs: {
pname = "coreutils" + (optionalString (!minimal) "-full");
@@ -230,32 +236,35 @@ stdenv.mkDerivation (finalAttrs: {
rm -r "$out/share"
'';
passthru =
{ }
// optionalAttrs (singleBinary != false) {
# everything in the single binary gets the same verdict, so we
# override _that case_ with verdicts from separate binaries.
#
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; see comment on inverse case below)
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/${
if withPrefix then "g" else ""
}{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
execer cannot bin/${
if withPrefix then "g" else ""
}{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
'';
}
// optionalAttrs (singleBinary == false) {
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; I have a note that the behavior may need selinux?).
# hard-set it so people working on macOS don't miss cases of
# runcon until ofBorg fails.
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/${if withPrefix then "g" else ""}runcon
'';
passthru = {
tests = {
static = pkgsStatic.coreutils;
};
}
// optionalAttrs (singleBinary != false) {
# everything in the single binary gets the same verdict, so we
# override _that case_ with verdicts from separate binaries.
#
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; see comment on inverse case below)
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/${
if withPrefix then "g" else ""
}{chroot,env,install,nice,nohup,runcon,sort,split,${stdbuf}timeout}
execer cannot bin/${
if withPrefix then "g" else ""
}{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
'';
}
// optionalAttrs (singleBinary == false) {
# binlore only spots exec in runcon on some platforms (i.e., not
# darwin; I have a note that the behavior may need selinux?).
# hard-set it so people working on macOS don't miss cases of
# runcon until ofBorg fails.
binlore.out = binlore.synthesize finalAttrs.finalPackage ''
execer can bin/${if withPrefix then "g" else ""}runcon
'';
};
meta = {
homepage = "https://www.gnu.org/software/coreutils/";