From 8a0d1de538392992b12faa699063ce519371020a Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 1 Aug 2025 17:13:40 +0200 Subject: [PATCH] travis: move to by-name (#430047) --- .../tools/misc => by-name/tr}/travis/Gemfile | 0 .../tools/misc => by-name/tr}/travis/Gemfile.lock | 0 .../tools/misc => by-name/tr}/travis/gemset.nix | 0 .../default.nix => by-name/tr/travis/package.nix} | 6 +++--- pkgs/development/tools/misc/travis/shell.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 3 insertions(+), 17 deletions(-) rename pkgs/{development/tools/misc => by-name/tr}/travis/Gemfile (100%) rename pkgs/{development/tools/misc => by-name/tr}/travis/Gemfile.lock (100%) rename pkgs/{development/tools/misc => by-name/tr}/travis/gemset.nix (100%) rename pkgs/{development/tools/misc/travis/default.nix => by-name/tr/travis/package.nix} (81%) delete mode 100644 pkgs/development/tools/misc/travis/shell.nix diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/by-name/tr/travis/Gemfile similarity index 100% rename from pkgs/development/tools/misc/travis/Gemfile rename to pkgs/by-name/tr/travis/Gemfile diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/by-name/tr/travis/Gemfile.lock similarity index 100% rename from pkgs/development/tools/misc/travis/Gemfile.lock rename to pkgs/by-name/tr/travis/Gemfile.lock diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/by-name/tr/travis/gemset.nix similarity index 100% rename from pkgs/development/tools/misc/travis/gemset.nix rename to pkgs/by-name/tr/travis/gemset.nix diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/by-name/tr/travis/package.nix similarity index 81% rename from pkgs/development/tools/misc/travis/default.nix rename to pkgs/by-name/tr/travis/package.nix index 52ae177172d3..06d571221be6 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/by-name/tr/travis/package.nix @@ -12,12 +12,12 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "travis"; - meta = with lib; { + meta = { description = "CLI and Ruby client library for Travis CI"; mainProgram = "travis"; homepage = "https://github.com/travis-ci/travis.rb"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zimbatm nicknovitski ]; diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix deleted file mode 100644 index 0820e89b4ba3..000000000000 --- a/pkgs/development/tools/misc/travis/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Env to update Gemfile.lock / gemset.nix -{ - pkgs ? import ../../../../.. { }, -}: -pkgs.stdenv.mkDerivation { - name = "env"; - buildInputs = with pkgs; [ - ruby.devEnv - gnumake - bundix - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b79decd22cf..8ebfff206f71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7590,8 +7590,6 @@ with pkgs; tflint-plugins = recurseIntoAttrs (callPackage ../development/tools/analysis/tflint-plugins { }); - travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { }; tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;