Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0f0c250967ed
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3893d6c6d76c
Choose a head ref
  • 1 commit
  • 15 files changed
  • 1 contributor

Commits on Jan 14, 2021

  1. 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 98c3490).
    
    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.
    alyssais committed Jan 14, 2021
    Copy the full SHA
    3893d6c View commit details
    Browse the repository at this point in the history