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: b7aefd4174a2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e8188006144
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 26, 2019

  1. gitaly: 1.27.0 -> 1.27.1

    @flokli
    flokli committed Mar 26, 2019
    Copy the full SHA
    e558347 View commit details

  2. gitlab: 11.9.0 -> 11.9.1

    @flokli
    flokli committed Mar 26, 2019
    Copy the full SHA
    ec31979 View commit details

  3. Merge pull request #58401 from flokli/gitlab-11.9.1 

    gitlab: 11.9.0 -> 11.9.1
    @flokli
    flokli authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8e81880 View commit details
Showing with 14 additions and 14 deletions.
  1. +12 −12 pkgs/applications/version-management/gitlab/data.json
  2. +2 −2 pkgs/applications/version-management/gitlab/gitaly/default.nix
24 changes: 12 additions & 12 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"ce": {
"version": "11.9.0",
"repo_hash": "1dm7syarifhfzy63mnwipmk01h9yxrbzqxlkjzqff4nrx04301lr",
"deb_hash": "0p97ykl8vz47d9y0rgn738p79i4sx64dgj5f2x8r2ylz7ihzzp0k",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.0-ce.0_amd64.deb/download.deb",
"version": "11.9.1",
"repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l",
"deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
"rev": "v11.9.0",
"rev": "v11.9.1",
"passthru": {
"GITALY_SERVER_VERSION": "1.27.0",
"GITALY_SERVER_VERSION": "1.27.1",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
}
},
"ee": {
"version": "11.9.0",
"repo_hash": "0p4b65b6yqw5xhhz11ww9pn03dm4qws7qhk840r3cgsv23n1jcqv",
"deb_hash": "08k1l0k2n7jrm75l8x4fnb7jwwzzxp31ywriyj7y3pwin9xsmkmc",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.0-ee.0_amd64.deb/download.deb",
"version": "11.9.1",
"repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd",
"deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
"rev": "v11.9.0-ee",
"rev": "v11.9.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.27.0",
"GITALY_SERVER_VERSION": "1.27.1",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "1.27.0";
version = "1.27.1";
name = "gitaly-${version}";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0m96048nxbgdkly5rz9d21yz8dmgv1kqis98is5kdz5b1wmhz18r";
sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp";
};

goPackagePath = "gitlab.com/gitlab-org/gitaly";