public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 13.10.2 -> 13.11.2 (#120947)

Browse Source
This commit is contained in:
Milan
2021-04-28 15:16:06 +02:00
committed by GitHub
parent 51729ed349
commit 5e2bfae1b8
12 changed files with 472 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/gitlab/default.nix
View File

@@ -32,7 +32,7 @@ let
openssl = x.openssl // {
buildInputs = [ openssl ];
};
ruby-magic-static = x.ruby-magic-static // {
ruby-magic = x.ruby-magic // {
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
@@ -131,8 +131,8 @@ stdenv.mkDerivation {
# 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";
url = "https://gitlab.com/gitlab-org/gitlab/-/commit/a5c78650441c31a522b18e30177c717ffdd7f401.patch";
sha256 = "1qcxr5f59slgzmpcbiwabdhpz1lxnq98yngg1xkyihk2zhv0g1my";
})
];