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

Commits on Jan 29, 2021

  1. gitlab: 13.7.1 -> 13.7.4 (#108720)

    @jslight90
    jslight90 authored Jan 29, 2021

    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
    e2c0897 View commit details

  2. Merge pull request #111156 from NixOS/haskell-updates 

    Update Haskell package set to Stackage Nightly 2021-01-29 (plus other fixes)
    @peti
    peti authored Jan 29, 2021

    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
    aba721a View commit details
12 changes: 6 additions & 6 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "13.7.1",
"repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km",
"version": "13.7.4",
"repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v13.7.1-ee",
"rev": "v13.7.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "13.7.1",
"GITLAB_PAGES_VERSION": "1.32.0",
"GITALY_SERVER_VERSION": "13.7.4",
"GITLAB_PAGES_VERSION": "1.34.0",
"GITLAB_SHELL_VERSION": "13.14.0",
"GITLAB_WORKHORSE_VERSION": "8.58.0"
"GITLAB_WORKHORSE_VERSION": "8.58.2"
}
}
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
@@ -33,14 +33,14 @@ let
};
};
in buildGoModule rec {
version = "13.7.1";
version = "13.7.4";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg";
};

vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
buildGoModule rec {
pname = "gitlab-workhorse";

version = "8.58.0";
version = "8.58.2";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80";
sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp";
};

vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";