diff options
author | adisbladis <adisbladis@gmail.com> | 2020-04-28 12:57:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-28 12:57:07 +0200 |
commit | 14927d85035dc30673bb69e49afba2b21196c3b7 (patch) | |
tree | ce9d846bb67d5f2ad37bb53f906ae0496316ecf6 | |
parent | 8e3a29d69ecdb7258a0f4b7f96caaa9952fe1ee1 (diff) | |
parent | b2c8626d618a8204ff6a5959653daec033e7362f (diff) | |
download | nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar.gz nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar.bz2 nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar.lz nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar.xz nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.tar.zst nixpkgs-14927d85035dc30673bb69e49afba2b21196c3b7.zip |
Merge pull request #83378 from afrepues/build-melpa-stable-with-no-null-pkgs
Build MELPA package sets without null packages
-rw-r--r-- | pkgs/applications/editors/emacs-modes/libgenerated.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 22 |
2 files changed, 19 insertions, 12 deletions
diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 57bccc60818..d0c8b4565f5 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -61,8 +61,9 @@ in { pname = builtins.replaceStrings [ "@" ] [ "at" ] ename; broken = ! isNull error; in - lib.nameValuePair ename (if hasSource then ( - self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: + if hasSource then + lib.nameValuePair ename ( + self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { inherit pname; ename = ename; @@ -85,6 +86,8 @@ in { }; } ) {} - ) else null); + ) + else + null; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index fb6a4268299..87da2079605 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -42,7 +42,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); + super = lib.listToAttrs (builtins.filter (s: s != null) + (map (melpaDerivation variant) + (lib.importJSON archiveJson))); overrides = rec { shared = rec { @@ -339,10 +341,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Map legacy renames from emacs2nix since code generation was ported to emacs lisp _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; desktop-plus = super."desktop+"; ghub-plus = super."ghub+"; git-gutter-plus = super."git-gutter+"; @@ -353,10 +351,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; }; stable = shared // { @@ -559,6 +553,16 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Legacy alias emacs-libvterm = unstable.vterm; + # Map legacy renames from emacs2nix since code generation was ported to emacs lisp + _0xc = super."0xc"; + _2048-game = super."2048-game"; + _4clojure = super."4clojure"; + at = super."@"; + term-plus = super."term+"; + term-plus-key-intercept = super."term+key-intercept"; + term-plus-mux = super."term+mux"; + xml-plus = super."xml+"; + w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = |