Loading pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff +36 −17 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= diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask --- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 +++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300 @@ -21,8 +21,6 @@ set -euo pipefail CASK=$0 EMACS=${CASK_EMACS:-${EMACS:-emacs}} -READLINK=${READLINK:-readlink} -GREADLINK=${GREADLINK:-greadlink} if [ "$#" -eq "0" ] ; then subcommand=install @@ -31,21 +29,10 @@ shift fi -set +eu -SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null) -if [ -z "$SRCDIR__" ] ; then - SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null) -fi - READLINK=${READLINK:-$($WHICH greadlink || true)} - if [ ! -z "$READLINK" ] ; then - SRCDIR__=$($READLINK -f "$CASK") - else -set -eu -if [ -z "$SRCDIR__" ]; then - SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") -fi -SRCDIR_=$(dirname "$SRCDIR__") -SRCDIR=$(dirname "$SRCDIR_") case $subcommand in emacs) EMACS="$EMACS" \ - "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ + "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \ --eval "(cask--initialize (expand-file-name default-directory))" \ "$@" ;; @@ -53,6 +40,6 @@ EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" ;; *) - "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" + "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" ;; Loading pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +16 −20 Original line number Diff line number Diff line { lib, ansi, coreutils, dash, ecukes, el-mock, ert-async, ert-runner, cl-generic, cl-lib, commander, epl, f, fetchFromGitHub, git, gitUpdater, melpaBuild, noflet, package-build, s, servant, shell-split-string, shut-up, }: melpaBuild (finalAttrs: { pname = "cask"; version = "0.8.8"; version = "0.9.0"; src = fetchFromGitHub { name = "cask-source-${finalAttrs.version}"; owner = "cask"; repo = "cask"; rev = "v${finalAttrs.version}"; hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; }; patches = [ Loading @@ -38,29 +35,28 @@ melpaBuild (finalAttrs: { packageRequires = [ ansi dash ecukes el-mock ert-async ert-runner cl-generic cl-lib commander epl f git noflet package-build s servant shell-split-string shut-up ]; ignoreCompilationError = false; strictDeps = true; # use melpaVersion so that it works for unstable releases too postPatch = '' lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.version} \ lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ substituteAllInPlace bin/cask ''; # TODO: use installBin as soon as installBin arrives Master branch postInstall = '' install -D -t $out/bin bin/cask ''; Loading Loading
pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff +36 −17 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= diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask --- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 +++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300 @@ -21,8 +21,6 @@ set -euo pipefail CASK=$0 EMACS=${CASK_EMACS:-${EMACS:-emacs}} -READLINK=${READLINK:-readlink} -GREADLINK=${GREADLINK:-greadlink} if [ "$#" -eq "0" ] ; then subcommand=install @@ -31,21 +29,10 @@ shift fi -set +eu -SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null) -if [ -z "$SRCDIR__" ] ; then - SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null) -fi - READLINK=${READLINK:-$($WHICH greadlink || true)} - if [ ! -z "$READLINK" ] ; then - SRCDIR__=$($READLINK -f "$CASK") - else -set -eu -if [ -z "$SRCDIR__" ]; then - SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") -fi -SRCDIR_=$(dirname "$SRCDIR__") -SRCDIR=$(dirname "$SRCDIR_") case $subcommand in emacs) EMACS="$EMACS" \ - "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ + "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \ --eval "(cask--initialize (expand-file-name default-directory))" \ "$@" ;; @@ -53,6 +40,6 @@ EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" ;; *) - "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" + "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" ;; Loading
pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +16 −20 Original line number Diff line number Diff line { lib, ansi, coreutils, dash, ecukes, el-mock, ert-async, ert-runner, cl-generic, cl-lib, commander, epl, f, fetchFromGitHub, git, gitUpdater, melpaBuild, noflet, package-build, s, servant, shell-split-string, shut-up, }: melpaBuild (finalAttrs: { pname = "cask"; version = "0.8.8"; version = "0.9.0"; src = fetchFromGitHub { name = "cask-source-${finalAttrs.version}"; owner = "cask"; repo = "cask"; rev = "v${finalAttrs.version}"; hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; }; patches = [ Loading @@ -38,29 +35,28 @@ melpaBuild (finalAttrs: { packageRequires = [ ansi dash ecukes el-mock ert-async ert-runner cl-generic cl-lib commander epl f git noflet package-build s servant shell-split-string shut-up ]; ignoreCompilationError = false; strictDeps = true; # use melpaVersion so that it works for unstable releases too postPatch = '' lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.version} \ lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ substituteAllInPlace bin/cask ''; # TODO: use installBin as soon as installBin arrives Master branch postInstall = '' install -D -t $out/bin bin/cask ''; Loading