ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-04 03:27:38 +03:00
Code Issues Projects Releases Wiki Activity

emacs: factor out common overrides for nongnu packages

Browse Source
This commit is contained in:
Lin Jian 2024-09-14 12:57:24 +08:00
parent 9928ed446d
commit e2479ad6d8
No known key found for this signature in database
GPG Key ID: A6698D36434F75A5
4 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix Normal file
View File

@ -0,0 +1,21 @@
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
'';
};
}

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

@ -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
commonOverrides = import ./nongnu-common-overrides.nix pkgs;
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
'';
};
};
overrides = self: super: { };
in
super // overrides
let
super' = super // (commonOverrides self super);
in
super' // (overrides self super')
);
in

23
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
View File

@ -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
commonOverrides = import ./nongnu-common-overrides.nix pkgs;
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
overrides = self: super: { };
popd
'';
};
};
in super // overrides);
in
let super' = super // (commonOverrides self super); in super' // (overrides self super'));
in generateNongnu { }

4
pkgs/top-level/emacs-packages.nix
View File

@ -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;
};