akkoma: 3.15.2 → 3.17.0 (#469295)

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
   '';
 

pkgs/by-name/ak/akkoma-fe/package.nix

@@ -4,8 +4,8 @@
   fetchFromGitea,
   fetchYarnDeps,
   writableTmpDirAsHomeHook,
-  fixup-yarn-lock,
-  yarn,
+  yarnConfigHook,
+  yarnBuildHook,
   nodejs,
   jpegoptim,
   oxipng,
@@ -15,25 +15,28 @@
 
 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 {
+  yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
     hash = "sha256-QB523QZX8oBMHWBSFF7MpaWWXc+MgEUaw/2gsCPZ9a4=";
   };
 
   nativeBuildInputs = [
     writableTmpDirAsHomeHook
-    fixup-yarn-lock
-    yarn
+    yarnConfigHook
+    yarnBuildHook
     nodejs
     jpegoptim
     oxipng
@@ -48,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
 

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" \