From 7de9db868dc58ee090c053d170a3804956b2c101 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 May 2026 23:56:15 +0200 Subject: [PATCH 1/2] libmowgli: fast-forward to latest commit Atheme/libmowgli are not doing release any more. --- pkgs/by-name/li/libmowgli/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libmowgli/package.nix b/pkgs/by-name/li/libmowgli/package.nix index 75a4bf2476d2..91904bdfd343 100644 --- a/pkgs/by-name/li/libmowgli/package.nix +++ b/pkgs/by-name/li/libmowgli/package.nix @@ -2,17 +2,22 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "libmowgli"; - version = "2.1.3"; + version = "2.1.3-unstable-2024-04-01"; src = fetchFromGitHub { owner = "atheme"; repo = "libmowgli-2"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-jlw6ixMoIdIjmQ86N+KN+Gez218sw894POkcCYnT0s0="; + rev = "878f7e931b55d36e2e1b27807f7a620cbb0577d8"; + hash = "sha256-Ik0GDsC0vEFNW/s10u+kNubqVh95ZqXb2I5W9iyU1z4="; + }; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; }; meta = { From ecd7613dcdb7ea21174d39f5e52c3d0ec55e8290 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 00:05:43 +0200 Subject: [PATCH 2/2] atheme: 7.2.12 -> 7.2.12-unstable-2026-05-12 Comes with pcre2 and y2k38 support. --- pkgs/by-name/at/atheme/package.nix | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/at/atheme/package.nix b/pkgs/by-name/at/atheme/package.nix index 9008c59ff772..d465ca95425e 100644 --- a/pkgs/by-name/at/atheme/package.nix +++ b/pkgs/by-name/at/atheme/package.nix @@ -1,26 +1,31 @@ { lib, stdenv, - fetchgit, + fetchFromGitHub, libmowgli, pkg-config, git, gettext, - pcre, + pcre2, libidn, libxcrypt, cracklib, openssl, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "atheme"; - version = "7.2.12"; + version = "7.2.12-unstable-2026-05-12"; - src = fetchgit { - url = "https://github.com/atheme/atheme.git"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; + src = fetchFromGitHub { + owner = "atheme"; + repo = "atheme"; + rev = "23071cdf2c7b20210799218b485f97f06311b41f"; + hash = "sha256-e7pD4ZXQ3irrpJJSDRuJu2pVMjxVe8AUzzVL5yCb9PA="; + # for modules and pinned libmowgli + fetchSubmodules = true; + # configure checks for git tree leaveDotGit = true; }; @@ -29,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: { git gettext ]; + buildInputs = [ libmowgli - pcre + pcre2 libidn libxcrypt cracklib @@ -47,6 +53,14 @@ stdenv.mkDerivation (finalAttrs: { "--enable-reproducible-builds" ]; + enableParallelBuilding = true; + + doCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { description = "Set of services for IRC networks"; homepage = "https://atheme.github.io/";