diff options
author | Kim Lindberger <kim.lindberger@gmail.com> | 2020-05-01 13:12:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-01 13:12:02 +0200 |
commit | 998ac52f0acaa3686a5fff6ff9f6f735ebb66d32 (patch) | |
tree | e53c2d1f9f4608f3c6d31dc97ee26ee2a9fcb754 /pkgs/applications/version-management | |
parent | 4e14ff6eac2b7e786a4a8aee532e14c017cec30c (diff) | |
parent | fc64bca95b27cf82e7c185b3a1723b326b0c20e7 (diff) | |
download | nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar.gz nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar.bz2 nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar.lz nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar.xz nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.tar.zst nixlib-998ac52f0acaa3686a5fff6ff9f6f735ebb66d32.zip |
Merge pull request #86420 from flokli/gitlab-12.8.10
gitlab: 12.8.9 -> 12.8.10
Diffstat (limited to 'pkgs/applications/version-management')
5 files changed, 14 insertions, 16 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c651e8bab92c..d3f2db5e5ad2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.9", - "repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4", + "version": "12.8.10", + "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.9-ee", + "rev": "v12.8.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.9", + "GITALY_SERVER_VERSION": "12.8.10", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.2" diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index e3f7865226a2..0c125f5a0bf9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -242,4 +242,4 @@ DEPENDENCIES webmock (~> 3.4.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 968b26632c72..5e3eac19df3b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.9"; + version = "12.8.10"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh"; + sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d91c84b1fa29..7719a90abb5d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -515,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a128fd5bc409..4c7bcefacb0d 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -13,7 +13,6 @@ from distutils.version import LooseVersion from typing import Iterable import requests -from xml.etree import ElementTree logger = logging.getLogger(__name__) @@ -30,12 +29,11 @@ class GitLabRepo: @property def tags(self) -> Iterable[str]: - r = requests.get(self.url + "/tags?format=atom", stream=True) + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) - tree = ElementTree.fromstring(r.content) - versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, versions)) + versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) |