From 445bc1494c31ff5803eb5cf58bcf7c620d985653 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 23 Dec 2019 00:09:58 +0100 Subject: [PATCH] gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83 For some reason this untagged commit is the one referred to in the main repository; this might be a mistake, but we'll have to package it for now to follow upstream. --- .../gitlab/gitaly/Gemfile.lock | 6 +- .../gitlab/gitaly/default.nix | 10 +++- .../version-management/gitlab/gitaly/deps.nix | 59 ++++++++++++++----- .../gitlab/gitaly/fix-executable-check.patch | 13 ++++ .../gitlab/gitaly/gemset.nix | 12 ++-- 5 files changed, 72 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 90c4e1bccea6..9d28a0730968 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -111,7 +111,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.3.0) + msgpack (1.3.1) multi_json (1.13.1) multipart-post (2.0.0) nokogiri (1.10.5) @@ -176,7 +176,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rugged (0.28.3.1) + rugged (0.28.4.1) safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2c7641622306..97d7404de8b1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,16 +17,20 @@ let }; }; in buildGoPackage rec { - version = "1.72.1"; + version = "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; - rev = "v${version}"; - sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91"; + rev = version; + sha256 = "1pxmhq1nrc8q2kk83bz5afx14hshqgzqm6j4vgmyjvbmdvgl80wv"; }; + # Fix a check which assumes that hook files are writeable by their + # owner. + patches = [ ./fix-executable-check.patch ]; + goPackagePath = "gitlab.com/gitlab-org/gitaly"; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 951ea39e5be7..31210f2d606a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; }; } { @@ -108,6 +108,15 @@ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; }; } + { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "v1.0.0"; + sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; + }; + } { goPackagePath = "github.com/cloudflare/tableflip"; fetch = { @@ -338,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; }; } { @@ -581,8 +590,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; }; } { @@ -639,6 +648,15 @@ sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; }; } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.2.0"; + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; + }; + } { goPackagePath = "github.com/libgit2/git2go"; fetch = { @@ -833,8 +851,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } { @@ -846,6 +864,15 @@ sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; }; } + { + goPackagePath = "github.com/sebest/xff"; + fetch = { + type = "git"; + url = "https://github.com/sebest/xff"; + rev = "6c115e0ffa35"; + sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; + }; + } { goPackagePath = "github.com/sergi/go-diff"; fetch = { @@ -869,8 +896,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + rev = "v1.3.0"; + sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; }; } { @@ -1067,8 +1094,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "0c3fc7cdd57c"; - sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i"; + rev = "3253d7975ca7"; + sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s"; }; } { @@ -1139,8 +1166,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -1202,8 +1229,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch new file mode 100644 index 000000000000..65e130078b7f --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch @@ -0,0 +1,13 @@ +diff --git a/internal/config/config.go b/internal/config/config.go +index 037c9602..3d5409dc 100644 +--- a/internal/config/config.go ++++ b/internal/config/config.go +@@ -185,7 +185,7 @@ func checkExecutable(path string) error { + return err + } + +- if fi.Mode()&0755 < 0755 { ++ if fi.Mode()&0555 < 0555 { + return fmt.Errorf("not executable: %v", path) + } + diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 47e1c3b35684..638f6512c1a3 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -418,10 +418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; + sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -490,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; multi_json = { source = { @@ -791,10 +791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; + sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx"; type = "gem"; }; - version = "0.28.3.1"; + version = "0.28.4.1"; }; safe_yaml = { groups = ["default" "development" "test"];