From 4a1bbbba52df8734df447e840e68602c5745179a Mon Sep 17 00:00:00 2001 From: Yaya Date: Sun, 18 May 2025 14:16:07 +0200 Subject: [PATCH] gitlab: move to pkgs/by-name --- .../gi}/gitlab/Remove-unsupported-database-names.patch | 0 .../version-management => by-name/gi}/gitlab/data.json | 0 .../gi}/gitlab/gitlab-workhorse/default.nix | 0 .../gitlab/default.nix => by-name/gi/gitlab/package.nix} | 0 .../gi}/gitlab/remove-hardcoded-locations.patch | 0 .../gi}/gitlab/reset_token.rake | 0 .../version-management => by-name/gi}/gitlab/rubyEnv/Gemfile | 0 .../gi}/gitlab/rubyEnv/Gemfile.lock | 0 .../gi}/gitlab/rubyEnv/gemset.nix | 0 .../version-management => by-name/gi}/gitlab/update.py | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++--- 11 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{applications/version-management => by-name/gi}/gitlab/Remove-unsupported-database-names.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/data.json (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/gitlab-workhorse/default.nix (100%) rename pkgs/{applications/version-management/gitlab/default.nix => by-name/gi/gitlab/package.nix} (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/remove-hardcoded-locations.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/reset_token.rake (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/Gemfile (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/Gemfile.lock (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/rubyEnv/gemset.nix (100%) rename pkgs/{applications/version-management => by-name/gi}/gitlab/update.py (99%) diff --git a/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch rename to pkgs/by-name/gi/gitlab/Remove-unsupported-database-names.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json similarity index 100% rename from pkgs/applications/version-management/gitlab/data.json rename to pkgs/by-name/gi/gitlab/data.json diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix rename to pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/by-name/gi/gitlab/package.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/default.nix rename to pkgs/by-name/gi/gitlab/package.nix diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch similarity index 100% rename from pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch rename to pkgs/by-name/gi/gitlab/remove-hardcoded-locations.patch diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/by-name/gi/gitlab/reset_token.rake similarity index 100% rename from pkgs/applications/version-management/gitlab/reset_token.rake rename to pkgs/by-name/gi/gitlab/reset_token.rake diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/Gemfile rename to pkgs/by-name/gi/gitlab/rubyEnv/Gemfile diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock rename to pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix rename to pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py similarity index 99% rename from pkgs/applications/version-management/gitlab/update.py rename to pkgs/by-name/gi/gitlab/update.py index 1fd0cba1c643..0642e6140951 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/by-name/gi/gitlab/update.py @@ -242,7 +242,7 @@ def update_rubyenv(): subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) # Reformat gemset.nix - subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/applications/version-management/gitlab"], cwd=NIXPKGS_PATH) + subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/by-name/gi/gitlab"], cwd=NIXPKGS_PATH) @cli.command("update-gitaly") @@ -378,7 +378,7 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: [ "git", "add", - "pkgs/applications/version-management/gitlab", + "pkgs/by-name/gi/gitlab", "pkgs/by-name/gi/gitaly", "pkgs/by-name/gi/gitlab-elasticsearch-indexer", "pkgs/by-name/gi/gitlab-pages", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c0304e4387..94c903666d21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3065,14 +3065,13 @@ with pkgs; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; - gitlab = callPackage ../applications/version-management/gitlab { }; - gitlab-ee = callPackage ../applications/version-management/gitlab { + gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix { gitlabEnterprise = true; }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; - gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; + gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { }; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };