Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-09-17 12:07:53 +00:00
committed by GitHub
64 changed files with 1877 additions and 518 deletions
+12
View File
@@ -16207,6 +16207,12 @@
githubId = 4708337;
name = "Marcelo A. de L. Santos";
};
maxicode = {
email = "ride-mullets-tidal@duck.com";
github = "maxicode2";
githubId = 65052855;
name = "maxicode";
};
maximsmol = {
email = "maximsmol@gmail.com";
github = "maximsmol";
@@ -19693,6 +19699,12 @@
githubId = 821972;
name = "Parth Mehrotra";
};
parthiv-krishna = {
email = "nixpkgs@parthiv.cc";
github = "parthiv-krishna";
githubId = 20658472;
name = "Parthiv Krishna";
};
pascalj = {
email = "nix@pascalj.de";
github = "pascalj";
+1 -2
View File
@@ -202,7 +202,6 @@ in
# Make sure that the final value has all fields for sake of other modules
# referring to this. TODO make `lib.systems` itself use the module system.
apply = lib.systems.elaborate;
defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
description = ''
Specifies the platform where the NixOS configuration will run.
@@ -253,7 +252,7 @@ in
# Make sure that the final value has all fields for sake of other modules
# referring to this. TODO make `lib.systems` itself use the module system.
apply = lib.systems.elaborate;
defaultText = lib.literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
defaultText = lib.literalExpression ''config.nixpkgs.system'';
description = ''
Systems with a recently generated `hardware-configuration.nix`
do not need to specify this option, unless cross-compiling, in which case
@@ -175,7 +175,7 @@ in
++ lib.optionals options.streaming [
"--streaming"
]
++ lib.optionals options.cuda [
++ lib.optionals options.useCUDA [
"--use-cuda"
]
++ options.extraArgs
@@ -1325,11 +1325,35 @@ in
];
config = mkIf cfg.enable {
warnings =
let
wirelessEnabled = config.networking.wireless.enable;
wirelessInterfaces = config.networking.wireless.interfaces;
hostapdInterfaces = lib.attrNames cfg.radios;
hasInterfaceConflict = lib.intersectLists hostapdInterfaces wirelessInterfaces != [ ];
# we check if wirelessInterfaces is empty as that means all interfaces implicit
shouldWarn = wirelessEnabled && (wirelessInterfaces == [ ] || hasInterfaceConflict);
in
if shouldWarn then
[
''
Some wireless interface is configured for both for client and access point mode:
this is not allowed. Either specify `networking.wireless.interfaces` and exclude
those from `services.hostapd.radios` or make sure to not run the `wpa_supplicant`
and `hostapd` services simultaneously.
''
]
else
[ ];
assertions = [
{
assertion = cfg.radios != { };
message = "At least one radio must be configured with hostapd!";
}
{
assertion = !config.networking.wireless.iwd.enable;
message = "hostapd and iwd conflict, use `networking.wireless.enable` in combination with `networking.wireless.interfaces`";
}
]
# Radio warnings
++ (concatLists (
@@ -112,10 +112,13 @@ let
iface != null
) "sys-subsystem-net-devices-${utils.escapeSystemdPath iface}.device";
configStr =
if cfg.allowAuxiliaryImperativeNetworks then
"-c /etc/wpa_supplicant.conf -I ${configFile}"
else
"-c ${configFile}";
(
if cfg.allowAuxiliaryImperativeNetworks then
"-c /etc/wpa_supplicant.conf -I ${configFile}"
else
"-c ${configFile}"
)
+ lib.concatMapStrings (p: " -I " + p) cfg.extraConfigFiles;
in
{
description = "WPA Supplicant instance" + optionalString (iface != null) " for interface ${iface}";
@@ -544,6 +547,14 @@ in
for available options.
'';
};
extraConfigFiles = mkOption {
type = types.listOf types.path;
default = [ ];
description = ''
Extra wpa_supplicant configuration files to load.
'';
};
};
};
+18 -1
View File
@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "homepage-dashboard";
meta.maintainers = with lib.maintainers; [ ];
meta.maintainers = with lib.maintainers; [ parthiv-krishna ];
nodes.machine = _: {
services.homepage-dashboard = {
@@ -21,10 +21,23 @@
];
}
];
services = [
{
Machines = [
{
Localhost = {
ping = "127.0.0.1";
};
}
];
}
];
};
};
testScript = ''
import json
# Ensure the services are started on managed machine
machine.wait_for_unit("homepage-dashboard.service")
machine.wait_for_open_port(8082)
@@ -40,5 +53,9 @@
# Ensure that we see the custom bookmarks on the page
page = machine.succeed("curl --fail http://127.0.0.1:8082/api/bookmarks")
assert "nixpkgs" in page, "Custom bookmarks not found"
# Ensure that the ping command works
response = machine.succeed("curl --fail \"http://localhost:8082/api/ping?groupName=Machines&serviceName=Localhost\"")
assert json.loads(response)["alive"] is True, "Ping to localhost failed"
'';
}
+21
View File
@@ -171,6 +171,23 @@ in
psk = "password";
};
};
extraConfigFiles = [
(pkgs.writeText "test1.conf" ''
network={
ssid="test1"
key_mgmt=WPA-PSK
psk="password1"
}
'')
(pkgs.writeText "test2.conf" ''
network={
ssid="test2"
key_mgmt=WPA-PSK
psk="password2"
}
'')
];
};
};
@@ -195,6 +212,10 @@ in
assert int(machine.succeed(f"grep -c bssid=00:00:00:00:00:01 {config_file}")) == 2
assert int(machine.succeed(f"grep -c bssid=00:00:00:00:00:02 {config_file}")) == 2
with subtest("Extra config files have been loaded"):
machine.wait_until_succeeds("wpa_cli -i wlan0 list_networks | grep -q test1")
machine.succeed("wpa_cli -i wlan0 list_networks | grep -q test2")
# save file for manual inspection
machine.copy_from_vm(config_file)
'';
@@ -11,13 +11,13 @@
}:
mkLibretroCore {
core = "pcsx2";
version = "0-unstable-2025-08-30";
version = "0-unstable-2025-09-14";
src = fetchFromGitHub {
owner = "libretro";
repo = "ps2";
rev = "b0e6c4d7f4abc8cfbf2c55322fc5009a685bc042";
hash = "sha256-6cpVsituAWX6sVP5JUvT7KjYZ7SzvD95EB90e2UxJ9A=";
rev = "bb03c99fa968b50309bd80d74598f053fe9168ce";
hash = "sha256-qIdrsLQWH29PGL0TNcUtFw6aSFUJKJccKrhMoi/vYCA=";
fetchSubmodules = true;
};
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2025-08-25";
version = "0-unstable-2025-09-12";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "fe54d0a413f8e7268bc8a321e691a562edd6b257";
hash = "sha256-d+bVkM8BsZ9eiHaSNCC4b156EjOqyQn93lOyy6FLbks=";
rev = "19b3995e6d09d9cbd4de9871ad94ea183ca53a6e";
hash = "sha256-6oZIZFnB2S7u4xxrOAfDPiql0biiXRMGD1iiPhFgCWc=";
fetchSubmodules = true;
};
@@ -26,10 +26,6 @@ lib.makeScope newScope (
texLive = texliveBasic;
};
pidgin-msn-pecan = callPackage ./msn-pecan { };
pidgin-mra = callPackage ./pidgin-mra { };
pidgin-carbons = callPackage ./carbons { };
pidgin-xmpp-receipts = callPackage ./pidgin-xmpp-receipts { };
@@ -54,20 +50,18 @@ lib.makeScope newScope (
purple-slack = callPackage ./purple-slack { };
purple-vk-plugin = callPackage ./purple-vk-plugin { };
purple-xmpp-http-upload = callPackage ./purple-xmpp-http-upload { };
tdlib-purple = callPackage ./tdlib-purple { };
pidgin-opensteamworks = callPackage ./pidgin-opensteamworks { };
purple-facebook = callPackage ./purple-facebook { };
}
// lib.optionalAttrs config.allowAliases {
purple-matrix = throw "'pidginPackages.purple-matrix' has been unmaintained since April 2022, so it was removed.";
pidgin-skypeweb = throw "'pidginPackages.pidgin-skypeweb' has been removed since Skype was shut down in May 2025.";
purple-hangouts = throw "'pidginPackages.purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat.";
pidgin-msn-pecan = throw "'pidginPackages.pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot";
pidgin-mra = throw "'pidginPackages.pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024.";
purple-facebook = throw "'pidginPackages.purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook.";
pidgin-opensteamworks = throw "'pidginPackages.pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam.";
purple-vk-plugin = throw "'pidginPackages.purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found.";
}
)
@@ -1,30 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
pidgin,
}:
stdenv.mkDerivation rec {
pname = "pidgin-msn-pecan";
version = "0.1.4";
src = fetchFromGitHub {
owner = "felipec";
repo = "msn-pecan";
rev = "v${version}";
sha256 = "0133rpiy4ik6rx9qn8m38vp7w505hnycggr53g3a2hfpk5xj03zh";
};
meta = {
description = "Alternative MSN protocol plug-in for Pidgin IM";
homepage = "https://github.com/felipec/msn-pecan";
platforms = lib.platforms.linux;
};
makeFlags = [
"PURPLE_LIBDIR=${placeholder "out"}/lib"
"PURPLE_DATADIR=${placeholder "out"}/share/data"
];
buildInputs = [ pidgin ];
}
@@ -1,39 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
pidgin,
}:
stdenv.mkDerivation {
pname = "pidgin-mra";
version = "unstable-2014-07-08";
src = fetchFromGitHub {
owner = "dreadatour";
repo = "pidgin-mra";
rev = "54b299266265cde800289b2d51f13b81f6bf379c";
sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pidgin ];
postPatch = ''
sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
'';
makeFlags = [
"DESTDIR=/"
"LIBDIR=${placeholder "out"}/lib"
"DATADIR=${placeholder "out"}/share"
];
meta = {
homepage = "https://github.com/dreadatour/pidgin-mra";
description = "Mail.ru Agent plugin for Pidgin / libpurple";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
@@ -1,51 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
pidgin,
glib,
json-glib,
nss,
nspr,
libsecret,
}:
stdenv.mkDerivation rec {
pname = "pidgin-opensteamworks";
version = "1.7.2";
src = fetchFromGitHub {
owner = "EionRobb";
repo = "pidgin-opensteamworks";
rev = version;
sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU=";
};
sourceRoot = "${src.name}/steam-mobile";
installFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
pidgin
glib
json-glib
nss
nspr
libsecret
];
meta = with lib; {
homepage = "https://github.com/EionRobb/pidgin-opensteamworks";
description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ arobyn ];
};
}
@@ -1,79 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchhg,
pidgin,
glib,
json-glib,
autoreconfHook,
}:
let
pidginHg = fetchhg {
url = "https://bitbucket.org/pidgin/main";
# take from VERSION file
rev = "9ff9acf9fa14";
sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv";
};
in
stdenv.mkDerivation rec {
pname = "purple-facebook";
version = "0.9.5";
src = fetchFromGitHub {
owner = "dequis";
repo = "purple-facebook";
rev = "v${version}-9ff9acf9fa14";
sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
};
postPatch = ''
# we do all patching from update.sh in preAutoreconf
echo "#!${stdenv.shell}" > update.sh
'';
preAutoreconf = ''
for FILE in $(cat MANIFEST_PIDGIN); do
install -Dm644 "${pidginHg}/$FILE" "pidgin/$FILE" || true
done
touch $(cat MANIFEST_VOIDS)
patchdir="$(pwd)/patches"
pushd pidgin
for patch in $(ls -1 "$patchdir"); do
patch -p1 -i "$patchdir/$patch"
done
popd
./autogen.sh
'';
makeFlags = [
"PLUGIN_DIR_PURPLE=/lib/pidgin/"
"DATA_ROOT_DIR_PURPLE=/share"
];
installPhase = ''
mkdir -p $out/lib/purple-2
cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/
'';
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [
pidgin
glib
json-glib
];
meta = with lib; {
inherit (src.meta) homepage;
description = "Facebook protocol plugin for libpurple";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ davorb ];
};
}
@@ -1,41 +0,0 @@
{
lib,
stdenv,
fetchhg,
pidgin,
cmake,
libxml2,
}:
let
version = "40ddb6d";
in
stdenv.mkDerivation {
pname = "purple-vk-plugin";
inherit version;
src = fetchhg {
url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
rev = version;
sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
pidgin
libxml2
];
preConfigure = ''
sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt
'';
cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ];
meta = {
homepage = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
description = "Vk (russian social network) plugin for Pidgin / libpurple";
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
};
}
@@ -17,20 +17,20 @@ let
avogadroI18N = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadro-i18n";
rev = "7eef0b83ded6221a3ddb85c0118cc26f9a35375c";
hash = "sha256-AR/y70zeYR9xBzWDB5JXjJdDM+NLOX6yxCQte2lYN/U=";
tag = "1.101.0";
hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8=";
};
in
stdenv.mkDerivation rec {
pname = "avogadro2";
version = "1.100.0";
version = "1.101.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = "avogadroapp";
rev = version;
hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU=";
hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc=";
};
postUnpack = ''
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "aldente";
version = "1.34.1";
version = "1.35.1";
src = fetchurl {
url = "https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring/releases/download/${finalAttrs.version}/AlDente.dmg";
hash = "sha256-hwlIYnd+ZYx+6+OQ1IPSzXKRaKDsKVJyeQCUhvhFMPU=";
hash = "sha256-OjajT9goWbK3dKmkvt/qbcjlytg/xOPxNEZWE7h24Uc=";
};
dontBuild = true;
+33
View File
@@ -0,0 +1,33 @@
{
lib,
fetchFromGitHub,
rustPlatform,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "applesauce";
version = "0.5.19";
src = fetchFromGitHub {
owner = "Dr-Emann";
repo = "applesauce";
tag = "applesauce-cli-v${finalAttrs.version}";
hash = "sha256-OJZOB7h3qFkaCaPi+EJxIFX8q/Q38vtI0CmDK4PMD1g=";
};
cargoHash = "sha256-gQQpvS2LtlDBXjTqQvSUCXv5UCiQm1kiS/yPcG5KGxY=";
meta = {
description = "Transparent compression for Apple File System Compression (AFSC)";
homepage = "https://github.com/Dr-Emann/applesauce";
changelog = "https://github.com/Dr-Emann/applesauce/releases/tag/applesauce-cli-v${finalAttrs.version}";
license = with lib.licenses; [
gpl3Plus
];
maintainers = with lib.maintainers; [
maxicode
];
mainProgram = "applesauce";
platforms = lib.platforms.darwin;
};
})
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "biome";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "@biomejs/biome@${finalAttrs.version}";
hash = "sha256-xfaF9wg8nWXFWfJCp25sIi65RjZJaRlNSEAboYl3zKI=";
hash = "sha256-ygpuBgqrjfcAGmd64i7vLLVPr0QaFhVo6xsUT1V8MA4=";
};
cargoHash = "sha256-8oN+eSR/+b0MRnN0/nYsAikhGahPH5imV5M2OKso9Bg=";
cargoHash = "sha256-KQJJUJ2bIEHJAm2XAMoCtk1u2Alw9jX1N/nEWdOTcX8=";
nativeBuildInputs = [ pkg-config ];
+4 -4
View File
@@ -6,13 +6,13 @@
"packages": {
"": {
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.115"
"@anthropic-ai/claude-code": "^1.0.117"
}
},
"node_modules/@anthropic-ai/claude-code": {
"version": "1.0.115",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.115.tgz",
"integrity": "sha512-scnmcSgtmRM4wUUWr+BfU+krK+m/n4Sxvhu9ePUlYRWklWrYnySvJ1WrAZG6/v9G6vDLDdoKIW7yol8SGnOSqA==",
"version": "1.0.117",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.117.tgz",
"integrity": "sha512-ZSBFpwPqMZJZq9//BYSW0MLGQY0svAtncPe2EVxohO87Gym6Dqi+IRSVZkWSwF07gmzZH3luqrepX3q33l7T+Q==",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "claude-code";
version = "1.0.115";
version = "1.0.117";
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-pN74V0cFmNjlkTp6qmoOa9z15BhTyM3U6VMi8pTiKcA=";
hash = "sha256-mGAc09YRUE6sjy4/gimGVIbPuRHANOyBP/hpuHsbZVI=";
};
npmDepsHash = "sha256-YUKJhBOxUL9hLnwb61sYqcjGIql4drOIku1t3v5c0Zo=";
npmDepsHash = "sha256-U/trPqqN4FNuH6yHlvkPL9DHR2Lw21+3xVtwenu/4Fs=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
-36
View File
@@ -1,36 +0,0 @@
# To use this package with a CMake and pkg-config build:
# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp)
# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc)
{
lib,
stdenv,
fetchFromGitHub,
cmake,
gtest,
}:
stdenv.mkDerivation rec {
pname = "easyloggingpp";
version = "9.97.1";
src = fetchFromGitHub {
owner = "amrayn";
repo = "easyloggingpp";
rev = "v${version}";
sha256 = "sha256-R4NdwsUywgJoK5E/OdZXFds6iBKOsMa0E+2PDdQbV6E=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ gtest ];
cmakeFlags = [ "-Dtest=ON" ];
env.NIX_CFLAGS_COMPILE = "-std=c++14" + lib.optionalString stdenv.hostPlatform.isLinux " -pthread";
postInstall = ''
mkdir -p $out/include
cp ../src/easylogging++.cc $out/include
'';
meta = {
description = "C++ logging library";
homepage = "https://github.com/amrayn/easyloggingpp";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ acowley ];
platforms = lib.platforms.all;
};
}
+2 -2
View File
@@ -9,12 +9,12 @@
}:
stdenv.mkDerivation rec {
version = "1.6.15";
version = "1.6.16";
pname = "freeipmi";
src = fetchurl {
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
sha256 = "sha256-1pKcNUY59c51tbGJfos2brY2JcI+XEWQp66gNP4rjK8=";
sha256 = "sha256-W872u562gOSbSjYjV5kwrOeJn1OSWyBF/p+RrWkEER0=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
+2 -2
View File
@@ -5,14 +5,14 @@
}:
buildGoModule (finalAttrs: {
pname = "gitea-mcp-server";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "gitea-mcp";
tag = "v${finalAttrs.version}";
hash = "sha256-BuSkrQl7HVZxsMF0w6F2Nf9QEuWpZV6pxChcvSgV0Eo=";
hash = "sha256-MWH50NOZKp0OxuIELnbp34GKLWFaVOZCZOQnNLvYHro=";
};
vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs=";
+4 -1
View File
@@ -74,7 +74,10 @@ stdenv.mkDerivation rec {
pango
];
pythonPath = lib.optionals guiSupport [
pythonPath = [
python3Packages.pyserial
]
++ lib.optionals guiSupport [
python3Packages.pygobject3
python3Packages.pycairo
];
@@ -6,6 +6,7 @@
pnpm_10,
python3,
stdenv,
unixtools,
cctools,
lib,
nixosTests,
@@ -89,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
--set-default PORT 3000 \
--set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \
--set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \
--add-flags "$out/share/homepage/server.js"
--add-flags "$out/share/homepage/server.js" \
--set PATH "${lib.makeBinPath [ unixtools.ping ]}"
${if enableLocalIcons then installLocalIcons else ""}
@@ -111,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "homepage";
homepage = "https://gethomepage.dev";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [ parthiv-krishna ];
platforms = lib.platforms.all;
};
})
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "hugo";
version = "0.149.1";
version = "0.150.0";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
tag = "v${finalAttrs.version}";
hash = "sha256-IGgh3uipi1HWdB3Y9hNGMUFL1WQVDGJlxd1dNK7OhH8=";
hash = "sha256-TWBwF/GPNPLNSEBmG0wVvqY+mgQpZk2MiQoLxB+dBuU=";
};
vendorHash = "sha256-d1eZ452ia2bj6ahEl1Mbva2iBi5IaKeYidP9bg7Thtc=";
vendorHash = "sha256-/jbShK+wEybD8hh5+1+Qd+NJkmp3w+BYf2UsTPEgwhw=";
checkFlags =
let
+2 -2
View File
@@ -19,13 +19,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.18";
version = "3.14.19";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-Tifw0awNLiJrWhMF61O2VW85I3eVxDChkod5avAV6zA=";
sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
};
CXXDEFS = [
+11 -16
View File
@@ -4,22 +4,21 @@
fetchFromGitHub,
pkg-config,
openssl,
testers,
mago,
versionCheckHook,
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mago";
version = "0.26.1";
version = "1.0.0-beta.14";
src = fetchFromGitHub {
owner = "carthage-software";
repo = "mago";
tag = version;
hash = "sha256-9WrSHjs1EdDqTXuB0HbIzQCQWp4okkdy3jTVl4J2wUg=";
tag = finalAttrs.version;
hash = "sha256-UKoq4RkFcLS47DZHPY/MhrRuLQoWYLoOzO2BeeJZoQw=";
};
cargoHash = "sha256-7/kbuWcy1IwAL7m87WPgyhwPidLL9K65u6ybpj0Ryl0=";
cargoHash = "sha256-/THZFU3lJbgJGA4lxWt6fyiHqIgQ539vj57iKoQfXZo=";
env = {
# Get openssl-sys to use pkg-config
@@ -30,20 +29,16 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ];
passthru = {
tests.version = testers.testVersion {
package = mago;
command = "mago --version";
version = "mago ${version}";
};
};
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = {
changelog = "https://github.com/carthage-software/mago/releases/tag/${version}";
changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}";
description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code";
homepage = "https://github.com/carthage-software/mago";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ gaelreyrol ];
mainProgram = "mago";
};
}
})
+3 -3
View File
@@ -14,19 +14,19 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.12.4";
version = "0.12.5";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
hash = "sha256-FduZKeWApGR/SmjiZsVDC0KJZq8XRtfCFQUZhxlVswM=";
hash = "sha256-FywU4nT/EjEqiC+67FWi3Ni63NI8nqJka6bPdfq1c30=";
};
buildInputs = lib.optional (!withGoolm) olm;
tags = lib.optional withGoolm "goolm";
vendorHash = "sha256-Ujk/bJWo4tU7wQxyF7VP1JLqNh+VuNy5n31x9AWyEZA=";
vendorHash = "sha256-LjlI5zqM1GS+7Sx1mqiwZHM4mPifX7MyLbqEckb90Jo=";
doCheck = false;
+2 -2
View File
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "metabase";
version = "0.54.1";
version = "0.56.5";
src = fetchurl {
url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
hash = "sha256-gHLugoL3wCvlCzN2fNJtCt+1iSW+kKPzWPpqqHAn/D0=";
hash = "sha256-oCTlxHhBdjoDywlYlsRvk/W5EZC41Eve86KGWw8pP5I=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -12
View File
@@ -10,29 +10,20 @@
curl,
versionCheckHook,
nix-update-script,
fetchpatch,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "miniserve";
version = "0.31.0";
version = "0.32.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
tag = "v${finalAttrs.version}";
hash = "sha256-sSCS5jHhu0PBF/R3YqbR9krZghNNa2cPkLkK8kvWWd4=";
hash = "sha256-9x2LGJwPf6QEvHvGD8i9Bz3tV8DNAtd9Wp9tXsbI2qo=";
};
patches = [
(fetchpatch {
name = "upload.patch";
url = "https://github.com/svenstaro/miniserve/commit/d41ade0d79e2c175515701350f763dd461c55964.patch";
hash = "sha256-2xQPcJFjlvrCeobuDXm+eVZzDsKoQoZL7OXEJxncX5k=";
})
];
cargoHash = "sha256-Gb1k4sd2/OV1GskFZBn7EapZTlhb9LK19lJHVP7uCK0=";
cargoHash = "sha256-JVzWmo+28K1kG4QaiAkGgBr8kkdfqoylJBWi+Fo9L6c=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -14,13 +14,13 @@ assert
buildGoModule rec {
pname = "opa-envoy-plugin";
version = "1.7.1-envoy";
version = "1.8.0-envoy";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa-envoy-plugin";
tag = "v${version}";
hash = "sha256-q4Cs5/QtGTWj8Ljr1R7BD6GWge6+/hUDAF/M2N/tgWE=";
hash = "sha256-tPPF/zCwPShejBZZO1Kw7+jd4BpTU81DeIUxxz9b0RY=";
};
vendorHash = null;
+3 -3
View File
@@ -5,15 +5,15 @@
}:
buildNpmPackage (finalAttrs: {
pname = "sillytavern";
version = "1.13.3";
version = "1.13.4";
src = fetchFromGitHub {
owner = "SillyTavern";
repo = "SillyTavern";
tag = finalAttrs.version;
hash = "sha256-IR2lR6kkjHXIHqCZJ+KK7abxK+oyJzWyEya86e3cEn8=";
hash = "sha256-C1VWyowuk4w1F5u88Xcp9m3UgNmcDKEn/NSojuLGAd8=";
};
npmDepsHash = "sha256-cAfFRJY2cVBSu3gp2zGlHe84L7c9PahZDyO7iREjHWs=";
npmDepsHash = "sha256-lVG00oUzrMxIVoKqTRtkMYUmS45YEOkcepXJl4vth2w=";
dontNpmBuild = true;
+4 -4
View File
@@ -11,13 +11,13 @@
buildDotnetModule (finalAttrs: {
pname = "smtp4dev";
version = "3.9.0";
version = "3.10.1";
src = fetchFromGitHub {
owner = "rnwood";
repo = "smtp4dev";
tag = finalAttrs.version;
hash = "sha256-LGhx+i4PIExC6GbBwDOLi/g1TxNoMFMZomdnbtc/wNc=";
hash = "sha256-bhS2/YO7jejw6+qx6EdLH98SnxeqMWajSz8i7ocNVX8=";
};
patches = [ ./smtp4dev-npm-packages.patch ];
@@ -33,7 +33,7 @@ buildDotnetModule (finalAttrs: {
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src patches;
hash = "sha256-Xjx3V5FH72D+CXBRZgmlkbp5evnp6F4zaHMWQB5o61w=";
hash = "sha256-c0/6kbMv5CmLxS0S/p3+oZvZsuHP9gt4X43uvGQFjTw=";
postPatch = "cd ${finalAttrs.npmRoot}";
};
@@ -51,7 +51,7 @@ buildDotnetModule (finalAttrs: {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/smtp4dev --help | head -1 | grep -F "smtp4dev version ${finalAttrs.version}"
$out/bin/smtp4dev --help > /dev/null
runHook postInstallCheck
'';
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "tfswitch";
version = "1.5.1";
version = "1.6.0";
src = fetchFromGitHub {
owner = "warrensbox";
repo = "terraform-switcher";
rev = "v${version}";
sha256 = "sha256-gXf6lqxWTX44fhAa34QlcKBxc4xLNVFUsGOlKvWnWKc=";
sha256 = "sha256-mkS53Bqw59F7Q8QyyMjQVm0uBR/HUUnzjCHNT/GiIEg=";
};
vendorHash = "sha256-cc1ZvVCcjFlJcHs0DH4atyWISrrDfyXPK6j2dSgWD0k=";
+2 -2
View File
@@ -6,13 +6,13 @@
}:
buildGoModule (finalAttrs: {
pname = "trdl-client";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "werf";
repo = "trdl";
tag = "v${finalAttrs.version}";
hash = "sha256-QqAVcATpxfjKEaluurVN9EylEGKNKWlBkE8KepIpjfo=";
hash = "sha256-/rhRsKlkRYQwN5IrFcOXiU12nEQMN75o2DPku5YPFe0=";
};
sourceRoot = "${finalAttrs.src.name}/client";
+3 -3
View File
@@ -1,7 +1,7 @@
rec {
version = "0.17.0-rc.1";
version = "0.17.0-rc.2";
tag = version;
hash = "sha256-ITV8T3gfP52e8Wtikm5e68FS2Pyh+adOq/G7xpQ46GU=";
cargoHash = "sha256-K8hdkWKcMLw9ImdG0B/VhZV2j6bzMevrwQYEpUlGuzs=";
hash = "sha256-2EO1nlAMbBi+DAuxgnf7eUKYiyXDt2+0rxFXR520V0U=";
cargoHash = "sha256-uufkv/UIb6jlagercZvA6eOQ4Pu3ZHWRpnd0pQbX8vY=";
updateScript = ./update-unstable.sh;
}
@@ -5,10 +5,11 @@
mathcomp,
mathcomp-algebra-tactics,
mathcomp-word,
ITree,
version ? null,
}:
mkCoqDerivation {
(mkCoqDerivation {
pname = "jasmin";
owner = "jasmin-lang";
@@ -27,12 +28,16 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp.version ]
[
(case (range "8.19" "9.1") (range "2.2" "2.4") "2025.02.0")
(case (range "8.20" "9.1") (range "2.2" "2.4") "2025.06.1")
(case (range "8.19" "9.1") (range "2.2" "2.4") "2025.02.1")
(case (isEq "8.18") (isEq "2.2") "2024.07.2")
]
null;
releaseRev = v: "v${v}";
release."2025.06.1".sha256 = "sha256-wEL1tN0HUa1Eb7FiQOBA6sAkuonrAMdkqq8gu9/CED0=";
release."2025.06.0".sha256 = "sha256-XfTg7ofamzMWqmRIU1/MO+S/ieNjvNEhlgIqFrchdAQ=";
release."2025.02.1".sha256 = "sha256-8P2GdplB12Q0e0XdL77w3nQL1/6Xl/gQNhGTB0WX/8I=";
release."2025.02.0".sha256 = "sha256-Jlf0+VPuYWXdWyKHKHSp7h/HuCCp4VkcrgDAmh7pi5s=";
release."2024.07.3".sha256 = "sha256-n/X8d7ILuZ07l24Ij8TxbQzAG7E8kldWFcUI65W4r+c=";
release."2024.07.2".sha256 = "sha256-aF8SYY5jRxQ6iEr7t6mRN3BEmIDhJ53PGhuZiJGB+i8=";
@@ -56,4 +61,9 @@ mkCoqDerivation {
vbgl
];
};
}
}).overrideAttrs
(o: {
propagatedBuildInputs =
o.propagatedBuildInputs
++ lib.optional (o.version == "dev" || lib.versionAtLeast o.version "2025.06") ITree;
})
@@ -332,11 +332,15 @@ let
'';
postFixup = ''
mkdir -p $dev/bin $dev/share/man/man1
mkdir -p $dev/bin $dev/lib $dev/share/man/man1
mv $out/bin/phpize $out/bin/php-config $dev/bin/
mv $out/lib/build $dev/lib/
mv $out/share/man/man1/phpize.1.gz \
$out/share/man/man1/php-config.1.gz \
$dev/share/man/man1/
substituteInPlace $dev/bin/phpize \
--replace-fail "$out/lib" "$dev/lib"
'';
src = if phpSrc == null then defaultPhpSrc else phpSrc;
@@ -28,32 +28,32 @@ let
moleculesRepo = fetchFromGitHub {
owner = "OpenChemistry";
repo = "molecules";
rev = "1.0.0";
sha256 = "guY6osnpv7Oqt+HE1BpIqL10POp+x8GAci2kY0bLmqg=";
tag = "1.101.0";
hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
};
crystalsRepo = fetchFromGitHub {
owner = "OpenChemistry";
repo = "crystals";
rev = "1.0.1";
sha256 = "sH/WuvLaYu6akOc3ssAKhnxD8KNoDxuafDSozHqJZC4=";
tag = "1.101.0";
hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
};
fragmentsRepo = fetchFromGitHub {
owner = "OpenChemistry";
repo = "fragments";
rev = "8dc711a59d016604b3e9b6d59dec178b8e6ccd36";
hash = "sha256-Valc5zwlaZ//eDupFouCfWCeID7/4ObU1SDLFJ/mo/g=";
tag = "1.101.0";
hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw=";
};
in
stdenv.mkDerivation rec {
pname = "avogadrolibs";
version = "1.100.0";
version = "1.101.0";
src = fetchFromGitHub {
owner = "OpenChemistry";
repo = pname;
rev = version;
hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E=";
tag = version;
hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk=";
};
postUnpack = ''
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "3.14.1";
version = "3.14.2";
pyproject = true;
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = "bthome-ble";
tag = "v${version}";
hash = "sha256-ySvEO4ic1Oo0b/kBADOMRgf9Thq6sBvxYWFKQpH3ouU=";
hash = "sha256-kxKQnHrRZE7ugrRn7VSwQ99TtEX/DmH5x4Yy22UsXjA=";
};
build-system = [ poetry-core ];
@@ -0,0 +1,33 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
stdenv,
}:
buildPythonPackage rec {
pname = "cv2_enumerate_cameras";
version = "1.2.2";
src = fetchFromGitHub {
owner = "lukehugh";
repo = "cv2_enumerate_cameras";
tag = "v${version}";
hash = "sha256-BInGgnsvRrfTaofqZzf5LawM/Lbr0vdgU/l7j/VQi1o=";
};
pyproject = true;
build-system = [ setuptools ];
pythonImportsCheck = [ "cv2_enumerate_cameras" ];
meta = {
homepage = "https://github.com/lukehugh/cv2_enumerate_cameras";
description = "Retrieve the connected camera's name, VID, PID, and the corresponding OpenCV index";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.qyliss ];
# Needs pyobjc-framework-avfoundation; not currently packaged.
broken = stdenv.hostPlatform.isDarwin;
};
}
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "django-guardian";
version = "3.1.3";
version = "3.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "django-guardian";
repo = "django-guardian";
tag = version;
hash = "sha256-cQw4bFcblq80ss64rQpg1VyS7rKiheEBJvmRRPyAn9Y=";
hash = "sha256-imisHa5DOIQrQCEPWC/0EqPjDq12tR3xr0Dl1VifJoI=";
};
build-system = [ setuptools ];
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "feedparser";
version = "6.0.11";
version = "6.0.12";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ydBAe2TG8qBl0OuyksKzXAEFDMDcM3V0Yaqr3ExBhNU=";
hash = "sha256-ZPds6Qrj6O9dHt4PjTtQzia8znHdiuXoKxzS1KX5Qig=";
};
nativeBuildInputs = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-ollama";
version = "0.7.1";
version = "0.7.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_ollama";
inherit version;
hash = "sha256-GJtl6iXAPGYMEFuA27UQnE/qjaaPHpBZKuv9/d5wiSg=";
hash = "sha256-Zkofjv6tyoKGyqL/lBimv662yExLsvm4IRzu2ewIPi4=";
};
build-system = [ hatchling ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-openai";
version = "0.5.4";
version = "0.5.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_openai";
inherit version;
hash = "sha256-nja20vxfBWsA7mVZAbO7fnBgsj97GUOYift41pY0D1Q=";
hash = "sha256-klM+g74usyHYSgGoT7K/RQa/aExBDNlMyymubJSaJ9Q=";
};
pythonRemoveDeps = [
@@ -26,7 +26,16 @@ buildPythonPackage rec {
'';
build-system = [
cython
(cython.overrideAttrs (rec {
name = "cython";
version = "3.0.12";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
tag = version;
hash = "sha256-clJXjQb6rVECirKRUGX0vD5a6LILzPwNo7+6KKYs2pI=";
};
}))
setuptools
];
@@ -0,0 +1,11 @@
{
version = "4.5-stable";
hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8=";
default = {
exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM=";
};
mono = {
exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs=";
nugetDeps = ./deps.json;
};
}
File diff suppressed because it is too large Load Diff
+12 -10
View File
@@ -375,16 +375,18 @@ let
strictDeps = true;
patches = lib.optionals (lib.versionOlder version "4.4") [
(fetchpatch {
name = "wayland-header-fix.patch";
url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
})
# Fix a crash in the mono test project build. It no longer seems to
# happen in 4.4, but an existing fix couldn't be identified.
./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
];
patches =
lib.optionals (lib.versionOlder version "4.4") [
(fetchpatch {
name = "wayland-header-fix.patch";
url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
})
# Fix a crash in the mono test project build. It no longer seems to
# happen in 4.4, but an existing fix couldn't be identified.
./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
]
++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch;
postPatch = ''
# this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
+5 -1
View File
@@ -59,7 +59,8 @@ rec {
godotPackages_4_3 = mkGodotPackages "4.3";
godotPackages_4_4 = mkGodotPackages "4.4";
godotPackages_4 = godotPackages_4_4;
godotPackages_4_5 = mkGodotPackages "4.5";
godotPackages_4 = godotPackages_4_5;
godotPackages = godotPackages_4;
godot_4_3 = godotPackages_4_3.godot;
@@ -68,6 +69,9 @@ rec {
godot_4_4 = godotPackages_4_4.godot;
godot_4_4-mono = godotPackages_4_4.godot-mono;
godot_4_4-export-templates-bin = godotPackages_4_4.export-templates-bin;
godot_4_5 = godotPackages_4_5.godot;
godot_4_5-mono = godotPackages_4_5.godot-mono;
godot_4_5-export-templates-bin = godotPackages_4_5.export-templates-bin;
godot_4 = godotPackages_4.godot;
godot_4-mono = godotPackages_4.godot-mono;
godot_4-export-templates-bin = godotPackages_4.export-templates-bin;
@@ -39,9 +39,6 @@ let
mv templates "$templates/$version"
'';
# this allows update-source-version to work
passthru.src = self;
meta = {
inherit (godot.meta)
changelog
@@ -0,0 +1,16 @@
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
index 0a52ef46c5..c932900037 100644
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -62,9 +62,9 @@ if env["builtin_freetype"]:
if env["brotli"]:
env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
- env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
+ env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"])
# Also needed in main env for scene/
- env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
+ env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"])
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "sgt-puzzles";
version = "20250730.a7c7826";
version = "20250904.2376227";
src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
hash = "sha256-oGk0HOXqXNxEVWixS6rptEF0bZYIkJeJzYhL3TSVhic=";
hash = "sha256-FF+RSJqGMhmV5QSaNOBpVeIgS5jAcQJfkW0MvdVxnPI=";
};
sgt-puzzles-menu = fetchurl {
@@ -23,9 +23,9 @@ let
};
# ./update-zen.py lqx
lqx = {
version = "6.16.5"; # lqx
version = "6.16.7"; # lqx
suffix = "lqx1"; # lqx
sha256 = "149pkbzsx1z5b8qizf03nz5b4p7in0kbyy8d35svvzrljr6dzjqn"; # lqx
sha256 = "1rw5iz9d2zz39hzg9p0nxbprz25hgiaycax5iq2yg87mqsxdajad"; # lqx
isLqx = true;
};
};
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
revert = true;
})
./unsurprising-ext-password.patch
./multiple-configs.patch
(fetchpatch {
name = "suppress-ctrl-event-signal-change.patch";
url = "https://w1.fi/cgit/hostap/patch/?id=c330b5820eefa8e703dbce7278c2a62d9c69166a";
@@ -0,0 +1,163 @@
commit ca4bcfbd9d2233c90080b9ad400bf576db221781
Author: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat Sep 13 13:54:00 2025 +0200
wpa_supplicant: allow multiple config files with -I
This change allows to load multiple addition configuration files in
wpa_supplicant by repeating the -I option.
Signed-off-by: Michele Guerini Rocco <rnhmjoj@inventati.org>
diff --git a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
index df538e332..71195d0d3 100644
--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
@@ -358,7 +358,8 @@
<varlistentry>
<term>-I filename</term>
<listitem>
- <para>Path to additional configuration file.</para>
+ <para>Path to additional configuration file
+ (can be repeat to add multiple files).</para>
</listitem>
</varlistentry>
diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c
index 9229eb51f..ff877f3b9 100644
--- a/wpa_supplicant/main.c
+++ b/wpa_supplicant/main.c
@@ -76,7 +76,7 @@ static void usage(void)
" -G = global ctrl_interface group\n"
" -h = show this help text\n"
" -i = interface name\n"
- " -I = additional configuration file\n"
+ " -I = additional configuration file (can be repeated)\n"
" -K = include keys (passwords, etc.) in debug output\n"
" -L = show license (BSD)\n"
#ifdef CONFIG_P2P
@@ -183,7 +183,8 @@ int main(int argc, char *argv[])
{
int c, i;
struct wpa_interface *ifaces, *iface;
- int iface_count, exitcode = -1;
+ int iface_count, conf_count = 0, exitcode = -1;
+ size_t path_size;
struct wpa_params params;
struct wpa_global *global;
@@ -253,7 +254,15 @@ int main(int argc, char *argv[])
iface->ifname = optarg;
break;
case 'I':
- iface->confanother = optarg;
+ if (conf_count >= 15) {
+ wpa_printf(MSG_ERROR,
+ "too many additional configuration files");
+ goto out;
+ }
+ path_size = 1 + os_strlen(optarg);
+ iface->confanother[conf_count] = os_malloc(path_size);
+ os_memcpy(iface->confanother[conf_count], optarg, path_size);
+ conf_count++;
break;
case 'K':
params.wpa_debug_show_keys++;
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d45002fd9..af5836ef5 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -675,8 +675,10 @@ static void wpa_supplicant_cleanup(struct wpa_supplicant *wpa_s)
os_free(wpa_s->confname);
wpa_s->confname = NULL;
- os_free(wpa_s->confanother);
- wpa_s->confanother = NULL;
+ for (i = 0; wpa_s->confanother[i] != NULL; i++) {
+ os_free(wpa_s->confanother[i]);
+ wpa_s->confanother[i] = NULL;
+ }
os_free(wpa_s->last_con_fail_realm);
wpa_s->last_con_fail_realm = NULL;
@@ -1404,6 +1406,7 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s)
struct wpa_config *conf;
int reconf_ctrl;
int old_ap_scan;
+ int i;
if (wpa_s->confname == NULL)
return -1;
@@ -1413,12 +1416,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s)
"file '%s' - exiting", wpa_s->confname);
return -1;
}
- if (wpa_s->confanother &&
- !wpa_config_read(wpa_s->confanother, conf, true)) {
- wpa_msg(wpa_s, MSG_ERROR,
- "Failed to parse the configuration file '%s' - exiting",
- wpa_s->confanother);
- return -1;
+
+ for (i = 0; wpa_s->confanother[i] != NULL; i++) {
+ if (!wpa_config_read(wpa_s->confanother[i], conf, true)) {
+ wpa_msg(wpa_s, MSG_ERROR,
+ "Failed to parse the configuration file '%s' - exiting",
+ wpa_s->confanother[i]);
+ return -1;
+ }
}
conf->changed_parameters = (unsigned int) -1;
@@ -7658,13 +7663,16 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
"configuration '%s'.", wpa_s->confname);
return -1;
}
- wpa_s->confanother = os_rel2abs_path(iface->confanother);
- if (wpa_s->confanother &&
- !wpa_config_read(wpa_s->confanother, wpa_s->conf, true)) {
- wpa_printf(MSG_ERROR,
- "Failed to read or parse configuration '%s'.",
- wpa_s->confanother);
- return -1;
+
+ for (int i = 0; iface->confanother[i] != NULL; i++) {
+ wpa_s->confanother[i] = os_rel2abs_path(iface->confanother[i]);
+ if (wpa_s->confanother[i] &&
+ !wpa_config_read(wpa_s->confanother[i], wpa_s->conf, true)) {
+ wpa_printf(MSG_ERROR,
+ "Failed to read or parse configuration '%s'.",
+ wpa_s->confanother[i]);
+ return -1;
+ }
}
/*
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 2f77413d5..84c009e78 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -66,12 +66,12 @@ struct wpa_interface {
const char *confname;
/**
- * confanother - Additional configuration name (file or profile) name
+ * confanother - Additional configuration names (file or profile) name
*
* This can also be %NULL when the additional configuration file is not
* used.
*/
- const char *confanother;
+ char *confanother[16];
/**
* ctrl_interface - Control interface parameter
@@ -713,7 +713,7 @@ struct wpa_supplicant {
char bridge_ifname[16];
char *confname;
- char *confanother;
+ char *confanother[16];
struct wpa_config *conf;
int countermeasures;
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
postgresqlBuildExtension (finalAttrs: {
pname = "omnigres";
version = "0-unstable-2025-09-05";
version = "0-unstable-2025-09-15";
src = fetchFromGitHub {
owner = "omnigres";
repo = "omnigres";
rev = "f9ec95c59a786835f38629a2e04a4784a460fba1";
hash = "sha256-F1vG+iAlixdWwW3LIovzwnuL75QTCDlF40QOUD5dNZk=";
rev = "5535ce27d6c80b3e0cf891d93e3ee07af492346c";
hash = "sha256-Ha5orh/6tvaNhGWmFpC/+ZV7WcD+nqkjwf3grhKUPys=";
};
# This matches postInstall of PostgreSQL's generic.nix, which does this for the PGXS Makefile.
+15 -57
View File
@@ -1,6 +1,5 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitea,
openssl,
@@ -31,12 +30,6 @@ let
inherit hash;
};
postPatch = ''
# Starting in 0.9.x series, Garage is using mold in local development
# and this leaks in this packaging, we remove it to use the default linker.
rm .cargo/config.toml || true
'';
inherit cargoHash cargoPatches;
nativeBuildInputs = [
@@ -54,44 +47,23 @@ let
OPENSSL_NO_VENDOR = true;
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.8.2/nix/compile.nix#L192-L198
# See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v2.1.0/nix/compile.nix#L71-L78
# on version changes for checking if changes are required here
buildFeatures = [
"kubernetes-discovery"
"bundled-libs"
]
++ lib.optional (lib.versionOlder version "1.0") "sled"
++ [
"metrics"
"k2v"
"telemetry-otlp"
"lmdb"
"sqlite"
"consul-discovery"
];
# To make integration tests pass, we include the optional k2v feature here,
# but in buildFeatures only for version 0.8+, where it's enabled by default.
# See: https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/
checkFeatures = [
"fjall"
"journald"
"k2v"
"kubernetes-discovery"
"bundled-libs"
]
++ lib.optional (lib.versionOlder version "1.0") "sled"
++ [
"lmdb"
"metrics"
"sqlite"
"syslog"
"telemetry-otlp"
];
disabledTests = [
# Upstream told us this test is flakey.
"k2v::poll::test_poll_item"
];
passthru.tests =
lib.optionalAttrs (lib.versionAtLeast version "1")
nixosTests."garage_${lib.versions.major version}";
passthru.tests = nixosTests."garage_${lib.versions.major version}";
meta = {
description = "S3-compatible object store for small self-hosted geo-distributed deployments";
@@ -111,31 +83,17 @@ let
};
in
rec {
garage_0_9_4 = generic {
version = "0.9.4";
hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc=";
cargoPatches = [ ./update-time.patch ];
eol = true;
garage_1 = generic {
version = "1.3.0";
hash = "sha256-6w+jun0UmQHmoXcokGpPM95BbQyOKefTeAelAFKxNCM=";
cargoHash = "sha256-mWLsOTWxzMdDfzEDu+WHJ12SVscEVfBVuOTVFbfnk0g=";
};
garage_1_2_0 = generic {
version = "1.2.0";
hash = "sha256-JoOwCbChSL7mjegnLHOH2Abfmsnw9BwNsjFj7nqBN6o=";
cargoHash = "sha256-vcvD0Fn/etnAuXrM3+rj16cqpEmW2nzRmrjXsftKTFE=";
garage_2 = generic {
version = "2.1.0";
hash = "sha256-GGwF6kVIJ7MPvO6VRj2ebquJEjJQBwpW18P6L2sGVDs=";
cargoHash = "sha256-0pT2fqseN1numJZdC0FFg1JXbDq1YmlmBPQVbOpxtkw=";
};
garage_2_0_0 = generic {
version = "2.0.0";
hash = "sha256-dn7FoouF+5qmW6fcC20bKQSc6D2G9yrWdBK3uN3bF58=";
cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc=";
};
garage_0_9 = garage_0_9_4;
garage_1 = garage_1_2_0;
garage_2 = garage_2_0_0;
garage = garage_1;
}
+30 -27
View File
@@ -1,28 +1,39 @@
{
lib,
stdenv,
makeWrapper,
makeBinaryWrapper,
buildGoModule,
fetchFromGitHub,
installShellFiles,
git,
gitMinimal,
gnupg,
xclip,
wl-clipboard,
passAlias ? false,
apple-sdk_14,
testers,
nix-update-script,
gopass,
versionCheckHook,
}:
buildGoModule rec {
let
wrapperPath = lib.makeBinPath (
[
gitMinimal
gnupg
xclip
]
++ lib.optionals stdenv.hostPlatform.isLinux [
wl-clipboard
]
);
in
buildGoModule (finalAttrs: {
pname = "gopass";
version = "1.15.16";
nativeBuildInputs = [
installShellFiles
makeWrapper
makeBinaryWrapper
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -33,7 +44,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-oZeik172VBSxuO3DfD5t8cKPl3AYjlyEw5x4/7g9h6o=";
};
@@ -44,19 +55,10 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.commit=${src.rev}"
"-X main.version=${finalAttrs.version}"
"-X main.commit=${finalAttrs.src.rev}"
];
wrapperPath = lib.makeBinPath (
[
git
gnupg
xclip
]
++ lib.optional stdenv.hostPlatform.isLinux wl-clipboard
);
postInstall = ''
installManPage gopass.1
installShellCompletion --cmd gopass \
@@ -73,25 +75,26 @@ buildGoModule rec {
--prefix PATH : "${wrapperPath}" \
--set GOPASS_NO_REMINDER true
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
passthru = {
inherit wrapperPath;
tests.version = testers.testVersion {
package = gopass;
};
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Slightly more awesome Standard Unix Password Manager for Teams. Written in Go";
homepage = "https://www.gopass.pw/";
license = licenses.mit;
maintainers = with maintainers; [
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
rvolosatovs
sikmir
];
changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md";
changelog = "https://github.com/gopasspw/gopass/blob/v${finalAttrs.version}/CHANGELOG.md";
longDescription = ''
gopass is a rewrite of the pass password manager in Go with the aim of
@@ -104,4 +107,4 @@ buildGoModule rec {
'';
mainProgram = "gopass";
};
}
})
+10 -5
View File
@@ -789,6 +789,7 @@ mapAliases {
EBTKS = ebtks; # Added 2024-01-21
eask = eask-cli; # Added 2024-09-05
easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19
ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17
ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
@@ -950,7 +951,11 @@ mapAliases {
gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19
garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16
garage_0_9_4 = throw "'garage_0_9_4' has been removed as it is unmaintained upstream"; # Added 2025-09-16
garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16
garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
@@ -1976,6 +1981,9 @@ mapAliases {
phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
picom-next = picom; # Added 2024-02-13
pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
@@ -2104,9 +2112,11 @@ mapAliases {
psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10
purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17
purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17
pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
@@ -2765,8 +2775,6 @@ mapAliases {
inherit (pidginPackages)
pidgin-indicator
pidgin-latex
pidgin-msn-pecan
pidgin-mra
pidgin-carbons
pidgin-xmpp-receipts
pidgin-otr
@@ -2779,11 +2787,8 @@ mapAliases {
purple-mm-sms
purple-plugin-pack
purple-slack
purple-vk-plugin
purple-xmpp-http-upload
tdlib-purple
pidgin-opensteamworks
purple-facebook
;
}
+4 -6
View File
@@ -2869,13 +2869,7 @@ with pkgs;
inherit (callPackages ../tools/filesystems/garage { })
garage
garage_0_9
garage_0_9_4
garage_1_2_0
garage_1
garage_2_0_0
garage_2
;
@@ -2969,6 +2963,7 @@ with pkgs;
godot3-mono-server
godotPackages_4_3
godotPackages_4_4
godotPackages_4_5
godotPackages_4
godotPackages
godot_4_3
@@ -2977,6 +2972,9 @@ with pkgs;
godot_4_4
godot_4_4-mono
godot_4_4-export-templates-bin
godot_4_5
godot_4_5-mono
godot_4_5-export-templates-bin
godot_4
godot_4-mono
godot_4-export-templates-bin
+2
View File
@@ -3236,6 +3236,8 @@ self: super: with self; {
cut-cross-entropy = callPackage ../development/python-modules/cut-cross-entropy { };
cv2-enumerate-cameras = callPackage ../development/python-modules/cv2-enumerate-cameras { };
cvelib = callPackage ../development/python-modules/cvelib { };
cvss = callPackage ../development/python-modules/cvss { };