Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
talyz committed Dec 22, 2019
1 parent 2f61471 commit 445bc14
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 28 deletions.
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 7 additions & 3 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
Expand Up @@ -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 = {
Expand Down
59 changes: 43 additions & 16 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -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)
}

12 changes: 6 additions & 6 deletions pkgs/applications/version-management/gitlab/gitaly/gemset.nix
Expand Up @@ -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"];
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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"];
Expand Down

0 comments on commit 445bc14

Please sign in to comment.