diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-15 19:32:36 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-15 19:32:36 -0700 |
commit | d1d37feb6d21180b7f7b47cf681613a09228da0a (patch) | |
tree | 8f763f266007b4925454a9c4e3f6057789f916de /pkgs/applications/version-management | |
parent | 91171e295574bd7721cafeaf4200c807952275a7 (diff) | |
parent | 56e1dac7c81ec3efd937111966949e55134efab8 (diff) | |
download | nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.gz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.bz2 nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.lz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.xz nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.tar.zst nixpkgs-d1d37feb6d21180b7f7b47cf681613a09228da0a.zip |
Merge branch 'master' into staging-next
Conflicts: pkgs/servers/x11/xorg/default.nix
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 77ad7d8658d..95060714c24 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE="; + sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ma27 ]; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d7e6261a932..60596eee4a9 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.3", - "repo_hash": "0kpdl1gwcxy13lwyl96nsia62wysrnxdygil6sz6s72hg0y2fsgr", + "version": "13.12.4", + "repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.3-ee", + "rev": "v13.12.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.3", + "GITALY_SERVER_VERSION": "13.12.4", "GITLAB_PAGES_VERSION": "1.39.0", "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.3" + "GITLAB_WORKHORSE_VERSION": "13.12.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 6276dd75eaf..8f189338e61 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "13.12.3"; + version = "13.12.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-qqLVYNCE8rKPBY5tj6AAoWcyIEtQZkO980NVPg0WO18="; + sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0="; }; vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e900a6522eb..2eb1d14d0a4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.12.3"; + version = "13.12.4"; src = fetchFromGitLab { owner = data.owner; |