gitlab: 13.9.4 -> 13.10.2

2021-04-07 23:23:24 +02:00
parent ead4b3caab
commit 9b30cda2f6
13 changed files with 1262 additions and 1187 deletions
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
 , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
 , gitlabEnterprise ? false, callPackage, yarn
-, fixup_yarn_lock, replace
+, fixup_yarn_lock, replace, file
 }:

 let
@@ -32,6 +32,10 @@ let
        openssl = x.openssl // {
          buildInputs = [ openssl ];
        };
+        ruby-magic-static = x.ruby-magic-static // {
+          buildInputs = [ file ];
+          buildFlags = [ "--enable-system-libraries" ];
+        };
      };
    groups = [
      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"