all-packages: move aliases to aliases.nix#39686
Merged
matthewbauer merged 9 commits intoNixOS:stagingfrom May 1, 2018
Merged
Conversation
matthewbauer
force-pushed
the
new-aliases
branch
from
c9279bd to
8de6603
Compare
GrahamcOfBorg
added
the
2.status: merge conflict
Ericson2314
reviewed
Apr 30, 2018
pkgs/top-level/aliases.nix
Outdated
Member
Author
There was a problem hiding this comment.
aliases is called with "import ./aliases.nix super" - so I think it works okay. Not sure if this is incorrect though.
Ericson2314
reviewed
Apr 30, 2018
pkgs/top-level/stage.nix
Outdated
Member
There was a problem hiding this comment.
skipAliases is a nice idea, like -Wcompat for GHC.
Member
Author
There was a problem hiding this comment.
Yes, we could even put a warning in aliases as well. It would probably be too annoying right now though- aliases are still used extensively in Nixpkgs.
Member
|
Awesome.
I put the following into `check-sameness.nix`
```nix
with import ./nixpkgs/lib/default.nix;
let
pkgs = import ./nixpkgs/default.nix {};
pkgsA = import ./nixpkgs_old/default.nix {};
pkgsB = import ./nixpkgs_new/default.nix {};
a = pkgs.writeText "pkgsA-list" (concatStringsSep "\n" (attrNames pkgsA));
b = pkgs.writeText "pkgsB-list" (concatStringsSep "\n" (attrNames pkgsB));
in
pkgs.runCommand "pkgs-diff" {
inherit a b;
} ''
diff -Nua "$a" "$b" > $out || true
''
```
checked out before and after trees into `nixpkgs_old` and `nixpkgs_new`,
built the derivation, and got this:
```screen
--- /nix/store/<censored>-pkgsA-list 1970-01-01 00:00:01.000000000 +0000
+++ /nix/store/<censored>-pkgsB-list 1970-01-01 00:00:01.000000000 +0000
@@ -216,6 +216,7 @@
ansible_2_5
ansifilter
ant
+ant_1_9
antfs-cli
anthy
antigen
```
Is this a bug?
|
Member
|
@oxij from the diff that looks like it's on purpose to align it with the unversioned @matthewbauer feel free to hit merge after resolving conflicts! |
GrahamcOfBorg
removed
the
2.status: merge conflict
matthewbauer
force-pushed
the
new-aliases
branch
3 times, most recently
from
728613a to
af64a0a
Compare
GrahamcOfBorg
added
10.rebuild-darwin-stdenv
Member
Author
|
In case anyone is interested, here is the script I'm using to find dupes in all-packaages.nix: |
GrahamcOfBorg
added
the
2.status: merge conflict
Lots of aliases have been left over. This is a massive edit that changes many random lines.
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.
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.
Overrides should only be on the "default" package not the other way around.
Member
Author
|
@GrahamcOfBorg eval |
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.
GrahamcOfBorg
added
6.topic: GNOME
32 tasks
Member
Author
|
@volth Yes I can definitely see the case w.r.t. mysql. Feel free to move any back that don't make sense. It's hard to make that judgement on so many aliases. My basic rule was to leave any "versioned" attributes but that was the only exception. |
Member
Author
I would agree at least if you substitute "buildability" with "eval". Aliases should not affect the building of anything. Right now I think skipAliases will always fail but we can definitely improve that. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lots of aliases have been left over. This is a massive edit that
changes many random lines.
Another spinoff from #39515.