Unverified Commit e2479ad6 authored by Lin Jian's avatar Lin Jian
Browse files

emacs: factor out common overrides for nongnu packages

parent 9928ed44

pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix

0 → 100644
+21 −0
Original line number Diff line number Diff line 
pkgs:



self: super:



{

  p4-16-mode = super.p4-16-mode.overrideAttrs {

    # workaround https://github.com/NixOS/nixpkgs/issues/301795

    prePatch = ''

      mkdir tmp-untar-dir

      pushd tmp-untar-dir



      tar --extract --verbose --file=$src

      content_directory=$(echo p4-16-mode-*)

      cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el

      src=$PWD/$content_directory.tar

      tar --create --verbose --file=$src $content_directory



      popd

    '';

  };

}

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

+12 −19
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ 
  3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix`

*/



{ lib, buildPackages }:

{

  lib,

  pkgs,

  buildPackages,

}:



self:

let
@@ -35,26 +39,15 @@ let 


      super = imported;



      overrides = {

        p4-16-mode = super.p4-16-mode.overrideAttrs {

          # workaround https://github.com/NixOS/nixpkgs/issues/301795

          prePatch = ''

            mkdir tmp-untar-dir

            pushd tmp-untar-dir



            tar --extract --verbose --file=$src

            content_directory=$(echo p4-16-mode-*)

            cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el

            src=$PWD/$content_directory.tar

            tar --create --verbose --file=$src $content_directory



            popd

          '';

        };

      };

      commonOverrides = import ./nongnu-common-overrides.nix pkgs;



      overrides = self: super: { };



    in

    let

      super' = super // (commonOverrides self super);

    in

    super // overrides

    super' // (overrides self super')

  );



in

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

+6 −19
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ To update the list of packages from nongnu (ELPA), 


*/



{ lib, buildPackages }:

{ lib, pkgs, buildPackages }:



self: let
@@ -29,24 +29,11 @@ self: let 


    super = imported;



    overrides = {

      p4-16-mode = super.p4-16-mode.overrideAttrs {

        # workaround https://github.com/NixOS/nixpkgs/issues/301795

        prePatch = ''

          mkdir tmp-untar-dir

          pushd tmp-untar-dir



          tar --extract --verbose --file=$src

          content_directory=$(echo p4-16-mode-*)

          cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el

          src=$PWD/$content_directory.tar

          tar --create --verbose --file=$src $content_directory



          popd

        '';

      };

    };

    commonOverrides = import ./nongnu-common-overrides.nix pkgs;



    overrides = self: super: { };



  in super // overrides);

  in

  let super' = super // (commonOverrides self super); in super' // (overrides self super'));



in generateNongnu { }

pkgs/top-level/emacs-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ let 
  };



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

    inherit (pkgs) buildPackages;

    inherit (pkgs) pkgs buildPackages;

    inherit lib;

  };



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

    inherit (pkgs) buildPackages;

    inherit (pkgs) pkgs buildPackages;

    inherit lib;

  };