summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2018-09-25 02:11:36 +0200
committerRobin Gloster <mail@glob.in>2018-09-25 03:53:32 +0200
commitcbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb (patch)
tree3407096b339e33a61ab4b2c4f2481c7aefeef210
parent545c07108f7e580c2789f7ac2591014396cd3159 (diff)
downloadnixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar.gz
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar.bz2
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar.lz
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar.xz
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.tar.zst
nixpkgs-cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb.zip
gitaly: 0.117.2 -> 0.120.0
-rw-r--r--pkgs/applications/version-management/gitaly/Gemfile2
-rw-r--r--pkgs/applications/version-management/gitaly/Gemfile.lock10
-rw-r--r--pkgs/applications/version-management/gitaly/default.nix6
-rw-r--r--pkgs/applications/version-management/gitaly/gemset.nix12
4 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index ad3a4c17137..2b752992fec 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rugged', '~> 0.27.4'
 gem 'github-linguist', '~> 6.1', require: 'linguist'
 gem 'gitlab-markup', '~> 1.6.4'
-gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 0a521ab22dc..d76ba86c398 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.107.0)
+    gitaly-proto (0.116.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (6.2.0)
@@ -75,9 +75,9 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.16.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.9.1)
     multi_json (1.13.1)
@@ -147,7 +147,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 5.0.2)
   faraday (~> 0.12)
-  gitaly-proto (~> 0.107.0)
+  gitaly-proto (~> 0.116.0)
   github-linguist (~> 6.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
@@ -162,4 +162,4 @@ DEPENDENCIES
   sentry-raven (~> 2.7.2)
 
 BUNDLED WITH
-   1.16.3
+   1.16.4
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 499f07472cf..b7eee8926aa 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.117.2";
+  version = "0.120.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1hwgixymfqr6fkywwbkvdcwg1q62pypx9ffvzbcl46n4x32spm9i";
+    sha256 = "0jsk6n1vmddpnnccr8mjvcsfjzaagqy1600q5yss6lbz896w2bx4";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -22,7 +22,7 @@ in buildGoPackage rec {
   passthru = {
     inherit rubyEnv;
   };
-  
+
   buildInputs = [ rubyEnv.wrappedRuby ];
 
   postInstall = ''
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 6245b792502..0717555b382 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -87,10 +87,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01g40gcv7a7w7z27pa65f229k04k1dgxf8rki4g38y6azaj88yib";
+      sha256 = "15946776v5v8c2jisknjm82s4q3b3q9x2xygjf4bkk4m45n766w1";
       type = "gem";
     };
-    version = "0.107.0";
+    version = "0.116.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -259,18 +259,18 @@
     dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
       type = "gem";
     };
-    version = "3.1";
+    version = "3.2.2";
   };
   mime-types-data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
       type = "gem";
     };
-    version = "3.2016.0521";
+    version = "3.2018.0812";
   };
   mini_portile2 = {
     source = {