Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-12-24 12:07:12 +00:00
committed by GitHub
38 changed files with 511 additions and 450 deletions
+1
View File
@@ -350,6 +350,7 @@ in
boot = {
blacklistedKernelModules = [
"nouveau"
"nova_core"
"nvidiafb"
];
+4 -1
View File
@@ -306,7 +306,10 @@ in
name = "nixos-install";
package = config.system.build.nixos-install;
})
(mkToolModule { name = "nixos-option"; })
(mkToolModule {
name = "nixos-option";
package = pkgs.nixos-option.override { nix = config.nix.package; };
})
(mkToolModule {
name = "nixos-rebuild";
package = config.system.build.nixos-rebuild;
@@ -12284,6 +12284,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
ocaml-nvim = buildVimPlugin {
pname = "ocaml.nvim";
version = "2025-12-02";
src = fetchFromGitHub {
owner = "tarides";
repo = "ocaml.nvim";
rev = "f13728bbedb02121ee54633465ac392bbf0a8e79";
sha256 = "140hh72x96ihzg766rv1nn8x4la27xycxxaqym3vv0wi5jd5v1sx";
};
meta.homepage = "https://github.com/tarides/ocaml.nvim/";
meta.hydraPlatforms = [ ];
};
oceanic-material = buildVimPlugin {
pname = "oceanic-material";
version = "0-unstable-2023-06-22";
@@ -1647,7 +1647,6 @@ assertNoAdditions {
lean-nvim = super.lean-nvim.overrideAttrs {
dependencies = with self; [
nvim-lspconfig
plenary-nvim
];
};
@@ -943,6 +943,7 @@ https://github.com/nvzone/minty/,HEAD,nvzone-minty
https://github.com/nvzone/typr/,HEAD,nvzone-typr
https://github.com/nvzone/volt/,HEAD,nvzone-volt
https://github.com/obsidian-nvim/obsidian.nvim/,HEAD,
https://github.com/tarides/ocaml.nvim/,HEAD,
https://github.com/nvimdev/oceanic-material/,,
https://github.com/mhartington/oceanic-next/,,
https://github.com/pwntester/octo.nvim/,,
@@ -110,11 +110,11 @@
"vendorHash": null
},
"bpg_proxmox": {
"hash": "sha256-bla9DS+5nxS2F2LAxUlPQstSUe9aDd1MShbs8sXpeo8=",
"hash": "sha256-S4GJqoUkqGNe3oZ0pwPR08+qkG5f2RiReVBU+UHkfFw=",
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
"owner": "bpg",
"repo": "terraform-provider-proxmox",
"rev": "v0.89.1",
"rev": "v0.90.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Vcp/AvcBz7wO8k89c1u3WGjhl0iuNMbWRAOIbEGXhbw="
},
@@ -1481,13 +1481,13 @@
"vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
},
"vultr_vultr": {
"hash": "sha256-Vxp8Uv6W6nKGvypPAvlY+TI5O77How79c7xBTJWg/5Q=",
"hash": "sha256-ezTWMaM06z1LLBgNqRYlT/SIyw3Vv3x8NFXkY4j5D3Q=",
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
"owner": "vultr",
"repo": "terraform-provider-vultr",
"rev": "v2.27.1",
"rev": "v2.28.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8="
"vendorHash": "sha256-8vYTNSjEwalDsS77UUVw7u2K3bbK4HM3yiUR3Ppi79I="
},
"wgebis_mailgun": {
"hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=",
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -15,21 +15,21 @@
buildGoModule (finalAttrs: {
pname = "anubis";
version = "1.23.1";
version = "1.24.0";
src = fetchFromGitHub {
owner = "TecharoHQ";
repo = "anubis";
tag = "v${finalAttrs.version}";
hash = "sha256-nE6LXB0+q313UatT3f4Cn/hbTxc4mSMHQnUm0xzTuvE=";
hash = "sha256-CZpQT3Uu0TNC4ra9f+OZWfovOJ+xFyumomETc10fOGA=";
};
vendorHash = "sha256-45SQUDvTX2xc8jJ8NXerbqRkQhBv6xyOPypJQf+tExU=";
vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk=";
npmDeps = fetchNpmDeps {
name = "anubis-npm-deps";
inherit (finalAttrs) src;
hash = "sha256-zlJD/Mv39bUHx+q+QSXpYWhELvbk7MCNWXLWcB4SP2A=";
hash = "sha256-wozZu00ir7V3mO6BLBamaxhI5fTdWgXQK+xGvr3T1gU=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
tag = "cvc5-${version}";
hash = "sha256-nxJjrpWZfYPuuKN4CWxOHEuou4r+MdK0AjdEPZHZbHI=";
hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
};
nativeBuildInputs = [
+17 -5
View File
@@ -4,16 +4,18 @@
fetchFromGitHub,
stdenv,
installShellFiles,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "fclones";
version = "0.35.0";
src = fetchFromGitHub {
owner = "pkolaczk";
repo = pname;
rev = "v${version}";
repo = "fclones";
tag = "v${finalAttrs.version}";
hash = "sha256-OCRfJh6vfAkL86J1GuLgfs57from3fx0NS1Bh1+/oXE=";
};
@@ -38,14 +40,24 @@ rustPlatform.buildRustPackage rec {
--zsh <(fclones complete zsh)
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "--version";
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Efficient Duplicate File Finder and Remover";
homepage = "https://github.com/pkolaczk/fclones";
changelog = "https://github.com/pkolaczk/fclones/releases/tag/${src.rev}";
changelog = "https://github.com/pkolaczk/fclones/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
cyounkins
];
mainProgram = "fclones";
};
}
})
+2 -2
View File
@@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluent-bit";
version = "4.2.0";
version = "4.2.2";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
tag = "v${finalAttrs.version}";
hash = "sha256-/38eKwKEmDGJfZxcsnqrcb7OZoNxWgc+R+t3SRqktZY=";
hash = "sha256-BYaJ76iX969SLxCUMyIRbHnVt5/N+wjMMvsqxFmLqUI=";
};
# The source build documentation covers some dependencies and CMake options.
+2 -2
View File
@@ -35,11 +35,11 @@
stdenv.mkDerivation rec {
pname = "gpsd";
version = "3.27";
version = "3.27.2";
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-YZUpLdeRC+aMtwGNRRZig+rv0/nbl3P81umnjUnqyZk=";
sha256 = "sha256-67Zu2SAYt5zsiO+2DjWllpJe70ZQLPA9b/CupjbudGE=";
};
# TODO: render & install HTML documentation using asciidoctor
+3 -3
View File
@@ -9,12 +9,12 @@
}:
let
pname = "models-dev";
version = "0-unstable-2025-12-19";
version = "0-unstable-2025-12-23";
src = fetchFromGitHub {
owner = "sst";
repo = "models.dev";
rev = "25a49727b134418f22cfd0c5cabe22d16b588810";
hash = "sha256-PYMEs0hFm7XqEwHO0RMuw9/IZFWc1r8cv4Iu8Na+XVw=";
rev = "d54bc052ebe97f8fc494e9fbb47a5d6266d20066";
hash = "sha256-HiIHiiP2AzMkUtshFBgZJ+wheOO0L+eOn44+C7xzYxA=";
};
node_modules = stdenvNoCC.mkDerivation {
@@ -14,16 +14,16 @@ assert
buildGoModule (finalAttrs: {
pname = "open-policy-agent";
version = "1.9.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
tag = "v${finalAttrs.version}";
hash = "sha256-VeN62lULKA+4Krd0as2B7LxaA43jcevamYV6S3OxB2o=";
hash = "sha256-W3iNyqMiUBz8xRq0kuYAMRW/eRKp1u+FVrHo1fN718E=";
};
vendorHash = null;
vendorHash = "sha256-vlF4TBjfinaY48UNefXFWbrWenD7eYYYMkByI2M32X8=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "podman-tui";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-vE2GG7lDGORTuziNSoKJWNKGhskcGuEh6U2KHrGu0JQ=";
hash = "sha256-Nm0vf+/DfFMFRYrxI48EoIeQZz19LUSJC9260+Vtynk=";
};
vendorHash = null;
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "25.12.6";
version = "25.12.7";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-zlTyh0D7FXB4LDGQXi4Hb8WeujaM7F7hoO9TccZfzFg=";
hash = "sha256-C05YNT6BfrWMuzph8DxNnc5eu2b3nqj06bzWqEWm0hU=";
};
nativeBuildInputs = [
@@ -1,7 +1,7 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } {
pname = "signal-desktop-bin";
version = "7.80.0";
version = "7.83.0";
libdir = "usr/lib64/signal-desktop";
bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
bsdtar -xf $downloadedFile -C "$out"
'';
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09815595-signal-desktop/signal-desktop-7.80.0-1.fc42.aarch64.rpm";
hash = "sha256-RunFdBUGBmDmztWdn9Rjbotnzwiid+gCIKPz1Nrc8v0=";
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09932085-signal-desktop/signal-desktop-7.83.0-1.fc42.aarch64.rpm";
hash = "sha256-OY+sHfAC/WTC2MkjFjlImYXLNflFNAw4VRcbQ/B3s10=";
}
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop-bin";
version = "7.80.0";
version = "7.83.0";
src = fetchurl {
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
hash = "sha256-hoWFoC+l4WwCYVWwlbIudrBNTw0wSUmB8Hyuy4/xyBs=";
hash = "sha256-5W70xzjT5+PbzmDHBFIqAUdXn9N1L0aZm1rrdAPUXRw=";
};
sourceRoot = ".";
@@ -1,12 +1,12 @@
{ callPackage, commandLineArgs }:
callPackage ./generic.nix { inherit commandLineArgs; } rec {
pname = "signal-desktop-bin";
version = "7.80.0";
version = "7.83.0";
libdir = "opt/Signal";
bindir = libdir;
extractPkg = "dpkg-deb -x $downloadedFile $out";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-d0OTlGtTGN4d7ZIShhVc39TiSJvEg9UMonqeP++R7x4=";
hash = "sha256-DhtOOve8dloIbTi78gLHWars/Y9Fv6YkLkHHpRK7OWY=";
}
@@ -24,23 +24,23 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "libsignal-node";
version = "0.83.0";
version = "0.86.3";
src = fetchFromGitHub {
owner = "signalapp";
repo = "libsignal";
tag = "v${finalAttrs.version}";
hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";
hash = "sha256-MEwtFOYdp8VjZ++R003kXj72m5yY5V/s+PwyORmN5os=";
};
cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";
cargoHash = "sha256-xAYMoOdEhq0502lWSwm1aDFh4gIEP1OYUWdOAqijeGM=";
npmRoot = "node";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-npm-deps";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";
hash = "sha256-6LL0+jLDfvU021EnArI71IAJOM/0HZcxNu5D+HfitS4=";
};
nativeBuildInputs = [
+6 -6
View File
@@ -24,7 +24,7 @@
}:
let
nodejs = nodejs_22;
pnpm = pnpm_10.override { inherit nodejs; };
pnpm = pnpm_10;
electron = electron_39;
libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
@@ -54,13 +54,13 @@ let
'';
});
version = "7.81.0";
version = "7.82.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "Signal-Desktop";
tag = "v${version}";
hash = "sha256-Ulv4/VZxsMAFKsNshVDdWjqGg4FzazvWdXGohwlyKs4=";
hash = "sha256-TcOLv5i1F9zQxbL8p8Smkil01OcnYpiLcfU2QwCGmXA=";
};
sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -140,15 +140,15 @@ stdenv.mkDerivation (finalAttrs: {
fetcherVersion = 1;
hash =
if withAppleEmojis then
"sha256-aNef+j0Kw8ERa1KKerGFi1+14U7YEclHThGIjkmQQow="
"sha256-taF3A2YcqMzqcS401fxRW9wEC/Ol7bVJ6belF4RTIRk="
else
"sha256-n5wvPqYCqKGC8ApUJ7K7OSwOHJq1rEivXiowK+HzN8M=";
"sha256-sWxxANPW0W5/tmowoJ7ZPBEBSurKN6C+wZAcLa2QHz8=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1764799973;
SOURCE_DATE_EPOCH = 1765407102;
};
preBuild = ''
+3 -3
View File
@@ -19,16 +19,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ringrtc";
version = "2.59.4";
version = "2.60.7";
src = fetchFromGitHub {
owner = "signalapp";
repo = "ringrtc";
tag = "v${finalAttrs.version}";
hash = "sha256-Yj2ARjQsEDoempZmX+N4whhyTiLxDPR6Y/qeeku9GOQ=";
hash = "sha256-tTfWAnY7I1Gch/tRr4o7NhoZhZ5+jGoZ1BWgAYl0a+I=";
};
cargoHash = "sha256-b17tO22CtVl4JK0ABD7h+JyyYwLOK1VTKTSKIGim2yQ=";
cargoHash = "sha256-h44LLxKDKBVfBMVdVUtlQdct+sFK553rRoOAXsSYqIM=";
preConfigure = ''
# Check for matching webrtc version
@@ -1,10 +1,10 @@
{
"src": {
"args": {
"hash": "sha256-E4qWqB9rxANygL3UMavjbVNcKdsn6GAv0eawXsrmIQg=",
"hash": "sha256-bjbMVnTgSrjHbJOpQz+PSf0kppzX3Wvu5wihPTRY9qg=",
"owner": "signalapp",
"repo": "webrtc",
"tag": "7339d"
"tag": "7339f"
},
"fetcher": "fetchFromGitHub"
},
+3 -3
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "silice";
version = "0-unstable-2025-07-03";
version = "0-unstable-2025-10-02";
src = fetchFromGitHub {
owner = "sylefeb";
repo = "silice";
rev = "656632ec300f8be3636cfd9bca5be954fc9c9120";
hash = "sha256-0awHQrGm4ggWE9+69ova1cXAaesaMNihbzpgAytRTks=";
rev = "73bebc454ef36cf447a99b5c50409af171675279";
hash = "sha256-GsIOs41wUjq1IYZcrASMEHAvS2/vJeJRK7I/cqSgzYY=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -36,20 +36,20 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "siyuan";
version = "3.4.2";
version = "3.5.0";
src = fetchFromGitHub {
owner = "siyuan-note";
repo = "siyuan";
rev = "v${finalAttrs.version}";
hash = "sha256-INwbp6gGqrmOtrM5d/8iEv1nlTUDSuo9AVN0EwNhW9Y=";
hash = "sha256-h7oYlxz9Loh4HiZDeQdWV9ycWfCaNNifgFLo1d5zOJk=";
};
kernel = buildGoModule {
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.src.name}/kernel";
vendorHash = "sha256-kt5fnkF/bxpeY9d86zKr9VlShvLy1gtaICfA0PGVGKI=";
vendorHash = "sha256-Q6Bpcgav9ClM+d723jYmuunybEP5iHt9nF5ssQ1kokQ=";
patches = [
(replaceVars ./set-pandoc-path.patch {
-48
View File
@@ -1,48 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
gdk-pixbuf,
gtk-engine-murrine,
gtk_engines,
librsvg,
}:
stdenv.mkDerivation rec {
pname = "skeu";
version = "0.5.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = "skeu";
rev = version;
sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
};
buildInputs = [
gdk-pixbuf
gtk_engines
librsvg
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Skeu* $out/share/themes
runHook postInstall
'';
meta = {
description = "GTK theme with skeuomorphism design";
homepage = "https://www.pling.com/p/1363834/";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.romildo ];
};
}
+4 -8
View File
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
cmake,
versionCheckHook,
nix-update-script,
}:
@@ -18,15 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-hrwkPSxY1DTEXt9vxDECDEJaoTDzBUS7rVI609uZwdU=";
};
preBuild = ''
echo "const char *gitversion = \"${finalAttrs.version}\";" > git_version.h # From Makefile
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD"
postPatch = ''
substituteInPlace makefile \
--replace-fail " -static " " " \
--replace-fail "\$(shell git rev-parse HEAD)" ${finalAttrs.version}
'';
nativeBuildInputs = [
cmake
];
installPhase = ''
runHook preInstall
+55 -37
View File
@@ -5,7 +5,6 @@
makeWrapper,
makeDesktopItem,
copyDesktopItems,
xorg,
gtk2,
sqlite,
openal,
@@ -17,14 +16,24 @@
pipewire,
libpulseaudio,
dotnet-runtime_8,
x11Support ? true,
xorg ? null,
waylandSupport ? false,
wayland ? null,
libxkbcommon ? null,
}:
stdenv.mkDerivation rec {
assert x11Support || waylandSupport;
assert x11Support -> xorg != null;
assert waylandSupport -> wayland != null;
assert waylandSupport -> libxkbcommon != null;
stdenv.mkDerivation (finalAttrs: {
pname = "vintagestory";
version = "1.21.6";
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
hash = "sha256-LkiL/8W9MKpmJxtK+s5JvqhOza0BLap1SsaDvbLYR0c=";
};
@@ -33,25 +42,27 @@ stdenv.mkDerivation rec {
copyDesktopItems
];
runtimeLibs = lib.makeLibraryPath (
[
gtk2
sqlite
openal
cairo
libGLU
SDL2
freealut
libglvnd
pipewire
libpulseaudio
]
++ (with xorg; [
libX11
libXi
libXcursor
])
);
runtimeLibs = [
gtk2
sqlite
openal
cairo
libGLU
SDL2
freealut
libglvnd
pipewire
libpulseaudio
]
++ lib.optionals x11Support [
xorg.libX11
xorg.libXi
xorg.libXcursor
]
++ lib.optionals waylandSupport [
wayland
libxkbcommon
];
desktopItems = [
(makeDesktopItem {
@@ -85,22 +96,29 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
preFixup = ''
makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--set-default mesa_glthread true \
--add-flags $out/share/vintagestory/Vintagestory.dll
preFixup =
let
runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs;
in
''
makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory \
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
--set-default mesa_glthread true \
${lib.strings.optionalString waylandSupport ''
--set-default OPENTK_4_USE_WAYLAND 1 \
''} \
--add-flags $out/share/vintagestory/Vintagestory.dll
makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
--set-default mesa_glthread true \
--add-flags $out/share/vintagestory/VintagestoryServer.dll
makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory-server \
--prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
--set-default mesa_glthread true \
--add-flags $out/share/vintagestory/VintagestoryServer.dll
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
local filename="$(basename -- "$file")"
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
done
'';
find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
local filename="$(basename -- "$file")"
ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
done
'';
meta = {
description = "In-development indie sandbox game about innovation and exploration";
@@ -116,4 +134,4 @@ stdenv.mkDerivation rec {
];
mainProgram = "vintagestory";
};
}
})
+48
View File
@@ -0,0 +1,48 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
libxkbcommon,
libpulseaudio,
cairo,
nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "way-edges";
version = "0.11.1";
src = fetchFromGitHub {
owner = "way-edges";
repo = "way-edges";
tag = finalAttrs.version;
hash = "sha256-1P4iOsoQolxfVGZEe+x0DvcDwB5bdBqR0OsfL+y3qQM=";
};
cargoHash = "sha256-RSCBQUZp6mxZcwsvr6OwQeXa5CmEhN8QUezv0By5j/s=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
cairo
libxkbcommon
libpulseaudio
];
RUSTFLAGS = [
"--cfg tokio_unstable"
"--cfg tokio_uring"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Wayland client focusing on widgets hidden in your screen edge";
homepage = "https://github.com/way-edges/way-edges";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ denperidge ];
mainProgram = "way-edges";
platforms = lib.platforms.linux;
};
})
+3 -3
View File
@@ -11,18 +11,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zerofs";
version = "0.22.6";
version = "0.22.8";
src = fetchFromGitHub {
owner = "Barre";
repo = "ZeroFS";
tag = "v${finalAttrs.version}";
hash = "sha256-6kXdifgRfYWT9/bSyxTekdh2CT+Mqu13oO/cGM1b1qk=";
hash = "sha256-YasJ72o/jTgYG9soYbOJpwdzs6I63gaJg4P2sgjwfnQ=";
};
sourceRoot = "${finalAttrs.src.name}/zerofs";
cargoHash = "sha256-OsuHhOQJFcigd57HEinwIvOjIaXv0X7/RjJLbY0D0eA=";
cargoHash = "sha256-0RgChmyqtvqBdmhLfbtOfLJpAmsPHzBfS483TFFboDw=";
nativeBuildInputs = [ cmake ];
@@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "wireplumber";
version = "0.5.12";
version = "0.5.13";
outputs = [
"out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "wireplumber";
rev = version;
hash = "sha256-3LdERBiPXal+OF7tgguJcVXrqycBSmD3psFzn4z5krY=";
hash = "sha256-iQpMT01mRroaA48spA11zdb47L5AcVmigE4nJuJRaUo=";
};
nativeBuildInputs = [
@@ -106,7 +106,16 @@
runCommand,
}:
buildPythonPackage rec {
let
# Avoid using `rec`, so that using e.g `passthru` or any other attributes
# defined inside, will have to be done via the beets argument, which can be
# overriden. Until `finalAttrs` support reaches `buildPythonPackage`, there
# is no way to avoid this. See:
#
# https://github.com/NixOS/nixpkgs/issues/258246
version = "2.5.1";
in
buildPythonPackage {
pname = "beets";
version = "2.5.1";
src = fetchFromGitHub {
@@ -145,7 +154,7 @@ buildPythonPackage rec {
typing-extensions
lap
]
++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues passthru.plugins.enabled));
++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues beets.passthru.plugins.enabled));
nativeBuildInputs = [
gobject-introspection
@@ -186,7 +195,7 @@ buildPythonPackage rec {
makeWrapperArgs = [
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
"--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
"--prefix PATH : ${lib.makeBinPath passthru.plugins.wrapperBins}"
"--prefix PATH : ${lib.makeBinPath beets.passthru.plugins.wrapperBins}"
];
nativeCheckInputs = [
@@ -199,12 +208,12 @@ buildPythonPackage rec {
pillow
writableTmpDirAsHomeHook
]
++ passthru.plugins.wrapperBins;
++ beets.passthru.plugins.wrapperBins;
__darwinAllowLocalNetworking = true;
disabledTestPaths =
passthru.plugins.disabledTestPaths
beets.passthru.plugins.disabledTestPaths
++ [
# touches network
"test/plugins/test_aura.py"
@@ -246,14 +255,14 @@ buildPythonPackage rec {
\( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
| sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
| sort -u > plugins_available
${diffPlugins (lib.attrNames passthru.plugins.builtins) "plugins_available"}
${diffPlugins (lib.attrNames beets.passthru.plugins.builtins) "plugins_available"}
export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
env EDITOR="${writeScript "beetconfig.sh" ''
#!${runtimeShell}
cat > "$1" <<CFG
plugins: ${lib.concatStringsSep " " (lib.attrNames passthru.plugins.enabled)}
plugins: ${lib.concatStringsSep " " (lib.attrNames beets.passthru.plugins.enabled)}
CFG
''}" "$out/bin/beet" config -e
env EDITOR=true "$out/bin/beet" config -e
@@ -433,10 +442,10 @@ buildPythonPackage rec {
testPaths = [ ];
};
};
base = lib.mapAttrs (_: a: { builtin = true; } // a) passthru.plugins.builtins;
base = lib.mapAttrs (_: a: { builtin = true; } // a) beets.passthru.plugins.builtins;
overrides = lib.mapAttrs (
plugName:
lib.throwIf (passthru.plugins.builtins.${plugName}.deprecated or false)
lib.throwIf (beets.passthru.plugins.builtins.${plugName}.deprecated or false)
"beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
) pluginOverrides;
all = lib.mapAttrs (
@@ -450,13 +459,13 @@ buildPythonPackage rec {
wrapperBins = [ ];
}
// a
) (lib.recursiveUpdate passthru.plugins.base passthru.plugins.overrides);
enabled = lib.filterAttrs (_: p: p.enable) passthru.plugins.all;
disabled = lib.filterAttrs (_: p: !p.enable) passthru.plugins.all;
) (lib.recursiveUpdate beets.passthru.plugins.base beets.passthru.plugins.overrides);
enabled = lib.filterAttrs (_: p: p.enable) beets.passthru.plugins.all;
disabled = lib.filterAttrs (_: p: !p.enable) beets.passthru.plugins.all;
disabledTestPaths = lib.flatten (
lib.attrValues (lib.mapAttrs (_: v: v.testPaths) passthru.plugins.disabled)
lib.attrValues (lib.mapAttrs (_: v: v.testPaths) beets.passthru.plugins.disabled)
);
wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues passthru.plugins.enabled);
wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues beets.passthru.plugins.enabled);
};
tests = {
gstreamer =
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "django-rq";
version = "3.2.1";
version = "3.2.2";
pyproject = true;
src = fetchFromGitHub {
owner = "rq";
repo = "django-rq";
tag = "v${version}";
hash = "sha256-oHBQpGRiNJFt07KEPC+KcCF6qM5PgSTyr0t35iyYhK4=";
hash = "sha256-vKvEFySTgIWqe6RYnl3POtjCEbCJZsRKL2KcRs9bv30=";
};
build-system = [ hatchling ];
@@ -90,9 +90,14 @@ buildPythonPackage rec {
pytest-dependency
];
disabledtests = [
disabledTests = [
# flaky, timing sensitive
"test_timing"
# flaky, depends on ssh connection
"test_argument_device_expansion"
"test_argument_file_expansion"
"test_local_managedfile"
];
pytestFlags = [ "--benchmark-disable" ];
@@ -22,14 +22,14 @@
}:
buildPythonPackage rec {
pname = "rendercanvas";
version = "2.4.2";
version = "2.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "pygfx";
repo = "rendercanvas";
tag = "v${version}";
hash = "sha256-42jnCD0jSGkz6zLokzF1lXjnVP8E2yrPu8AQ80EKEI4=";
hash = "sha256-FjKotBAGEtM5JYA3PGeoSl3v4m6vq1EE/r/gCsabdIo=";
};
postPatch = ''
@@ -38,8 +38,6 @@ buildPythonPackage rec {
build-system = [ flit-core ];
dependencies = [ sniffio ];
nativeCheckInputs = [
pytestCheckHook
glfw
@@ -51,7 +49,10 @@ buildPythonPackage rec {
];
# flaky timing and / or interrupt based tests
disabledTests = [ "test_offscreen_event_loop" ];
disabledTests = [
"test_offscreen_event_loop"
"test_call_later_thread"
];
disabledTestPaths = [
"tests/test_loop.py"
"tests/test_scheduling.py"
@@ -39,14 +39,14 @@
}:
buildPythonPackage rec {
pname = "wgpu-py";
version = "0.28.1";
version = "0.29.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pygfx";
repo = "wgpu-py";
tag = "v${version}";
hash = "sha256-91L0rXaMYtDztk9aJQhWDWa8sG+MHQ4sPyidzZmK+ZI=";
hash = "sha256-drXO3NHIuK34tbOZjxOCz1lnlcrfx6mADZ2WlEc9vDU=";
};
postPatch =
@@ -111,7 +111,9 @@ let
# Enable crashkernel support
PROC_VMCORE = yes;
HIGHMEM4G = lib.mkIf (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit) yes;
HIGHMEM4G = lib.mkIf (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit) (
whenAtLeast "6.15" yes
);
# Track memory leaks and performance issues related to allocations.
MEM_ALLOC_PROFILING = whenAtLeast "6.10" yes;
@@ -564,7 +566,7 @@ let
# Required for Nova
# FIXME: remove after https://gitlab.freedesktop.org/drm/rust/kernel/-/commit/3d3352e73a55a4ccf110f8b3419bbe2fbfd8a030 lands
RUST_FW_LOADER_ABSTRACTIONS = whenAtLeast "6.12" yes;
RUST_FW_LOADER_ABSTRACTIONS = lib.mkIf withRust (whenAtLeast "6.12" yes);
}
//
lib.optionalAttrs
@@ -954,7 +956,7 @@ let
KSM = yes;
VIRT_DRIVERS = yes;
# We need 64 GB (PAE) support for Xen guest support
HIGHMEM64G = {
HIGHMEM64G = whenOlder "6.15" {
optional = true;
tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y";
};
+1
View File
@@ -1484,6 +1484,7 @@ mapAliases {
siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
skeu = throw "'skeu' has been removed as its source is unavailable"; # Added 2025-12-23
SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
sladeUnstable = slade-unstable; # Added 2025-08-26