diff options
| author | Kim Lindberger <kim.lindberger@gmail.com> | 2021-04-27 19:25:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 19:25:43 +0200 |
| commit | e50164a7ce00019cba2b07b5ec0fc85f22ec72c0 (patch) | |
| tree | 36793be39379095d68018b4e4ec1688a28d6a53d /pkgs | |
| parent | 8e1f3bcfa5228e6b24eaf300ccb57da9b4b55a48 (diff) | |
| parent | 1215bd4ea9364dd9cb52d7b454bdbaa4c074b034 (diff) | |
| download | nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar.gz nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar.bz2 nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar.lz nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar.xz nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.tar.zst nixpkgs-e50164a7ce00019cba2b07b5ec0fc85f22ec72c0.zip | |
Merge pull request #113201 from talyz/gitlab-db-key-base-patch
gitlab: Add patch for db_key_base length bug, fix descriptions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 5d2b923628b..89a2ac6ec95 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file @@ -125,6 +125,15 @@ 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/dea620633d446ca0f53a75674454ff0dd4bd8f99.patch"; + sha256 = "19m4z4np3sai9kqqqgabl44xv7p8lkcyqr6s5471axfxmf9m2023"; + }) ]; postPatch = '' |