diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-14 17:49:32 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-14 21:27:48 +0000 |
| commit | 3893d6c6d76ca2b51ef3694a6c0f27dc8eb01ef5 (patch) | |
| tree | 435e493f1aed99e7e97a2c12e65b1a2dcf35c96a /nixos/tests | |
| parent | 0f0c250967eda44217bb67d30f0b64882e2bc921 (diff) | |
gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:
/* All git-relates tools live here, in a separate attribute set so that users
* can get a fast overview over what's available.
but unfortunately that hasn't actually held up in practice.
Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing. In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c34901969).
So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix. This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.
The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before. I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/git/hub.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index 51ec3d5b4129..4f3189861a00 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -6,12 +6,12 @@ import ../make-test-python.nix ({ pkgs, ...} : { nodes.hub = { pkgs, ... }: { - environment.systemPackages = [ pkgs.gitAndTools.hub ]; + environment.systemPackages = [ pkgs.hub ]; }; testScript = '' - assert "git version ${pkgs.git.version}\nhub version ${pkgs.gitAndTools.hub.version}\n" in hub.succeed("hub version") + assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") assert "These GitHub commands are provided by hub" in hub.succeed("hub help") ''; }) |