Unverified Commit 5d9f1a8d authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #331051 from linj-fork/pr/add-nongnu-devel 

emacs.pkgs.nongnuDevelPackages: init
parents 42e81cc7 18d13117

pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix

0 → 100644
+5243 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

  # Updating



  To update the list of packages from nongnu devel (ELPA),



  1. Run `./update-nongnu-devel`.

  2. Check for evaluation errors:

       # "../../../../../" points to the default.nix from root of Nixpkgs tree

       env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.nongnuDevelPackages

  3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix`

*/



{ lib, buildPackages }:



self:

let



  generateNongnu = lib.makeOverridable (

    {

      generated ? ./nongnu-devel-generated.nix,

    }:

    let



      imported = import generated {

        callPackage =

          pkgs: args:

          self.callPackage pkgs (

            args

            // {

              # Use custom elpa url fetcher with fallback/uncompress

              fetchurl = buildPackages.callPackage ./fetchelpa.nix { };

            }

          );

      };



      super = imported;



      overrides = { };



    in

    super // overrides

  );



in

generateNongnu { }

pkgs/applications/editors/emacs/elisp-packages/update-from-overlay

+3 −0
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ download_change "elpa/elpa-generated.nix" 
download_change "elpa/elpa-devel-generated.nix"

download_change "melpa/recipes-archive-melpa.json"

download_change "nongnu/nongnu-generated.nix"

download_change "nongnu/nongnu-devel-generated.nix"



test_packageset "nongnuPackages"

test_packageset "nongnuDevelPackages"

test_packageset "elpaPackages"

test_packageset "elpaDevelPackages"

test_packageset "melpaStablePackages"
@@ -44,3 +46,4 @@ commit_change "elpa-packages" "elpa-generated.nix" 
commit_change "elpa-devel-packages" "elpa-devel-generated.nix"

commit_change "melpa-packages" "recipes-archive-melpa.json"

commit_change "nongnu-packages" "nongnu-generated.nix"

commit_change "nongnu-devel-packages" "nongnu-devel-generated.nix"

pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel

0 → 100755
+6 −0
Original line number Diff line number Diff line 
#! /usr/bin/env nix-shell

#! nix-shell --show-trace ./emacs2nix.nix -i bash



output="nongnu-devel-generated.nix"

nongnu-devel-packages.sh --names $EMACS2NIX/names.nix -o "$output"

nixfmt "$output"

pkgs/top-level/emacs-packages.nix

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ let 
    inherit lib;

  };



  mkNongnuDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix {

    inherit (pkgs) buildPackages;

    inherit lib;

  };



  mkNongnuPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix {

    inherit (pkgs) buildPackages;

    inherit lib;
@@ -57,6 +62,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ 
  , lib ? pkgs.lib

  , elpaDevelPackages ? mkElpaDevelPackages { inherit pkgs lib; } self

  , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self

  , nongnuDevelPackages ? mkNongnuDevelPackages { inherit pkgs lib; } self

  , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self

  , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self

  , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
@@ -64,6 +70,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ 
}: ({}

  // elpaDevelPackages // { inherit elpaDevelPackages; }

  // elpaPackages // { inherit elpaPackages; }

  // nongnuDevelPackages // { inherit nongnuDevelPackages; }

  // nongnuPackages // { inherit nongnuPackages; }

  // melpaStablePackages // { inherit melpaStablePackages; }

  // melpaPackages // { inherit melpaPackages; }