Merge master into staging-next

Changed files
+874 -596
lib
nixos
doc
modules
services
mail
web-apps
system
boot
loader
limine
tests
pkgs
applications
networking
instant-messengers
telegram
telegram-desktop
build-support
trivial-builders
by-name
_3
_3cpio
bo
bolt-launcher
ca
el
element-desktop
element-web-unwrapped
fi
files-cli
ga
gr
gr-framework
grav
im
impression
kl
klystrack
ku
kubectl-gadget
li
libgeneral
lo
ma
materialgram
ne
nero-umu
nextcloud-talk-desktop
nt
ntpd-rs
ol
olivetin
op
opencloud
pu
ru
ruffle
su
sunsetr
sw
switch-to-configuration-ng
sy
synapse-admin-etkecc
tr
trivy
tu
tuned
xb
xbrightness
development
python-modules
aiogithubapi
amaranth-boards
batchspawner
chex
distrax
dvc
i3ipc
jupyter-collaboration-ui
libuuu
notobuilder
oslo-log
plyer
postgrest
pygit2
realtime
rlax
scmrepo
sentence-transformers
supabase
textual
torch
servers
home-assistant
custom-lovelace-modules
universal-remote-card
tools
package-management
top-level
+8 -1
lib/meta.nix
···
:::
*/
-
addMetaAttrs = newAttrs: drv: drv // { meta = (drv.meta or { }) // newAttrs; };
+
addMetaAttrs =
+
newAttrs: drv:
+
if drv ? overrideAttrs then
+
drv.overrideAttrs (old: {
+
meta = (old.meta or { }) // newAttrs;
+
})
+
else
+
drv // { meta = (drv.meta or { }) // newAttrs; };
/**
Disable Hydra builds of given derivation.
+3 -1
nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md
···
By default, some units are filtered from the outputs to make it less spammy.
This can be disabled for development or testing by setting the environment variable
-
`STC_DISPLAY_ALL_UNITS=1`
+
`STC_DISPLAY_ALL_UNITS=1`.
+
+
More detailed output can be displayed by setting `STC_DEBUG=1`.
Most of these actions are either self-explaining but some of them have to do
with our units or the activation script. For this reason, these topics are
+2 -2
nixos/modules/services/mail/listmonk.nix
···
'';
databaseSettingsOpts = with lib.types; {
-
freeformType = oneOf [
+
freeformType = attrsOf (oneOf [
(listOf str)
(listOf (attrsOf anything))
str
int
bool
-
];
+
]);
options = {
"app.notify_emails" = lib.mkOption {
+1 -2
nixos/modules/services/web-apps/grav.nix
···
'';
};
-
phpPackage = mkPackageOption pkgs "php" { };
+
phpPackage = mkPackageOption pkgs "php83" { };
maxUploadSize = mkOption {
type = types.str;
···
extraConfig = ''
index index.php index.html /index.php$request_uri;
add_header X-Content-Type-Options nosniff;
-
add_header X-XSS-Protection "1; mode=block";
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header X-Frame-Options sameorigin;
+1 -1
nixos/modules/system/boot/loader/limine/limine.nix
···
script = ''
cp ${config.services.fwupd.package.fwupd-efi}/libexec/fwupd/efi/fwupd*.efi /run/fwupd-efi/
chmod +w /run/fwupd-efi/fwupd*.efi
-
${lib.getExe pkgs.sbctl} sign /run/fwupd-efi/fwupd*.efi
+
${lib.getExe cfg.secureBoot.sbctl} sign /run/fwupd-efi/fwupd*.efi
'';
};
+1
nixos/tests/stalwart/stalwart-mail.nix
···
main.succeed("systemctl restart stalwart-mail.service")
main.wait_for_open_port(587)
main.wait_for_open_port(143)
+
main.wait_for_open_port(80)
main.succeed("test-imap-read")
+2 -2
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop-unwrapped";
-
version = "6.0.2";
+
version = "6.1.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
-
hash = "sha256-l6i5ml4dCvJ5QJShK9jacJZlEujm1ObCFGa9VJ1y2zE=";
+
hash = "sha256-gCakI7r0xyJt8rGtaz6vXuG022alezcipNIkyzZEvoA=";
};
nativeBuildInputs = [
+1
pkgs/build-support/trivial-builders/default.nix
···
inherit name text;
executable = true;
destination = "/bin/${name}";
+
meta.mainProgram = name;
};
# See doc/build-helpers/trivial-build-helpers.chapter.md
+3 -3
pkgs/by-name/_3/_3cpio/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "3cpio";
-
version = "0.10.2";
+
version = "0.11.0";
src = fetchFromGitHub {
owner = "bdrung";
repo = "3cpio";
tag = version;
-
hash = "sha256-UtXyJ4PDzi4BJ0nd9w/hygcJVfNd3H5WAIV+f23dtpk=";
+
hash = "sha256-TZw9IixZxQ00uFZw6RtAY4zWV22zuuaP6dAB4vkXwaM=";
};
-
cargoHash = "sha256-XGTa5Ui4yPHmuC4tTWGMTKN/erHSaiJVmxHglbt+udg=";
+
cargoHash = "sha256-2IT5zdgUvzeYt81iwYssR/xEp03Qz6+Ll5u02y+R3qo=";
# Tests attempt to access arbitrary filepaths
doCheck = false;
+3 -2
pkgs/by-name/bo/bolt-launcher/package.nix
···
let
bolt = stdenv.mkDerivation (finalAttrs: {
pname = "bolt-launcher";
-
version = "0.19.0";
+
version = "0.19.1";
src = fetchFromGitHub {
owner = "AdamCake";
repo = "bolt";
tag = finalAttrs.version;
fetchSubmodules = true;
-
hash = "sha256-0ROwETpIa0j7gRhvLMFI9Sz2HEsAuUkQGg0jZef6o/g=";
+
hash = "sha256-1BvjKlpUD4gJJOlrc2wsl9Pv2x1TBcejYsGiliMrwao=";
};
nativeBuildInputs = [
···
maintainers = with lib.maintainers; [
nezia
jaspersurmont
+
iedame
];
platforms = lib.platforms.linux;
mainProgram = "${bolt.name}";
-2
pkgs/by-name/ca/cage/package.nix
···
pixman,
libxkbcommon,
xcbutilwm,
-
systemd,
libGL,
libX11,
xwayland ? null,
···
pixman
libxkbcommon
xcbutilwm
-
systemd
libGL
libX11
];
+3 -3
pkgs/by-name/el/element-desktop/element-desktop-pin.nix
···
{
-
"version" = "1.11.109";
+
"version" = "1.11.110";
"hashes" = {
-
"desktopSrcHash" = "sha256-4M+1wOwyMVRdzXpgdBi9Fi4WM7MMypDHAOcifk3iejI=";
-
"desktopYarnHash" = "sha256-uff/bOv3Gs/fNk9oPbE0X7EjftrIr7p/wSLgv8SDzkg=";
+
"desktopSrcHash" = "sha256-iWdNiihpU29nek+EQjHmRi7dXadPYYoIt6bhufauKf8=";
+
"desktopYarnHash" = "sha256-l/hclDXT1JeToQPnWFDXU8JSN+oEm5hPYm4OQ7QJONk=";
};
}
+3 -3
pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
···
{
-
"version" = "1.11.109";
+
"version" = "1.11.110";
"hashes" = {
-
"webSrcHash" = "sha256-TTpaRMSi5YX95ZwfQA0XVLO52oPCu9VU0+dVylEQwhU=";
-
"webYarnHash" = "sha256-9HU2k6EX8v3JfPt8HYlLuSnkt7Y12f6AiNXB2e0lDWM=";
+
"webSrcHash" = "sha256-9NOotUTcB2S6SSH620Em0YOwy6mxrWhChqdOZj0Leu0=";
+
"webYarnHash" = "sha256-TimQp6qcgszOuxRUOsN0Ey+pVVUGbEC6aRJ5gYXZ3dg=";
};
}
+3 -3
pkgs/by-name/fi/files-cli/package.nix
···
buildGoModule rec {
pname = "files-cli";
-
version = "2.15.85";
+
version = "2.15.88";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
-
hash = "sha256-nARnc4oh0Pfpo8yxh6oXlS/CQK2oMmN2imCajFMbrFI=";
+
hash = "sha256-qSQIXDc7x3/qDxEeTEsPA2Dwl29OW+SggkPvbe8rojI=";
};
-
vendorHash = "sha256-xU2X+ElbV+iQxJwPIR0ficMCgn2QwMWeZ3wNtcLgLeg=";
+
vendorHash = "sha256-HOnnfWET7p8hdhuoQyx3m7UV+Pp552CrQNxgtq0rA+w=";
ldflags = [
"-s"
+50 -55
pkgs/by-name/ga/garnet/deps.json
···
},
{
"pname": "Azure.Core",
-
"version": "1.46.1",
-
"hash": "sha256-xpb9A2pFHEQ07yVrzq0gpeFBTN9LTqk7iHhg707a5Mg="
+
"version": "1.47.1",
+
"hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
},
{
"pname": "Azure.Identity",
-
"version": "1.14.1",
-
"hash": "sha256-F4CtJqq8wh5g9wZj8exVuzSDQm4pp0Gq5RgrKsQFFzY="
+
"version": "1.15.0",
+
"hash": "sha256-eqR6Akmrtu4U4fPvkDwMbwk2dPGx+MaKPj+Y80e0/Ak="
},
{
"pname": "Azure.Storage.Blobs",
-
"version": "12.24.0",
-
"hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs="
+
"version": "12.25.0",
+
"hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
},
{
"pname": "Azure.Storage.Common",
-
"version": "12.23.0",
-
"hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q="
+
"version": "12.24.0",
+
"hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA="
},
{
"pname": "CommandLineParser",
···
},
{
"pname": "Microsoft.Extensions.Configuration",
-
"version": "9.0.3",
-
"hash": "sha256-p1KEkbl1h3dJkBZQUMK2Jt1vbm/NGIHqLEr7QrLYIbg="
+
"version": "9.0.8",
+
"hash": "sha256-GnD1Ar/yZfCZQw2k/2jKteLG1lF/Dk7S3tgMvn+SFqc="
},
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
-
"version": "9.0.3",
-
"hash": "sha256-OjL0pzW+Wsp0KSrqawYHdtIf8w0XqvY8USEbptgP6dI="
+
"version": "9.0.8",
+
"hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
-
"version": "9.0.3",
-
"hash": "sha256-KxYOzATIl0qI8MScHL9BYsCB3dvqoNDCrraiquBHMVs="
+
"version": "9.0.8",
+
"hash": "sha256-N8WMvnbCKsUtpK08B1CYi5LOuq6Sbv3Nois4CKjDQJ8="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
-
"version": "9.0.3",
-
"hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0="
+
"version": "9.0.8",
+
"hash": "sha256-fJOwbtlmP6mXGYqHRCqtb7e08h5mFza6Wmd1NbNq3ug="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-
"version": "9.0.3",
-
"hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4="
+
"version": "9.0.8",
+
"hash": "sha256-uFBeyx8WTgDX2z8paf6ZAQ45WexaWG8uzO5x+qGrPRU="
},
{
"pname": "Microsoft.Extensions.Logging",
-
"version": "9.0.3",
-
"hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA="
+
"version": "9.0.8",
+
"hash": "sha256-SEVCMpVwjcQtTSs4lirb89A36MxLQwwqdDFWbr1VvP8="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
···
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
-
"version": "9.0.3",
-
"hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso="
+
"version": "9.0.8",
+
"hash": "sha256-vaUApbwsqKt7+AItgusbCKKdTyOg/5KCdSZjDZarw20="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
-
"version": "9.0.3",
-
"hash": "sha256-u9Un3Bc+Cbj2E8u2etU+KPPv3IbCKgCAY/SCAGK6+LE="
+
"version": "9.0.8",
+
"hash": "sha256-/6sIAQlXXDdWnERGXN9XqqOFf1Q71uFSMiThwdIPzEY="
},
{
"pname": "Microsoft.Extensions.Logging.Console",
-
"version": "9.0.3",
-
"hash": "sha256-bDHxUjuO4d63GXbDoD9Hdo8AvAke0/r38hzctAWQUqc="
+
"version": "9.0.8",
+
"hash": "sha256-8cz7l8ubkRIBd6gwDJcpJd66MYNU0LsvDH9+PU+mTJo="
},
{
"pname": "Microsoft.Extensions.Options",
-
"version": "9.0.3",
-
"hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8="
+
"version": "9.0.8",
+
"hash": "sha256-AbwIL8sSZ/qDBKbvabHp1tbExBFr73fYjuXJiV6On1U="
},
{
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-
"version": "9.0.3",
-
"hash": "sha256-FjYrMjnkEplPTYoHUVU94zXIuVsjL5AcGHb/zYkh138="
+
"version": "9.0.8",
+
"hash": "sha256-MwTPdC6kJ6Ff/Tw7BHa9JzRwBeCVdRS1gMz17agSjaY="
},
{
"pname": "Microsoft.Extensions.Primitives",
-
"version": "9.0.3",
-
"hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
+
"version": "9.0.8",
+
"hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc="
},
{
"pname": "Microsoft.Identity.Client",
-
"version": "4.71.1",
-
"hash": "sha256-3KwibXbY1bV1ZQlSdOPtCjP2xQtPJpOb82OTmkwKjpY="
+
"version": "4.73.1",
+
"hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
},
{
"pname": "Microsoft.Identity.Client.Extensions.Msal",
-
"version": "4.71.1",
-
"hash": "sha256-n6+06yWqyMjpKpdj9TmDz+XEQmCvw0KEgpG5dbEf0Io="
+
"version": "4.73.1",
+
"hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
···
},
{
"pname": "System.ClientModel",
-
"version": "1.4.1",
-
"hash": "sha256-BG5ObHp2Kfmg7MT3ikaAKTGpJPEkpWOtQmkiqf14BWc="
+
"version": "1.5.1",
+
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
···
},
{
"pname": "System.Diagnostics.DiagnosticSource",
-
"version": "9.0.3",
-
"hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M="
+
"version": "9.0.8",
+
"hash": "sha256-bVGcjEcZUVeY2jOvZeFnG+ym8ebUKOftx+gErNXeiK4="
},
{
"pname": "System.IdentityModel.Tokens.Jwt",
···
},
{
"pname": "System.IO.Hashing",
-
"version": "6.0.0",
-
"hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
+
"version": "8.0.0",
+
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
},
{
"pname": "System.IO.Pipelines",
-
"version": "9.0.3",
-
"hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
-
},
-
{
-
"pname": "System.Memory",
-
"version": "4.5.5",
-
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+
"version": "9.0.8",
+
"hash": "sha256-dO84rUcpDgj6k8rTZq3Kmy/y+6c/cP1Fa1dsCV9JIlA="
},
{
"pname": "System.Memory.Data",
···
},
{
"pname": "System.Memory.Data",
-
"version": "6.0.1",
-
"hash": "sha256-RXS82gmLtIOAUaGqTc8J3bVbHTL5pnW3QFE3G+Xb5Jk="
+
"version": "8.0.1",
+
"hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
},
{
"pname": "System.Numerics.Vectors",
···
},
{
"pname": "System.Text.Encodings.Web",
-
"version": "9.0.3",
-
"hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
+
"version": "9.0.8",
+
"hash": "sha256-2Fy5/VAqBHuwcxHMVevyzQDRIRlyTZlT+5pwr6OtuuU="
},
{
"pname": "System.Text.Json",
···
},
{
"pname": "System.Text.Json",
-
"version": "9.0.3",
-
"hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
+
"version": "9.0.8",
+
"hash": "sha256-CEoLOj0KeuctK2jXd6yZ+/5yx4apsEh7+xsJH95h/1c="
},
{
"pname": "System.Threading.Tasks.Extensions",
+2 -2
pkgs/by-name/ga/garnet/package.nix
···
buildDotnetModule rec {
pname = "garnet";
-
version = "1.0.82";
+
version = "1.0.83";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
-
hash = "sha256-ju39u5GvlxKxTn47MAicNFM9Delk6n/ht74p2XxmM44=";
+
hash = "sha256-Z1PNgCanrHVyWILwR1HYjJdhoToMU43G9mo1UlRfV8Q=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
-68
pkgs/by-name/gr/gr-framework/package.nix
···
-
{
-
lib,
-
stdenv,
-
fetchFromGitHub,
-
-
cmake,
-
ninja,
-
qt6,
-
-
cairo,
-
ffmpeg,
-
ghostscript,
-
glfw,
-
libtiff,
-
qhull,
-
xercesc,
-
xorg,
-
zeromq,
-
-
nix-update-script,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "gr-framework";
-
version = "0.73.10";
-
-
src = fetchFromGitHub {
-
owner = "sciapp";
-
repo = "gr";
-
rev = "v${version}";
-
hash = "sha256-vCcXWgoaWcaNRgIk9CrXp8eTII/CBOHR1iDncC/Cd4k=";
-
};
-
-
nativeBuildInputs = [
-
cmake
-
ninja
-
qt6.wrapQtAppsHook
-
];
-
-
buildInputs = [
-
cairo
-
ffmpeg
-
ghostscript
-
glfw
-
libtiff
-
qhull
-
qt6.qtbase
-
xercesc
-
xorg.libX11
-
xorg.libXft
-
xorg.libXt
-
zeromq
-
];
-
-
preConfigure = ''
-
echo ${version} > version.txt
-
'';
-
-
passthru.updateScript = nix-update-script { };
-
-
meta = with lib; {
-
description = "GR framework is a graphics library for visualisation applications";
-
homepage = "https://gr-framework.org";
-
license = licenses.mit;
-
maintainers = with maintainers; [ ];
-
platforms = platforms.unix;
-
};
-
}
+2 -2
pkgs/by-name/gr/grav/package.nix
···
}:
let
-
version = "1.7.48";
+
version = "1.7.49.2";
in
stdenvNoCC.mkDerivation {
pname = "grav";
···
src = fetchzip {
url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-
hash = "sha256-e8WpdO0n3pY4Ajs1fvMkMI+CrR6uMitswvYS5rxal4g=";
+
hash = "sha256-Yu7uFoim12pe4OT/dSsQVcZ6nyYGKWLJbsfLFtI05Z8=";
};
patches = [
+3 -3
pkgs/by-name/im/impression/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "impression";
-
version = "3.5.0";
+
version = "3.5.1";
src = fetchFromGitLab {
owner = "adhami3310";
repo = "Impression";
tag = "v${finalAttrs.version}";
-
hash = "sha256-LtCfqBtgtayjCuBukfjDtZfaGM7I2rOImxD2yvRITVk=";
+
hash = "sha256-xSgH1k/K52sh3qcIHWyv/WgRX9sVWZAXm+OabWbbNJo=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
-
hash = "sha256-chRsKBnl6QOJ4b1UZak5lnp4lQmXCyZXI/8iJs5lM/E=";
+
hash = "sha256-cBaScjnhWW9nLFdeCuW7jzlJ8qZecc0FxjpJTRZJ6Lo=";
};
nativeBuildInputs = [
+33 -10
pkgs/by-name/kl/klystrack/package.nix
···
pkg-config,
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "klystrack";
version = "1.7.6";
src = fetchFromGitHub {
owner = "kometbomb";
repo = "klystrack";
-
tag = version;
+
tag = finalAttrs.version;
fetchSubmodules = true;
-
sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz";
+
hash = "sha256-30fUI4abo4TxoUdZfKBowL4lF/lDiwnhQASr1kTVKcE=";
};
+
# https://github.com/kometbomb/klystrack/commit/6dac9eb5e75801ce4dec1d8b339f78e3df2f54bc fixes build but doesn't apply as-is, just patch in the flag
+
# Make embedded date reproducible
+
# Use pkg-config instead of sdl2-config
+
postPatch = ''
+
substituteInPlace Makefile \
+
--replace-fail '-DUSESDL_IMAGE' '-DUSESDL_IMAGE -DUSESDL_RWOPS'
+
+
substituteInPlace Makefile klystron/Makefile \
+
--replace-fail 'date' 'date --date @$(SOURCE_DATE_EPOCH)'
+
+
substituteInPlace klystron/common.mk klystron/tools/makebundle/Makefile \
+
--replace-fail 'sdl2-config' 'pkg-config sdl2 SDL2_image'
+
'';
+
+
strictDeps = true;
+
+
nativeBuildInputs = [
+
pkg-config
+
];
+
buildInputs = [
SDL2
SDL2_image
];
-
nativeBuildInputs = [ pkg-config ];
patches = [
(fetchpatch {
url = "https://github.com/kometbomb/klystrack/commit/bb537595d02140176831c4a1b8e9121978b32d22.patch";
-
sha256 = "06gl9q0jwg039kpxb13lg9x0k59s11968qn4lybgkadvzmhxkgmi";
+
hash = "sha256-sb7ZYf27qfmWp8RiZFIIOpUJenp0hNXvTAM8LgFO9Bk=";
})
];
···
];
installPhase = ''
+
runHook preInstall
+
install -Dm755 bin.release/klystrack $out/bin/klystrack
mkdir -p $out/lib/klystrack
···
mkdir -p $out/share/applications
substitute linux/klystrack.desktop $out/share/applications/klystrack.desktop \
--replace "klystrack %f" "$out/bin/klystrack %f"
+
+
runHook postInstall
'';
-
meta = with lib; {
+
meta = {
description = "Chiptune tracker";
homepage = "https://kometbomb.github.io/klystrack";
-
license = licenses.mit;
-
maintainers = with maintainers; [ suhr ];
-
platforms = platforms.linux;
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ suhr ];
+
platforms = lib.platforms.linux;
mainProgram = "klystrack";
};
-
}
+
})
+3 -3
pkgs/by-name/ku/kubectl-gadget/package.nix
···
buildGoModule rec {
pname = "kubectl-gadget";
-
version = "0.43.0";
+
version = "0.44.0";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
-
hash = "sha256-j1tJTg9ZKVsthKH6A+zq+kJL0xC2mZu/AV6xS+0BtKM=";
+
hash = "sha256-h3J6RQG9CI+2U+iWINUs3JX4uEfbl0VeOXsaWuZx2dg=";
};
-
vendorHash = "sha256-0JbBVh5zQBQHx6Mfe8h3T+/Jvm0hmdEas6vOj1CNJwc=";
+
vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg=";
env.CGO_ENABLED = 0;
+2 -2
pkgs/by-name/li/libgeneral/package.nix
···
}:
clangStdenv.mkDerivation (finalAttrs: {
pname = "libgeneral";
-
version = "85";
+
version = "86";
src = fetchFromGitHub {
owner = "tihmstar";
repo = "libgeneral";
tag = finalAttrs.version;
-
hash = "sha256-bCaAx1PVqT7Fl8IoefupIb6UuHD43clmdtnomF5Vycs=";
+
hash = "sha256-60vzQkf5ztAEyLRz/+q+pGs6g9Wdv3DJp1uXgRFNUDA=";
};
# Do not depend on git to calculate version, instead
+2 -2
pkgs/by-name/lo/lock/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "lock";
-
version = "1.7.3";
+
version = "1.7.5";
src = fetchFromGitHub {
owner = "konstantintutsch";
repo = "Lock";
tag = "v${finalAttrs.version}";
-
hash = "sha256-NxSw77GpcLoLfbD46QECORdJKWBfWS8zQE+SU3J9GK8=";
+
hash = "sha256-vm1Tv3av9x5KZcUwL/yvnE7MeHhdFEutOpbgyWJRR0g=";
};
strictDeps = true;
+3 -3
pkgs/by-name/ma/materialgram/package.nix
···
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
finalAttrs: previousAttrs: {
pname = "materialgram-unwrapped";
-
version = "6.0.0.1";
+
version = "6.1.0.1";
src = fetchFromGitHub {
owner = "kukuruzka165";
repo = "materialgram";
-
rev = "refs/tags/v${finalAttrs.version}";
-
hash = "sha256-MXIXYwYuILm/bAShH9tZWOndDFOsp9oVYonX+BPPK4M=";
+
tag = "v${finalAttrs.version}";
+
hash = "sha256-LUmO2KONOhfi0i1ABu3nB2RSgybF/cBWw8Pk6ULGza4=";
fetchSubmodules = true;
};
+2 -2
pkgs/by-name/ne/nero-umu/package.nix
···
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nero-umu";
-
version = "1.1.3";
+
version = "1.1.4";
src = fetchFromGitHub {
owner = "SeongGino";
repo = "Nero-umu";
tag = "v${finalAttrs.version}";
-
hash = "sha256-w9sMBMtaop0lCwqvNf235cf0+ON91tMoqU1guyX6oVU=";
+
hash = "sha256-Cx2hN5LV7/EOXnn9RfIsj9OmnlM1oMZB7a535/hwTas=";
};
#Replace quazip git submodule with pre-packaged quazip
+2 -2
pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "nextcloud-talk-desktop";
-
version = "1.2.5";
+
version = "1.2.6";
# Building from source would require building also building Server and Talk components
# See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
src = fetchzip {
url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-
hash = "sha256-Jozdyxd02LocmbRrR2pB7EtIRIjd988JtDhlCNbumks=";
+
hash = "sha256-uCqmcDZ5iaeT8nCss3Y2nen4N5nzMKu0dkTU/gapVow=";
stripRoot = false;
};
+3 -3
pkgs/by-name/nt/ntpd-rs/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "ntpd-rs";
-
version = "1.6.1";
+
version = "1.6.2";
src = fetchFromGitHub {
owner = "pendulum-project";
repo = "ntpd-rs";
tag = "v${version}";
-
hash = "sha256-1GnJFiptSzj5zI8IlcrFjwooujUM9ouzcIgghUEs518=";
+
hash = "sha256-X8nmfG7ZhtB4P6N0ku0Gc9xHOGJFeGTnB1WizZ2X1fk=";
};
-
cargoHash = "sha256-Wk9KxNgIGDEIEYIl7O+3eamUHuBSBMxZgUob9FryuGI=";
+
cargoHash = "sha256-p3ryAggKR6ylCvaQ8M30OmLyGCL4bOYR/YwqNfAzcAg=";
nativeBuildInputs = [
pandoc
+6 -1
pkgs/by-name/ol/olivetin/package.nix
···
runHook postInstall
'';
+
postFixup = ''
+
find $out -type f -name '*.go' -exec \
+
sed -i -E 's|//.*protoc-gen-go(-grpc)? +v.*$||' {} +
+
'';
+
outputHashMode = "recursive";
-
outputHash = "sha256-o+Zt3rmTK7NmBQ9hDlbxZySUlCx6Ks7yQTtdm9+pJac=";
+
outputHash = "sha256-wHqXsSV18mF/CfLQ0S4rGtT3QRcLnneYXAa8nXZaHpQ=";
};
webui = buildNpmPackage {
+8 -2
pkgs/by-name/op/opencloud/package.nix
···
in
buildGoModule rec {
pname = "opencloud";
-
version = "3.3.0";
+
version = "3.4.0";
src = fetchFromGitHub {
owner = "opencloud-eu";
repo = "opencloud";
tag = "v${version}";
-
hash = "sha256-ekOqKJxXTEClHfVZ5VDzKgEG3imK7ec/bnpqduL4LOQ=";
+
hash = "sha256-uoGgsz0BUUVuSEZrTX8b294FbVqL2YPFg7JoyRpH8Do=";
};
postPatch = ''
···
libxcrypt
vips
];
+
+
# wants testcontainers and docker, and we don't have a good way to skip tests
+
# based on package name and not test name
+
preCheck = ''
+
rm services/search/pkg/opensearch/*_test.go
+
'';
env = {
# avoids 'make generate' calling `git`, otherwise no-op
+7
pkgs/by-name/pu/puppet/Gemfile
···
source "https://rubygems.org"
gem "puppet"
+
+
# ruby used to provide these in stdlib but now they must be defined
+
gem "base64"
+
gem "syslog"
+
gem "ostruct"
+
gem "benchmark"
+
gem "racc"
+29 -9
pkgs/by-name/pu/puppet/Gemfile.lock
···
GEM
remote: https://rubygems.org/
specs:
-
concurrent-ruby (1.2.3)
+
base64 (0.3.0)
+
benchmark (0.4.1)
+
concurrent-ruby (1.3.5)
deep_merge (1.2.2)
-
facter (4.7.0)
+
facter (4.10.0)
hocon (~> 1.3)
thor (>= 1.0.1, < 1.3)
-
fast_gettext (2.3.0)
+
fast_gettext (3.1.0)
+
prime
+
forwardable (1.3.3)
+
getoptlong (0.2.1)
hocon (1.4.0)
locale (2.1.4)
-
multi_json (1.15.0)
-
puppet (8.6.0)
+
logger (1.7.0)
+
multi_json (1.17.0)
+
ostruct (0.6.3)
+
prime (0.1.4)
+
forwardable
+
singleton
+
puppet (8.10.0)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (>= 4.3.0, < 5)
-
fast_gettext (>= 2.1, < 3)
+
fast_gettext (>= 2.1, < 4)
+
getoptlong (~> 0.2.0)
locale (~> 2.1)
multi_json (~> 1.13)
puppet-resource_api (~> 1.5)
···
semantic_puppet (~> 1.0)
puppet-resource_api (1.9.0)
hocon (>= 1.0)
+
racc (1.8.1)
scanf (1.0.0)
-
semantic_puppet (1.1.0)
+
semantic_puppet (1.1.1)
+
singleton (0.3.0)
+
syslog (0.3.0)
+
logger
thor (1.2.2)
PLATFORMS
+
aarch64-linux
ruby
-
x86_64-linux
DEPENDENCIES
+
base64
+
benchmark
+
ostruct
puppet
+
racc
+
syslog
BUNDLED WITH
-
2.5.9
+
2.6.9
+119 -12
pkgs/by-name/pu/puppet/gemset.nix
···
{
+
base64 = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
+
type = "gem";
+
};
+
version = "0.3.0";
+
};
+
benchmark = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
+
type = "gem";
+
};
+
version = "0.4.1";
+
};
concurrent-ruby = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
type = "gem";
};
-
version = "1.2.3";
+
version = "1.3.5";
};
deep_merge = {
groups = [ "default" ];
···
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "0bigvzjqmfd7s0wwmg22372iffy4jz71x25g1r1ij8h60bk1097h";
+
sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp";
type = "gem";
};
-
version = "4.7.0";
+
version = "4.10.0";
};
fast_gettext = {
+
dependencies = [ "prime" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2";
+
sha256 = "1i9anyxdsz3lxlg9cg2dcad1fwykz4lr45v2q3nwjp477b1q8k4w";
type = "gem";
};
-
version = "2.3.0";
+
version = "3.1.0";
+
};
+
forwardable = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi";
+
type = "gem";
+
};
+
version = "1.3.3";
+
};
+
getoptlong = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
+
type = "gem";
+
};
+
version = "0.2.1";
};
hocon = {
groups = [ "default" ];
···
};
version = "2.1.4";
};
+
logger = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+
type = "gem";
+
};
+
version = "1.7.0";
+
};
multi_json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+
sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
+
type = "gem";
+
};
+
version = "1.17.0";
+
};
+
ostruct = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
+
type = "gem";
+
};
+
version = "0.6.3";
+
};
+
prime = {
+
dependencies = [
+
"forwardable"
+
"singleton"
+
];
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "0pi2g9sd9ssyrpvbybh4skrgzqrv0rrd1q7ylgrsd519gjzmwxad";
type = "gem";
};
-
version = "1.15.0";
+
version = "0.1.4";
};
puppet = {
dependencies = [
···
"deep_merge"
"facter"
"fast_gettext"
+
"getoptlong"
"locale"
"multi_json"
"puppet-resource_api"
···
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "1b9a1spqh5zfmpr0f1rz597wr7s4d7d796768ms04ssd634r4539";
+
sha256 = "0fia3ji6isnqz4a31aq8k4nd8p7vkxn80hhgqfdc8kkrba7xxxgj";
type = "gem";
};
-
version = "8.6.0";
+
version = "8.10.0";
};
puppet-resource_api = {
dependencies = [ "hocon" ];
···
};
version = "1.9.0";
};
+
racc = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
+
type = "gem";
+
};
+
version = "1.8.1";
+
};
scanf = {
groups = [ "default" ];
platforms = [ ];
···
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
-
sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj";
+
sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm";
type = "gem";
};
-
version = "1.1.0";
+
version = "1.1.1";
+
};
+
singleton = {
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3";
+
type = "gem";
+
};
+
version = "0.3.0";
+
};
+
syslog = {
+
dependencies = [ "logger" ];
+
groups = [ "default" ];
+
platforms = [ ];
+
source = {
+
remotes = [ "https://rubygems.org" ];
+
sha256 = "023lbh48fcn72gwyh1x52ycs1wx1bnhdajmv0qvkidmdsmxnxzjd";
+
type = "gem";
+
};
+
version = "0.3.0";
};
thor = {
groups = [ "default" ];
+2 -1
pkgs/by-name/pu/puppet/package.nix
···
bundlerUpdateScript,
lib,
puppet,
+
ruby_3_4,
testers,
}:
-
bundlerApp {
+
(bundlerApp.override { ruby = ruby_3_4; }) {
pname = "puppet";
gemdir = ./.;
exes = [ "puppet" ];
+3 -3
pkgs/by-name/ru/ruffle/package.nix
···
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruffle";
-
version = "0.2-nightly-2025-08-22";
+
version = "0.2-nightly-2025-09-02";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
-
hash = "sha256-bv8ZQuEU8QqtC7fvtELXlkQkjPoGqqSglhE0lzsTEIk=";
+
hash = "sha256-QpX30big3hEL2KaUo6M4BfWrQOGMfnrxSluOQKoveaE=";
};
-
cargoHash = "sha256-89xxPl6nIp4VLsQqsaXH9VKWX6Ehw6KCJaOuxnSxu0g=";
+
cargoHash = "sha256-celZXTEzjxDm804D39LE1MSsrGcqIZE9o6ZmoNgIMnA=";
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
env =
+4 -3
pkgs/by-name/su/sunsetr/package.nix
···
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sunsetr";
-
version = "0.7.1";
+
version = "0.8.0";
src = fetchFromGitHub {
owner = "psi4j";
repo = "sunsetr";
tag = "v${finalAttrs.version}";
-
hash = "sha256-XDa6kjhdEur8YDfQQNg+RpLRtfOeTklB6LwXJaPcG7c=";
+
hash = "sha256-TCG6jokt0lMiCGcltFtTTOKDgvOSW/bzNvgAk+opW28=";
};
-
cargoHash = "sha256-Jsii8PkRIZgQ4yrQHZpK8bLhaW5jg6EKYw65rPRCtGQ=";
+
cargoHash = "sha256-PULjNh7AkwRIoZ8gQp9RB4JeurioKiZ2xjk939l7uOU=";
checkFlags = [
"--skip=config::tests::test_geo_toml_exists_before_config_creation"
···
description = "Automatic blue light filter for Hyprland, Niri, and everything Wayland";
homepage = "https://github.com/psi4j/sunsetr";
license = lib.licenses.mit;
+
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.DoctorDalek1963 ];
};
})
+1 -4
pkgs/by-name/sw/switch-to-configuration-ng/package.nix
···
src = ./src;
-
cargoLock = {
-
lockFile = ./src/Cargo.lock;
-
outputHashes."rust-ini-0.21.1" = "sha256-0nSBhme/g+mVsYdiq0Ash0ek9WEdvbf/b9FRxA7sauk=";
-
};
+
cargoLock.lockFile = ./src/Cargo.lock;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
+229 -148
pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.lock
···
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-
version = 3
+
version = 4
[[package]]
name = "aho-corasick"
···
]
[[package]]
-
name = "ansi_term"
-
version = "0.12.1"
+
name = "anstream"
+
version = "0.6.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+
checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
dependencies = [
-
"winapi",
+
"anstyle",
+
"anstyle-parse",
+
"anstyle-query",
+
"anstyle-wincon",
+
"colorchoice",
+
"is_terminal_polyfill",
+
"utf8parse",
]
[[package]]
-
name = "anyhow"
-
version = "1.0.86"
+
name = "anstyle"
+
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
[[package]]
-
name = "atty"
-
version = "0.2.14"
+
name = "anstyle-parse"
+
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+
checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
dependencies = [
-
"hermit-abi",
-
"libc",
-
"winapi",
+
"utf8parse",
+
]
+
+
[[package]]
+
name = "anstyle-query"
+
version = "1.1.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+
dependencies = [
+
"windows-sys",
+
]
+
+
[[package]]
+
name = "anstyle-wincon"
+
version = "3.0.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
+
dependencies = [
+
"anstyle",
+
"once_cell_polyfill",
+
"windows-sys",
]
[[package]]
-
name = "bitflags"
-
version = "1.3.2"
+
name = "anyhow"
+
version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
[[package]]
name = "bitflags"
-
version = "2.5.0"
+
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
[[package]]
name = "cfg-if"
-
version = "1.0.0"
+
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
[[package]]
name = "cfg_aliases"
-
version = "0.1.1"
+
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "clap"
-
version = "2.34.0"
+
version = "4.5.41"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
+
dependencies = [
+
"clap_builder",
+
]
+
+
[[package]]
+
name = "clap_builder"
+
version = "4.5.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
dependencies = [
-
"ansi_term",
-
"atty",
-
"bitflags 1.3.2",
+
"anstream",
+
"anstyle",
+
"clap_lex",
"strsim",
-
"textwrap",
-
"unicode-width",
-
"vec_map",
]
[[package]]
+
name = "clap_lex"
+
version = "0.7.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+
[[package]]
+
name = "colorchoice"
+
version = "1.0.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+
[[package]]
name = "const-random"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "crunchy"
-
version = "0.2.2"
+
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "dbus"
···
[[package]]
name = "dbus-codegen"
-
version = "0.11.0"
+
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bcd91775d91fc83c7d526aa7c08078bac0b30f382706689901ac819fe6ddc812"
+
checksum = "cf7b8c78e020d2eb0bb7ad986a86c5e5477d66d3cb13ea23a0faf896dd72a1db"
dependencies = [
"clap",
"dbus",
···
[[package]]
name = "deranged"
-
version = "0.3.11"
+
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [
"powerfmt",
]
···
]
[[package]]
-
name = "error-chain"
-
version = "0.12.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-
dependencies = [
-
"version_check",
-
]
-
-
[[package]]
name = "getrandom"
-
version = "0.2.15"
+
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"libc",
···
[[package]]
name = "glob"
-
version = "0.3.1"
+
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
[[package]]
name = "hashbrown"
···
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
[[package]]
-
name = "hermit-abi"
-
version = "0.1.19"
+
name = "hostname"
+
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+
checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
dependencies = [
+
"cfg-if",
"libc",
+
"windows-link",
]
[[package]]
-
name = "hostname"
-
version = "0.3.1"
+
name = "is_terminal_polyfill"
+
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-
dependencies = [
-
"libc",
-
"match_cfg",
-
"winapi",
-
]
+
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itoa"
-
version = "1.0.11"
+
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "libc"
-
version = "0.2.155"
+
version = "0.2.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
[[package]]
name = "libdbus-sys"
···
[[package]]
name = "log"
-
version = "0.4.21"
+
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-
[[package]]
-
name = "match_cfg"
-
version = "0.1.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
[[package]]
name = "memchr"
-
version = "2.7.4"
+
version = "2.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
[[package]]
name = "nix"
-
version = "0.28.0"
+
version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
-
"bitflags 2.5.0",
+
"bitflags",
"cfg-if",
"cfg_aliases",
"libc",
···
[[package]]
name = "once_cell"
-
version = "1.19.0"
+
version = "1.21.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+
[[package]]
+
name = "once_cell_polyfill"
+
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
[[package]]
name = "ordered-multimap"
···
[[package]]
name = "pkg-config"
-
version = "0.3.30"
+
version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "powerfmt"
···
[[package]]
name = "proc-macro2"
-
version = "1.0.86"
+
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-
version = "1.0.36"
+
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
[[package]]
name = "regex"
-
version = "1.10.5"
+
version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
···
[[package]]
name = "regex-automata"
-
version = "0.4.7"
+
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
···
[[package]]
name = "regex-syntax"
-
version = "0.8.4"
+
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rust-ini"
-
version = "0.21.1"
-
source = "git+https://github.com/zonyitoo/rust-ini?rev=5748ae57a178216a920b88dfac1296618e967447#5748ae57a178216a920b88dfac1296618e967447"
+
version = "0.21.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e7295b7ce3bf4806b419dc3420745998b447178b7005e2011947b38fc5aa6791"
dependencies = [
"cfg-if",
"ordered-multimap",
-
"trim-in-place",
]
[[package]]
name = "serde"
-
version = "1.0.203"
+
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-
version = "1.0.203"
+
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
···
[[package]]
name = "strsim"
-
version = "0.8.0"
+
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "switch-to-configuration"
···
[[package]]
name = "syn"
-
version = "2.0.67"
+
version = "2.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
dependencies = [
"proc-macro2",
"quote",
···
[[package]]
name = "syslog"
-
version = "6.1.1"
+
version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3"
+
checksum = "019f1500a13379b7d051455df397c75770de6311a7a188a699499502704d9f10"
dependencies = [
-
"error-chain",
"hostname",
"libc",
"log",
···
]
[[package]]
-
name = "textwrap"
-
version = "0.11.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-
dependencies = [
-
"unicode-width",
-
]
-
-
[[package]]
name = "time"
-
version = "0.3.36"
+
version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
···
[[package]]
name = "time-core"
-
version = "0.1.2"
+
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
-
version = "0.2.18"
+
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
"num-conv",
"time-core",
···
]
[[package]]
-
name = "trim-in-place"
-
version = "0.1.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc"
-
-
[[package]]
name = "unicode-ident"
-
version = "1.0.12"
+
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-
[[package]]
-
name = "unicode-width"
-
version = "0.1.13"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-
[[package]]
-
name = "vec_map"
-
version = "0.8.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
-
name = "version_check"
-
version = "0.9.4"
+
name = "utf8parse"
+
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "wasi"
-
version = "0.11.0+wasi-snapshot-preview1"
+
version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "winapi"
···
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
+
name = "windows-link"
+
version = "0.1.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+
[[package]]
+
name = "windows-sys"
+
version = "0.59.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+
dependencies = [
+
"windows-targets",
+
]
+
+
[[package]]
+
name = "windows-targets"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+
dependencies = [
+
"windows_aarch64_gnullvm",
+
"windows_aarch64_msvc",
+
"windows_i686_gnu",
+
"windows_i686_gnullvm",
+
"windows_i686_msvc",
+
"windows_x86_64_gnu",
+
"windows_x86_64_gnullvm",
+
"windows_x86_64_msvc",
+
]
+
+
[[package]]
+
name = "windows_aarch64_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+
[[package]]
+
name = "windows_aarch64_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+
[[package]]
+
name = "windows_i686_gnu"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+
[[package]]
+
name = "windows_i686_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+
[[package]]
+
name = "windows_i686_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+
[[package]]
+
name = "windows_x86_64_gnu"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+
[[package]]
+
name = "windows_x86_64_gnullvm"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+
[[package]]
+
name = "windows_x86_64_msvc"
+
version = "0.52.6"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+
[[package]]
name = "xml-rs"
-
version = "0.8.20"
+
version = "0.8.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+
checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
+4 -6
pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml
···
dbus = "0.9.7"
glob = "0.3.1"
log = "0.4.21"
-
nix = { version = "0.28.0", features = ["fs", "signal"] }
+
nix = { version = "0.30.1", features = ["fs", "signal"] }
regex = "1.10.4"
-
rust-ini = { git = "https://github.com/zonyitoo/rust-ini", rev = "5748ae57a178216a920b88dfac1296618e967447", features = [
-
"inline-comment",
-
] }
-
syslog = "6.1.1"
+
rust-ini = { version = "0.21.2", features = ["inline-comment"] }
+
syslog = "7.0.0"
[build-dependencies]
-
dbus-codegen = "0.11.0"
+
dbus-codegen = "0.12.0"
+42 -6
pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
···
// Allow for this switch-to-configuration to remain consistent with the perl implementation.
// Perl's "die" uses errno to set the exit code: https://perldoc.perl.org/perlvar#%24%21
fn die() -> ! {
-
std::process::exit(std::io::Error::last_os_error().raw_os_error().unwrap_or(1));
+
let code = match std::io::Error::last_os_error().raw_os_error().unwrap_or(1) {
+
// Ensure that even if errno did not point to a helpful error code, we still have a
+
// non-zero exit code
+
0 => 1,
+
other => other,
+
};
+
+
std::process::exit(code);
}
fn parse_os_release() -> Result<HashMap<String, String>> {
···
&unit_file_content,
ParseOption {
enabled_quote: true,
+
enabled_indented_mutiline_value: false,
+
enabled_preserve_key_leading_whitespace: false,
// Allow for escaped characters that won't get interpreted by the INI parser. These
// often show up in systemd unit files device/mount/swap unit names (e.g. dev-disk-by\x2dlabel-root.device).
enabled_escape: false,
···
submitted_jobs: &Rc<RefCell<HashMap<dbus::Path<'static>, Job>>>,
) {
while !submitted_jobs.borrow().is_empty() {
+
log::debug!(
+
"waiting for submitted jobs to finish, still have {} job(s)",
+
submitted_jobs.borrow().len()
+
);
_ = conn.process(Duration::from_millis(500));
}
}
···
.restart_unit("nixos-activation.service", "replace")
.context("Failed to restart nixos-activation.service")?;
+
log::debug!("waiting for nixos activation to finish");
while !*nixos_activation_done.borrow() {
_ = dbus_conn
.process(Duration::from_secs(500))
···
/// Performs switch-to-configuration functionality for the entire system
fn do_system_switch(action: Action) -> anyhow::Result<()> {
+
log::debug!("Performing system switch");
+
let out = PathBuf::from(required_env("OUT")?);
let toplevel = PathBuf::from(required_env("TOPLEVEL")?);
let distro_id = required_env("DISTRO_ID")?;
···
let install_bootloader = required_env("INSTALL_BOOTLOADER")?;
let locale_archive = required_env("LOCALE_ARCHIVE")?;
let new_systemd = PathBuf::from(required_env("SYSTEMD")?);
+
let log_level = if std::env::var("STC_DEBUG").is_ok() {
+
LevelFilter::Debug
+
} else {
+
LevelFilter::Info
+
};
let action = ACTION.get_or_init(|| action);
+
log::debug!("Using action {:?}", action);
// The action that is to be performed (like switch, boot, test, dry-activate) Also exposed via
// environment variable from now on
···
std::fs::set_permissions("/run/nixos", perms)
.context("Failed to set permissions on /run/nixos directory")?;
+
log::debug!("Creating lock file /run/nixos/switch-to-configuration.lock");
let Ok(lock) = std::fs::OpenOptions::new()
.append(true)
.create(true)
···
die();
};
+
log::debug!("Acquiring lock on file /run/nixos/switch-to-configuration.lock");
let Ok(_lock) = Flock::lock(lock, FlockArg::LockExclusiveNonblock) else {
eprintln!("Could not acquire lock");
die();
};
-
if syslog::init(Facility::LOG_USER, LevelFilter::Debug, Some("nixos")).is_err() {
+
if syslog::init(Facility::LOG_USER, log_level, Some("nixos")).is_err() {
bail!("Failed to initialize logger");
···
!= "1"
do_pre_switch_check(&pre_switch_check, &toplevel, action)?;
+
log::debug!("Done performing pre-switch checks");
if *action == Action::Check {
···
// Install or update the bootloader.
if matches!(action, Action::Switch | Action::Boot) {
do_install_bootloader(&install_bootloader, &toplevel)?;
+
log::debug!("Done performing bootloader installation");
// Just in case the new configuration hangs the system, do a sync now.
···
eprintln!("restarting systemd...");
_ = systemd.reexecute(); // we don't get a dbus reply here
+
log::debug!("waiting for systemd restart to finish");
while !*systemd_reload_status.borrow() {
_ = dbus_conn
.process(Duration::from_millis(500))
···
// Make systemd reload its units.
_ = systemd.reload(); // we don't get a dbus reply here
+
log::debug!("waiting for systemd reload to finish");
while !*systemd_reload_status.borrow() {
_ = dbus_conn
.process(Duration::from_millis(500))
···
.canonicalize()
.context("Failed to get full path to /proc/self/exe")?;
+
log::debug!("Performing user switch for {name}");
std::process::Command::new(&myself)
.uid(uid)
.gid(gid)
···
//
// Wait for events from systemd to settle. process() will return true if we have received any
// messages on the bus.
-
while dbus_conn
-
.process(Duration::from_millis(250))
-
.unwrap_or_default()
-
{}
+
let mut waited = Duration::from_millis(0);
+
let wait_interval = Duration::from_millis(250);
+
let max_wait = Duration::from_secs(90);
+
log::debug!("waiting for systemd events to settle");
+
while dbus_conn.process(wait_interval).unwrap_or_default() {
+
waited += wait_interval;
+
if waited >= max_wait {
+
log::debug!("timed out waiting systemd events to settle");
+
break;
+
}
+
}
let new_active_units = get_active_units(&systemd)?;
+3 -3
pkgs/by-name/sy/synapse-admin-etkecc/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "synapse-admin-etkecc";
-
version = "0.11.1-etke45";
+
version = "0.11.1-etke46";
src = fetchFromGitHub {
owner = "etkecc";
repo = "synapse-admin";
tag = "v${finalAttrs.version}";
-
hash = "sha256-LlwNVlgZl5O9paEGem68FbzAPOfXlLTxZ865vR7qPR8=";
+
hash = "sha256-jRz4yST/Uqo2lLNKU/5vtP9pw3kLtgi3Btq5LxO2xOA=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
-
hash = "sha256-7eSQQdcJkBIbG/0cj0uh02Day+4ph6LMQGIaMPqjpdk=";
+
hash = "sha256-E9ukVprsM6GAUuWw+5l4PoYQc9VoDh1YgtpCRmCCam0=";
};
nativeBuildInputs = [
+3 -3
pkgs/by-name/tr/trivy/package.nix
···
buildGo124Module rec {
pname = "trivy";
-
version = "0.65.0";
+
version = "0.66.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
tag = "v${version}";
-
hash = "sha256-xOYLIBLy+0avsTp+Sind6IJc9O17aF4inRNnhuHwz1M=";
+
hash = "sha256-Kn28mUdCi/8FPrAa0UbfOaBlzkaGc9daYOR93t+n2uY=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
-
vendorHash = "sha256-2O0zmPgXL0FZbnzEME8pBPizhWcCgKOukoNJhDhjCrQ=";
+
vendorHash = "sha256-FabIeFGUX55zyMtGadHKGbJ7awlHgNzfO2IiiFKmIc4=";
subPackages = [ "cmd/trivy" ];
+12 -12
pkgs/by-name/tu/tuned/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "tuned";
-
version = "2.25.1";
+
version = "2.26.0";
outputs = [
"out"
···
owner = "redhat-performance";
repo = "tuned";
tag = "v${finalAttrs.version}";
-
hash = "sha256-MMyYMgdvoAIeLCqUZMoQYsYYbgkXku47nZWq2aowPFg=";
+
hash = "sha256-tqr8o4rRhN75hXCdsIhFedfWvicmlIFuZjBNKLQgimQ=";
};
patches = [
···
patchShebangs .
substituteInPlace tuned-gui.py tuned.service tuned/ppd/tuned-ppd.service \
-
--replace-warn "/usr/sbin/" "$out/bin/"
-
-
substituteInPlace tuned-gui.py \
-
--replace-warn "/usr/share/" "$out/share/"
+
--replace-fail "/usr/sbin/" "$out/bin/"
substituteInPlace tuned-gui.desktop \
-
--replace-warn "/usr/sbin/tuned-gui" "tuned-gui"
+
--replace-fail "/usr/sbin/tuned-gui" "tuned-gui"
substituteInPlace experiments/powertop2tuned.py \
-
--replace-warn "/usr/sbin/powertop" "${lib.getExe powertop}"
+
--replace-fail "/usr/sbin/powertop" "${lib.getExe powertop}"
+
+
substituteInPlace \
+
tuned/{gtk/tuned_dialog.py,consts.py} tuned-gui.py tuned-adm.bash \
+
$(find profiles/ -type f -executable -name '*.sh') \
+
--replace-warn "/usr/share" "$out/share" \
+
--replace-warn "/usr/lib" "$out/lib"
'';
strictDeps = true;
···
];
makeFlags = [
+
"DESTDIR=${placeholder "out"}"
"PREFIX="
-
"DATADIR=/share"
-
"DESTDIR=${placeholder "out"}"
-
"KERNELINSTALLHOOKDIR=/lib/kernel/install.d"
"PYTHON=${lib.getExe python3Packages.python}"
"PYTHON_SITELIB=/${python3Packages.python.sitePackages}"
"TMPFILESDIR=/lib/tmpfiles.d"
-
"TUNED_PROFILESDIR=/lib/tuned/profile"
"UNITDIR=/lib/systemd/system"
];
-53
pkgs/by-name/xb/xbrightness/package.nix
···
-
{
-
lib,
-
stdenv,
-
fetchurl,
-
imake,
-
gccmakedep,
-
libX11,
-
libXaw,
-
libXext,
-
libXmu,
-
libXpm,
-
libXxf86vm,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "xbrightness";
-
version = "0.3-mika-akk";
-
-
src = fetchurl {
-
url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz";
-
sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
-
};
-
-
nativeBuildInputs = [
-
imake
-
gccmakedep
-
];
-
buildInputs = [
-
libX11
-
libXaw
-
libXext
-
libXmu
-
libXpm
-
libXxf86vm
-
];
-
-
makeFlags = [
-
"BINDIR=$(out)/bin"
-
"MANPATH=$(out)/share/man"
-
];
-
installTargets = [
-
"install"
-
"install.man"
-
];
-
-
meta = {
-
description = "X11 brigthness and gamma software control";
-
homepage = "http://shallowsky.com/software";
-
license = lib.licenses.mit;
-
platforms = lib.platforms.linux;
-
mainProgram = "xbrightness";
-
};
-
}
+5 -5
pkgs/development/python-modules/aiogithubapi/default.nix
···
pytestCheckHook,
pythonOlder,
sigstore,
+
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
···
version = "25.5.0";
pyproject = true;
-
disabled = pythonOlder "3.8";
+
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ludeeus";
···
};
__darwinAllowLocalNetworking = true;
-
-
pythonRelaxDeps = [ "async-timeout" ];
postPatch = ''
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
···
--replace-fail 'version = "0"' 'version = "${version}"'
'';
+
pythonRelaxDeps = [ "async-timeout" ];
+
build-system = [ poetry-core ];
dependencies = [
···
aresponses
pytest-asyncio
pytestCheckHook
+
writableTmpDirAsHomeHook
];
pytestFlags = [ "--asyncio-mode=auto" ];
preCheck = ''
-
export HOME=$(mktemp -d)
-
# Need sigstore is an optional dependencies and need <2
rm -rf tests/test_helper.py
'';
+3 -3
pkgs/development/python-modules/amaranth-boards/default.nix
···
buildPythonPackage rec {
pname = "amaranth-boards";
-
version = "0-unstable-2025-03-29";
+
version = "0-unstable-2025-08-28";
pyproject = true;
# from `pdm show`
realVersion =
···
src = fetchFromGitHub {
owner = "amaranth-lang";
repo = "amaranth-boards";
-
rev = "c26a72e59c786b38e0e989ae64c6c2560ca7c29c";
+
rev = "7e24efe2f6e95afddd0c1b56f1a9423c48caa472";
# these files change depending on git branch status
postFetch = "rm -f $out/.git_archival.txt $out/.gitattributes";
-
hash = "sha256-qzm3No5dGvpPpPCtLal+dv7Tz93FbZPnLTQZjO9jbac=";
+
hash = "sha256-NkeSFmbiu5XtUEv/IfaY0P72SVH82HmERfPAHqIY+z8=";
};
build-system = [ pdm-backend ];
+2 -2
pkgs/development/python-modules/batchspawner/default.nix
···
jupyterhub,
# tests
-
pytest-asyncio,
+
pytest-asyncio_0,
pytest-cov-stub,
pytestCheckHook,
}:
···
];
nativeCheckInputs = [
-
pytest-asyncio
+
pytest-asyncio_0
pytest-cov-stub
pytestCheckHook
];
+9 -4
pkgs/development/python-modules/chex/default.nix
···
fetchFromGitHub,
# build-system
-
setuptools,
+
flit-core,
# dependencies
absl-py,
···
buildPythonPackage rec {
pname = "chex";
-
version = "0.1.90";
+
version = "0.1.91";
pyproject = true;
src = fetchFromGitHub {
owner = "deepmind";
repo = "chex";
tag = "v${version}";
-
hash = "sha256-nZYfkK73p3HpUOMPyqkV4YR3BDGrpdZrl36dmfZt7Bk=";
+
hash = "sha256-lJ9+kvG7dRtfDVgvkcJ9/jtnX0lMfxY4mmZ290y/74U=";
};
-
build-system = [ setuptools ];
+
build-system = [
+
flit-core
+
];
+
pythonRelaxDeps = [
+
"typing_extensions"
+
];
dependencies = [
absl-py
jax
+15 -25
pkgs/development/python-modules/distrax/default.nix
···
lib,
buildPythonPackage,
fetchFromGitHub,
-
fetchpatch2,
+
+
# build-system
+
flit-core,
+
+
# dependencies
+
absl-py,
chex,
+
jax,
jaxlib,
numpy,
tensorflow-probability,
+
+
# tests
dm-haiku,
pytest-xdist,
pytestCheckHook,
···
buildPythonPackage rec {
pname = "distrax";
-
version = "0.1.5";
+
version = "0.1.7";
pyproject = true;
src = fetchFromGitHub {
owner = "google-deepmind";
repo = "distrax";
tag = "v${version}";
-
hash = "sha256-A1aCL/I89Blg9sNmIWQru4QJteUTN6+bhgrEJPmCrM0=";
+
hash = "sha256-R6rGGNzup3O6eZ2z4vygYWTjroE/Irt3aog8Op+0hco=";
};
-
patches = [
-
# TODO: remove at the next release (already on master)
-
(fetchpatch2 {
-
name = "fix-jax-0.6.0-compat";
-
url = "https://github.com/google-deepmind/distrax/commit/c02708ac46518fac00ab2945311e0f2ee32c672c.patch";
-
hash = "sha256-hFNXKoA1b5I6dzhwTRXp/SnkHv89GI6tYwlnBBHwG78=";
-
})
-
# https://github.com/google-deepmind/distrax/pull/289
-
(fetchpatch2 {
-
name = "fix-jax-0.7.0-compat";
-
url = "https://github.com/google-deepmind/distrax/commit/7fc5bd7efff4a7144d175199159f115c3e68a3cf.patch";
-
hash = "sha256-TiD72YIb6ajpaCO1yOGl/+JCuaikQ879Zcpaf2wzMq4=";
-
})
+
build-system = [
+
flit-core
];
-
# TODO: remove at the next release (already on master)
-
# https://github.com/google-deepmind/distrax/pull/293
-
postPatch = ''
-
substituteInPlace distrax/_src/utils/transformations.py \
-
--replace-fail \
-
"jax.experimental.pjit.pjit_p" \
-
"jex.core.primitives.jit_p"
-
'';
-
dependencies = [
+
absl-py
chex
+
jax
jaxlib
numpy
tensorflow-probability
+2 -2
pkgs/development/python-modules/dvc/default.nix
···
buildPythonPackage rec {
pname = "dvc";
-
version = "3.61.0";
+
version = "3.63.0";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "iterative";
repo = "dvc";
tag = version;
-
hash = "sha256-h+jhXGLxS6atMk84Y942QuEhVRYzZJs1pn/wcde3TN0=";
+
hash = "sha256-7wuxNPELHdxQSHKHQo8KTQ9yj8KW8RVEN0ykJN/he9E=";
};
pythonRelaxDeps = [
+51 -28
pkgs/development/python-modules/i3ipc/default.nix
···
lib,
buildPythonPackage,
fetchFromGitHub,
-
xorg,
-
pytest,
+
coreutils,
+
setuptools,
+
xlib,
+
fontconfig,
+
pytestCheckHook,
+
writableTmpDirAsHomeHook,
+
pytest-asyncio,
+
pytest-timeout,
pytest-xvfb,
i3,
-
xlib,
-
xdpyinfo,
-
makeFontsConf,
-
coreutils,
+
xorg,
}:
buildPythonPackage rec {
pname = "i3ipc";
version = "2.2.1";
-
format = "setuptools";
+
pyproject = true;
src = fetchFromGitHub {
-
owner = "acrisci";
+
owner = "altdesktop";
repo = "i3ipc-python";
-
rev = "v${version}";
-
sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";
+
tag = "v${version}";
+
hash = "sha256-JRwipvIF1zL/x2A+xEJKEFV6BlDnv2Xt/eyIzVrSf40=";
};
-
propagatedBuildInputs = [ xlib ];
+
+
patches = [
+
# Upstream expects a very old version of pytest-asyncio. This patch correctly
+
# decorates async fixtures using pytest-asyncio and configures `loop_scope`
+
# where needed.
+
./fix-async-tests.patch
+
];
+
+
postPatch = ''
+
substituteInPlace test/i3.config \
+
--replace-fail /bin/true ${coreutils}/bin/true
+
'';
+
+
build-system = [ setuptools ];
+
dependencies = [ xlib ];
+
+
# Fontconfig error: Cannot load default config file
+
env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
-
fontsConf = makeFontsConf { fontDirectories = [ ]; };
-
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
nativeCheckInputs = [
-
pytest
-
xdpyinfo
+
pytestCheckHook
+
writableTmpDirAsHomeHook
+
pytest-asyncio
+
pytest-timeout
pytest-xvfb
+
i3
+
xorg.xdpyinfo
xorg.xvfb
-
i3
];
-
postPatch = ''
-
substituteInPlace test/i3.config \
-
--replace /bin/true ${coreutils}/bin/true
-
'';
+
disabledTestPaths = [
+
# Timeout
+
"test/test_shutdown_event.py::TestShutdownEvent::test_shutdown_event_reconnect"
+
"test/aio/test_shutdown_event.py::TestShutdownEvent::test_shutdown_event_reconnect"
+
# Flaky
+
"test/test_window.py::TestWindow::test_detailed_window_event"
+
"test/aio/test_workspace.py::TestWorkspace::test_workspace"
+
];
-
checkPhase = ''
-
py.test --ignore=test/aio/test_shutdown_event.py \
-
--ignore=test/test_shutdown_event.py
-
'';
+
pythonImportsCheck = [ "i3ipc" ];
-
meta = with lib; {
+
meta = {
description = "Improved Python library to control i3wm and sway";
-
homepage = "https://github.com/acrisci/i3ipc-python";
-
license = licenses.bsd3;
-
maintainers = with maintainers; [ vanzef ];
+
homepage = "https://github.com/altdesktop/i3ipc-python";
+
changelog = "https://github.com/altdesktop/i3ipc-python/releases/tag/${src.tag}";
+
license = lib.licenses.bsd3;
+
maintainers = with lib.maintainers; [ vanzef ];
};
}
+28
pkgs/development/python-modules/i3ipc/fix-async-tests.patch
···
+
diff --git a/test/aio/ipctest.py b/test/aio/ipctest.py
+
index 88e4cda..3d0fd9c 100644
+
--- a/test/aio/ipctest.py
+
+++ b/test/aio/ipctest.py
+
@@ -1,5 +1,6 @@
+
from subprocess import Popen
+
import pytest
+
+import pytest_asyncio
+
+
from i3ipc.aio import Connection
+
from i3ipc import CommandReply
+
@@ -19,7 +20,7 @@ class IpcTest:
+
def event_loop(self):
+
return asyncio.get_event_loop()
+
+
- @pytest.fixture(scope='class')
+
+ @pytest_asyncio.fixture(scope='class', loop_scope='class')
+
async def i3(self):
+
process = Popen(['i3', '-c', 'test/i3.config'])
+
# wait for i3 to start up
+
diff --git a/pytest.ini b/pytest.ini
+
index 1ea6b80..788bdac 100644
+
--- a/pytest.ini
+
+++ b/pytest.ini
+
@@ -1,2 +1,3 @@
+
[pytest]
+
timeout = 5
+
+asyncio_default_test_loop_scope = class
+2 -2
pkgs/development/python-modules/jupyter-collaboration-ui/default.nix
···
buildPythonPackage rec {
pname = "jupyter-collaboration-ui";
-
version = "2.1.0";
+
version = "2.1.1";
pyproject = true;
src = fetchPypi {
pname = "jupyter_collaboration_ui";
inherit version;
-
hash = "sha256-EaoXDM1kcpzXyRFEtP9NLo2QAn1U44FXAX61NemdfMk=";
+
hash = "sha256-eqPssYhFQMOi3MdPwCoGrYIMK8BN6HafQG2Gq6Ftn60=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/libuuu/default.nix
···
buildPythonPackage rec {
pname = "libuuu";
-
version = "1.5.222";
+
version = "1.5.233";
pyproject = true;
src = fetchPypi {
inherit pname version;
-
hash = "sha256-idPz7CHixeS/YQwDmADMtAhS4Qwzrj53vDvUfb8pmpQ=";
+
hash = "sha256-SbnQs+khNT1DwrctwHi0rsuO1WR/KgA7TUFARw9AHAU=";
};
build-system = [
+2
pkgs/development/python-modules/notobuilder/default.nix
···
setuptools-scm
];
+
env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.0.0";
+
dependencies = [
fonttools
ufomerge
+2 -2
pkgs/development/python-modules/oslo-log/default.nix
···
buildPythonPackage rec {
pname = "oslo-log";
-
version = "7.2.0";
+
version = "7.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "oslo.log";
tag = version;
-
hash = "sha256-d5U3zvymIoGYfXfHFp7+gQuDOLHy/q4c+NOlUoCmikU=";
+
hash = "sha256-DEKRkVaGJeHx/2k3pC/OxtJ0lzFj1IXtRFz1uJJPgR8=";
};
# Manually set version because prb wants to get it from the git upstream repository (and we are
+42 -11
pkgs/development/python-modules/plyer/default.nix
···
lib,
buildPythonPackage,
fetchFromGitHub,
+
fetchpatch,
keyring,
-
mock,
pytestCheckHook,
+
setuptools,
+
writableTmpDirAsHomeHook,
}:
buildPythonPackage rec {
pname = "plyer";
version = "2.1.0";
-
format = "setuptools";
+
pyproject = true;
src = fetchFromGitHub {
owner = "kivy";
···
sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE=";
};
+
patches = [
+
# Fix compatibility with Python 3.13
+
(fetchpatch {
+
name = "0001-plyer-Use-unittest-mock.patch";
+
url = "https://github.com/kivy/plyer/commit/c9e73f395e2b51d46ada68119abfae2973591c00.patch";
+
hash = "sha256-rWak2GOGnsw+GhEtdob9h1c39aa6Z1yU7vH9kdGjHO0=";
+
})
+
(fetchpatch {
+
name = "0002-plyer-Remove-whitespace-error-during-self.assertEqual-function-call.patch";
+
url = "https://github.com/kivy/plyer/commit/8393c61dfd3a7aa0362d3bf530ba9ca052878c1a.patch";
+
hash = "sha256-omjpQJQ+vZ6T12vL6LvKOuRSihiHfLdEZ1pDat8VuiM=";
+
})
+
(fetchpatch {
+
name = "0003-plyer-Replace obj.__doc__-with-getdoc-obj-to-automatically-remove-new-lines.patch";
+
url = "https://github.com/kivy/plyer/commit/675750f31e9f98cd5de2df732afe34648f343d3e.patch";
+
hash = "sha256-Lb7MbbcIjwbfnR8U6t9j0c+bqU7kK3/xEt13pSF8G6M=";
+
})
+
(fetchpatch {
+
name = "0004-plyer-Remove-newline-and-indentation-comparisons-during-self.assertEqual-function-call.patch";
+
url = "https://github.com/kivy/plyer/commit/31e96f689771cd43f0a925463a59fcbc49f58e46.patch";
+
hash = "sha256-ZYYftI4w+21Q6oKm1wku7NJg3xfkIpkjN+PvZY0YjyY=";
+
})
+
];
+
postPatch = ''
-
rm -r examples
# remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016
find -iname "wifi*" -exec rm {} \;
substituteInPlace plyer/__init__.py \
-
--replace "wifi = Proxy('wifi', facades.Wifi)" "" \
-
--replace "'wifi', " ""
+
--replace-fail "wifi = Proxy('wifi', facades.Wifi)" "" \
+
--replace-fail "'wifi', " ""
substituteInPlace plyer/facades/__init__.py \
-
--replace "from plyer.facades.wifi import Wifi" ""
+
--replace-fail "from plyer.facades.wifi import Wifi" ""
'';
+
build-system = [
+
setuptools
+
];
+
propagatedBuildInputs = [ keyring ];
nativeCheckInputs = [
-
mock
pytestCheckHook
+
writableTmpDirAsHomeHook
];
enabledTestPaths = [ "plyer/tests" ];
···
# The test and the API under test do work outside the nix build.
"test_uniqueid"
];
+
preCheck = ''
-
HOME=$(mktemp -d)
mkdir -p $HOME/.config/ $HOME/Pictures
'';
pythonImportsCheck = [ "plyer" ];
-
meta = with lib; {
+
meta = {
broken = stdenv.hostPlatform.isDarwin;
description = "Plyer is a platform-independent api to use features commonly found on various platforms";
homepage = "https://github.com/kivy/plyer";
-
license = licenses.mit;
-
maintainers = with maintainers; [ rski ];
+
license = lib.licenses.mit;
+
teams = [
+
lib.teams.ngi
+
];
};
}
+1 -1
pkgs/development/python-modules/postgrest-py/default.nix pkgs/development/python-modules/postgrest/default.nix
···
}:
buildPythonPackage rec {
-
pname = "postgrest-py";
+
pname = "postgrest";
version = "1.1.1";
pyproject = true;
+2 -2
pkgs/development/python-modules/pygit2/default.nix
···
buildPythonPackage rec {
pname = "pygit2";
-
version = "1.18.1";
+
version = "1.18.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-hOBvw3CLjTvu787GN/Ydh96zgnLnSH6hxSkXQYT/9sQ=";
+
hash = "sha256-7Kh+BmLJZXFbfxNJHV6FjfLAkINB3um94rwDJo5GD1U=";
};
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
+11 -10
pkgs/development/python-modules/realtime/default.nix
···
buildPythonPackage,
fetchFromGitHub,
poetry-core,
-
python-dateutil,
+
pydantic,
typing-extensions,
websockets,
aiohttp,
+
pytest-asyncio,
pytestCheckHook,
python-dotenv,
}:
buildPythonPackage rec {
pname = "realtime-py";
-
version = "2.5.2";
+
version = "2.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "supabase";
repo = "realtime-py";
-
rev = "v${version}";
-
hash = "sha256-NFxWcnt/zpgDehacqK7QlXhmjrh6JoA6xh+sFjD/tt0=";
+
tag = "v${version}";
+
hash = "sha256-cWWgVs+ZNRvBje3kuDQS5L5utkY3z7MluGFNmjf9LFc=";
};
dependencies = [
-
python-dateutil
+
pydantic
typing-extensions
websockets
-
aiohttp
];
pythonRelaxDeps = [
"websockets"
-
"aiohttp"
-
"typing-extensions"
];
-
# Can't run all the tests due to infinite loop in pytest-asyncio
-
nativeBuildInputs = [
+
nativeCheckInputs = [
+
aiohttp
+
pytest-asyncio
pytestCheckHook
python-dotenv
];
···
build-system = [ poetry-core ];
+
# requires running Supabase
doCheck = false;
meta = {
+
changelog = "https://github.com/supabase/realtime-py/blob/${src.tag}/CHANGELOG.md";
homepage = "https://github.com/supabase/realtime-py";
license = lib.licenses.mit;
description = "Python Realtime Client for Supabase";
+2 -29
pkgs/development/python-modules/rlax/default.nix
···
buildPythonPackage rec {
pname = "rlax";
-
version = "0.1.7";
+
version = "0.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "google-deepmind";
repo = "rlax";
tag = "v${version}";
-
hash = "sha256-w5vhXBMUlcqlLTKA58QgQ4pxyGs3etxJLIFUVPhE7H8=";
+
hash = "sha256-E/zYFd5bfx58FfA3uR7hzRAIs844QzJA8TZTwmwDByk=";
};
-
# TODO: remove these patches at the next release (already on master)
-
patches = [
-
(fetchpatch {
-
# Follow chex API change (https://github.com/google-deepmind/chex/pull/52)
-
name = "replace-deprecated-chex-assertions";
-
url = "https://github.com/google-deepmind/rlax/commit/30e7913a1102667137654d6e652a6c4b9e9ba1f4.patch";
-
hash = "sha256-OPnuTKEtwZ28hzR1660v3DcktxTYjhR1xYvFbQvOhgs=";
-
})
-
(fetchpatch {
-
name = "remove-deprecation-warning";
-
url = "https://github.com/google-deepmind/rlax/commit/dea6eb479ffc32156aefe73015387a762c6b4562.patch";
-
hash = "sha256-htDyDRJW0eQx7AmrS3Fl7Lbh2VAmoYiDgHSePsQUaWs=";
-
})
-
(fetchpatch {
-
name = "fix-deprecation-warnings";
-
url = "https://github.com/google-deepmind/rlax/commit/605e0ef8ad8f9a06e88d4aabbb7d50e086d0cf3a.patch";
-
hash = "sha256-GZ/nGMXne6Lv6yDm/29NVTWxLBVSzaPYKAfQOLHY4UI=";
-
})
-
# https://github.com/google-deepmind/rlax/pull/135
-
(fetchpatch {
-
name = "fix-jax-0.6.0-compat";
-
url = "https://github.com/google-deepmind/rlax/commit/461b4cf9b4239d6b1b83aad6e5946f68d8402b93.patch";
-
hash = "sha256-uPMpm4IcoBWJwnyuIRjQEfo0F9HIW/lrwecxGW/Yw38=";
-
})
-
];
-
build-system = [
setuptools
];
···
jax
jaxlib
numpy
-
tensorflow-probability
];
nativeCheckInputs = [
+2 -2
pkgs/development/python-modules/scmrepo/default.nix
···
buildPythonPackage rec {
pname = "scmrepo";
-
version = "3.5.1";
+
version = "3.5.2";
pyproject = true;
disabled = pythonOlder "3.9";
···
owner = "iterative";
repo = "scmrepo";
tag = version;
-
hash = "sha256-pAORKgS6IivDjx5sms/9XYZKQ3+hRuRvsEFGkfKj0ME=";
+
hash = "sha256-dZukbMrjUwJUHIBibOFrzBEs4TT0ljm4cnmKQ7rXMug=";
};
build-system = [
+5
pkgs/development/python-modules/sentence-transformers/default.nix
···
{
lib,
+
stdenv,
buildPythonPackage,
fetchFromGitHub,
···
# NameError: name 'ParallelismConfig' is not defined
"test_hf_argument_parser"
"test_hf_argument_parser_incorrect_string_arguments"
+
]
+
++ lib.optionals (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [
+
# These sparse tests also time out, on x86_64-darwin.
+
"sim_sparse"
];
disabledTestPaths = [
+9 -10
pkgs/development/python-modules/supabase/default.nix
···
fetchFromGitHub,
poetry-core,
gotrue,
-
postgrest-py,
+
postgrest,
realtime,
storage3,
supafunc,
···
pytestCheckHook,
python-dotenv,
pytest-asyncio,
-
pydantic,
}:
buildPythonPackage rec {
-
pname = "supabase-py";
-
version = "2.16.0";
+
pname = "supabase";
+
version = "2.17.0";
pyproject = true;
src = fetchFromGitHub {
owner = "supabase";
repo = "supabase-py";
rev = "v${version}";
-
hash = "sha256-n+LVC4R9m/BKID9wLEMw/y/2I589TUXTygSIPfTZwB8=";
+
hash = "sha256-psfDs5BCtUjyPsfLwksNvzLmUKmYDvmxKIDPQE/NmQU=";
};
build-system = [ poetry-core ];
-
propagatedBuildInputs = [
-
postgrest-py
+
# FIXME remove for supabase >= 2.18.0
+
pythonRelaxDeps = true;
+
+
dependencies = [
+
postgrest
realtime
gotrue
httpx
storage3
supafunc
-
pydantic
];
nativeBuildInputs = [
···
];
pythonImportsCheck = [ "supabase" ];
-
-
doCheck = true;
meta = {
homepage = "https://github.com/supabase/supabase-py";
+2 -2
pkgs/development/python-modules/textual/default.nix
···
buildPythonPackage rec {
pname = "textual";
-
version = "6.0.0";
+
version = "6.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Textualize";
repo = "textual";
tag = "v${version}";
-
hash = "sha256-VpZeK0/SATL+XFDkPQgWwUIsJ4Kgqg0PQ4VzNYp4nPU=";
+
hash = "sha256-awieNrdyORLxQU52rmon/jftzt/A4+HMbMpa6V0HaG8=";
};
build-system = [ poetry-core ];
+5
pkgs/development/python-modules/torch/source/default.nix
···
url = "https://github.com/pytorch/pytorch/commit/231c72240d80091f099c95e326d3600cba866eee.patch";
hash = "sha256-BBCjxzz2TUkx4nXRyRILA82kMwyb/4+C3eOtYqf5dhk=";
})
+
+
# Fixes GCC-14 compatibility on ARM
+
# Adapted from https://github.com/pytorch/pytorch/pull/157867
+
# TODO: remove at the next release
+
./gcc-14-arm-compat.path
]
++ lib.optionals cudaSupport [
./fix-cmake-cuda-toolkit.patch
+49
pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path
···
+
diff --git a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
+
index 7f05c2ad166..1632b595c4c 100644
+
--- a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
+
+++ b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
+
@@ -220,8 +220,12 @@ class Vectorized<BFloat16> {
+
Vectorized<BFloat16> le(const Vectorized<BFloat16>& other) const;
+
};
+
+
-inline std::tuple<Vectorized<float>, Vectorized<float>> convert_bfloat16_float(
+
- const Vectorized<c10::BFloat16>& a) {
+
+#if defined(__GNUC__) && __GNUC__ == 14
+
+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE
+
+__attribute__((optimize("no-tree-vectorize")))
+
+#endif
+
+inline std::tuple<Vectorized<float>, Vectorized<float>>
+
+convert_bfloat16_float(const Vectorized<c10::BFloat16>& a) {
+
static_assert(
+
Vectorized<c10::BFloat16>::size() == 2 * Vectorized<float>::size());
+
auto zero = svreinterpret_bf16_f32(svdup_n_f32(0.0f));
+
diff --git a/aten/src/ATen/native/cpu/Activation.cpp b/aten/src/ATen/native/cpu/Activation.cpp
+
index 52d5383e60f..00c9f4eb253 100644
+
--- a/aten/src/ATen/native/cpu/Activation.cpp
+
+++ b/aten/src/ATen/native/cpu/Activation.cpp
+
@@ -26,6 +26,10 @@ namespace at::native {
+
+
namespace {
+
+
+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__aarch64__) && !defined(__ARM_FEATURE_SVE)
+
+// Workaround for gcc-14.2.0 ICE during RTL pass: expand when compiling for NEON
+
+__attribute__((optimize("no-tree-vectorize")))
+
+#endif
+
static void log_sigmoid_cpu_kernel(TensorBase &output, TensorBase &buffer, const TensorBase &input) {
+
if (at::isReducedFloatingType(input.scalar_type())) {
+
AT_DISPATCH_REDUCED_FLOATING_TYPES(input.scalar_type(), "log_sigmoid_cpu", [&]() {
+
diff --git a/aten/src/ATen/native/cpu/Unfold2d.cpp b/aten/src/ATen/native/cpu/Unfold2d.cpp
+
index 8ef0741e77a..8c94decfff0 100644
+
--- a/aten/src/ATen/native/cpu/Unfold2d.cpp
+
+++ b/aten/src/ATen/native/cpu/Unfold2d.cpp
+
@@ -169,6 +169,10 @@ static void unfolded2d_acc_channels_last(
+
+
/* note: due to write issues, this one cannot be parallelized as well as
+
* unfolded2d_copy */
+
+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__ARM_FEATURE_SVE) && !defined(__ARM_FEATURE_BF16)
+
+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE without BF16
+
+__attribute__((optimize("no-tree-vectorize")))
+
+#endif
+
void unfolded2d_acc_kernel(
+
ScalarType dtype,
+
void *finput_data,
+3 -3
pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
···
buildNpmPackage rec {
pname = "universal-remote-card";
-
version = "4.6.11";
+
version = "4.7.1";
src = fetchFromGitHub {
owner = "Nerwyn";
repo = "android-tv-card";
rev = version;
-
hash = "sha256-JlP4miJGtOP5738N57xTYgSSGTHAa/JEwCnR8gk/e18=";
+
hash = "sha256-jwSEBGaXgXHqYJqpWi7aQXx3egoNZuek6gbnPxaAkGY=";
};
patches = [ ./dont-call-git.patch ];
-
npmDepsHash = "sha256-ALxCA9f1kn73r1f1QhEUg+WEK6CEHvm9lQn4AGG2Js0=";
+
npmDepsHash = "sha256-khdRkLsLcLRiUx9xlCIoy8x9KThrnhMBsOET3X2+KgI=";
installPhase = ''
runHook preInstall
+1 -1
pkgs/tools/package-management/nix/default.nix
···
git = addTests "git" self.nixComponents_git.nix-everything;
-
latest = self.nix_2_30;
+
latest = self.nix_2_31;
# Read ./README.md before bumping a major release
stable = addFallbackPathsCheck self.nix_2_28;
+2
pkgs/top-level/aliases.nix
···
gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25;
gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead";
+
gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
graalvmCEPackages = graalvmPackages; # Added 2024-08-10
graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17
···
xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25
+
xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
xdragon = dragon-drop; # Added 2025-03-22
-1
pkgs/top-level/packages-config.nix
···
with super;
lib.mapAttrs (_: set: recurseIntoAttrs set) {
inherit (super)
-
fusePackages
gns3Packages
platformioPackages
rPackages
+1
pkgs/top-level/python-aliases.nix
···
Polygon3 = polygon3; # Added 2023-08-08
posix_ipc = posix-ipc; # added 2024-01-07
poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
+
postgrest-py = postgrest; # added 2024-08-29
postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
+1 -1
pkgs/top-level/python-packages.nix
···
posix-ipc = callPackage ../development/python-modules/posix-ipc { };
-
postgrest-py = callPackage ../development/python-modules/postgrest-py { };
+
postgrest = callPackage ../development/python-modules/postgrest { };
posthog = callPackage ../development/python-modules/posthog { };