Merge master into staging-next

Changed files
+188 -129
nixos
modules
services
video
pkgs
by-name
dl
ea
eask-cli
ec
ek
eksctl
ne
netcat-gnu
ru
ruffle
si
silc_client
silc_server
su
supercell-wx
sv
svt-av1-psy
svtplay-dl
sy
syncthing-macos
development
ocaml-modules
janestreet
python-modules
numbagg
structlog
rocq-modules
rocq-elpi
os-specific
linux
tools
graphics
asymptote
top-level
+5 -1
nixos/modules/services/video/frigate.nix
···
# Caches
PrivateTmp = true;
-
CacheDirectory = "frigate";
CacheDirectoryMode = "0750";
# Sockets/IPC
···
# Caches
PrivateTmp = true;
+
CacheDirectory = [
+
"frigate"
+
# https://github.com/blakeblackshear/frigate/discussions/18129
+
"frigate/model_cache"
+
];
CacheDirectoryMode = "0750";
# Sockets/IPC
+13 -10
pkgs/by-name/dl/dlx/package.nix
···
stdenv.mkDerivation {
pname = "dlx";
-
version = "2012-07-08";
src = fetchzip {
url = "https://www.davidviner.com/zip/dlx/dlx.zip";
-
sha256 = "0508linnar9ivy3xr99gzrb2l027ngx12dlxaxs7w67cnwqnb0dg";
};
-
makeFlags = [
-
"CC=${stdenv.cc.targetPrefix}cc"
-
"LINK=${stdenv.cc.targetPrefix}cc"
-
"CFLAGS=-O2"
-
];
hardeningDisable = [ "format" ];
installPhase = ''
···
mv README.txt MANUAL.TXT $out/share/dlx/doc/
'';
-
meta = with lib; {
homepage = "https://www.davidviner.com/dlx.html?name=DLX+Simulator";
description = "DLX simulator written in C";
-
license = licenses.gpl2Only;
-
platforms = platforms.linux;
};
}
···
stdenv.mkDerivation {
pname = "dlx";
+
version = "0-unstable-2012-07-08";
src = fetchzip {
url = "https://www.davidviner.com/zip/dlx/dlx.zip";
+
hash = "sha256-r4FlMbfsGH50V502EfqzRwAqVv4vpdyH3zFlZW2kCBQ=";
};
+
preBuild = ''
+
makeFlagsArray+=(
+
CC="${stdenv.cc.targetPrefix}cc"
+
LINK="${stdenv.cc.targetPrefix}cc"
+
CFLAGS="-O2 -Wno-implicit-function-declaration"
+
)
+
'';
+
hardeningDisable = [ "format" ];
installPhase = ''
···
mv README.txt MANUAL.TXT $out/share/dlx/doc/
'';
+
meta = {
homepage = "https://www.davidviner.com/dlx.html?name=DLX+Simulator";
description = "DLX simulator written in C";
+
license = lib.licenses.gpl2Only;
+
platforms = lib.platforms.linux;
};
}
+3 -3
pkgs/by-name/ea/eask-cli/package.nix
···
buildNpmPackage rec {
pname = "eask-cli";
-
version = "0.11.2";
src = fetchFromGitHub {
owner = "emacs-eask";
repo = "cli";
rev = version;
-
hash = "sha256-Lcnn84vRx9flKRouBkqtV6oehNReDfzmQr9htBl3jB0=";
};
-
npmDepsHash = "sha256-QkgH5q8EKGXahhENGsT3NBW7RdPVrSGwiTOi3Yy+ViE=";
dontBuild = true;
···
buildNpmPackage rec {
pname = "eask-cli";
+
version = "0.11.4";
src = fetchFromGitHub {
owner = "emacs-eask";
repo = "cli";
rev = version;
+
hash = "sha256-uZFultiaRa1EQtIekc8d5vtcu+9QH5vZEB7wTjlg/vU=";
};
+
npmDepsHash = "sha256-Kw7HcqnJdLCqkGXrv2C+u/Ad21TockUsllNt4eUzEoA=";
dontBuild = true;
+12
pkgs/by-name/ec/ecopcr/gcc14.patch
···
···
+
diff --git a/src/ecogrep.c b/src/ecogrep.c
+
index 8d45312..d9fe676 100644
+
--- a/src/ecogrep.c
+
+++ b/src/ecogrep.c
+
@@ -5,6 +5,7 @@
+
#include <getopt.h>
+
#include <stdlib.h>
+
#include <sys/stat.h>
+
+#include <unistd.h>
+
+
+
#define VERSION "0.1"
+4
pkgs/by-name/ec/ecopcr/package.nix
···
hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA=";
};
buildInputs = [
gcc
python3
···
hash = "sha256-ssvWpi7HuuRRAkpqqrX3ijLuBqM3QsrmrG+t7/m6fZA=";
};
+
patches = [
+
./gcc14.patch
+
];
+
buildInputs = [
gcc
python3
+3 -3
pkgs/by-name/ek/eksctl/package.nix
···
buildGoModule rec {
pname = "eksctl";
-
version = "0.207.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
-
hash = "sha256-USWeMzJ1k+sJx2p3FzFhbO48m61WUuCvp7Juwa9jtus=";
};
-
vendorHash = "sha256-TEw5ts51M/nvcljqrCHIkTGk64dhhEamhkP/qS/y1uo=";
doCheck = false;
···
buildGoModule rec {
pname = "eksctl";
+
version = "0.208.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
+
hash = "sha256-lRRB6yAELCNzXWiuxaEHTwlTG7/x3AC97ZnaEtJ3AVs=";
};
+
vendorHash = "sha256-7aV+BJDudRpqpNk0ve2u7/GHCswMvw07yKrdnnvfO6M=";
doCheck = false;
+7 -7
pkgs/by-name/ne/netcat-gnu/package.nix
···
fetchurl,
}:
-
stdenv.mkDerivation rec {
pname = "netcat-gnu";
version = "0.7.1";
src = fetchurl {
-
url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2";
-
sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
};
-
meta = with lib; {
description = "Utility which reads and writes data across network connections";
homepage = "https://netcat.sourceforge.net/";
mainProgram = "netcat";
-
license = licenses.gpl2Plus;
-
platforms = platforms.unix;
maintainers = with lib.maintainers; [ RossComputerGuy ];
};
-
}
···
fetchurl,
}:
+
stdenv.mkDerivation (finalAttrs: {
pname = "netcat-gnu";
version = "0.7.1";
src = fetchurl {
+
url = "mirror://sourceforge/netcat/netcat-${finalAttrs.version}.tar.bz2";
+
hash = "sha256:1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
};
+
meta = {
description = "Utility which reads and writes data across network connections";
homepage = "https://netcat.sourceforge.net/";
mainProgram = "netcat";
+
license = lib.licenses.gpl2Plus;
+
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ RossComputerGuy ];
};
+
})
+3 -3
pkgs/by-name/ru/ruffle/package.nix
···
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruffle";
-
version = "0-nightly-2025-05-01";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
tag = lib.strings.removePrefix "0-" finalAttrs.version;
-
hash = "sha256-EHX+S0+RZSOktAqgkczlJPbAoEa+cj2EllvhJRLAbK8=";
};
useFetchCargoVendor = true;
-
cargoHash = "sha256-VwV7REm61mj7IqpX58qm0a8leVBRqJpkB6y1EBsxPaw=";
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
env =
···
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruffle";
+
version = "0-nightly-2025-05-11";
src = fetchFromGitHub {
owner = "ruffle-rs";
repo = "ruffle";
tag = lib.strings.removePrefix "0-" finalAttrs.version;
+
hash = "sha256-m/4e15znssmDASvuLu7BpkhKLZmw7TZ2nXB0bAPrN+4=";
};
useFetchCargoVendor = true;
+
cargoHash = "sha256-JtapILlrDbTFBa763h04lMMP2xQxW0vOpAfyIlHPjeI=";
cargoBuildFlags = lib.optional withRuffleTools "--workspace";
env =
-53
pkgs/by-name/si/silc_client/package.nix
···
-
{
-
lib,
-
stdenv,
-
fetchurl,
-
perl,
-
pkg-config,
-
glib,
-
ncurses,
-
enablePlugin ? false,
-
}:
-
-
# Enabling the plugin and using it with a recent irssi, segafults on join:
-
# http://marc.info/?l=silc-devel&m=125610477802211
-
-
stdenv.mkDerivation rec {
-
pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin";
-
version = "1.1.11";
-
-
src = fetchurl {
-
url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2";
-
sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn";
-
};
-
-
enableParallelBuilding = true;
-
-
dontDisableStatic = true;
-
-
hardeningDisable = [ "format" ];
-
-
configureFlags =
-
[
-
"--with-ncurses=${ncurses.dev}"
-
]
-
++ lib.optionals enablePlugin [
-
"--with-silc-plugin=${placeholder "out"}/lib/irssi"
-
];
-
-
nativeBuildInputs = [ pkg-config ];
-
buildInputs = [
-
perl
-
glib
-
ncurses
-
];
-
-
meta = {
-
homepage = "http://silcnet.org/";
-
description = "Secure Internet Live Conferencing server";
-
mainProgram = "silc";
-
license = lib.licenses.gpl2;
-
maintainers = [ ];
-
platforms = with lib.platforms; linux;
-
};
-
}
···
-24
pkgs/by-name/si/silc_server/package.nix
···
-
{
-
lib,
-
stdenv,
-
fetchurl,
-
}:
-
-
stdenv.mkDerivation rec {
-
pname = "silc-server";
-
version = "1.1.18";
-
-
src = fetchurl {
-
url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2";
-
sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s";
-
};
-
-
meta = {
-
homepage = "http://silcnet.org/";
-
description = "Secure Internet Live Conferencing server";
-
mainProgram = "silcd";
-
license = lib.licenses.gpl2Plus;
-
maintainers = [ ];
-
platforms = with lib.platforms; linux;
-
};
-
}
···
+2 -2
pkgs/by-name/su/supercell-wx/package.nix
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "supercell-wx";
-
version = "0.4.8";
src = fetchFromGitHub {
owner = "dpaulat";
repo = "supercell-wx";
rev = "refs/tags/v${finalAttrs.version}-release";
-
sha256 = "sha256-gKR5Mfzw5B4f4/dWintlbDHX3q+d1RmFE+MNp5uSSuc=";
fetchSubmodules = true;
};
···
in
stdenv.mkDerivation (finalAttrs: {
pname = "supercell-wx";
+
version = "0.4.9";
src = fetchFromGitHub {
owner = "dpaulat";
repo = "supercell-wx";
rev = "refs/tags/v${finalAttrs.version}-release";
+
sha256 = "sha256-3fVUxbGosN4Y4h8BJXUV7DNv7VZTma+IsV94+Zt8DCA=";
fetchSubmodules = true;
};
+16 -10
pkgs/by-name/sv/svt-av1-psy/package.nix
···
)
)
{
-
USE_EXTERNAL_CPUINFO = true;
LIBDOVI_FOUND = true;
LIBHDR10PLUS_RS_FOUND = true;
};
-
nativeBuildInputs = [
-
cmake
-
nasm
-
];
-
buildInputs = [
-
cpuinfo
-
libdovi
-
hdr10plus
-
];
passthru.updateScript = unstableGitUpdater {
branch = "master";
···
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ johnrtitor ];
};
})
···
)
)
{
LIBDOVI_FOUND = true;
LIBHDR10PLUS_RS_FOUND = true;
};
+
nativeBuildInputs =
+
[
+
cmake
+
]
+
++ lib.optionals stdenv.hostPlatform.isx86_64 [
+
nasm
+
];
+
buildInputs =
+
[
+
libdovi
+
hdr10plus
+
]
+
++ lib.optionals stdenv.hostPlatform.isx86_64 [
+
cpuinfo
+
];
passthru.updateScript = unstableGitUpdater {
branch = "master";
···
];
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ johnrtitor ];
+
mainProgram = "SvtAv1EncApp";
};
})
+1 -1
pkgs/by-name/sv/svtplay-dl/package.nix
···
owner = "spaam";
repo = "svtplay-dl";
rev = version;
-
hash = "sha256-VHONba7ywvIFlH1swUU8oCTu+Y+RcerqJMe6+URgldo=";
};
build-system = [ setuptools ];
···
owner = "spaam";
repo = "svtplay-dl";
rev = version;
+
hash = "sha256-ApoAcYaqPIurgDM+ctyyx9+OyUmhJ+1fjdGj0ln6v7w=";
};
build-system = [ setuptools ];
+39
pkgs/by-name/sy/syncthing-macos/package.nix
···
···
+
{
+
lib,
+
fetchurl,
+
stdenv,
+
undmg,
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
pname = "syncthing-macos";
+
version = "1.29.2-2";
+
+
src = fetchurl {
+
url = "https://github.com/syncthing/syncthing-macos/releases/download/v${finalAttrs.version}/Syncthing-${finalAttrs.version}.dmg";
+
hash = "sha256-KbUpc2gymxkhkpSvIpy2fF3xAKsDqHHwlfUB8BF8+Sc=";
+
};
+
+
nativeBuildInputs = [ undmg ];
+
+
sourceRoot = "Syncthing.app";
+
+
installPhase = ''
+
runHook preInstall
+
+
mkdir -p $out/Applications/${finalAttrs.sourceRoot}
+
cp -R . $out/Applications/${finalAttrs.sourceRoot}
+
+
runHook postInstall
+
'';
+
+
meta = {
+
description = "Official frugal and native macOS Syncthing application bundle";
+
homepage = "https://github.com/syncthing/syncthing-macos";
+
license = lib.licenses.mit;
+
maintainers = with lib.maintainers; [ Enzime ];
+
hydraPlatforms = [ ]; # no building required
+
platforms = lib.platforms.darwin;
+
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+
};
+
})
+2 -2
pkgs/development/ocaml-modules/janestreet/0.17.nix
···
base = janePackage {
pname = "base";
-
version = "0.17.1";
-
hash = "sha256-5wqBpOHhiIy9JUuxb3OnpZHrHSM7VODuLSihaIyeFn0=";
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [
···
base = janePackage {
pname = "base";
+
version = "0.17.2";
+
hash = "sha256-GMUlo77IKXwsldZYK5uRcmjj2RyaDhdfFo1KRCJl9Dc=";
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [
+64
pkgs/development/python-modules/numbagg/default.nix
···
···
+
{
+
lib,
+
fetchFromGitHub,
+
buildPythonPackage,
+
+
# build-system
+
setuptools,
+
setuptools-scm,
+
+
# dependencies
+
numba,
+
numpy,
+
+
# tests
+
pytestCheckHook,
+
bottleneck,
+
hypothesis,
+
pandas,
+
pytest-benchmark,
+
tabulate,
+
}:
+
+
buildPythonPackage rec {
+
version = "0.9.0";
+
pname = "numbagg";
+
pyproject = true;
+
+
src = fetchFromGitHub {
+
owner = "numbagg";
+
repo = "numbagg";
+
tag = "v${version}";
+
hash = "sha256-BuD5hjAd++pW4pEQyl0UP9gd3J8SjJirtpxVE53BLpM=";
+
};
+
+
build-system = [
+
setuptools
+
setuptools-scm
+
];
+
+
dependencies = [
+
numpy
+
numba
+
];
+
+
pythonImportsCheck = [ "numbagg" ];
+
+
nativeCheckInputs = [
+
pytestCheckHook
+
+
pandas
+
bottleneck
+
hypothesis
+
tabulate
+
pytest-benchmark
+
];
+
+
meta = {
+
description = "Fast N-dimensional aggregation functions with Numba";
+
homepage = "https://github.com/numbagg/numbagg";
+
changelog = "https://github.com/numbagg/numbagg/releases/tag/${version}";
+
license = lib.licenses.bsd3;
+
maintainers = with lib.maintainers; [ flokli ];
+
};
+
}
+2 -2
pkgs/development/python-modules/structlog/default.nix
···
buildPythonPackage rec {
pname = "structlog";
-
version = "25.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "hynek";
repo = "structlog";
tag = version;
-
hash = "sha256-sDJZMAXOfcBx+PgKt48nsATEiR5QvAfyrCP+qWiTzrc=";
};
build-system = [
···
buildPythonPackage rec {
pname = "structlog";
+
version = "25.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "hynek";
repo = "structlog";
tag = version;
+
hash = "sha256-Ve6RBCQ8PJtlN/gzSjj/gxFkJsgcJhlNMAKDybBTx54=";
};
build-system = [
+2 -2
pkgs/development/rocq-modules/rocq-elpi/default.nix
···
defaultVersion = lib.switch rocq-core.rocq-version [
{
case = "9.0";
-
out = "2.5.0";
}
] null;
-
release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg=";
releaseRev = v: "v${v}";
mlPlugin = true;
···
defaultVersion = lib.switch rocq-core.rocq-version [
{
case = "9.0";
+
out = "2.5.1";
}
] null;
+
release."2.5.1".sha256 = "sha256-vw18iPPoI44tM8C05Wj4YvFAi1jjfyjZ90dbxX4NgQM=";
releaseRev = v: "v${v}";
mlPlugin = true;
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
···
# kernel config in the xanmod version commit
variants = {
lts = {
-
version = "6.12.26";
-
hash = "sha256-9dJ9XdP0KSnPYWS8eRL/rtdammvxLaur5lTydzsE8uU=";
};
main = {
-
version = "6.14.5";
-
hash = "sha256-HTy8Q5HclYo7bAHQAbANfUmVq2kkmnBgxK7f7SEWRO4=";
};
};
···
# kernel config in the xanmod version commit
variants = {
lts = {
+
version = "6.12.28";
+
hash = "sha256-afmAC1tdiggI2qN1Kf9fJiUJqC9d8gzTj5PAg7wsiuw=";
};
main = {
+
version = "6.14.6";
+
hash = "sha256-wI383p+g03RrNUkPdo0TnB1n5yZI7bGwcSjB/9HpQH0=";
};
};
+2 -2
pkgs/tools/graphics/asymptote/default.nix
···
}:
stdenv.mkDerivation (finalAttrs: {
-
version = "3.02";
pname = "asymptote";
outputs = [
···
src = fetchurl {
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-
hash = "sha256-Z5bec53elWwwxon7DPOSenEUe0lho32IOTPgJxM/xwo=";
};
# override with TeX Live containers to avoid building sty, docs from source
···
}:
stdenv.mkDerivation (finalAttrs: {
+
version = "3.03";
pname = "asymptote";
outputs = [
···
src = fetchurl {
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
+
hash = "sha256-PIpOaYi1M9PVhlCqnL1VZvn3hqmrDl/QoDcPOHUOT70=";
};
# override with TeX Live containers to avoid building sty, docs from source
+2
pkgs/top-level/aliases.nix
···
siduck76-st = st-snazzy; # Added 2024-12-24
signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
shout = nodePackages.shout; # Added unknown; moved 2024-10-19
sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
···
siduck76-st = st-snazzy; # Added 2024-12-24
signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
+
silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
+
silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12
sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
shout = nodePackages.shout; # Added unknown; moved 2024-10-19
sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
+2
pkgs/top-level/python-packages.nix
···
numbaWithCuda = self.numba.override { cudaSupport = true; };
numcodecs = callPackage ../development/python-modules/numcodecs { };
numdifftools = callPackage ../development/python-modules/numdifftools { };
···
numbaWithCuda = self.numba.override { cudaSupport = true; };
+
numbagg = callPackage ../development/python-modules/numbagg { };
+
numcodecs = callPackage ../development/python-modules/numcodecs { };
numdifftools = callPackage ../development/python-modules/numdifftools { };