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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a9fe36cd0b4c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 316094b8ab27
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 10, 2020

  1. emacsPackages.elpaBuild: pass through meta

    Previously, meta wasn't being passed through at all, because it's
    removed from args without being used anywhere.  This made it so that
    rcirc-menu wasn't being marked as broken even though it was supposed
    to be.
    
    This patch copies the meta handling from melpaBuild, including the
    default home page (adapted for ELPA).
    alyssais committed Dec 10, 2020
    Copy the full SHA
    5016fdb View commit details
  2. Merge pull request #106606 from alyssais/elpa-meta

    emacsPackages.elpaBuild: pass through meta
    adisbladis authored Dec 10, 2020
    Copy the full SHA
    316094b View commit details
Showing with 11 additions and 0 deletions.
  1. +11 −0 pkgs/build-support/emacs/elpa.nix
11 changes: 11 additions & 0 deletions pkgs/build-support/emacs/elpa.nix
Original file line number Diff line number Diff line change
@@ -7,9 +7,18 @@ with lib;
{ pname
, version
, src
, meta ? {}
, ...
}@args:

let

defaultMeta = {
homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html";
};

in

import ./generic.nix { inherit lib stdenv emacs texinfo; } ({

phases = "installPhase fixupPhase distPhase";
@@ -23,6 +32,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
runHook postInstall
'';

meta = defaultMeta // meta;
}

// removeAttrs args [ "files" "fileSpecs"