From e7383a32e365371b9d62c30f16089687db7cb5d4 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 9 Jan 2023 18:08:25 +0100 Subject: [PATCH] gitlab-pages: Maintain together with the rest of GitLab + add to... ...update.py --- .../version-management/gitlab}/gitlab-pages/default.nix | 0 pkgs/applications/version-management/gitlab/update.py | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) rename pkgs/{servers/http => applications/version-management/gitlab}/gitlab-pages/default.nix (100%) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix similarity index 100% rename from pkgs/servers/http/gitlab-pages/default.nix rename to pkgs/applications/version-management/gitlab/gitlab-pages/default.nix diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f322a5d375e..76e45cd4469e 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -199,6 +199,14 @@ def update_gitaly(): _call_nix_update('gitaly', gitaly_server_version) +@cli.command('update-gitlab-pages') +def update_gitlab_pages(): + """Update gitlab-shell""" + data = _get_data_json() + gitlab_pages_version = data['passthru']['GITLAB_PAGES_VERSION'] + _call_nix_update('gitlab-pages', gitlab_pages_version) + + @cli.command('update-gitlab-shell') def update_gitlab_shell(): """Update gitlab-shell""" @@ -223,6 +231,7 @@ def update_all(ctx, rev: str): ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_gitaly) + ctx.invoke(update_gitlab_pages) ctx.invoke(update_gitlab_shell) ctx.invoke(update_gitlab_workhorse) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffde8e34ba6..b52fc43d6dbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7473,6 +7473,8 @@ with pkgs; gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { }; + gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -24014,8 +24016,6 @@ with pkgs; gatling = callPackage ../servers/http/gatling { }; - gitlab-pages = callPackage ../servers/http/gitlab-pages { }; - glabels = callPackage ../applications/graphics/glabels { }; nats-server = callPackage ../servers/nats-server { };