Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

emacs: use unstable melpa for dependencies #36423

Merged
merged 1 commit into from Mar 19, 2018

Conversation

matthewbauer
Copy link
Member

Motivation for this change

See #36345 for discussion. This should fix issues with MELPA stable being out of date occasionaly.

/cc @ttuegel

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

these paths will be fetched (40.36 MiB download, 120.59 MiB unpacked):
  /nix/store/2g2j2yawbxrs9wkvqfgdk0z6pmzv6awi-emacs-25.3
  /nix/store/dzk7zlqcyh49ck1zax3qi92i0b297fz0-libungif-4.1.4
  /nix/store/gcgr3bd2i77k6vjvc2hgrm7xkpw0417c-libselinux-2.4
copying path '/nix/store/gcgr3bd2i77k6vjvc2hgrm7xkpw0417c-libselinux-2.4' from 'https://cache.nixos.org'...
copying path '/nix/store/dzk7zlqcyh49ck1zax3qi92i0b297fz0-libungif-4.1.4' from 'https://cache.nixos.org'...
copying path '/nix/store/2g2j2yawbxrs9wkvqfgdk0z6pmzv6awi-emacs-25.3' from 'https://cache.nixos.org'...
/nix/store/2g2j2yawbxrs9wkvqfgdk0z6pmzv6awi-emacs-25.3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)


100 5888k  100 5888k    0     0  5174k      0  0:00:01  0:00:01 --:--:-- 5174k

fetching path ‘/nix/store/ilax0a97miv12llzxqi1dddj60h1ay6d-emacs-25.3’...

*** Downloading ‘https://cache.nixos.org/nar/00zq83q64fdfj8cpq5xfrxdbs2d04xrgd9kyis66hxwnlnwdn0ir.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/ilax0a97miv12llzxqi1dddj60h1ay6d-emacs-25.3’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  8 40.1M    8 3524k    0     0  4808k      0  0:00:08 --:--:--  0:00:08 4801k
 40 40.1M   40 16.1M    0     0  9736k      0  0:00:04  0:00:01  0:00:03 9730k
 75 40.1M   75 30.3M    0     0  11.0M      0  0:00:03  0:00:02  0:00:01 11.0M
100 40.1M  100 40.1M    0     0  11.8M      0  0:00:03  0:00:03 --:--:-- 11.8M

/nix/store/ilax0a97miv12llzxqi1dddj60h1ay6d-emacs-25.3

@matthewbauer
Copy link
Member Author

/cc @ttuegel @mdorman
Does this seem like an okay change? It just changes the precedence for MELPA (giving unstable higher priority).

@@ -385,9 +385,9 @@ let
in
lib.makeScope newScope (self:
{}
// melpaPackages self
// elpaPackages self
// melpaStablePackages self
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every package in melpaStablePackages is also in melpaPackages, so we can remove this line to improve evaluation performance.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is some people might be using the nixpkgs.emacsPackagesNg.melpaStablePackages attribute set. This will at least preserve that for them until a better solution can be found.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not saying to remove melpaStablePackages, I'm saying to stop inheriting everything from it into the default package set.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay did that, thanks! I'm not 100% on how this all works but I'm not sure if there is anyway to access "melpaStablePackages" now that it is not in the scope. At least this now fails:

nix-build -A emacsPackagesNg.melpaStablePackages.magit

@matthewbauer
Copy link
Member Author

Ok updated with changes. Thanks!

remove melpaStablePackages from default scope
@matthewbauer
Copy link
Member Author

Actually things broke removing melpaStablePackages. Will keep it as a compromise until we can find a better solution to this issue.

@matthewbauer matthewbauer merged commit ee52f36 into NixOS:master Mar 19, 2018
ttuegel added a commit to ttuegel/nixpkgs that referenced this pull request Mar 25, 2018
Lowering the priority of melpaStablePackages (NixOS#36423) leaves elpaPackages ahead
of melpaPackages; the former carries outdated dependencies which should be
overridden by melpaPackages.

See also: NixOS#36423
@matthewbauer matthewbauer deleted the emacs-use-unstable-melpa branch February 22, 2019 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants