gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-03-13 11:26:36 +00:00
committed by GitHub
parent d518b88802 69c2e8b24f
commit d80f07575d
43 changed files with 284 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/netbird.nix
-1
View File
@@ -340,7 +340,6 @@ in
substitute ${cfg.ui.package}/share/applications/netbird.desktop \
"$out/share/applications/${mkBin "netbird"}.desktop" \
--replace-fail 'Name=Netbird' "Name=NetBird @ ${client.service.name}" \
--replace-fail '${lib.getExe cfg.ui.package}' "$out/bin/${mkBin "netbird-ui"}" \
--replace-fail 'Icon=netbird' "Icon=${cfg.ui.package}/share/pixmaps/netbird.png"
'')
];
nixos/tests/netbird.nix
+6 -5
View File
@@ -7,12 +7,13 @@
];
nodes = {
node =
{ ... }:
{
services.netbird.enable = true;
services.netbird.clients.custom.port = 51819;
node = {
services.netbird = {
enable = true;
clients.custom.port = 51819;
ui.enable = true;
};
};
};
/*
pkgs/build-support/vm/default.nix
+2 -2
View File
@@ -403,8 +403,8 @@ let
];
origArgs = args;
origBuilder = builder;
QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize} -object memory-backend-memfd,id=mem,size=${toString memSize}M,share=on -machine memory-backend=mem";
passAsFile = [ ]; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742
env.QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize} -object memory-backend-memfd,id=mem,size=${toString memSize}M,share=on -machine memory-backend=mem";
__structuredAttrs = true;
}
);
pkgs/by-name/at/atuin-desktop/package.nix
+4 -1
View File
@@ -125,8 +125,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
# Otherwise tauri will look for a private key we don't have.
tauriConf = builtins.toJSON { bundle.createUpdaterArtifacts = false; };
passAsFile = [ "tauriConf" ];
preBuild = ''
tauriConfPath="tauriConf"
printf "%s" "$tauriConf" > "$tauriConfPath"
tauriBuildFlags+=(
"--config"
"$tauriConfPath"
@@ -164,6 +165,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
doCheck = !stdenv.isDarwin;
__structuredAttrs = true;
meta = {
description = "Local-first, executable runbook editor";
homepage = "https://atuin.sh";
pkgs/by-name/db/dbus/package.nix
+4
View File
@@ -95,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
__darwinAllowLocalNetworking = true;
env = lib.optionalAttrs stdenv.hostPlatform.isStatic {
NIX_LDFLAGS = "-lcap-ng";
};
mesonFlags = [
"--libexecdir=${placeholder "out"}/libexec"
# datadir from which dbus will load files will be managed by the NixOS module:
pkgs/by-name/dd/ddcutil/package.nix
+2 -2
View File
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ddcutil";
version = "2.2.3";
version = "2.2.6";
src = fetchurl {
url = "https://www.ddcutil.com/tarballs/ddcutil-${finalAttrs.version}.tar.gz";
hash = "sha256-4XvAUqYvnqhS2eOLpPHtfnNmVnoOGdvhpDnuca2+BqA=";
hash = "sha256-5LaRkcC0UK6iOjSlks88WPAn/hRiAgF5BwzJLV7K7Yg=";
};
nativeBuildInputs = [
pkgs/by-name/de/devenv/package.nix
+3 -4
View File
@@ -23,7 +23,7 @@
}:
let
version = "2.0.3";
version = "2.0.4";
devenvNixVersion = "2.32";
devenvNixRev = "41eee9d3b1f611b1b90d51caa858b6d83834c44a";
@@ -48,10 +48,10 @@ rustPlatform.buildRustPackage {
owner = "cachix";
repo = "devenv";
tag = "v${version}";
hash = "sha256-1DpF5F7zgOZ7QrRjz23315pUoF532dHnsU/V4UQithk=";
hash = "sha256-wPH6q2PSP64doUXHqdEAmY68X4IAeC2UjSIyqzoUYwE=";
};
cargoHash = "sha256-gZFRbTDPQNKf2msBv9wOavaH1iB1Tk3shYf0/4TSZBQ=";
cargoHash = "sha256-CzhdUrNAAhCVnXZCk06djnBv1cczhj7tIG/JRmaBX5c=";
env = {
RUSTFLAGS = "--cfg tracing_unstable";
@@ -78,7 +78,6 @@ rustPlatform.buildRustPackage {
openssl
sqlite
dbus
boehmgc
llvmPackages.clang-unwrapped
nix_components.nix-expr-c
nix_components.nix-store-c
pkgs/by-name/gr/grafana/package.nix
+3 -3
View File
@@ -21,7 +21,7 @@
buildGoModule (finalAttrs: {
pname = "grafana";
version = "12.4.0";
version = "12.4.1";
subPackages = [
"pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
owner = "grafana";
repo = "grafana";
rev = "v${finalAttrs.version}";
hash = "sha256-HvQqMMU6UeL7wCew0cUG03/cXsnh5sh2/DmgcU8cJ1M=";
hash = "sha256-xzQMDIlvhzO8Cn6pav631T1NxIBDO7Qh71Jj/k8LSsE=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
# Since this is not a dependency attribute the buildPackages has to be specified.
offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-47Al3NqQQm5YVhaRyd5Gk0UaJz1+irKGY7BiZh2jO94=";
hash = "sha256-odT+qMGpeWlXG5jUGwM1PcqbaSR0FUiSUr3mq2mJFDw=";
};
disallowedRequisites = [ finalAttrs.offlineCache ];
pkgs/by-name/is/isle-portable/package.nix
+2 -11
View File
@@ -3,6 +3,7 @@
callPackage,
requireFile,
runCommand,
writeText,
makeBinaryWrapper,
symlinkJoin,
isle-portable-unwrapped ? callPackage ./unwrapped.nix { },
@@ -37,17 +38,7 @@ symlinkJoin (
) iniWithDisk;
# Make a config ini file
iniFile =
runCommand "isle.ini"
{
passAsFile = [ "iniFile" ];
# Set the ISO path.
iniFile = lib.generators.toINI { } quotedIni;
}
''
cp "$iniFilePath" "$out"
'';
iniFile = writeText "isle.ini" (lib.generators.toINI { } quotedIni);
in
{
inherit (isle-portable-unwrapped) version;
pkgs/by-name/ki/kitty/package.nix
+7 -7
View File
@@ -39,8 +39,8 @@
zsh,
fish,
nixosTests,
go_1_24,
buildGo124Module,
go_1_26,
buildGo126Module,
nix-update-script,
makeBinaryWrapper,
darwin,
@@ -51,21 +51,21 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.45.0";
version = "0.46.0";
pyproject = false;
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
tag = "v${version}";
hash = "sha256-3XQWmLd8F0ndzzLOcV/7144M9enqc/7FULVLeM2Kpts=";
hash = "sha256-YkJtiJQd7V/OhR45rE1qNgu1RmhAwFmgu3YVpCLrGa4=";
};
goModules =
(buildGo124Module {
(buildGo126Module {
pname = "kitty-go-modules";
inherit src version;
vendorHash = "sha256-aLl9hPfRmUE8VARwkwXhxjzDPKUGNGD+yzxY5pUIcgs=";
vendorHash = "sha256-DEaMBblHpfcrySuMqM6SGFPyEyVd8SiXYiftHQBnYdE=";
}).goModules;
buildInputs = [
@@ -110,7 +110,7 @@ buildPythonApplication rec {
sphinx-copybutton
sphinxext-opengraph
sphinx-inline-tabs
go_1_24
go_1_26
fontconfig
makeBinaryWrapper
]
pkgs/by-name/ko/koules/package.nix
+6 -3
View File
@@ -10,12 +10,13 @@
libx11,
libxext,
makeDesktopItem,
imagemagick,
}:
let
debian-extras = fetchzip {
url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz";
hash = "sha256-g0Z6C1YSZL6N2eYUuZgXkPDoOLc4e9jAFL3ivk3OAS8=";
url = "mirror://debian/pool/main/k/koules/koules_1.4-29.debian.tar.xz";
hash = "sha256-8AQGU3uAu1nCKeu4nqCDOL7FcSJeYvD1pmidEPLLekY=";
};
in
stdenv.mkDerivation (finalAttrs: {
@@ -32,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
gccmakedep
installShellFiles
copyDesktopItems
imagemagick
];
buildInputs = [
libx11
@@ -60,7 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm755 xkoules $out/bin/xkoules
install -Dm755 koules.sndsrv.linux $out/lib/koules.sndsrv.linux
install -m644 sounds/* $out/lib/
install -Dm644 Koules.xpm $out/share/pixmaps/koules.xpm
mkdir -p $out/share/icons/hicolor/32x32/apps
magick Koules.xpm -background none -extent 32x32-1 -gravity center $out/share/icons/hicolor/32x32/apps/koules.png
installManPage xkoules.6
runHook postInstall
'';
pkgs/by-name/li/libsignal-ffi/package.nix
+8 -15
View File
@@ -3,32 +3,22 @@
stdenv,
fetchFromGitHub,
rustPlatform,
runCommand,
xcodebuild,
protobuf,
boringssl,
}:
let
# boring-sys expects the static libraries in build/ instead of lib/
boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
mkdir $out
cd $out
ln -s ${boringssl.out}/lib build
ln -s ${boringssl.dev}/include include
'';
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "libsignal-ffi";
# must match the version used in mautrix-signal
# see https://github.com/mautrix/signal/issues/401
version = "0.87.1";
version = "0.87.5";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "signalapp";
repo = "libsignal";
tag = "v${finalAttrs.version}";
hash = "sha256-yr2+yM7RmUQ7mNDMCcaM5cCpudof14JuO5J6D944k0U=";
hash = "sha256-xffBXvq1ikesIjw6cXfphnTIiyuMiUcY8h0pzSgfD8U=";
};
nativeBuildInputs = [
@@ -37,10 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ];
env.BORING_BSSL_PATH = "${boringssl-wrapper}";
env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
env = {
BORING_BSSL_INCLUDE_PATH = boringssl.dev + "/include";
BORING_BSSL_PATH = boringssl;
NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
};
cargoHash = "sha256-rqxp+RZuuT+nFudNeCgA8g04C9KT1Qi59K4b2avL5u4=";
cargoHash = "sha256-MwAtUrLoSi/pjsBWOAd9JoepAueq17hkZCH21q72O3w=";
cargoBuildFlags = [
"-p"
pkgs/by-name/ll/llmfit/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "llmfit";
version = "0.6.7";
version = "0.6.9";
src = fetchFromGitHub {
owner = "AlexsJones";
repo = "llmfit";
tag = "v${finalAttrs.version}";
hash = "sha256-kmpdbdfiKgfapIpfFAo1RnLy/DC1Rn0waRKCCLnyYVc=";
hash = "sha256-qrdumfjdzjZPhlubc9R4ila59nvNKVCH6HmeXhVcf0g=";
};
cargoHash = "sha256-mvWlexpYK0kTycBG2I1sG/Kql9SqaZlYDpcM8nvLyJg=";
cargoHash = "sha256-1M4E9cFSYaKU41FO8lyFvkB+2GnNxUjxifk6ibmVd5I=";
meta = {
description = "Find what runs on your hardware";
pkgs/by-name/lu/lux-cli/package.nix
+3 -3
View File
@@ -18,18 +18,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lux-cli";
version = "0.25.3";
version = "0.26.1";
src = fetchFromGitHub {
owner = "lumen-oss";
repo = "lux";
tag = "v${finalAttrs.version}";
hash = "sha256-RpkgWcfc52tEYTPvqNvuD+JWrvLVaqX2f+Irem8E3IQ=";
hash = "sha256-AJ0HgUZXK+JsdOykZhr+snONMakfZbBmJrkY/HfpSoI=";
};
buildAndTestSubdir = "lux-cli";
cargoHash = "sha256-MfVC4vW5iV4HkfHA1N8UhgB53y5RVImnImI5C7CxVDA=";
cargoHash = "sha256-VNJPOIArmqiQ2LUNej9U0PGkjRr6gjo1DJn6XTDKNaA=";
nativeInstallCheckInputs = [
versionCheckHook
pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+3 -3
View File
@@ -14,19 +14,19 @@
python3Packages.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.148.0";
version = "1.149.1";
pyproject = true;
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-MQOjuVBxwOKO11wc/FafqndI0QgZT3jaigpjRsJXxRA=";
hash = "sha256-A780cOls5/Xb3rmgOWUZj27Q4MtfTLhBoCPOw5ZOE/4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-LKO4Qa81AeUxEcUdvm43Bc8ANJJqtYEv5ucV0743yy0=";
hash = "sha256-rF1hCPUnsSpo/9+2oG4z2+qCqSSd5VQ5I3mRHz0uJ2w=";
};
build-system =
pkgs/by-name/ma/mautrix-signal/package.nix
+3 -3
View File
@@ -20,14 +20,14 @@ let
in
buildGoModule rec {
pname = "mautrix-signal";
version = "26.02";
tag = "v0.2602.0";
version = "26.02.2";
tag = "v0.2602.2";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
inherit tag;
hash = "sha256-FWFAH+jtPdLG9vJS4QXpFjsGWUzILW17WRFyfdnFlAE=";
hash = "sha256-+VhplU/7FR8itvjqsn4wwfUlDiIQZmhXgh8rNm/mjS8=";
};
buildInputs =
pkgs/by-name/mc/mcp-grafana/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "mcp-grafana";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "grafana";
repo = "mcp-grafana";
tag = "v${finalAttrs.version}";
hash = "sha256-HqNKbpmZCrEST2wesUo/swkT5wcnV2ZOpwYmqq+2EzA=";
hash = "sha256-rHUoHtJoZXDwXU7/fTAymmQGLwAFDRHwqMSbnZvsoUc=";
};
vendorHash = "sha256-w4v1/RqnNfGFzapmWd96UTT4Sc18lSVX5HvsXWWmhSY=";
pkgs/by-name/mp/mpd/package.nix
+2 -2
View File
@@ -197,13 +197,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mpd";
version = "0.24.8";
version = "0.24.9";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-nVa4cNXr1lTcHQYoz1TVqgu/Ly6O3CL+2iHm92KOX3g=";
sha256 = "sha256-WBIPGdn8Hg/YH236epiNuenp8XwHoBcmgJa+CApIjBE=";
};
buildInputs = [
pkgs/by-name/pa/packcc/package.nix
+21 -39
View File
@@ -1,65 +1,47 @@
{
bats,
cmake,
fetchFromGitHub,
lib,
ninja,
python3,
stdenv,
testers,
uncrustify,
versionCheckHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "packcc";
version = "2.2.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "arithy";
repo = "packcc";
rev = "v${finalAttrs.version}";
hash = "sha256-fmZL34UL7epFFGo0gCsj8TcyhBt5uCfnLCLCQugXF6U=";
hash = "sha256-uRvZr6mw9eI0a4JxFwDNyPBIrwTHgq3KmarDP/NmrEs=";
};
postPatch = ''
patchShebangs tests
# Remove broken tests.
rm -rf \
tests/ast-calc.v3.d \
tests/style.d
'';
dontConfigure = true;
preBuild = ''
cd build/${
if stdenv.cc.isGNU then
"gcc"
else if stdenv.cc.isClang then
"clang"
else
throw "Unsupported C compiler"
}
'';
doCheck = true;
nativeCheckInputs = [
bats
uncrustify
python3
nativeBuildInputs = [
cmake
ninja
];
preCheck = ''
# Style tests will always fail because upstream uses an older version of
# uncrustify.
rm -rf ../../tests/style.d
''
+ lib.optionalString stdenv.cc.isClang ''
export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion'
'';
doCheck = true;
checkTarget = "check";
nativeCheckInputs = [
bats
python3
uncrustify
];
installPhase = ''
runHook preInstall
install -Dm755 release/bin/packcc $out/bin/packcc
runHook postInstall
'';
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
doInstallCheck = true;
installCheckInputs = [ versionCheckHook ];
meta = {
description = "Parser generator for C";
pkgs/by-name/pr/prek/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "prek";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "j178";
repo = "prek";
tag = "v${finalAttrs.version}";
hash = "sha256-BwoeeWb+g4w29V85MqhoPT9B16zJtrsgzxMwjUa4zLI=";
hash = "sha256-XWUotVd6DGk8IfE5UT2NjgSB6FL/HDEBr/wBFqOMe0I=";
};
cargoHash = "sha256-7XbqXUvTyIKVE94vE/uRPYdtv8Ol05quPXVWlnCpeZg=";
cargoHash = "sha256-ZIkbA6rfS+8YhfP0YE4v9Me9FeRvLVLGRBUZnoA9ids=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/pr/process-cpp/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "process-cpp";
version = "3.0.3";
version = "3.1.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lib-cpp/process-cpp";
rev = finalAttrs.version;
hash = "sha256-PmlgzCEvBPC0k/pU6xneKINOGAas+hDWIrWUEkj+rDU=";
hash = "sha256-hS9V1SLO1eaIFz6ppF87c0kXHHQq6ZPOxfr00XuvWhQ=";
};
outputs = [
pkgs/by-name/pr/prusa-slicer/package.nix
-4
View File
@@ -203,10 +203,6 @@ clangStdenv.mkDerivation (finalAttrs: {
mkdir -p "$out/lib"
mv -v $out/bin/*.* $out/lib/
mkdir -p "$out/share/pixmaps/"
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer.png" "$out/share/pixmaps/PrusaSlicer.png"
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
mkdir -p "$out"/share/mime/packages
cat << EOF > "$out"/share/mime/packages/prusa-gcode-viewer.xml
<?xml version="1.0" encoding="UTF-8"?>
pkgs/by-name/ps/psysh/package.nix
+3 -3
View File
@@ -6,13 +6,13 @@
}:
php.buildComposerProject2 (finalAttrs: {
pname = "psysh";
version = "0.12.20";
version = "0.12.21";
src = fetchFromGitHub {
owner = "bobthecow";
repo = "psysh";
tag = "v${finalAttrs.version}";
hash = "sha256-YTKViaWBCUxerYklo22mNzrFp8M/RE3VLHrqhXuYkes=";
hash = "sha256-/qY7o7gsO0SdDzf9sfWFDpO/fjX3tSAoKsTeSGQ65HM=";
forceFetchGit = true;
postFetch = ''
cp $out/build/composer.json $out/
@@ -20,7 +20,7 @@ php.buildComposerProject2 (finalAttrs: {
'';
};
vendorHash = "sha256-u3aCYxYblnbM7m1GXnhBqSlgohmGAT9jfieLFnaAx0g=";
vendorHash = "sha256-gYFix4QRVuUne+brU/Vfa1sS6tiUPAu8NRE7c4WUBPU=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
pkgs/by-name/re/remind/package.nix
+2 -2
View File
@@ -16,14 +16,14 @@
tcl.mkTclDerivation rec {
pname = "remind";
version = "06.02.04";
version = "06.02.05";
src = fetchFromGitea {
domain = "git.skoll.ca";
owner = "Skollsoft-Public";
repo = "Remind";
rev = version;
hash = "sha256-7fNc/BiXliyLYif291G83ET2NtiU/dLgbhwut+JbjP0=";
hash = "sha256-7zjQMnC4OwfwaqMlH9IABkwUw7RUKIQj2gl3rXKiRLI=";
};
propagatedBuildInputs = lib.optionals withGui [
pkgs/by-name/sl/slurm/package.nix
+2 -2
View File
@@ -42,7 +42,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "slurm";
version = "25-11-3-1";
version = "25-11-4-1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "slurm";
# The release tags use - instead of .
rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
hash = "sha256-wG94g5fb39A/JqJgdKn8EuXTg1xtGNQw9vJn4jAF3z0=";
hash = "sha256-5axewcMS7+S9R7aQUlQH24M8+AeqO1/qNv+WZMkVDUc=";
};
outputs = [
pkgs/by-name/so/somo/package.nix
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "somo";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "theopfr";
repo = "somo";
tag = "v${finalAttrs.version}";
hash = "sha256-LURaGG0S3qE7lK4CgDEoNfJJOzZT3/FAQB6Bgt3/a3Y=";
hash = "sha256-EFU2JuNAWtlyS8UI4wnxgQEWVGSRu+02wPqUsWkQD9A=";
};
cargoHash = "sha256-KZxEHwmLTFs0RqjvM8DbropsbiYEMNmsOOgFUNKE8Ls=";
cargoHash = "sha256-/l8nHbJWqSvJ/u1K/S+icHOdXfWe/aR9sJndGvKEOyM=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/up/uptime-kuma/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage (finalAttrs: {
pname = "uptime-kuma";
version = "2.2.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "louislam";
repo = "uptime-kuma";
tag = finalAttrs.version;
hash = "sha256-L1YDh5yBEoqjIeHkuLZe0uo6xMRuMh2Eu15wS6yhLDQ=";
hash = "sha256-pofxivhITkYezxjZkCY5jgOkoyEnmbzTrGZRKF5jAqQ=";
};
npmDepsHash = "sha256-E8lPxLYn74BOgfIW8wPoiUGYXbnFnSanY45wQUxPHd4=";
npmDepsHash = "sha256-jg8NUnQlH/7Pw2at4beTbzA+WbGu21aWAHQ4cLJGXNc=";
patches = [
# Fixes the permissions of the database being not set correctly
pkgs/by-name/vc/vcmi/package.nix
+4 -1
View File
@@ -24,6 +24,7 @@
versionCheckHook,
xz,
zlib,
enableMMAI ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vcmi";
@@ -62,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
xz
zlib
];
]
++ lib.optional enableMMAI onnxruntime;
cmakeFlags = [
(lib.cmakeBool "ENABLE_CLIENT" true)
@@ -72,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_TEST" false) # Requires nonfree data files.
(lib.cmakeBool "ENABLE_PCH" false)
(lib.cmakeBool "ENABLE_DISCORD" false)
(lib.cmakeBool "ENABLE_MMAI" enableMMAI)
(lib.cmakeFeature "CMAKE_INSTALL_RPATH" "$out/lib/vcmi")
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
pkgs/by-name/we/werf/package.nix
+9 -13
View File
@@ -10,29 +10,25 @@
}:
buildGoModule (finalAttrs: {
pname = "werf";
version = "2.56.2";
version = "2.62.2";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
tag = "v${finalAttrs.version}";
hash = "sha256-xf7S3hpJ/+ZmmBdGWOsyshF+FI5X9M3yOvjrxpNgy+Y=";
hash = "sha256-DRztwFKP3G5NyonyHtEMmHLDYgd0GAomEv3Kk1ANDsk=";
};
proxyVendor = true;
vendorHash = "sha256-YNcff8KwSWfiILBuSVS7BFokMgsErQ1AhrXJGrhztDM=";
subPackages = [ "cmd/werf" ];
nativeBuildInputs = [
installShellFiles
versionCheckHook
];
vendorHash = "sha256-DLDwZEKFOgzFvPOwJ99h/a7QVRHGgRHmWFue1JvmRh8=";
nativeBuildInputs = [ installShellFiles ];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs ]
++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ];
subPackages = [ "cmd/werf" ];
env.CGO_ENABLED = if stdenv.hostPlatform.isLinux then 1 else 0;
ldflags = [
@@ -62,7 +58,6 @@ buildGoModule (finalAttrs: {
];
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
preCheck = ''
# Test all packages.
unset subPackages
@@ -72,7 +67,8 @@ buildGoModule (finalAttrs: {
integration/suites \
pkg/true_git/*_test.go \
pkg/werf/exec/*_test.go \
test/e2e
test/e2e \
test/legacy_e2e
''
+ lib.optionalString (finalAttrs.env.CGO_ENABLED == 0) ''
# A workaround for osusergo.
@@ -80,7 +76,7 @@ buildGoModule (finalAttrs: {
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
pkgs/development/interpreters/erlang/28.nix
+2 -2
View File
@@ -1,6 +1,6 @@
genericBuilder:
genericBuilder {
version = "28.4";
hash = "sha256-1WqxypHs2/a0x+uyo0YxMIlH0YRGo/UZHptHcrPK1c4=";
version = "28.4.1";
hash = "sha256-0J4bNyLwZdP4ac/TzPIQUch0NeNGbcDKaRSnH83C5Lk=";
}
pkgs/development/interpreters/python/cpython/default.nix
+43 -9
View File
@@ -165,21 +165,55 @@ let
);
}
// __splices;
# When we override the interpreter we also need to override the spliced
# versions of the interpreter. NOTE: In lua-5/interpreter.nix, this
# filter is different - we take every attribute from @inputs, besides
# derivations. That filter causes cross compilations issues for Python
# See e.g:
#
# pkgsCross.armv7l-hf-multiplatform.buildPackages.python3Packages.bcrypt
#
# And the following Nixpkgs issues/PRs:
#
# - https://github.com/NixOS/nixpkgs/issues/48046
# - https://github.com/NixOS/nixpkgs/pull/480005 (Wrong PR)
# - https://github.com/NixOS/nixpkgs/pull/482866 (Correct fix)
# - https://github.com/NixOS/nixpkgs/pull/498251 (Re-adds this @inputs filter)
inputs' = lib.filterAttrs (
n: v:
(builtins.elem (builtins.typeOf v) [
"int"
"bool"
"string"
"path"
"null"
])
|| n == "packageOverrides"
) inputs;
override =
attr:
let
python = attr.override {
self = python;
};
python = attr.override (
inputs'
// {
self = python;
}
);
in
python;
in
passthruFun rec {
inherit self sourceVersion packageOverrides;
implementation = "cpython";
libPrefix = "python${pythonVersion}${lib.optionalString (!enableGIL) "t"}";
executable = libPrefix;
pythonVersion = with sourceVersion; "${major}.${minor}";
libPrefix = "python${pythonVersion}${lib.optionalString (!enableGIL) "t"}";
in
passthruFun {
inherit
self
sourceVersion
packageOverrides
libPrefix
pythonVersion
;
implementation = "cpython";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
inherit hasDistutilsCxxPatch pythonAttr;
inherit (splices)
pkgs/development/python-modules/modelscope/default.nix
+5 -8
View File
@@ -8,19 +8,16 @@
tqdm,
}:
let
version = "1.34.0";
in
buildPythonPackage {
buildPythonPackage (finalAttrs: {
pname = "modelscope";
inherit version;
version = "1.35";
pyproject = true;
src = fetchFromGitHub {
owner = "modelscope";
repo = "modelscope";
tag = "v${version}";
hash = "sha256-Uq8qmU8ZmNRegaWHn1hlDDpRjWjgfecBvJklmhW36eM=";
tag = finalAttrs.version;
hash = "sha256-CPiiVJDY8KjwYXW5oTZcaLjozSZrQ5JwQGT8Xitum3E=";
};
build-system = [ setuptools ];
@@ -46,4 +43,4 @@ buildPythonPackage {
doronbehar
];
};
}
})
pkgs/development/python-modules/plopp/default.nix
+2 -2
View File
@@ -36,14 +36,14 @@
buildPythonPackage (finalAttrs: {
pname = "plopp";
version = "26.2.1";
version = "26.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scipp";
repo = "plopp";
tag = finalAttrs.version;
hash = "sha256-31F6hVrVRNdvzAEifdeNsa5B52D/VtNWn4F9qUcSKJ0=";
hash = "sha256-A8F2Gd0HmHRlusScFoFulsFaqaXA/HxmtT8ODdRLA+U=";
};
build-system = [
pkgs/os-specific/linux/kernel/update-zen.py
+13 -18
View File
@@ -58,30 +58,30 @@ def nix_prefetch_url(url, unpack=False):
return out.decode('utf-8').rstrip()
def update_file(relpath, variant, version, suffix, sha256):
def update_file(relpath, version, suffix, sha256):
file_path = os.path.join(DIR, relpath)
with fileinput.FileInput(file_path, inplace=True) as f:
for line in f:
result = line
result = re.sub(
fr'^ version = ".+"; # {variant}',
f' version = "{version}"; # {variant}',
fr'^ version = ".+";',
f' version = "{version}";',
result)
result = re.sub(
fr'^ suffix = ".+"; # {variant}',
f' suffix = "{suffix}"; # {variant}',
fr'^ suffix = ".+";',
f' suffix = "{suffix}";',
result)
result = re.sub(
fr'^ sha256 = ".+"; # {variant}',
f' sha256 = "{sha256}"; # {variant}',
fr'^ sha256 = ".+";',
f' sha256 = "{sha256}";',
result)
print(result, end='')
def read_file(relpath, variant):
def read_file(relpath):
file_path = os.path.join(DIR, relpath)
re_version = re.compile(fr'^\s*version = "(.+)"; # {variant}')
re_suffix = re.compile(fr'^\s*suffix = "(.+)"; # {variant}')
re_version = re.compile(fr'^\s*version = "(.+)";')
re_suffix = re.compile(fr'^\s*suffix = "(.+)";')
version = None
suffix = None
with fileinput.FileInput(file_path, mode='r') as f:
@@ -102,12 +102,7 @@ def read_file(relpath, variant):
if __name__ == "__main__":
if len(sys.argv) == 1:
panic("Update variant expected")
variant = sys.argv[1]
if variant not in ("zen", "lqx"):
panic(f"Unexepected variant instead of 'zen' or 'lqx': {sys.argv[1]}")
pattern = re.compile(fr"v(\d+\.\d+\.?\d*)-({variant}\d+)")
pattern = re.compile(fr"v(\d+\.\d+\.?\d*)-(zen\d+)")
zen_tags = github_api_request('repos/zen-kernel/zen-kernel/releases')
for tag in zen_tags:
zen_match = pattern.match(tag['tag_name'])
@@ -116,7 +111,7 @@ if __name__ == "__main__":
zen_version = zen_match.group(1)
zen_suffix = zen_match.group(2)
break
old_version, old_suffix = read_file('zen-kernels.nix', variant)
old_version, old_suffix = read_file('zen-kernels.nix')
if old_version != zen_version or old_suffix != zen_suffix:
zen_hash = nix_prefetch_git('https://github.com/zen-kernel/zen-kernel.git', zen_tag)
update_file('zen-kernels.nix', variant, zen_version, zen_suffix, zen_hash)
update_file('zen-kernels.nix', zen_version, zen_suffix, zen_hash)
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+4 -4
View File
@@ -15,14 +15,14 @@ let
variants = {
# ./update-xanmod.sh lts
lts = {
version = "6.18.16";
hash = "sha256-qBcYKjVEg2DnGk9ywmDUCVCryyPZYnR7d4Y3QbiEa/c=";
version = "6.18.17";
hash = "sha256-REUiyKNRDhpE0vRJb+PyBpOQem0oZrV+rbeLtkkJSTo=";
isLTS = true;
};
# ./update-xanmod.sh main
main = {
version = "6.19.6";
hash = "sha256-6b0N9Q8Z3d5pElXHZHJlb2lALCsd3vCWhXA9kBYhyLk=";
version = "6.19.7";
hash = "sha256-I0bv4r08pUuhjJR1ksti2vDqzq2tZdNcaD24kDBLssk=";
};
};
pkgs/os-specific/linux/kernel/zen-kernels.nix
+87 -156
View File
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
buildLinux,
variant,
...
}@args:
@@ -12,160 +11,92 @@ let
# file), we need something lower to override them, but we still want users to
# override options if they need using lib.mkForce (that has 50 priority)
mkKernelOverride = lib.mkOverride 90;
# Comments with variant added for update script
variants = {
# ./update-zen.py zen
zen = {
version = "6.18.13"; # zen
suffix = "zen1"; # zen
sha256 = "0x6s3pa7c6zlvr3w2fv6i15v54cy1pschvgk7b4vrzx1bcrjdxf7"; # zen
isLqx = false;
};
# ./update-zen.py lqx
lqx = {
version = "6.19.6"; # lqx
suffix = "lqx1"; # lqx
sha256 = "19ayfp9wiax25ji81dk7ylrdjjgzyahb9d27hcvhgbbr1irlg3w6"; # lqx
isLqx = true;
};
};
zenKernelsFor =
{
version,
suffix,
sha256,
isLqx,
}:
buildLinux (
args
// {
inherit version;
pname = "linux-${if isLqx then "lqx" else "zen"}";
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
inherit sha256;
};
# This is based on the following sources:
# - zen: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-zen/-/blob/main/config
# - lqx: https://github.com/damentz/liquorix-package/blob/6.13/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64
# - Liquorix features: https://liquorix.net/
# The list below is not exhaustive, so the kernels probably doesn't match
# the upstream, but should bring most of the improvements that will be
# expected by users
structuredExtraConfig =
with lib.kernel;
{
# Zen Interactive tuning
ZEN_INTERACTIVE = yes;
# FQ-Codel Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_CODEL = yes;
# Preempt (low-latency)
PREEMPT = mkKernelOverride yes;
PREEMPT_VOLUNTARY = mkKernelOverride no;
# Preemptible tree-based hierarchical RCU
TREE_RCU = yes;
PREEMPT_RCU = yes;
RCU_EXPERT = yes;
TREE_SRCU = yes;
TASKS_RCU_GENERIC = yes;
TASKS_RCU = yes;
TASKS_RUDE_RCU = yes;
TASKS_TRACE_RCU = yes;
RCU_STALL_COMMON = yes;
RCU_NEED_SEGCBLIST = yes;
RCU_FANOUT = freeform "64";
RCU_FANOUT_LEAF = freeform "16";
RCU_BOOST = yes;
RCU_BOOST_DELAY = option (freeform "500");
RCU_NOCB_CPU = yes;
RCU_LAZY = yes;
RCU_DOUBLE_CHECK_CB_TIME = yes;
# BFQ I/O scheduler
IOSCHED_BFQ = mkKernelOverride yes;
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
# NT synchronization primitive emulation
NTSYNC = yes;
# Preemptive Full Tickless Kernel at 1000Hz
HZ = freeform "1000";
HZ_1000 = yes;
}
// lib.optionalAttrs isLqx {
# https://github.com/damentz/liquorix-package/commit/07b176edc002f2a7825ae181613e1f79a3650fd2
CMDLINE_BOOL = yes;
CMDLINE = freeform "audit=0 intel_pstate=disable amd_pstate=disable ";
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
# PDS Process Scheduler
SCHED_ALT = yes;
SCHED_PDS = yes;
# https://github.com/damentz/liquorix-package/commit/a7055b936c0f4edb8f6afd5263fe1d2f8a5cd877
RCU_BOOST = no;
RCU_LAZY = mkKernelOverride no;
# Swap storage is compressed with LZ4 using zswap
ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes;
ZSWAP_COMPRESSOR_DEFAULT_ZSTD = mkKernelOverride no;
# https://github.com/damentz/liquorix-package/commit/3a82381a4db3452599e2b2a607046a379c72ad27
SLAB_BUCKETS = mkKernelOverride (option no);
# https://github.com/damentz/liquorix-package/commit/ca7efe07abd478f3f4cbe0725a3383fd235aa5be
ENERGY_MODE = mkKernelOverride (option no);
# https://github.com/damentz/liquorix-package/commit/fdc93f5633d22c26f0994fba751a26de0cb51a17
WQ_POWER_EFFICIENT_DEFAULT = mkKernelOverride (option no);
# Fix error: unused option: XXX.
CFS_BANDWIDTH = mkKernelOverride (option no);
PSI = mkKernelOverride (option no);
RT_GROUP_SCHED = mkKernelOverride (option no);
SCHED_AUTOGROUP = mkKernelOverride (option no);
SCHED_CLASS_EXT = mkKernelOverride (option no);
SCHED_CORE = mkKernelOverride (option no);
UCLAMP_TASK = mkKernelOverride (option no);
UCLAMP_TASK_GROUP = mkKernelOverride (option no);
};
extraPassthru.updateScript = [
./update-zen.py
(if isLqx then "lqx" else "zen")
];
extraMeta = {
branch = lib.versions.majorMinor version + "/master";
maintainers = with lib.maintainers; [
thiagokokada
jerrysm64
axertheaxe
];
teams = [ ];
description =
"Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."
+ lib.optionalString isLqx " (Same as linux_zen, but less aggressive release schedule and additional extra config)";
broken = stdenv.hostPlatform.isAarch64;
};
}
// (args.argsOverride or { })
);
suffix = "zen1"; # zen
in
zenKernelsFor variants.${variant}
buildLinux (
args
// rec {
version = "6.18.13";
pname = "linux-zen";
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-${suffix}";
sha256 = "0x6s3pa7c6zlvr3w2fv6i15v54cy1pschvgk7b4vrzx1bcrjdxf7";
};
# This is based on the following source:
# https://gitlab.archlinux.org/archlinux/packaging/packages/linux-zen/-/blob/main/config
# The list below is not exhaustive, so the kernel probably doesn't match
# the upstream, but should bring most of the improvements that will be
# expected by users
structuredExtraConfig = with lib.kernel; {
# Zen Interactive tuning
ZEN_INTERACTIVE = yes;
# FQ-Codel Packet Scheduling
NET_SCH_DEFAULT = yes;
DEFAULT_FQ_CODEL = yes;
# Preempt (low-latency)
PREEMPT = mkKernelOverride yes;
PREEMPT_VOLUNTARY = mkKernelOverride no;
# Preemptible tree-based hierarchical RCU
TREE_RCU = yes;
PREEMPT_RCU = yes;
RCU_EXPERT = yes;
TREE_SRCU = yes;
TASKS_RCU_GENERIC = yes;
TASKS_RCU = yes;
TASKS_RUDE_RCU = yes;
TASKS_TRACE_RCU = yes;
RCU_STALL_COMMON = yes;
RCU_NEED_SEGCBLIST = yes;
RCU_FANOUT = freeform "64";
RCU_FANOUT_LEAF = freeform "16";
RCU_BOOST = yes;
RCU_BOOST_DELAY = option (freeform "500");
RCU_NOCB_CPU = yes;
RCU_LAZY = yes;
RCU_DOUBLE_CHECK_CB_TIME = yes;
# BFQ I/O scheduler
IOSCHED_BFQ = mkKernelOverride yes;
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
# NT synchronization primitive emulation
NTSYNC = yes;
# Preemptive Full Tickless Kernel at 1000Hz
HZ = freeform "1000";
HZ_1000 = yes;
};
extraPassthru.updateScript = [
./update-zen.py
];
extraMeta = {
branch = lib.versions.majorMinor version + "/master";
maintainers = with lib.maintainers; [
thiagokokada
jerrysm64
axertheaxe
];
teams = [ ];
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
broken = stdenv.hostPlatform.isAarch64;
};
}
// (args.argsOverride or { })
)
pkgs/servers/sql/postgresql/ext/pg_partman.nix
+2 -2
View File
@@ -7,13 +7,13 @@
postgresqlBuildExtension (finalAttrs: {
pname = "pg_partman";
version = "5.4.2";
version = "5.4.3";
src = fetchFromGitHub {
owner = "pgpartman";
repo = "pg_partman";
tag = "v${finalAttrs.version}";
hash = "sha256-H4RhswglzLG89wm4QKA+H0HLMb21gzorV1pOURkpqt0=";
hash = "sha256-oZiwU0cZkHViQ6aiOeJCroXAGFKN3krDOYc/bnyTEAw=";
};
meta = {
pkgs/servers/web-apps/discourse/default.nix
+2 -2
View File
@@ -53,13 +53,13 @@
}:
let
version = "2025.12.1";
version = "2025.12.2";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
sha256 = "sha256-1s6ixKLlNd9osdG+qGIpo6kjEv3c/yDfJ6+APj6QQvM=";
sha256 = "sha256-lovpaG5K+avTC9W2rFN21JZQXCT8b0HBXLMgWEIz9fs=";
};
ruby = ruby_3_3;
pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+2 -2
View File
@@ -143,7 +143,7 @@ GEM
discourse-seed-fu (2.3.12)
activerecord (>= 3.1)
activesupport (>= 3.1)
discourse_ai-tokenizers (0.4)
discourse_ai-tokenizers (0.4.2)
activesupport (>= 6.0)
tiktoken_ruby (~> 0.0.15)
tokenizers (~> 0.6.3)
@@ -973,7 +973,7 @@ CHECKSUMS
discourse-emojis (1.0.44) sha256=63425a32379fb471d58f5eac9a1e931fc5a94efb7d327f71f1580af4dfe4edb3
discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033
discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
discourse_ai-tokenizers (0.4) sha256=54d7ddcc5479f3bb3057b90f4a85106b4602a07336b51d372c1a1dd8f08104c5
discourse_ai-tokenizers (0.4.2) sha256=61c2f254582a3ae69255115b2b072904361003612b5b0f52aa64773817aae413
discourse_dev_assets (0.0.6) sha256=4dfe7946927aa3d61a4ba89b5aef39d6daaeb70e35d7125dc481806a5c0aea4e
docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+2 -2
View File
@@ -808,10 +808,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1i84h7qdh78s5hvivd9nffh04ikb222ll3xrawqbpwvrak6dvmsl";
sha256 = "04z4m8bkhxv4m990ynrbc41i0dh4543jnnqian9fcfiab1ag5hk1";
type = "gem";
};
version = "0.4";
version = "0.4.2";
};
discourse_dev_assets = {
dependencies = [
pkgs/top-level/aliases.nix
+2
View File
@@ -1152,6 +1152,7 @@ mapAliases {
linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
linux_lqx = throw "linux_lqx has been removed due to lack of maintenance"; # Added 2026-03-13
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;
linux_rpi2 = linuxKernel.kernels.linux_rpi2;
@@ -1184,6 +1185,7 @@ mapAliases {
linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2025-10-27
linuxPackages_lqx = throw "linuxPackages_lqx has been removed due to lack of maintenance"; # Added 2026-03-13
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
pkgs/top-level/all-packages.nix
-2
View File
@@ -8666,8 +8666,6 @@ with pkgs;
# zen-kernel
linuxPackages_zen = linuxKernel.packages.linux_zen;
linux_zen = linuxPackages_zen.kernel;
linuxPackages_lqx = linuxKernel.packages.linux_lqx;
linux_lqx = linuxPackages_lqx.kernel;
# XanMod kernel
linuxPackages_xanmod = linuxKernel.packages.linux_xanmod;
pkgs/top-level/linux-kernels.nix
+3 -15
View File
@@ -231,20 +231,7 @@ in
linux_latest = packageAliases.linux_latest.kernel;
# Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
# https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
linux_zen = zenKernels {
variant = "zen";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_lqx = zenKernels {
variant = "lqx";
linux_zen = callPackage ../os-specific/linux/kernel/zen-kernels.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
@@ -281,6 +268,7 @@ in
linux_hardened = linux_6_12_hardened;
}
// lib.optionalAttrs config.allowAliases {
linux_lqx = throw "linux_lqx has been removed due to lack of maintenance";
linux_libre = throw "linux_libre has been removed due to lack of maintenance";
linux_latest_libre = throw "linux_latest_libre has been removed due to lack of maintenance";
@@ -785,12 +773,12 @@ in
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod);
linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable);
linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);
}
// lib.optionalAttrs config.allowAliases {
linux_lqx = throw "linux_lqx has been removed due to lack of maintenance";
linux_libre = throw "linux_libre has been removed due to lack of maintenance";
linux_latest_libre = throw "linux_latest_libre has been removed due to lack of maintenance";