diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/applications/version-management/gitlab/gitaly | |
parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
download | nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixpkgs-362d88c2b19e3857576b2571722dc66c381c185a.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitaly')
-rw-r--r-- | pkgs/applications/version-management/gitlab/gitaly/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7c84acc8f05..298897d6701 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, - bundlerEnv, pkgconfig, libgit2 }: + bundlerEnv, pkgconfig, libgit2_0_27 }: let rubyEnv = bundlerEnv rec { @@ -18,15 +18,6 @@ let }; }; }; - libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { - version = "0.27.8"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; - }; - }); in buildGoPackage rec { version = "12.8.10"; pname = "gitaly"; |