From e52c2a6869829a8b2c3feaca2bbffefcfaf63564 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Mon, 3 Mar 2025 08:25:28 +0100
Subject: [PATCH 1/2] gitlab: update ruby and downgrade nodejs to meet
 upstreams recommendations

---
 pkgs/applications/version-management/gitlab/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index a784b9e22780..e74b60d0e0df 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,9 +11,9 @@
   makeWrapper,
   nettools,
   nixosTests,
-  nodejs,
+  nodejs_20,
   replace,
-  ruby_3_2,
+  ruby_3_3,
   stdenv,
   tzdata,
   yarn,
@@ -53,7 +53,7 @@ let
 
   rubyEnv = bundlerEnv rec {
     name = "gitlab-env-${version}";
-    ruby = ruby_3_2;
+    ruby = ruby_3_3;
     gemdir = ./rubyEnv;
     gemset = import (gemdir + "/gemset.nix") src;
     gemConfig = defaultGemConfig // {
@@ -150,7 +150,7 @@ let
     nativeBuildInputs = [
       rubyEnv.wrappedRuby
       rubyEnv.bundler
-      nodejs
+      nodejs_20
       yarn
       git
       cacert

From 8ba830c8bc1863006834c43c6c0af877d73078ae Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Mon, 3 Mar 2025 13:28:23 +0100
Subject: [PATCH 2/2] gitlab: fix merge requests pages by running script of
 vue-demi

https://gitlab.com/gitlab-org/gitlab/-/issues/522960
---
 pkgs/applications/version-management/gitlab/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index e74b60d0e0df..fc0c34474d4f 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -200,6 +200,12 @@ let
       patchShebangs node_modules/
       patchShebangs scripts/frontend/
 
+      # TODO: Try to remove --ignore-scripts
+      # Needed for the js dependency pinia to work
+      pushd node_modules/vue-demi
+      yarn run postinstall
+      popd
+
       runHook postConfigure
     '';