Commit 78bf14b8 authored by Anderson Torres's avatar Anderson Torres
Browse files

emacsPackages.cask: use melpaBuild

- use a patch that parameterizes lispdir
  - so that we can get rid of SRCDIR and other dependencies
- finalAttrs
- remove failing doCheck
- sei ignoreCompilationError to false
- meta.mainProgram
- meta.homepage points to GitHub
  - because the previous is outdated
- nixfmt-rfc-style
parent d52e3211
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
diff -Naur cask-source-0.8.8-old/bin/cask cask-source-0.8.8/bin/cask
--- cask-source-0.8.8-old/bin/cask	1969-12-31 21:00:01.000000000 -0300
+++ cask-source-0.8.8/bin/cask	2024-08-30 18:34:48.986474121 -0300
@@ -37,19 +37,6 @@
 		EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@"
 		;;
 	*)
-		WHICH=${WHICH:-which}
-		READLINK=$($WHICH readlink || true)
-		if [ "$(uname || true)" == "Darwin" ] ; then
-			READLINK=
-		fi
-		READLINK=${READLINK:-$($WHICH greadlink || true)}
-		if [ ! -z "$READLINK" ] ; then
-			SRCDIR__=$($READLINK -f "$CASK")
-		else
-			SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
-		fi
-		SRCDIR_=$(dirname "$SRCDIR__")
-		SRCDIR=$(dirname "$SRCDIR_")
-		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
+		"$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@"
 		;;
 esac
+43 −36
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
, bash
, emacs
, python3
{
  lib,
  ansi,
  coreutils,
  dash,
  ecukes,
  el-mock,
  ert-async,
  ert-runner,
  f,
  fetchFromGitHub,
  git,
  gitUpdater,
  melpaBuild,
  noflet,
  package-build,
  s,
  servant,
  shell-split-string,
}:

stdenv.mkDerivation (finalAttrs: {
melpaBuild (finalAttrs: {
  pname = "cask";
  version = "0.8.8";

  src = fetchFromGitHub {
    name = "cask-source-${finalAttrs.version}";
    owner = "cask";
    repo = "cask";
    rev = "v${finalAttrs.version}";
    hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU=";
  };

  doCheck = true;
  patches = [
    # Uses LISPDIR substitution var
    ./0000-cask-lispdir.diff
  ];

  nativeBuildInputs = [ emacs ];
  buildInputs = [
    bash
    python3
  ]
  ++ (with emacs.pkgs; [
  packageRequires = [
    ansi
    dash
    ecukes
@@ -38,40 +50,35 @@ stdenv.mkDerivation (finalAttrs: {
    s
    servant
    shell-split-string
  ]);
  ];

  strictDeps = true;

  buildPhase = ''
    runHook preBuild
  ignoreCompilationError = false;

    emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
  strictDeps = true;

    runHook postBuild
  postPatch = ''
    lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.version} \
      substituteAllInPlace bin/cask
  '';

  installPhase = ''
    runHook preInstall

    mkdir -p $out/bin
    install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc
    install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask
    ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask

    runHook postInstall
  postInstall = ''
    install -D -t $out/bin bin/cask
  '';

  meta = with lib; {
  passthru.updateScript = gitUpdater {
    rev-prefix = "v";
  };

  meta = {
    homepage = "https://github.com/cask/cask";
    description = "Project management for Emacs";
    mainProgram = "cask";
    longDescription = ''
      Cask is a project management tool for Emacs that helps automate the
      package development cycle; development, dependencies, testing, building,
      packaging and more.
    '';
    homepage = "https://cask.readthedocs.io/en/latest/index.html";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ AndersonTorres ];
    inherit (emacs.meta) platforms;
    license = lib.licenses.gpl3Plus;
    mainProgram = "cask";
    maintainers = with lib.maintainers; [ AndersonTorres ];
  };
})