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

emacspeak: 58.0 -> 59.0 #291953

Merged
merged 4 commits into from
Feb 29, 2024
Merged

emacspeak: 58.0 -> 59.0 #291953

merged 4 commits into from
Feb 29, 2024

Conversation

AndersonTorres
Copy link
Member

Description of changes

Closes #291869

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@AndersonTorres AndersonTorres marked this pull request as ready for review February 28, 2024 00:58
@github-actions github-actions bot added the 6.topic: emacs Text editor label Feb 28, 2024
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 28, 2024
Also, keep a green alias in order to not break things.
- finalAttrs design pattern
- set strictDeps
- getExe emacs
- get rid of nested with
- set meta.changelog
- set meta.mainProgram
AndersonTorres and others added 2 commits February 28, 2024 18:39
Also, updates broken version according to the changelog.

Co-authored-by: R. RyanTM <[email protected]>
@Atemu Atemu merged commit ebe6e80 into NixOS:master Feb 29, 2024
22 of 23 checks passed
@@ -1,34 +1,37 @@
{ lib
, stdenv
, emacs
Copy link
Contributor

Choose a reason for hiding this comment

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

Directly pulling in emacs has some issues:

  • the unneeded emacs is in the closure of emacs-nox.pkgs.emacspeak
  • native compilation results of emacs-nox.pkgs.emacspeak, if generated, will not be used by emacs-nox

BTW, the directory structure of $out is probably wrong because it is quite different from other packages in emacsPackages.

@@ -5,6 +5,8 @@ let
inherit (self) callPackage;
in
{
inherit (pkgs) emacspeak;
Copy link
Contributor

Choose a reason for hiding this comment

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

Applying this patch can fix issues mentioned here. However, whether this package should be moved to "by-name" needs discussion.

-   inherit (pkgs) emacspeak;
+   emacspeak = pkgs.emacspeak.override { emacs = self.emacs; };

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: emacs Text editor 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants