diff options
author | Milan Pässler <milan@petabyte.dev> | 2020-11-20 21:02:55 +0100 |
---|---|---|
committer | Milan Pässler <milan@petabyte.dev> | 2020-11-21 01:38:35 +0100 |
commit | 2429d5a307198b2349dcc2b69dec63359622e222 (patch) | |
tree | bc85b3d0a2c4a1e234ce542b162c3cf16334cb18 /pkgs/applications/version-management/gitlab/update.py | |
parent | 0f82bd767b16daa7e228464593bcf6b7dd4baae4 (diff) | |
download | nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.gz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.bz2 nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.lz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.xz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.zst nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.zip |
gitlab: 13.5.1 -> 13.6.0
Changed ruby version to 2.7.x to match upstream. Added a gem config for gitlab-pg_query as it tries to download a source tarball during the build process. Also removed a patch for gitaly that has become obsolete by upstream fix [here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9).
Diffstat (limited to 'pkgs/applications/version-management/gitlab/update.py')
-rwxr-xr-x | pkgs/applications/version-management/gitlab/update.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 98d994f0003..0f215370e18 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.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -40,9 +40,7 @@ class GitLabRepo: return versions def get_git_hash(self, rev: str): - out = subprocess.check_output(['nix-prefetch-git', self.url, rev]) - j = json.loads(out) - return j['sha256'] + return subprocess.check_output(['nix-universal-prefetch', 'fetchFromGitLab', '--owner', self.owner, '--repo', self.repo, '--rev', rev]).decode('utf-8').strip() @staticmethod def rev2version(tag: str) -> str: |