Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 644045de8b97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f79f998f3163
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jan 15, 2020

  1. gitaly: a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83 -> 1.77.1 

    (cherry picked from commit e1e61f3)
    @flokli
    flokli committed Jan 15, 2020
    Copy the full SHA
    644e25f View commit details

  2. gitlab: 12.6.2 -> 12.6.4 

    (cherry picked from commit 57560cc)
    @flokli
    flokli committed Jan 15, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    f79f998 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "12.6.2",
"repo_hash": "0bchamvr3f0ph49f7xa76gsp2mjj1ajy4q0wy1hjvr9bayxx94av",
"version": "12.6.4",
"repo_hash": "0jsww785bxvjdrp1wsz6zkvx9zr69j24bway6nfyjkz8a7vbl9ls",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.6.2-ee",
"rev": "v12.6.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83",
"GITALY_SERVER_VERSION": "1.77.1",
"GITLAB_PAGES_VERSION": "1.12.0",
"GITLAB_SHELL_VERSION": "10.3.0",
"GITLAB_WORKHORSE_VERSION": "8.18.0"
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,14 +17,14 @@ let
};
};
in buildGoPackage rec {
version = "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83";
version = "1.77.1";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = version;
sha256 = "1pxmhq1nrc8q2kk83bz5afx14hshqgzqm6j4vgmyjvbmdvgl80wv";
rev = "v${version}";
sha256 = "08xc9lxlvga36yq1wdvb1h4zk70c36qspyd7azhkw84kzwfrif1c";
};

# Fix a check which assumes that hook files are writeable by their
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -327,7 +327,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false

# Prometheus
gem 'prometheus-client-mmap', '~> 0.9.10'
gem 'prometheus-client-mmap', '~> 0.10.0'
gem 'raindrops', '~> 0.18'
end

8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -531,8 +531,8 @@ GEM
regexp_parser (~> 1.1)
regexp_property_values (~> 0.3)
json (1.8.6)
json-jwt (1.9.4)
activesupport
json-jwt (1.11.0)
activesupport (>= 4.2)
aes_key_wrap
bindata
json-schema (2.8.0)
@@ -746,7 +746,7 @@ GEM
parser
unparser
procto (0.0.3)
prometheus-client-mmap (0.9.10)
prometheus-client-mmap (0.10.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@@ -1283,7 +1283,7 @@ DEPENDENCIES
peek (~> 1.1)
pg (~> 1.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
prometheus-client-mmap (~> 0.10.0)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
rack (~> 2.0.7)
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -2326,10 +2326,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r";
sha256 = "18rf9v20i0dk5dblr7m22di959xpch2h7gsx0cl585cryr7apwp3";
type = "gem";
};
version = "1.9.4";
version = "1.11.0";
};
json-schema = {
dependencies = ["addressable"];
@@ -3365,10 +3365,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0immyg4as0isyj2dcjf44n0avg1jv5kx1qk0asrgb5ayzwmjqg1k";
sha256 = "00d2c79xhz5k3fcclarjr1ffxbrvc6236f4rrvriad9kwqr7c1mp";
type = "gem";
};
version = "0.9.10";
version = "0.10.0";
};
pry = {
dependencies = ["coderay" "method_source"];