From 1e1e0a1487329a3ba9897c2d52dcfc8239282d8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Feb 2026 22:59:37 +0100 Subject: [PATCH] solanum: 0-unstable-2026-01-27 -> 0-unstable-2026-02-03 --- pkgs/by-name/so/solanum/dont-create-logdir.patch | 6 ++++-- pkgs/by-name/so/solanum/package.nix | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/so/solanum/dont-create-logdir.patch b/pkgs/by-name/so/solanum/dont-create-logdir.patch index e348dd7b85ba..a9d11fe4c610 100644 --- a/pkgs/by-name/so/solanum/dont-create-logdir.patch +++ b/pkgs/by-name/so/solanum/dont-create-logdir.patch @@ -1,13 +1,15 @@ diff --git a/Makefile.am b/Makefile.am -index 19e7b396..21093521 100644 +index 99444f6c..1804c50a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -35,9 +35,6 @@ include/serno.h: +@@ -34,11 +34,6 @@ include/serno.h: echo '#define DATECODE 0UL' >>include/serno.h; \ fi -install-data-hook: - test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir} +- @# needed for FHS paths: +- test -d ${DESTDIR}${pkglocalstatedir} || mkdir -p ${DESTDIR}${pkglocalstatedir} - install-exec-hook: rm -f ${DESTDIR}${libdir}/*.la diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index 3c9a551458e9..d251b455cec3 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2026-01-27"; + version = "0-unstable-2026-02-03"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "852bef71f56d206aa224231589849c4c9be81867"; - hash = "sha256-hPlWOHplf6mOMmSX5DWY8kw6YNskTE6YYVqEmGsrnxs="; + rev = "9778247c3dca59370b21c4f34f328c52e8b8c669"; + hash = "sha256-qeAO4AcrPPUW+5TA20GcLSzTKGC51IrK53K9qtBxnH4="; }; patches = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation { ]; postPatch = '' - substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' + substituteInPlace include/defaults.h --replace-fail 'ETCPATH "' '"/etc/solanum' ''; preConfigure = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation { "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=solanum-" - "--localstatedir=/var/lib" + "--localstatedir=/var" "--with-rundir=/run" "--with-logdir=/var/log" ]