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: ca4fe58b4426
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e9be7fcb002c
Choose a head ref
  • 10 commits
  • 10 files changed
  • 1 contributor

Commits on May 1, 2018

  1. all-packages: move aliases to aliases.nix 

    Lots of aliases have been left over. This is a massive edit that
changes many random lines.
    @matthewbauer
    matthewbauer committed May 1, 2018
    2 Configuration menu
    Copy the full SHA
    218d81b View commit details
    Browse the repository at this point in the history

  2. aliases: add gccApple

    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    2911ece View commit details
    Browse the repository at this point in the history

  3. aliases: add check if alias still exists in all-packages.nix 

    If an alias is already defined in all-packages.nix, we want to throw
an error to make it obvious that something is wrong. Otherwise there
is no way to realize that the alias is shadowing the real definition.
    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    9d7c57a View commit details
    Browse the repository at this point in the history

  4. aliases: add skip aliases config 

    You can turn on this config option if you want to find references to
aliases in Nixpkgs. Ideally these can be removed from Nixpkgs and
eventually we can remove the alias altogether.
    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    ffe4b64 View commit details
    Browse the repository at this point in the history

  5. mysql → mariadb

    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    4654643 View commit details
    Browse the repository at this point in the history

  6. all-packages: normalize overrides 

    Overrides should only be on the "default" package not the other way around.
    @matthewbauer
    matthewbauer committed May 1, 2018
    4 Configuration menu
    Copy the full SHA
    48a1345 View commit details
    Browse the repository at this point in the history

  7. all-packages: more overrides normalizing

    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    7ab8c88 View commit details
    Browse the repository at this point in the history

  8. all-packages: cleanup from last commit

    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    a7d5c50 View commit details
    Browse the repository at this point in the history

  9. all-packages: revert 2 name changes 

    I am reverting two name changes that might not be a good idea:

- gnum4 → m4
- apacheAnt → ant

These are debatable changes & not sure what’s best. I prefered the
short version because there are not alternatives- but will not hold
off for now.
    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    485e4a6 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #39686 from matthewbauer/new-aliases 

    all-packages: move aliases to aliases.nix
    @matthewbauer
    matthewbauer committed May 1, 2018
    Configuration menu
    Copy the full SHA
    e9be7fc View commit details
    Browse the repository at this point in the history