gitlab: 13.11.2 -> 13.12.0

(cherry picked from commit 1ded8ef44ef83de6cfafd1b19ed6c6c09e734ad4)
2021-05-25 23:00:11 +02:00
parent 8418b1397c
commit a555872f04
9 changed files with 910 additions and 868 deletions
@@ -125,15 +125,6 @@ stdenv.mkDerivation {
  patches = [
    # Change hardcoded paths to the NixOS equivalent
    ./remove-hardcoded-locations.patch
-
-    # Use the exactly 32 byte long version of db_key_base with
-    # aes-256-gcm, see
-    # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
-    (fetchpatch {
-      name = "secrets_db_key_base_length.patch";
-      url = "https://gitlab.com/gitlab-org/gitlab/-/commit/a5c78650441c31a522b18e30177c717ffdd7f401.patch";
-      sha256 = "1qcxr5f59slgzmpcbiwabdhpz1lxnq98yngg1xkyihk2zhv0g1my";
-    })
  ];

  postPatch = ''