Merge pull request #138279 from helsinki-systems/fix/agda2-mode

emacs.pkgs.*: fix to unblock channel
This commit is contained in:
Jörg Thalheim 2021-09-17 15:10:01 +01:00 committed by GitHub
commit 01643e3d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 5 deletions

View File

@ -4,18 +4,18 @@
trivialBuild rec { trivialBuild rec {
pname = "agda-mode"; pname = "agda-mode";
version = pkgs.haskellPackages.Agda.version; version = haskellPackages.Agda.version;
dontUnpack = true; dontUnpack = true;
# already byte-compiled by Agda builder # already byte-compiled by Agda builder
buildPhase = '' buildPhase = ''
agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate` agda=`${haskellPackages.Agda}/bin/agda-mode locate`
cp `dirname $agda`/*.el* . cp `dirname $agda`/*.el* .
''; '';
meta = { meta = {
inherit (pkgs.haskellPackages.Agda.meta) homepage license; inherit (haskellPackages.Agda.meta) homepage license;
description = "Agda2-mode for Emacs extracted from Agda package"; description = "Agda2-mode for Emacs extracted from Agda package";
longDescription = '' longDescription = ''
Wrapper packages that liberates init.el from `agda-mode locate` magic. Wrapper packages that liberates init.el from `agda-mode locate` magic.

View File

@ -1,6 +1,7 @@
{ lib { lib
, trivialBuild , trivialBuild
, fetchFromGitHub , fetchFromGitHub
, emacs
}: }:
trivialBuild rec { trivialBuild rec {

View File

@ -2,7 +2,6 @@
, trivialBuild , trivialBuild
, fetchFromGitHub , fetchFromGitHub
, emacs , emacs
, emacsPackages
}: }:
trivialBuild rec { trivialBuild rec {
@ -20,7 +19,7 @@ trivialBuild rec {
emacs emacs
] ++ propagatedUserEnvPkgs; ] ++ propagatedUserEnvPkgs;
propagatedUserEnvPkgs = with emacsPackages; [ propagatedUserEnvPkgs = with emacs.pkgs; [
evil evil
markdown-mode markdown-mode
]; ];

View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, emacs , emacs
, trivialBuild
}: }:
trivialBuild { trivialBuild {

View File

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub
, trivialBuild , trivialBuild
, emacs , emacs
}: }:

View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, trivialBuild
, emacs , emacs
}: }: