summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-04-30 23:15:15 +0200
committertalyz <kim.lindberger@gmail.com>2020-05-01 13:27:14 +0200
commit24d07de7dfc25ea7f748868438fe6dce58695a7d (patch)
tree3e0e6c2a3963780c28f9bd21da3e79fa87222f1c
parentMerge pull request #86297 from primeos/chromium-backport (diff)
downloadnixpkgs-24d07de7dfc25ea7f748868438fe6dce58695a7d.tar.gz
gitaly: 12.8.9 -> 12.8.10
(cherry picked from commit 9eb6dc762f67d09e4598ee2e35070821590e68dc)
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock4
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/gemset.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index e3f7865226a2..0c125f5a0bf9 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -114,7 +114,7 @@ GEM
minitest (5.14.0)
msgpack (1.3.1)
multipart-post (2.0.0)
- nokogiri (1.10.7)
+ nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
@@ -242,4 +242,4 @@ DEPENDENCIES
webmock (~> 3.4.0)
BUNDLED WITH
- 1.17.3
+ 2.1.4
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index cc271714bac0..4a426ae6b7aa 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
- version = "12.8.9";
+ version = "12.8.10";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh";
+ sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs";
};
# Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index d91c84b1fa29..7719a90abb5d 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -515,10 +515,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
+ sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
type = "gem";
};
- version = "1.10.7";
+ version = "1.10.9";
};
nokogumbo = {
dependencies = ["nokogiri"];