From 3315ef205dfa8a173e90227bebcc89b7e47ba8de Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 8 Dec 2025 14:41:12 +0100 Subject: [PATCH 1/4] akkoma: 3.15.2 -> 3.17.0 --- pkgs/by-name/ak/akkoma/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ak/akkoma/package.nix b/pkgs/by-name/ak/akkoma/package.nix index 24b91973a4ed..02f4e56fcd2c 100644 --- a/pkgs/by-name/ak/akkoma/package.nix +++ b/pkgs/by-name/ak/akkoma/package.nix @@ -10,14 +10,17 @@ beamPackages.mixRelease rec { pname = "akkoma"; - version = "3.15.2"; + version = "3.17.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; tag = "v${version}"; - hash = "sha256-GW86OyO/XPIrCS+cPKQ8LG8PdhhfA2rNH1FXFiuL6vM="; + hash = "sha256-RXKqeaS+cvOGQNMU/g2lbAk/V1JbkU2XXqITqv1U/wU="; + + # upstream repository archive fetching is broken + forceFetchGit = true; }; nativeBuildInputs = [ cmake ]; @@ -36,7 +39,7 @@ beamPackages.mixRelease rec { mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-ygRj0s9J2/nBXR5s9CE7eMRBxsRhKlV/IZrkwPpco14="; + hash = "sha256-DqSeMjom9UjgGjjfJomWCr7jQhXEkqVrDCvW3+pDtcQ="; postInstall = '' substituteInPlace "$out/http_signatures/mix.exs" \ From 8aeafd4e793b2275fa9aad08baa279afa22a1c8e Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 8 Dec 2025 14:42:02 +0100 Subject: [PATCH 2/4] akkoma-fe: 3.15.0 -> 3.12.0 Despite the lower version number, 3.12.0 is more recent than 3.15.0. --- pkgs/by-name/ak/akkoma-fe/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ak/akkoma-fe/package.nix b/pkgs/by-name/ak/akkoma-fe/package.nix index ce282974eac4..ef526ffe4a51 100644 --- a/pkgs/by-name/ak/akkoma-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-fe/package.nix @@ -15,14 +15,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "akkoma-fe"; - version = "3.15.0"; + version = "3.12.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma-fe"; tag = "v${finalAttrs.version}"; - hash = "sha256-VKYeJwAc4pMpF1dWBnx5D39ffNk7eGpJI2es+GAxdow="; + hash = "sha256-DK+KLAcT/10qhwmB+GoHN/7nOKJEJ32zSao8/fjgW7E="; + + # upstream repository archive fetching is broken + forceFetchGit = true; }; offlineCache = fetchYarnDeps { From 1f04d8a258ce534350bee9b3a2e888dc9f331e46 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 9 Dec 2025 14:41:51 +0100 Subject: [PATCH 3/4] akkoma-fe: build using yarn{Config,Build}Hook --- pkgs/by-name/ak/akkoma-fe/package.nix | 31 +++++---------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ak/akkoma-fe/package.nix b/pkgs/by-name/ak/akkoma-fe/package.nix index ef526ffe4a51..6fae60b35fb9 100644 --- a/pkgs/by-name/ak/akkoma-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-fe/package.nix @@ -4,8 +4,8 @@ fetchFromGitea, fetchYarnDeps, writableTmpDirAsHomeHook, - fixup-yarn-lock, - yarn, + yarnConfigHook, + yarnBuildHook, nodejs, jpegoptim, oxipng, @@ -28,15 +28,15 @@ stdenv.mkDerivation (finalAttrs: { forceFetchGit = true; }; - offlineCache = fetchYarnDeps { + yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-QB523QZX8oBMHWBSFF7MpaWWXc+MgEUaw/2gsCPZ9a4="; }; nativeBuildInputs = [ writableTmpDirAsHomeHook - fixup-yarn-lock - yarn + yarnConfigHook + yarnBuildHook nodejs jpegoptim oxipng @@ -51,27 +51,6 @@ stdenv.mkDerivation (finalAttrs: { build/webpack.prod.conf.js ''; - configurePhase = '' - runHook preConfigure - - yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache} - fixup-yarn-lock yarn.lock - - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - export NODE_ENV="production" - export NODE_OPTIONS="--openssl-legacy-provider" - yarn run build --offline - - runHook postBuild - ''; - installPhase = '' runHook preInstall From b2942857a3400a6d4da4ae13b6aae56cb3744756 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 12 Dec 2025 17:59:14 +0100 Subject: [PATCH 4/4] akkoma-admin-fe: 2.3.0-2-unstable-2024-04-27 -> 2.3.0-2-unstable-2025-12-07 --- pkgs/by-name/ak/akkoma-admin-fe/package.nix | 56 ++++++--------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix index e6cc16e74125..e60d6588b254 100644 --- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix @@ -2,77 +2,51 @@ lib, stdenv, fetchFromGitea, - fetchYarnDeps, - writableTmpDirAsHomeHook, - fixup-yarn-lock, - yarn, + yarn-berry_3, nodejs, - git, python3, pkg-config, libsass, - nix-update-script, xcbuild, + nix-update-script, }: +let + yarn-berry = yarn-berry_3; +in stdenv.mkDerivation (finalAttrs: { pname = "admin-fe"; - version = "2.3.0-2-unstable-2024-04-27"; + version = "2.3.0-2-unstable-2025-12-07"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "7e16abcbaab10efa6c2c4589660cf99f820a718d"; - hash = "sha256-W/2Ay2dNeVQk88lgkyTzKwCNw0kLkfI6+Azlbp0oMm4="; + rev = "a0e3b95a75367d1b5e329963a3d54f67cf59dfca"; + hash = "sha256-eEAM1itUvpR57B0BseeeRuV+ZjcYiJvbdln8vleRNcc="; + + # upstream repository archive fetching is broken + forceFetchGit = true; }; - offlineCache = fetchYarnDeps { + offlineCache = yarn-berry.fetchYarnBerryDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-acF+YuWXlMZMipD5+XJS+K9vVFRz3wB2fZqc3Hd0Bjc="; + hash = "sha256-YZlvIr27bHBgsQcBiayqEX07kjX6iH2Kh5wt+PQFq04="; }; nativeBuildInputs = [ - fixup-yarn-lock - writableTmpDirAsHomeHook - yarn + yarn-berry.yarnBerryConfigHook + yarn-berry nodejs pkg-config python3 - git libsass ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - configurePhase = '' - runHook preConfigure - - yarn config --offline set yarn-offline-mirror ${lib.escapeShellArg finalAttrs.offlineCache} - fixup-yarn-lock yarn.lock - substituteInPlace yarn.lock \ - --replace-fail '"git://github.com/adobe-webplatform/eve.git#eef80ed"' '"https://github.com/adobe-webplatform/eve.git#eef80ed"' - - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/cross-env - - mkdir -p "$HOME/.node-gyp/${nodejs.version}" - echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion" - ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" - export npm_config_nodedir=${nodejs} - - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - - pushd node_modules/node-sass - LIBSASS_EXT=auto yarn run build --offline - popd - - export NODE_OPTIONS="--openssl-legacy-provider" yarn run build:prod --offline - runHook postBuild '';