Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-01-24 18:06:56 +00:00
committed by GitHub
77 changed files with 881 additions and 791 deletions
@@ -128,6 +128,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
- [services.resolved](#opt-services.resolved.enable) module was converted to RFC42-style settings. The moved options have also been renamed to match the upstream names. Aliases mean current configs will continue to function, but users should move to the new options as convenient.
- Support for Bluetooth audio based on `bluez-alsa` has been added to the `hardware.alsa` module. It can be enabled with the new [enableBluetooth](#opt-hardware.alsa.enableBluetooth) option.
- `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
- `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.
+47 -3
View File
@@ -44,9 +44,15 @@ let
in
lib.forEach options (i: "options ${i.driver} index=${toList i.ids} id=${toList i.names}");
defaultDeviceVars = {
pluginsPath = pkgs.symlinkJoin {
name = "alsa-with-plugins";
paths = cfg.plugins;
};
alsaVariables = {
"ALSA_AUDIO_OUT" = cfg.defaultDevice.playback;
"ALSA_AUDIO_IN" = cfg.defaultDevice.capture;
"ALSA_PLUGIN_DIR" = lib.mkIf (cfg.plugins != [ ]) "${pluginsPath}/lib/alsa-lib";
};
in
@@ -106,6 +112,8 @@ in
enableOSSEmulation = lib.mkEnableOption "the OSS emulation";
enableBluetooth = lib.mkEnableOption "Bluetooth audio support via BlueALSA";
enableRecorder = lib.mkOption {
type = lib.types.bool;
default = false;
@@ -125,6 +133,15 @@ in
'';
};
plugins = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [ ];
example = lib.literalExpression "[ pkgs.bluez-alsa ]";
description = ''
List of ALSA plugins to be added to the search path.
'';
};
defaultDevice.playback = lib.mkOption {
type = lib.types.str;
default = "";
@@ -392,8 +409,8 @@ in
};
# Set default PCM devices
environment.sessionVariables = defaultDeviceVars;
systemd.globalEnvironment = defaultDeviceVars;
environment.sessionVariables = alsaVariables;
systemd.globalEnvironment = alsaVariables;
environment.etc."asound.conf".text = cfg.config;
@@ -412,6 +429,33 @@ in
environment.systemPackages = [ pkgs.alsa-utils ];
})
(lib.mkIf (cfg.enable && cfg.enableBluetooth) {
users.users.bluealsa = {
description = "BlueALSA daemons user";
isSystemUser = true;
group = "audio";
};
# Link ALSA configuration
environment.etc."alsa/conf.d/20-bluealsa.conf".source =
"${pkgs.bluez-alsa}/etc/alsa/conf.d/20-bluealsa.conf";
# Install plugin
hardware.alsa.plugins = [ pkgs.bluez-alsa ];
# Install CLI tools and systemd units
environment.systemPackages = [ pkgs.bluez-alsa ];
systemd.packages = [ pkgs.bluez-alsa ];
# See Nixpkgs issue #81138
systemd.services."bluealsa".wantedBy = [ "bluetooth.target" ];
# Note: bluealsa-aplay is available but we don't start it
# by default, it's only needed to make the machine act as
# bluetooth speaker
})
(lib.mkIf config.hardware.alsa.enablePersistence {
# Install udev rules for restoring card settings on boot
@@ -406,15 +406,14 @@ in
http = {
# https://www.home-assistant.io/integrations/http/
server_host = mkOption {
type = types.nullOr (types.either types.str (types.listOf types.str));
default = null;
example = [
"::1"
"127.0.0.1"
type = types.either types.str (types.listOf types.str);
default = [
"0.0.0.0"
"::"
];
example = "::1";
description = ''
Only listen to incoming requests on specific IP/host.
The option is unset by default, meaning that Home Assistant listens on all available addresses.
Only listen to incoming requests on specific IP/host. The default listed assumes support for IPv4 and IPv6.
'';
};
+13 -10
View File
@@ -356,16 +356,6 @@ in
"d '${cfg.stateDir}/public/plugin_assets' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.stateDir}/themes' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.stateDir}/tmp' 0750 ${cfg.user} ${cfg.group} - -"
"d /run/redmine/public - - - - -"
"L+ /run/redmine/config - - - - ${cfg.stateDir}/config"
"L+ /run/redmine/files - - - - ${cfg.stateDir}/files"
"L+ /run/redmine/log - - - - ${cfg.stateDir}/log"
"L+ /run/redmine/plugins - - - - ${cfg.stateDir}/plugins"
"L+ /run/redmine/public/assets - - - - ${cfg.stateDir}/public/assets"
"L+ /run/redmine/public/plugin_assets - - - - ${cfg.stateDir}/public/plugin_assets"
"L+ /run/redmine/themes - - - - ${cfg.stateDir}/themes"
"L+ /run/redmine/tmp - - - - ${cfg.stateDir}/tmp"
];
systemd.services.redmine = {
@@ -392,6 +382,19 @@ in
++ lib.optional cfg.components.ghostscript ghostscript;
preStart = ''
# Create symlinks for the basic directory layout the redmine package
# expects. This part must be done in preStart rather than tmpfiles,
# because /run/redmine is re-created when the service is restarted
mkdir /run/redmine/public
ln -s "${cfg.stateDir}/config" /run/redmine/config
ln -s "${cfg.stateDir}/files" /run/redmine/files
ln -s "${cfg.stateDir}/log" /run/redmine/log
ln -s "${cfg.stateDir}/plugins" /run/redmine/plugins
ln -s "${cfg.stateDir}/public/assets" /run/redmine/public/assets
ln -s "${cfg.stateDir}/public/plugin_assets" /run/redmine/public/plugin_assets
ln -s "${cfg.stateDir}/themes" /run/redmine/themes
ln -s "${cfg.stateDir}/tmp" /run/redmine/tmp
rm -rf "${cfg.stateDir}/plugins/"*
rm -rf "${cfg.stateDir}/themes/"*
@@ -625,7 +625,6 @@ in
services.crowdsec.settings.general = {
common = {
daemonize = false;
log_media = "stdout";
};
config_paths = {
+26
View File
@@ -46,4 +46,30 @@ in
name = "pgsql";
type = "postgresql";
};
restart = makeTest {
name = "redmine-restart";
nodes.machine =
{ config, pkgs, ... }:
{
services.redmine = {
enable = true;
package = pkgs.redmine;
};
};
testScript = ''
start_all()
machine.wait_for_unit("redmine.service")
machine.wait_for_open_port(3000)
machine.succeed("curl --fail http://localhost:3000/")
machine.systemctl("stop redmine.service")
machine.systemctl("start redmine.service")
machine.wait_for_unit("redmine.service")
machine.wait_for_open_port(3000)
machine.succeed("curl --fail http://localhost:3000/")
'';
};
}
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-pce-fast";
version = "0-unstable-2026-01-16";
version = "0-unstable-2026-01-23";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-pce-fast-libretro";
rev = "6d182b22f6b9430c76ea71579ffb2eee0e2e9521";
hash = "sha256-QHkG5CSZgaakblOgp5HxGvtWg8K4Nbag481nhG4UjoY=";
rev = "52675734da114a19b3705f03906b1455f3d76644";
hash = "sha256-hITofg0UB5sGNOKAijfORz3ZtHY5CCdqFmbT4nMkmG8=";
};
makefile = "Makefile";
@@ -12,13 +12,13 @@
}:
mkLibretroCore {
core = "mupen64plus-next";
version = "0-unstable-2025-11-14";
version = "0-unstable-2026-01-20";
src = fetchFromGitHub {
owner = "libretro";
repo = "mupen64plus-libretro-nx";
rev = "680e033fc8ed1a49df7b156d97164e0050ee13bc";
hash = "sha256-oBsOC1YtHx+mTgi9rwucU7rVeFt6RbxKrxHyPDx0eXg=";
rev = "bc43bcedc276861254b48526f56799d63a30723b";
hash = "sha256-0dofQP35EmVY6i5muwIARuF1G4+92jhFjAiWcwyJDTs=";
};
# Fix for GCC 14
@@ -5,13 +5,13 @@
}:
mkLibretroCore rec {
core = "np2kai";
version = "0-unstable-2024-11-03";
version = "0-unstable-2026-01-19";
src = fetchFromGitHub {
owner = "AZO234";
repo = "NP2kai";
rev = "4b109eaac4f79b04065ff5025319fce51537e04d";
hash = "sha256-tRFvK8d5Y/umy/b1BKN85ZSaDWyK95hII4RVng7A5uU=";
rev = "e2138c44ea539b36b2d1fc17b70c14fcedfd9784";
hash = "sha256-59u8UWk2KNtZNAUcMql0BaCY+VtDs7GssrQRbXbqB3c=";
fetchSubmodules = true;
};
@@ -724,11 +724,11 @@
"vendorHash": null
},
"ibm-cloud_ibm": {
"hash": "sha256-DvWlf3FHYDcNxUZUOoslQjhuwGvElAEu/duDsX4xbKs=",
"hash": "sha256-1GqI6cFy386osELaG474OeQX33wIAIEABb/bL5ezs6Q=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.87.1",
"rev": "v1.87.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-vKu5ytMAhIYKoPNfuxpyBT9gRdSAR4wFI/7A9K+RiAo="
},
@@ -1,127 +0,0 @@
{
pname,
version,
src,
gitSrc,
buildInputs ? [ ],
homepage,
description,
maintainers,
passthru ? { },
}:
{
lib,
stdenv,
openssl,
zlib,
asciidoc,
libxml2,
libxslt,
docbook_xsl,
pkg-config,
coreutils,
gnused,
groff,
docutils,
gzip,
bzip2,
lzip,
xz,
zstd,
python3Packages,
}:
stdenv.mkDerivation {
inherit
pname
version
src
gitSrc
passthru
;
separateDebugInfo = true;
nativeBuildInputs = [
pkg-config
asciidoc
]
++ (with python3Packages; [
python
wrapPython
]);
buildInputs = buildInputs ++ [
openssl
zlib
libxml2
libxslt
docbook_xsl
];
pythonPath = with python3Packages; [
pygments
markdown
];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"lzip"|"${lzip}/bin/lzip"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-e 's|"zstd"|"${zstd}/bin/zstd"|' \
-i ui-snapshot.c
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
substituteInPlace filters/html-converters/rst2html \
--replace 'rst2html.py' '${docutils}/bin/rst2html.py'
'';
# Give cgit a git source tree and pass configuration parameters (as make
# variables).
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
'';
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$(out)/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
# Install manpage.
postInstall = ''
# xmllint fails:
#make install-man
# bypassing xmllint works:
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
wrapProgram $script --prefix PATH : '${
lib.makeBinPath [
coreutils
gnused
]
}'
done
'';
stripDebugList = [ "cgit" ];
enableParallelBuilding = true;
meta = {
inherit homepage description;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]);
};
}
@@ -1,17 +1,34 @@
{
lib,
stdenv,
fetchurl,
callPackage,
openssl,
zlib,
asciidoc,
libxml2,
libxslt,
luajit,
docbook_xsl,
pkg-config,
coreutils,
gnused,
groff,
docutils,
gzip,
bzip2,
lzip,
xz,
zstd,
python3Packages,
nixosTests,
}:
callPackage (import ./common.nix rec {
stdenv.mkDerivation {
pname = "cgit";
version = "1.2.3";
src = fetchurl {
url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz";
url = "https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz";
sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss";
};
@@ -23,11 +40,95 @@ callPackage (import ./common.nix rec {
sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
};
buildInputs = [ luajit ];
separateDebugInfo = true;
nativeBuildInputs = [
pkg-config
asciidoc
]
++ (with python3Packages; [
python
wrapPython
]);
buildInputs = [
openssl
zlib
libxml2
libxslt
luajit
docbook_xsl
];
pythonPath = with python3Packages; [
pygments
markdown
];
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"lzip"|"${lzip}/bin/lzip"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-e 's|"zstd"|"${zstd}/bin/zstd"|' \
-i ui-snapshot.c
substituteInPlace filters/html-converters/man2html \
--replace 'groff' '${groff}/bin/groff'
substituteInPlace filters/html-converters/rst2html \
--replace 'rst2html.py' '${docutils}/bin/rst2html.py'
'';
# Give cgit a git source tree and pass configuration parameters (as make
# variables).
preBuild = ''
mkdir -p git
tar --strip-components=1 -xf "$gitSrc" -C git
'';
makeFlags = [
"prefix=$(out)"
"CGIT_SCRIPT_PATH=$(out)/cgit/"
"CC=${stdenv.cc.targetPrefix}cc"
"AR=${stdenv.cc.targetPrefix}ar"
];
# Install manpage.
postInstall = ''
# xmllint fails:
#make install-man
# bypassing xmllint works:
a2x --no-xmllint -f manpage cgitrc.5.txt
mkdir -p "$out/share/man/man5"
cp cgitrc.5 "$out/share/man/man5"
wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath"
for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do
wrapProgram $script --prefix PATH : '${
lib.makeBinPath [
coreutils
gnused
]
}'
done
'';
stripDebugList = [ "cgit" ];
enableParallelBuilding = true;
passthru.tests = { inherit (nixosTests) cgit; };
homepage = "https://git.zx2c4.com/cgit/about/";
description = "Web frontend for git repositories";
maintainers = with lib.maintainers; [ bjornfor ];
}) { }
meta = {
homepage = "https://git.zx2c4.com/cgit/about/";
description = "Web frontend for git repositories";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
bjornfor
qyliss
sternenseemann
];
};
}
@@ -1,27 +0,0 @@
{
lib,
fetchurl,
callPackage,
}:
callPackage (import ./common.nix rec {
pname = "cgit-pink";
version = "1.4.1";
src = fetchurl {
url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz";
sha256 = "1ma6j3r4ba5fhd47pc6xn5bmxaqr8ci2pvky9v100n1hh5n6q97i";
};
# cgit-pink is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz";
sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
};
homepage = "https://git.causal.agency/cgit-pink/about/";
description = "cgit fork aiming for better maintenance";
maintainers = with lib.maintainers; [ sternenseemann ];
}) { }
+9 -4
View File
@@ -16,6 +16,8 @@
readline,
sbc,
python3,
systemdSupport ? true,
systemdLibs,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
pkg-config
python3
];
]
++ lib.optional systemdSupport systemdLibs;
buildInputs = [
alsa-lib
@@ -49,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
libbsd
ncurses
]
++ lib.optionals aacSupport [
fdk_aac
];
++ lib.optional aacSupport fdk_aac;
configureFlags = [
(lib.enableFeature aacSupport "aac")
@@ -59,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: {
(lib.enableFeature true "rfcomm")
(lib.withFeatureAs true "alsaplugindir" "${placeholder "out"}/lib/alsa-lib")
(lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share/dbus-1/system.d")
(lib.enableFeature systemdSupport "systemd")
(lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system")
(lib.withFeatureAs systemdSupport "bluealsauser" "bluealsa")
(lib.withFeatureAs systemdSupport "bluealsaaplayuser" "bluealsa")
];
passthru.updateScript = gitUpdater { };
+3 -3
View File
@@ -12,16 +12,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cantus";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "CodedNil";
repo = "cantus";
tag = version;
hash = "sha256-/gwZqr66rpD7w9EuN03vKRWVH/DYDLUvijEkmrN2E+c=";
hash = "sha256-dAMphU+voDUwFzlPuV6nCUg0RaVVyRJLoM6IwjUtvA4=";
};
cargoHash = "sha256-vC/07gvVMH/UATFl7NvJTRLzIOSjrelzINmQ6zUBSos=";
cargoHash = "sha256-0RVjHKg2msoxY+0WZHOPOAXK2nNne7CA9owmNUf8x6I=";
nativeBuildInputs = [
pkg-config
@@ -7,13 +7,13 @@
buildNpmPackage {
pname = "coc-rust-analyzer";
version = "0-unstable-2026-01-06";
version = "0-unstable-2026-01-20";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "coc-rust-analyzer";
rev = "35615c7feafbc8005e160e7609888a97f5d3b031";
hash = "sha256-Kj3gUKFsfgUVVWuz7nuc7djRvfyvXc3wkHt1DxYIw30=";
rev = "edde4d30f76bb6ff2e0684be4da496ed5d8166c4";
hash = "sha256-cBpGhkpqAnzjUHyzuTWkUxMpFjGIdxrXu7TZRbomK9A=";
};
npmDepsHash = "sha256-PgMgpVoKmhuqtSV73wSdqdQ5Bt5AeRwbn71mIulBh8Y=";
+10 -10
View File
@@ -5,18 +5,18 @@
installShellFiles,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "crowdsec";
version = "1.7.2";
version = "1.7.6";
src = fetchFromGitHub {
owner = "crowdsecurity";
repo = "crowdsec";
tag = "v${version}";
hash = "sha256-f0SxOXxXqKft3Nnf9y7itpPXJOjBrEpImbPANFNx4BM=";
tag = "v${finalAttrs.version}";
hash = "sha256-Qd5EHn7G7bTV+S4bVXfHytoCI5L/gHxAKB9emeKoSLc=";
};
vendorHash = "sha256-v1UECFfgx1zFCzSyazxFRWMP/0fayVnrC+pJHio5z+Q=";
vendorHash = "sha256-txiZmUd/GQQu7XiI4iE25aCmOLe2sC0uQ8Gne76cw+Q=";
nativeBuildInputs = [ installShellFiles ];
@@ -28,9 +28,9 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
"-X github.com/crowdsecurity/go-cs-lib/version.Version=v${version}"
"-X github.com/crowdsecurity/go-cs-lib/version.Version=v${finalAttrs.version}"
"-X github.com/crowdsecurity/go-cs-lib/version.BuildDate=1970-01-01_00:00:00"
"-X github.com/crowdsecurity/go-cs-lib/version.Tag=v${version}"
"-X github.com/crowdsecurity/go-cs-lib/version.Tag=v${finalAttrs.version}"
"-X github.com/crowdsecurity/crowdsec/pkg/cwversion.Codename=alphaga"
"-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultConfigDir=/etc/crowdsec"
"-X github.com/crowdsecurity/crowdsec/pkg/csconfig.defaultDataDir=/var/lib/crowdsec/data"
@@ -56,7 +56,7 @@ buildGoModule rec {
preCheck = ''
version=$($GOPATH/bin/cscli version 2>&1 | sed -nE 's/^version: (.*)/\1/p')
if [ "$version" != "v${version}" ]; then
if [ "$version" != "v${finalAttrs.version}" ]; then
echo "Invalid version string: '$version'"
exit 1
fi
@@ -64,7 +64,7 @@ buildGoModule rec {
meta = {
homepage = "https://crowdsec.net/";
changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${version}";
changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${finalAttrs.version}";
description = "Free, open-source and collaborative IPS";
longDescription = ''
CrowdSec is a free, modern & collaborative behavior detection engine,
@@ -82,4 +82,4 @@ buildGoModule rec {
jk
];
};
}
})
+2 -2
View File
@@ -17,13 +17,13 @@
}:
let
version = "0.300.4";
version = "0.300.5";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
hash = "sha256-f2whzEq0LOyvNVLjSNvA19azbtJnOMJqu5EJQXnzZyg=";
hash = "sha256-TRd7usz3+a9h8f/waLKqlu6RuF/GsU9LdCx1NRGWIDA=";
};
vendorHash = "sha256-IB3DqaUbdrqnYQpyHtnvY37xjbRvTvNOV39b8wciuTA=";
+1 -1
View File
@@ -77,7 +77,7 @@ let
};
in
symlinkJoin {
name = "${pname}-${version}";
inherit pname version;
paths = [
wrapper
@@ -29,11 +29,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-network-displays";
version = "0.98.0";
version = "0.99.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz";
sha256 = "sha256-3M42vuzgtTFFQJBswGn4KP5XtSWuv0LlhREFiHxiu2c=";
sha256 = "sha256-Hs5KG8gix+v3JeiEe4zomYtH0ewXFaS03bnd1xaR7YU=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
version = "49.2";
version = "49.3";
outputs = [
"out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
hash = "sha256-0TuFXY35nev37M+BC24FT9sK64fvixMZGKbkyRl6Asc=";
hash = "sha256-KPDb1kRS8AVxKfImdTyV0nJt4H8fX0c63cfDxQem0xo=";
};
patches = [
@@ -23,11 +23,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-text-editor";
version = "49.0";
version = "49.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY=";
hash = "sha256-8ESPJHu1l5pQxgIixExFEYgK1HTiVJV2Xl7SJG5U27E=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "gnote";
version = "49.1";
version = "49.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-l845YCx31l3w1d0z4HtbhtakWFdtzh5rbtGx5If14HM=";
hash = "sha256-lC8CsXIFff4HbdBNDwNlLqafNjg3Lsbrn8p3CBYEp7U=";
};
buildInputs = [
+2 -2
View File
@@ -13,14 +13,14 @@
python3Packages.buildPythonApplication rec {
pname = "gns3-server";
version = "2.2.55";
version = "2.2.56";
pyproject = true;
src = fetchFromGitHub {
owner = "GNS3";
repo = "gns3-server";
tag = "v${version}";
hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";
hash = "sha256-akA6P/ONPioce4pJbg4wAzSvb7aSYGM8NfCs7q9svic=";
};
# GNS3 2.3.26 requires a static BusyBox for the Docker integration
+2 -2
View File
@@ -34,11 +34,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gthumb";
version = "3.12.8.2";
version = "3.12.9";
src = fetchurl {
url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
sha256 = "sha256-q8V7EQMWXdaRU1eW99vbp2hiF8fQael07Q89gA/oh5Y=";
sha256 = "sha256-13+ItWneSSV4BzDnhnspB3GNpmBowkLd6bvaEH4YP/o=";
};
strictDeps = true;
+6 -3
View File
@@ -16,11 +16,12 @@
mpv-unwrapped,
}:
let
version = "0.3.10";
version = "0.3.21";
url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}";
url =
rec {
x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz";
aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz";
x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
aarch64-darwin = x86_64-darwin;
}
@@ -28,8 +29,9 @@ let
or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
hash =
rec {
x86_64-linux = "sha256-GTF9KrcTolCc1w/WT0flwlBCBitskFPaJuNUdxCW9gs=";
x86_64-darwin = "sha256-7qcUnYBasUqisEW56fq4JGgojBmfqycrDIMpCCWLxlc=";
x86_64-linux = "sha256-RZDRb/afXbalNbLBGaQgx5Qd4UEbNrvIsa3h+e6osJE=";
aarch64-linux = "sha256-1ys7uyCjXe4IBeXRk8mFjqmP9OottNefQrrtTkxq/qU=";
x86_64-darwin = "sha256-mo7Rj6c89KZrsL29i99x4E7b6soWlGUsC6KpSB7y5iY=";
aarch64-darwin = x86_64-darwin;
}
.${stdenv.hostPlatform.system};
@@ -90,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ ivyfanchiang ];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
+20
View File
@@ -26,6 +26,8 @@
writeShellScript,
common-updater-scripts,
xmlstarlet,
makeDesktopItem,
copyDesktopItems,
}:
let
@@ -67,6 +69,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
unzip
makeWrapper
copyDesktopItems
];
unpackCmd = ''
@@ -81,7 +84,23 @@ stdenv.mkDerivation {
dontBuild = true;
# Upstream doesn't seem to have a desktop item out of the box
desktopItems = [
(makeDesktopItem {
name = "netsoft-com.netsoft.hubstaff";
desktopName = "Hubstaff";
exec = "HubstaffClient";
icon = "hubstaff";
comment = "Time tracking software";
categories = [
"Office"
"ProjectManagement"
];
})
];
installPhase = ''
runHook preInstall
# remove files for 32-bit arch to skip building for this arch
# but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch)
rm -rf x86 x86_64/lib64
@@ -100,6 +119,7 @@ stdenv.mkDerivation {
# Why is this needed? SEGV otherwise.
ln -s $opt/data/resources $opt/x86_64/resources
runHook postInstall
'';
# to test run:
+4 -4
View File
@@ -50,7 +50,7 @@
}:
let
nix = nixVersions.nix_2_32;
nix = nixVersions.nix_2_33;
perlDeps = buildEnv {
name = "hydra-perl-deps";
@@ -132,14 +132,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2025-11-06";
version = "0-unstable-2026-01-23";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "241ab718002ca5740b7e3f659d0fbd483ab40523";
hash = "sha256-ifmzQS+u/dODQXmMVQLIb4AF4dkWI9s7VGYpV6x/Iq4=";
rev = "8bc95a96f787eb36f29ceec773f5bf48bd121097";
hash = "sha256-Ro+qOHWmWuKJiUwX8bmNuGpb0cLUaPr0vsuZGAi2QCI=";
};
outputs = [
+2 -2
View File
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lean4";
version = "4.26.0";
version = "4.27.0";
# Using a vendored version rather than nixpkgs' version to match the exact version required by
# Lean. Apparently, even a slight version change can impact greatly the final performance.
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "leanprover";
repo = "lean4";
tag = "v${finalAttrs.version}";
hash = "sha256-KDHE2RX1H+QKojrOUbJjIiKlv2kCvAwp4H8V81tDHbQ=";
hash = "sha256-nxAznaWQEilzn93SZTKLKL7TZEPD5LRcJLFmgoCWsXA=";
};
postPatch =
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lix-diff";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "tgirlcloud";
repo = "lix-diff";
tag = "v${finalAttrs.version}";
hash = "sha256-uZd8xoQWsvJCmHtxtKJzKtaupUdXMXKWqSjXnK/BZco=";
hash = "sha256-ehASke8ZpvHkQI9bCV3/9i1QG67hjSIMoIMQDlbODxU=";
};
cargoHash = "sha256-ydB65V879tW42FXSgdoUDeQbovsVf8qXku9uW4mqAfs=";
cargoHash = "sha256-ghwCwIg0PDfUfiHnwiUy8kNjPEgVWk92zA5ZnlD8BO8=";
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -14,13 +14,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "moonlight";
version = "1.3.37";
version = "1.3.38";
src = fetchFromGitHub {
owner = "moonlight-mod";
repo = "moonlight";
tag = "v${finalAttrs.version}";
hash = "sha256-4cz1icY7i8RFdh/HhG/y6UzR/zkhsp4+G2dplm4g+wo=";
hash = "sha256-xp3CdKoQnnbv+UNfjQskifLn7w+LINCIBaUdSZfTCK4=";
};
nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 3;
hash = "sha256-sU0EBSNwpjqyBsvyJim8Qz90dht7xc6f52HaY0sBPds=";
hash = "sha256-yXd9EF20aQr1YUqRyc3QeEVwsMLaT6Xhh/izT/JCVa0=";
};
env = {
+2 -2
View File
@@ -71,7 +71,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
version = "49.2";
version = "49.3";
outputs = [
"out"
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
hash = "sha256-J2ORoIDlCVaSQKyGECVdd4q2qIoyUPmxd0AlXxNOPAo=";
hash = "sha256-nvH2HW/kAcyj/L5tmjsqT5tCY4y/hENzVmamGWSo8MM=";
};
mesonFlags = [
+2 -2
View File
@@ -23,7 +23,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "opengamepadui";
version = "0.44.1";
version = "0.44.2";
buildType = if withDebug then "debug" else "release";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ShadowBlip";
repo = "OpenGamepadUI";
tag = "v${finalAttrs.version}";
hash = "sha256-pZYlx1OVh0Gwvje8GqNV6U7ATy1/mxx6+8jSLqm5jDE=";
hash = "sha256-5Ch3j9URjf9MsGeH7x5CYojnDFQeLXJqcixcGJeDvT4=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "oxlint";
version = "1.39.0";
version = "1.41.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "oxc";
tag = "oxlint_v${finalAttrs.version}";
hash = "sha256-Sg9NtXRuQ0ZruK8a8k5EkeDOJ9v6uzpNzEQ/FY56ioY=";
hash = "sha256-/XLGvEut0TsFkq0U+evPOumjBYahEL29kjJ0u2iBkx8=";
};
cargoHash = "sha256-sgIarCuUmSTAVPVr82rp4dQwzDMWESIbGgkCYEExz6o=";
cargoHash = "sha256-8Q94e9zZRdOMd7WVzS6kE31gBHCG8KC4SteaxnxDjHo=";
nativeBuildInputs = [
cmake
+3 -3
View File
@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage {
pname = "par-lang";
version = "0-unstable-2026-01-18";
version = "0-unstable-2026-01-23";
src = fetchFromGitHub {
owner = "faiface";
repo = "par-lang";
rev = "e10c1e4be92162fefdb515f321a2699c73726005";
hash = "sha256-/Rz0D7zAxjJgm/61/M3iGZ6XwHEHGT6tTmispUjSbW4=";
rev = "d2de05c1dd7e6020727900e4e7c638ece3435fef";
hash = "sha256-adR6M3EINAtGExkHmL7TiUlSHuFUk92+/F2u+SAK6oQ=";
};
cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo=";
+2 -2
View File
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plantuml";
version = "1.2025.10";
version = "1.2026.1";
src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
hash = "sha256-fUFZrW8LD6M1WV6I2pYigr9rJaDlo0OLY8NZdB+w2yk=";
hash = "sha256-QzZ4N2bSZNPaBzt8pG1q3wM/E/XC3bTAOrmeRHHA2uA=";
};
nativeBuildInputs = [
+5 -7
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sdl3-image";
version = "3.2.6";
version = "3.4.0";
outputs = [
"lib"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libsdl-org";
repo = "SDL_image";
tag = "release-${finalAttrs.version}";
hash = "sha256-CnUCqFq9ZaM/WQcmaCpQdjtjR9l5ymzgeqEJx7ZW/s4=";
hash = "sha256-XRPHDcJ49sZa7y8TCWfS2gPOhpGyUnMMXVqvjV9f8E0=";
};
strictDeps = true;
@@ -46,21 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
sdl3
libtiff
libpng
libwebp
libjxl
]
++ (lib.optional (!stdenv.hostPlatform.isDarwin) libavif)
++ (lib.optionals (!enableSTB) [
libpng
libjpeg
]);
++ (lib.optional (!enableSTB) libjpeg);
cmakeFlags = [
# fail when a dependency could not be found
(lib.cmakeBool "SDLIMAGE_STRICT" true)
# disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise.
(lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false)
# disable stbi
# enable stb conditionally
(lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB)
# enable imageio backend
(lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO)
+2 -2
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "shaarli";
version = "0.15.0";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
sha256 = "sha256-+UEtbEYHQrLtClk6VemMhSNx0OPh/JDVlDIfeIzdmRI=";
sha256 = "sha256-e/iZ+SPMt6HphEbLY2hM7pnvXHxsCOYZoXyGpA5FMtg=";
};
outputs = [
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2025.24.3";
version = "2026.1";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-bLD7EOebKx3lbmJUBBUQEOWArNRjmdsKUwXV7taQHQA=";
hash = "sha256-1cNa25Gv2fbUYa7PRN8nHbiFtjSk03GbEhIIekMln2Q=";
fetchSubmodules = true;
};
+3 -3
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "soundsource";
version = "5.8.10";
version = "6.0.2";
src = fetchurl {
url = "https://web.archive.org/web/20251119083726/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
hash = "sha256-kIGpIxlX+qyiXeOWq9DjKLZL4fPZdgsro9P6SqrPQHo=";
url = "https://web.archive.org/web/20251220113913/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
hash = "sha256-tzgGUYaY6mIZXs3xxGC3b3AoJ/DcaESYr49zcDS7+Fo=";
};
dontUnpack = true;
+41 -34
View File
@@ -1,24 +1,50 @@
{
lib,
stdenvNoCC,
fetchurl,
jre,
stdenv,
fetchFromGitHub,
jdk,
makeWrapper,
copyDesktopItems,
makeDesktopItem,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "stegsolve";
version = "1.3";
version = "1.3.1";
src = fetchurl {
# No versioned binary is published :(
url = "https://web.archive.org/web/20230319054116if_/http://www.caesum.com/handbook/Stegsolve.jar";
sha256 = "0np5zb28sg6yzkp1vic80pm8iiaamvjpbf5dxmi9kwvqcrh4jyq0";
src = fetchFromGitHub {
owner = "fee1-dead";
repo = "Stegsolve";
rev = finalAttrs.version;
hash = "sha256-WiIZymeYnub0JilWGLXKhQKEoO1hce5DarbEjp+rTGQ==";
};
dontUnpack = true;
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
buildInputs = [ jdk ];
buildPhase = ''
runHook preBuild
mkdir -p out/
javac -d out/ -sourcepath src/ -classpath out/ -encoding utf8 src/**/*.java
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/
mv out $out/lib/stegsolve
makeWrapper ${jdk}/bin/java $out/bin/stegsolve \
--add-flags "-classpath $out/lib/stegsolve stegsolve.StegSolve"
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
@@ -31,33 +57,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
})
];
nativeBuildInputs = [
makeWrapper
copyDesktopItems
];
installPhase = ''
runHook preInstall
export JAR=$out/share/java/stegsolve/stegsolve.jar
install -D $src $JAR
makeWrapper ${jre}/bin/java $out/bin/stegsolve \
--add-flags "-jar $JAR"
runHook postInstall
'';
meta = {
description = "Steganographic image analyzer, solver and data extractor for challanges";
homepage = "https://www.wechall.net/forum/show/thread/527/Stegsolve_1.3/";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = {
fullName = "Cronos License";
url = "http://www.caesum.com/legal.php";
free = false;
redistributable = true;
};
maintainers = with lib.maintainers; [ emilytrau ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
emilytrau
fee1-dead
];
platforms = lib.platforms.all;
mainProgram = "stegsolve";
};
+381 -345
View File
File diff suppressed because it is too large Load Diff
+22 -24
View File
@@ -1,24 +1,22 @@
diff --git i/build.rs w/build.rs
index 2174a43..cf93c2f 100644
--- i/build.rs
+++ w/build.rs
@@ -14,17 +14,8 @@ fn main() {
// Print the path to make it available during the build
println!("cargo:rustc-env=SUS_HOME={}", home_dir.to_str().unwrap());
- // note: add error checking yourself.
- let output = std::process::Command::new("git")
- .args(["rev-parse", "HEAD"])
- .output()
- .unwrap();
- let git_hash = String::from_utf8(output.stdout).unwrap();
- println!("cargo:rustc-env=GIT_HASH={}", git_hash);
- println!(
- "cargo:rustc-env=BUILD_DATE={}",
- chrono::Local::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, false)
- );
+ println!("cargo:rustc-env=GIT_HASH=@GIT_HASH@");
+ println!("cargo:rustc-env=BUILD_DATE=@GIT_DATE@");
}
fn get_sus_dir() -> PathBuf {
diff --git a/build.rs b/build.rs
index d7c26bb..ffaed27 100644
--- a/build.rs
+++ b/build.rs
@@ -22,16 +22,8 @@ fn main() -> Result<(), String> {
} else {
" without LSP Support"
};
- let git_hash = std::process::Command::new("git")
- .args(["rev-parse", "HEAD"])
- .output()
- .unwrap();
- let git_hash = String::from_utf8(git_hash.stdout).unwrap();
- let git_hash = git_hash.trim();
- let build_date = chrono::Local::now().format("%Y-%m-%d_%H:%M:%S");
-
println!(
- "cargo:rustc-env=EXTRA_VERSION_STRING= ({git_hash}) built at {build_date}{build_features}"
+ "cargo:rustc-env=EXTRA_VERSION_STRING= (@GIT_HASH@) committed at @GIT_DATE@{build_features}"
);
} else {
println!("cargo:rustc-env=EXTRA_VERSION_STRING=");
+6 -4
View File
@@ -9,17 +9,18 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sus-compiler";
version = "0.3.0-unstable-2025-08-28";
version = "0.3.7";
src = fetchFromGitHub {
owner = "pc2";
repo = "sus-compiler";
rev = "bc46d911a71d0248a88586c10057206ffadc82ca";
hash = "sha256-Wnj303B4G09qGOecZfFsicjNcfRkISfo9JDYJeFubVM=";
rev = "v${finalAttrs.version}";
hash = "sha256-O4aBVN7jbPm7iqMpxCRYWJ+89zcMCZTKyhRLBcQDKa8=";
fetchSubmodules = true;
leaveDotGit = true;
# Manual patch phase with replacement of Git details just before they're deleted.
# Also ensures reproducibility by removing build time.
postFetch = ''
cp ${./build.rs.patch} build.rs.patch
PATCH="$(realpath build.rs.patch)"
@@ -42,7 +43,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoLock.lockFile = ./Cargo.lock;
preBuild = ''
export HOME="$TMPDIR";
export INSTALL_SUS_HOME="$out/share/sus-compiler";
mkdir -p "$INSTALL_SUS_HOME"
'';
postPatch = ''
@@ -1,10 +1,10 @@
diff --git a/meson_options.txt b/meson_options.txt
index eec3659..f064a1b 100644
index 7220d2f..92fa778 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,10 @@ option('gtk-doc',
type : 'boolean',
value : 'true',
value : true,
description : 'Build developer documentation')
+option('installed_test_prefix',
+ type: 'string',
@@ -14,10 +14,10 @@ index eec3659..f064a1b 100644
type : 'feature',
value : 'auto',
diff --git a/src/meson.build b/src/meson.build
index a2352ac..c1f25ac 100644
index bf36c2d..2419ac2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -85,6 +85,7 @@ install_subdir('does-not-exist', install_dir: historydir, strip_directory : true
@@ -90,6 +90,7 @@ install_emptydir(historydir)
cdata = configuration_data()
cdata.set('libexecdir', get_option('prefix') / get_option('libexecdir'))
@@ -25,26 +25,26 @@ index a2352ac..c1f25ac 100644
cdata.set('historydir', historydir)
configure_file(
@@ -147,16 +148,16 @@ if os_backend == 'linux' and gobject_introspection.found()
'linux/integration-test.py',
'linux/output_checker.py',
],
- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower'
)
install_subdir('linux/tests/',
- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower'
)
@@ -154,16 +155,16 @@ if os_backend == 'linux' and gobject_introspection.found()
'linux/integration-test.py',
'linux/output_checker.py',
],
- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower'
)
install_subdir('linux/tests/',
- install_dir: get_option('prefix') / get_option('libexecdir') / 'upower'
+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower'
)
configure_file(
input: 'upower-integration.test.in',
output: 'upower-integration.test',
- install_dir: get_option('datadir') / 'installed-tests' / 'upower',
+ install_dir: get_option('installed_test_prefix') / 'share' / 'installed-tests' / 'upower',
configuration: cdata
)
endif
configure_file(
input: 'upower-integration.test.in',
output: 'upower-integration.test',
- install_dir: get_option('datadir') / 'installed-tests' / 'upower',
+ install_dir: get_option('installed_test_prefix') / 'libexec' / 'upower',
configuration: cdata
)
endif
diff --git a/src/upower-integration.test.in b/src/upower-integration.test.in
index 151ded0..b0a9bec 100644
--- a/src/upower-integration.test.in
+2 -2
View File
@@ -38,7 +38,7 @@ assert withDocs -> withIntrospection;
stdenv.mkDerivation (finalAttrs: {
pname = "upower";
version = "1.90.10";
version = "1.91.0";
outputs = [
"out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "upower";
repo = "upower";
rev = "v${finalAttrs.version}";
hash = "sha256-08lAt91RJ/sFIGlq1gfn4wUiwNxWyTO+pX41HKzQTG8=";
hash = "sha256-naKklfBtwBorfSLPLc/XYC4M22G6X5So4Q3SXZtT4pI=";
};
patches =
+3 -3
View File
@@ -6,7 +6,7 @@
nix-update-script,
}:
let
version = "2.17.0";
version = "2.17.1";
in
buildGoLatestModule {
pname = "wakapi";
@@ -16,10 +16,10 @@ buildGoLatestModule {
owner = "muety";
repo = "wakapi";
tag = version;
hash = "sha256-aQh1Jn718sk/Wvsjk9xFJ5NBSmsF6OOYtj22g6kwY8k=";
hash = "sha256-/7jYfLs9IcAWYVWISdDeXWV+PfHGFjkxcFkpqH2lxS8=";
};
vendorHash = "sha256-wlpTC050EYEjA5fteaGOGVKonMNOr7Ym2uoGUj0fw/M=";
vendorHash = "sha256-AA9gIIUsoJG4RnDZ1fAJu+iqeXXbRbprBVxuVvR1tzo=";
# Not a go module required by the project, contains development utilities
excludedPackages = [ "scripts" ];
+2 -2
View File
@@ -39,7 +39,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "wesnoth${suffix}";
version = if enableDevel then "1.19.19" else "1.18.6";
version = if enableDevel then "1.19.20" else "1.18.6";
src = fetchFromGitHub {
owner = "wesnoth";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
tag = finalAttrs.version;
hash =
if enableDevel then
"sha256-9MExXXRnkjEWzOW7TPtNmwExoW7s0/u8w34n7DIS0YU="
"sha256-G0MsCXZRwryGjl6h9KVtMBsQiljYVInPz6wxSQ0jSyw="
else
"sha256-y2ceN7rX8j+pNlaajw32ZxwFrUxqAuILADZvum03NhU=";
};
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "xcursor-viewer";
version = "0-unstable-2026-01-05";
version = "0-unstable-2026-01-23";
src = fetchFromGitHub {
owner = "drizt";
repo = "xcursor-viewer";
rev = "216ed3b6b4694f75fc424862874dc5e2b66fb685";
hash = "sha256-faQuxHrUAqqSODDKZrRlMnWRj0NeM8hSHSbec7KSo50=";
rev = "c7aad6c662eab1a0907489d44afbc84ea3aa8de6";
hash = "sha256-iHnWRcM6UYuhNykH4uiXFmVKnFUiyrLNKtjaAh6ilnw=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication rec {
pname = "ytdl-sub";
version = "2026.01.16.post1";
version = "2026.01.24.post1";
pyproject = true;
src = fetchFromGitHub {
owner = "jmbannon";
repo = "ytdl-sub";
tag = version;
hash = "sha256-G48veVi4aeDngpJeYiY5ri0Vv/tg2GzVIzrtoqlGjwc=";
hash = "sha256-MxnJVglteXALiEeNisZiK3pXoD/eyj1irenUKPywEnc=";
};
postPatch = ''
@@ -13,25 +13,25 @@
hypothesis,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "astropy-healpix";
version = "1.1.2";
version = "1.1.3";
pyproject = true;
src = fetchPypi {
inherit version;
pname = lib.replaceStrings [ "-" ] [ "_" ] pname;
hash = "sha256-A2cd8So27Ds1fCRNUVS2eGNi/12AdwZ1x7JIFRAQZuQ=";
inherit (finalAttrs) version;
pname = "astropy_healpix";
hash = "sha256-9SDYOr6CFdPo4aN7K9kRce42pvVfEQ1aLbhj112Bs7c=";
};
nativeBuildInputs = [
build-system = [
extension-helpers
numpy
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dependencies = [
numpy
astropy
];
@@ -52,7 +52,8 @@ buildPythonPackage rec {
meta = {
description = "BSD-licensed HEALPix for Astropy";
homepage = "https://github.com/astropy/astropy-healpix";
changelog = "https://github.com/astropy/astropy-healpix/blob/v${finalAttrs.version}/CHANGES.rst";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.smaret ];
};
}
})
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "dbt-semantic-interfaces";
version = "0.9.0";
version = "0.10.3";
pyproject = true;
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "dbt-semantic-interfaces";
tag = "v${version}";
hash = "sha256-I/bMpqTaAHs0XnYOYjFRgXv3qB06LItkaSxtRjk55js=";
hash = "sha256-uTlz41eIcEqMvD9d9jvn7g9sZs4uEKUdsmZ0fwWkIuY=";
};
pythonRelaxDeps = [ "importlib-metadata" ];
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202601231";
version = "0.1.202601241";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-85ogu9BYQqacBHR44BT7pQuv9DpUxk1Cl8/VBDF/lqg=";
hash = "sha256-LItzSttudJs1VmcXabxD38omsuK8+RsFMDYCPmm/+Ok=";
};
__darwinAllowLocalNetworking = true;
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "insteon-frontend-home-assistant";
version = "0.6.0";
version = "0.6.1";
pyproject = true;
src = fetchPypi {
pname = "insteon_frontend_home_assistant";
inherit version;
hash = "sha256-oBTk7gblJA6/w0wSx+efdEmY5ioJiRMUfDqjyg0LkFg=";
hash = "sha256-r6xXEZFAGgXByl+urpXfzhuCedBPjqkwT8Q0sEHQA2w=";
};
nativeBuildInputs = [ setuptools ];
@@ -9,7 +9,7 @@
}:
let
version = "1.33.0";
version = "1.34.0";
in
buildPythonPackage {
pname = "modelscope";
@@ -20,7 +20,7 @@ buildPythonPackage {
owner = "modelscope";
repo = "modelscope";
tag = "v${version}";
hash = "sha256-CEaeO6oD1enGKT87anc3qSynDaN8pTC4utNoMBTvL84=";
hash = "sha256-Uq8qmU8ZmNRegaWHn1hlDDpRjWjgfecBvJklmhW36eM=";
};
build-system = [ setuptools ];
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "music-assistant-client";
version = "1.3.2";
version = "1.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "music-assistant";
repo = "client";
tag = version;
hash = "sha256-7u7P3uYFxx1UFzPIOgo0fCEEJrEEdBbBE7INhinkgLQ=";
hash = "sha256-f5+25MWuovG/g3PscWt0jls/5Y/Qdt2kq9Ai7/9P4aI=";
};
postPatch = ''
@@ -22,14 +22,14 @@ buildPythonPackage rec {
pname = "music-assistant-models";
# Must be compatible with music-assistant-client package
# nixpkgs-update: no auto update
version = "1.1.70";
version = "1.1.89";
pyproject = true;
src = fetchFromGitHub {
owner = "music-assistant";
repo = "models";
tag = version;
hash = "sha256-yJ0MaXbzhvbqdMA1M2l7QC+0ExAHuTU1N4XIkJOj6pg=";
hash = "sha256-/eNCgAB5G8g1r2fcW27lySEqg+q/1bJvwwyntigGWjo=";
};
postPatch = ''
@@ -15,14 +15,14 @@
buildPythonPackage (finalAttrs: {
pname = "opower";
version = "0.16.4";
version = "0.16.5";
pyproject = true;
src = fetchFromGitHub {
owner = "tronikos";
repo = "opower";
tag = "v${finalAttrs.version}";
hash = "sha256-r1evfPKvuMXlOvpwqqOSyC80TpZWphYhDVQCi9IiI+8=";
hash = "sha256-MeHM6ro6SNz9w4PTCJhc3zZAIkXKujthEJaq9A5zbI8=";
};
build-system = [ setuptools ];
@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "proton-vpn-api-core";
version = "4.14.1";
version = "4.14.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = "python-proton-vpn-api-core";
rev = "v${version}";
hash = "sha256-xyCjzcSasLGm2DMMViI1wpzcLd0mmaBvIyI1HrtW+Gg=";
hash = "sha256-yWiUiR0us+ISa9cdjfN4IzlbiZEzUlndNFy/BpfHYqk=";
};
postPatch = ''
@@ -1,31 +1,31 @@
{
lib,
fetchFromGitHub,
buildPythonPackage,
isPy3k,
zope-interface,
twisted,
fetchFromGitHub,
greenlet,
setuptools,
twisted,
zope-interface,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "python3-eventlib";
version = "0.3.0";
format = "setuptools";
disabled = !isPy3k;
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "AGProjects";
repo = "python3-eventlib";
rev = version;
hash = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ=";
tag = finalAttrs.version;
hash = "sha256-jN9nn+rI4TJLrEiEIoVxQ3XnXWSws1FenGUfG3doc94=";
};
propagatedBuildInputs = [
zope-interface
twisted
build-system = [ setuptools ];
dependencies = [
greenlet
twisted
zope-interface
];
pythonImportsCheck = [ "eventlib" ];
@@ -33,13 +33,13 @@ buildPythonPackage rec {
meta = {
description = "Networking library written in Python";
homepage = "https://github.com/AGProjects/python3-eventlib";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ chanley ];
longDescription = ''
Eventlib is a networking library written in Python. It achieves high
scalability by using non-blocking I/O while at the same time retaining
high programmer usability by using coroutines to make the non-blocking io
operations appear blocking at the source code level.
'';
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ chanley ];
};
}
})
@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "trimesh";
version = "4.11.0";
version = "4.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "mikedh";
repo = "trimesh";
tag = version;
hash = "sha256-jp+ac2tqNrL9uxdfzyrm5F2+0zvxfDvMEYCq0yQSZqE=";
hash = "sha256-N9loKQ+xcUtug98K2nsCs5kXUnLLtxCqNH8L8wStb74=";
};
build-system = [ setuptools ];
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "volkswagencarnet";
version = "5.4.1";
version = "5.4.5";
pyproject = true;
src = fetchFromGitHub {
@@ -19,19 +19,19 @@
buildPythonPackage rec {
pname = "whenever";
version = "0.9.4";
version = "0.9.5";
pyproject = true;
src = fetchFromGitHub {
owner = "ariebovenberg";
repo = "whenever";
tag = version;
hash = "sha256-b4xxh2Pva5+Qwv5DyifJohEY73wOO/eFc1dJeQSN3QY=";
hash = "sha256-HGASKQHQWXPzMcTHylRG94ZdL2gwLyHyfoTywllMTdA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
hash = "sha256-2VXS6SQjYx61D8b42TjS5OJxcg4+e+T6dEsZfRA/gRk=";
hash = "sha256-i5hbXk+CFrsnIhT3DjnWbP2GaIqJxll8fbxCFz/21M8=";
};
build-system = [
@@ -19,16 +19,16 @@
pytest-cov-stub,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "yourdfpy";
version = "0.0.59";
version = "0.0.60";
pyproject = true;
src = fetchFromGitHub {
owner = "clemense";
repo = "yourdfpy";
tag = "v${version}";
hash = "sha256-9GSDD/RjLGlmuncyH97TqKZrPU8WpmbSKGT7sDKy9FA=";
tag = "v${finalAttrs.version}";
hash = "sha256-tXFrwtxjLvHNxT/MhrAiV2CGcbKj1JRi/Yo8Qt6UBfk=";
};
build-system = [
@@ -55,9 +55,9 @@ buildPythonPackage rec {
meta = {
description = "Python parser for URDFs";
homepage = "https://github.com/clemense/yourdfpy/";
changelog = "https://github.com/clemense/yourdfpy/blob/${src.tag}/CHANGELOG.md";
changelog = "https://github.com/clemense/yourdfpy/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nim65s ];
mainProgram = "yourdfpy";
};
}
})
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2026.1.2";
version = "2026.1.3";
components = {
"3_day_blinds" =
ps: with ps; [
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "jwillemsen";
domain = "daikin_onecta";
version = "4.4.4";
version = "4.4.5";
src = fetchFromGitHub {
owner = "jwillemsen";
repo = "daikin_onecta";
tag = "v${version}";
hash = "sha256-8a5P+eoa3iEER4b2SlsYi+feyPnc4n4RYzl6Lg+nqmQ=";
hash = "sha256-NO0ZRNSKE3fSSTpw9cwyD8jmKVV986bEKh27d4iiJpk=";
};
meta = {
@@ -7,16 +7,16 @@
pydantic,
}:
buildHomeAssistantComponent {
buildHomeAssistantComponent rec {
owner = "NewsGuyTor";
domain = "fellow";
version = "0-unstable-2026-01-11";
version = "1.2.1";
src = fetchFromGitHub {
owner = "NewsGuyTor";
repo = "FellowAiden-HomeAssistant";
rev = "3a999d0e761fa1e791339753d3ccc9938adf27f6";
hash = "sha256-2sR8LQsV+qXrmuhr2uKuzBhM6G9IySJVA/UjRr4crDQ=";
tag = "v${version}";
hash = "sha256-cGyGobR0lMNReWCxK7RzeqsnYJZQNRPjYqirLHjeCFI=";
};
passthru.updateScript = unstableGitUpdater { };
@@ -27,6 +27,7 @@ buildHomeAssistantComponent {
];
meta = {
changelog = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant/releases/tag/${src.tag}";
description = "Home Assistant integration for Fellow Aiden coffee brewer";
homepage = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant";
license = lib.licenses.gpl3Only;
@@ -19,13 +19,13 @@
buildHomeAssistantComponent rec {
owner = "signalkraft";
domain = "mypyllant";
version = "0.9.10";
version = "0.9.11";
src = fetchFromGitHub {
owner = "signalkraft";
repo = "mypyllant-component";
tag = "v${version}";
hash = "sha256-4IfLd+NEaWyxgdnAz7YGM/6i0usoqwgKlBJFzDOlJ4A=";
hash = "sha256-wkUz5pPO50yfWbZBa+Z+9WKIZKCJhJVn8/HlzZwSZVY=";
};
dependencies = [
@@ -17,13 +17,13 @@
buildHomeAssistantComponent rec {
owner = "bramstroker";
domain = "powercalc";
version = "1.20.2";
version = "1.20.3";
src = fetchFromGitHub {
inherit owner;
repo = "homeassistant-powercalc";
tag = "v${version}";
hash = "sha256-NzWivgvDUv41fSA/6g4mYIuoUCobVUdf3bbfmKl0kWg=";
hash = "sha256-z66VHJ/ZzQKvx4l00XGKvTBt9o4T+hv64oCGZNDRUng=";
};
dependencies = [ numpy ];
@@ -10,13 +10,13 @@
buildHomeAssistantComponent rec {
owner = "jmcollin78";
domain = "versatile_thermostat";
version = "8.6.0";
version = "8.6.1";
src = fetchFromGitHub {
inherit owner;
repo = domain;
tag = version;
hash = "sha256-rzNznV2YfBUxgYdc+qZeDIBVeMfwPwvDyYVON980SCg=";
hash = "sha256-yQMTuNinRVHIsaS8Q7aqGozN1sTbkLGvXFhEw47jUkA=";
};
dependencies = [
@@ -10,13 +10,13 @@
buildHomeAssistantComponent rec {
owner = "robinostlund";
domain = "volkswagencarnet";
version = "5.4.1";
version = "5.4.5";
src = fetchFromGitHub {
owner = "robinostlund";
repo = "homeassistant-volkswagencarnet";
tag = "v${version}";
hash = "sha256-nlidbT5dILw4rin4uUDQ8OSqUijpQuoePk20UIl5Uvo=";
hash = "sha256-Ye++ialp9ryC6J+ZXrRqLkuLct6sbk3+NknZo4sx4hc=";
};
postPatch = ''
@@ -11,13 +11,13 @@
buildHomeAssistantComponent rec {
owner = "al-one";
domain = "xiaomi_miot";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "al-one";
repo = "hass-xiaomi-miot";
rev = "v${version}";
hash = "sha256-0B+rG2h2OMb363t0529/XjqZ9ORaT7XXk4qVyEAfNx8=";
hash = "sha256-S1rkrNf1rV9TDjcAfFxFj/IlHMngjp4qysx+8pN0TdI=";
};
dependencies = [
+3 -3
View File
@@ -293,7 +293,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2026.1.2";
hassVersion = "2026.1.3";
in
python.pkgs.buildPythonApplication rec {
@@ -314,13 +314,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
tag = version;
hash = "sha256-+H+ujcJ7uYLNFfm05V7FBdogGGUSkC1b6PaWJ5Zu24k=";
hash = "sha256-zmS5OZaUFe45rbCil7sbVlhy0wwA+F9tBO10KvBM2PY=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-uWcSCmarOtfYIVYPz8wAgO8tx15MJcEP1Wv3h8YT0xI=";
hash = "sha256-gs5YyR1MofSMV8TDeBGp9keIREcszZGcLvtnHOYR7uc=";
};
build-system = with python.pkgs; [
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
version = "0.13.307";
version = "0.13.308";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
tag = version;
hash = "sha256-E3kZEwyEmUxeRzwXQgI769mikyL1FkazmZXQFaknvlA=";
hash = "sha256-ErRtbRwlke4UMJuXgfvEz6rM5VY583a7Jn+sU0nLnNo=";
};
build-system = [ setuptools ];
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2026.1.2";
version = "2026.1.3";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
tag = version;
hash = "sha256-f1decOoOyavabUC2KnScB+bnuernkyKMnKwnilViuRQ=";
hash = "sha256-BfowhNb9A6zyCSsSJevjEal6PXkIwmnhm4a2tNt0Qg4=";
};
build-system = [
+1
View File
@@ -415,6 +415,7 @@ mapAliases {
cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12
cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12
certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27
cgit-pink = throw "cgit-pink has been removed, as it is unmaintained upstream"; # Added 2026-01-21
challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27
charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18
charybdis = throw "charybdis was removed since its upstream repo was archived in 2021"; # Added 2026-01-13
-2
View File
@@ -1154,8 +1154,6 @@ with pkgs;
cgit = callPackage ../applications/version-management/cgit { };
cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { };
datalad = with python3Packages; toPythonApplication datalad;
datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;