From 363b352af3cba175c55d47d94e86e9e289da7396 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 9 Jul 2019 20:09:15 -0400 Subject: gitlab: 11.10.8 -> 12.0.3 This is a major version bump but things were generally straightforward save two wrinkles: * it is necessary to ignore collisions in the gitlab bundler environment as both `omniauth_oauth2_generic` and `apollo_upload_server` provide a `console` executable. * grpc had to be patched since its build system expects the `AR` environment variable to contain not just the path to `ar` but also the `rpc` flags (see the discussion in nixpkgs #63056). --- pkgs/applications/version-management/gitlab/update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/gitlab/update.py') diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0ec743cb67d77..ae1f0ad4c5068 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -35,8 +35,8 @@ class GitLabRepo: 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 = filter(self.version_regex.match, versions) - + versions = list(filter(self.version_regex.match, versions)) + # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) return versions -- cgit 1.4.1