commit 66063074cf41f08c39738b1436f4bdae7fb97265 · pyrox.dev/nixpkgs

+85

pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0001-cask-bootstrap.diff

···

       1
       1
       +
       diff --git a/cask-bootstrap.el b/cask-bootstrap.el

     

       2
       2
       +
       --- a/cask-bootstrap.el

     

       3
       3
       +
       +++ b/cask-bootstrap.el

     

       4
       4
       +
       @@ -27,41 +27,18 @@

     

       5
       5
       +
        

     

       6
       6
       +
        ;;; Code:

     

       7
       7
       +
        

     

       8
       8
       +
       -(require 'package)

     

       9
       9
       +
       +;; Add nix store paths for dependencies to the load-path.

     

       10
       10
       +
       +(let ((paths '(@loadPaths@)))

     

       11
       11
       +
       +  (dolist (path paths)

     

       12
       12
       +
       +    (push path load-path)))

     

       13
       13
       +
        

     

       14
       14
       +
       -(defvar cask-directory)

     

       15
       15
       +
       +(let ((paths '(@nativeLoadPaths@)))

     

       16
       16
       +
       +  (dolist (path paths)

     

       17
       17
       +
       +    (push path native-comp-eln-load-path)))

     

       18
       18
       +
        

     

       19
       19
       +
       -(defconst cask-bootstrap-dir

     

       20
       20
       +
       -  (expand-file-name

     

       21
       21
       +
       -   (locate-user-emacs-file

     

       22
       22
       +
       -    (format ".cask/%s.%s/bootstrap" emacs-major-version emacs-minor-version)))

     

       23
       23
       +
       -  "Path to Cask bootstrap directory.")

     

       24
       24
       +
       -

     

       25
       25
       +
       -;; Restore several package- variables and `load-path` after let-scope.

     

       26
       26
       +
       -(let (package-alist

     

       27
       27
       +
       -      package-archive-contents

     

       28
       28
       +
       -      package--initialized

     

       29
       29
       +
       -      (load-path (add-to-list

     

       30
       30
       +
       -                  'load-path (expand-file-name "package-build" cask-directory)))

     

       31
       31
       +
       -      (package-archives '(("gnu" . "https://elpa.gnu.org/packages/")

     

       32
       32
       +
       -                          ("melpa" . "https://melpa.org/packages/")))

     

       33
       33
       +
       -      (package-user-dir cask-bootstrap-dir)

     

       34
       34
       +
       -      (deps '(s f commander git epl shut-up cl-lib cl-generic eieio ansi)))

     

       35
       35
       +
       -  (package-initialize)

     

       36
       36
       +
       -  (setq package-archive-contents nil) ;; force refresh, cask#573, cask#559

     

       37
       37
       +
       -  (unless (package-installed-p 'cl-lib)

     

       38
       38
       +
       -    ;; package-build depends on cl-lib

     

       39
       39
       +
       -    (unless package-archive-contents

     

       40
       40
       +
       -      (package-refresh-contents))

     

       41
       41
       +
       -    (package-install 'cl-lib))

     

       42
       42
       +
       -  (require 'package-build)

     

       43
       43
       +
       +(let ((deps '(@depsMod@)))

     

       44
       44
       +
          (dolist (pkg deps)

     

       45
       45
       +
       -    (unless (featurep pkg)

     

       46
       46
       +
       -      (unless (package-installed-p pkg)

     

       47
       47
       +
       -        (unless package-archive-contents

     

       48
       48
       +
       -          (package-refresh-contents))

     

       49
       49
       +
       -        (package-install pkg))

     

       50
       50
       +
       -      (require pkg))))

     

       51
       51
       +
       +    (require pkg)))

     

       52
       52
       +
        

     

       53
       53
       +
        (provide 'cask-bootstrap)

     

       54
       54
       +
        

     

       55
       55
       +
       diff --git a/cask-cli.el b/cask-cli.el

     

       56
       56
       +
       --- a/cask-cli.el

     

       57
       57
       +
       +++ b/cask-cli.el

     

       58
       58
       +
       @@ -129,25 +129,8 @@ already is installed, it will not be installed again."

     

       59
       59
       +
            (cask-install (cask-cli--bundle))))

     

       60
       60
       +
        

     

       61
       61
       +
        (defun cask-cli/upgrade-cask ()

     

       62
       62
       +
       -  "Upgrade Cask itself and its dependencies.

     

       63
       63
       +
       -

     

       64
       64
       +
       -This command requires that Cask is installed using Git and that

     

       65
       65
       +
       -Git is available in `exec-path'."

     

       66
       66
       +
       -  (unless (f-exists? (f-expand ".no-upgrade" cask-directory))

     

       67
       67
       +
       -    (unwind-protect

     

       68
       68
       +
       -        (progn

     

       69
       69
       +
       -          (epl-change-package-dir cask-bootstrap-dir)

     

       70
       70
       +
       -          (epl-initialize)

     

       71
       71
       +
       -          (epl-add-archive "gnu" "https://elpa.gnu.org/packages/")

     

       72
       72
       +
       -          (epl-add-archive "melpa" "https://melpa.org/packages/")

     

       73
       73
       +
       -          (epl-refresh)

     

       74
       74
       +
       -          (epl-upgrade))

     

       75
       75
       +
       -      (epl-reset))

     

       76
       76
       +
       -    (require 'git)

     

       77
       77
       +
       -    (let ((git-repo cask-directory))

     

       78
       78
       +
       -      (if (s-present? (git-run "status" "--porcelain"))

     

       79
       79
       +
       -          (error "Cannot update Cask because of dirty tree")

     

       80
       80
       +
       -        (git-pull)))))

     

       81
       81
       +
       +  "Disabled in Nixpkgs as this function requires that Cask is installed using Git."

     

       82
       82
       +
       +  (princ "Upgrade not available when installed via Nixpkgs.\n"))

     

       83
       83
       +
        

     

       84
       84
       +
        (defun cask-cli/exec (&rest _args)

     

       85
       85
       +
          "Execute ARGS with correct `exec-path' and `load-path'.")

+83 -48

pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix

···

       4
       4
        
         cl-generic,

     

       5
       5
        
         cl-lib,

     

       6
       6
        
         commander,

     

       7
       7
       -
       

     

       8
       7
        
         epl,

     

       9
       8
        
         f,

     

       10
       9
        
         fetchFromGitHub,

     

       10
       10
       +
         installShellFiles,

     

       11
       11
        
         git,

     

       12
       12
        
         melpaBuild,

     

       13
       13
        
         package-build,

     

       14
       14
       +
         replaceVars,

     

       14
       15
        
         s,

     

       15
       16
        
         shut-up,

     

       16
       17
        
       }:

     

       18
       18
       +
       let

     

       19
       19
       +
         formatLoadPath = x: ''"${x}/share/emacs/site-lisp/elpa/${x.ename}-${x.melpaVersion or x.version}"'';

     

       20
       20
       +
         formatNativeLoadPath = x: ''"${x}/share/emacs/native-lisp"'';

     

       21
       21
       +
         getAllDependenciesOfPkg =

     

       22
       22
       +
           pkg:

     

       23
       23
       +
           let

     

       24
       24
       +
             direct = builtins.filter (x: x != null) (pkg.packageRequires or [ ]);

     

       25
       25
       +
             indirect = builtins.concatLists (map getAllDependenciesOfPkg direct);

     

       26
       26
       +
           in

     

       27
       27
       +
           lib.unique (direct ++ indirect);

     

       28
       28
       +
       in

     

       29
       29
       +
       melpaBuild (

     

       30
       30
       +
         finalAttrs:

     

       31
       31
       +
         let

     

       32
       32
       +
           nixpkgDependencies = getAllDependenciesOfPkg finalAttrs.finalPackage;

     

       33
       33
       +
           loadPaths = builtins.concatStringsSep " " (map formatLoadPath nixpkgDependencies);

     

       34
       34
       +
           nativeLoadPaths = builtins.concatStringsSep " " (

     

       35
       35
       +
             map formatNativeLoadPath (nixpkgDependencies ++ [ (placeholder "out") ])

     

       36
       36
       +
           );

     

       37
       37
       +
           emacsBuiltinDeps = [

     

       38
       38
       +
             "cl-lib"

     

       39
       39
       +
             "eieio"

     

       40
       40
       +
           ];

     

       41
       41
       +
           depsMod = builtins.concatStringsSep " " ((map (x: x.ename) nixpkgDependencies) ++ emacsBuiltinDeps);

     

       42
       42
       +
         in

     

       43
       43
       +
         {

     

       44
       44
       +
           pname = "cask";

     

       45
       45
       +
           version = "0.9.1";

     

       17
       46
        
       

     

       18
       18
       -
       melpaBuild (finalAttrs: {

     

       19
       19
       -
         pname = "cask";

     

       20
       20
       -
         version = "0.9.0";

     

       47
       47
       +
           src = fetchFromGitHub {

     

       48
       48
       +
             name = "cask-source-${finalAttrs.version}";

     

       49
       49
       +
             owner = "cask";

     

       50
       50
       +
             repo = "cask";

     

       51
       51
       +
             rev = "v${finalAttrs.version}";

     

       52
       52
       +
             hash = "sha256-/vinpQ51AuaTbXW4L4MnVonyfzTMvHUF4HViSPBKZxs=";

     

       53
       53
       +
           };

     

       21
       54
        
       

     

       22
       22
       -
         src = fetchFromGitHub {

     

       23
       23
       -
           name = "cask-source-${finalAttrs.version}";

     

       24
       24
       -
           owner = "cask";

     

       25
       25
       -
           repo = "cask";

     

       26
       26
       -
           rev = "v${finalAttrs.version}";

     

       27
       27
       -
           hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A=";

     

       28
       28
       -
         };

     

       55
       55
       +
           nativeBuildInputs = [ installShellFiles ];

     

       29
       56
        
       

     

       30
       30
       -
         patches = [

     

       31
       31
       -
           # Uses LISPDIR substitution var

     

       32
       32
       -
           ./0000-cask-lispdir.diff

     

       33
       33
       -
         ];

     

       57
       57
       +
           patches = [

     

       58
       58
       +
             # Uses LISPDIR substitution var

     

       59
       59
       +
             ./0000-cask-lispdir.diff

     

       60
       60
       +
             # Use Nix provided dependencies instead of letting Cask bootstrap itself

     

       61
       61
       +
             ./0001-cask-bootstrap.diff

     

       62
       62
       +
           ];

     

       34
       63
        
       

     

       35
       35
       -
         packageRequires = [

     

       36
       36
       -
           ansi

     

       37
       37
       -
           cl-generic

     

       38
       38
       -
           cl-lib

     

       39
       39
       -
           commander

     

       40
       40
       -
           epl

     

       41
       41
       -
           f

     

       42
       42
       -
           git

     

       43
       43
       -
           package-build

     

       44
       44
       -
           s

     

       45
       45
       -
           shut-up

     

       46
       46
       -
         ];

     

       64
       64
       +
           packageRequires = [

     

       65
       65
       +
             ansi

     

       66
       66
       +
             cl-generic

     

       67
       67
       +
             cl-lib

     

       68
       68
       +
             commander

     

       69
       69
       +
             epl

     

       70
       70
       +
             f

     

       71
       71
       +
             git

     

       72
       72
       +
             package-build

     

       73
       73
       +
             s

     

       74
       74
       +
             shut-up

     

       75
       75
       +
           ];

     

       47
       76
        
       

     

       48
       48
       -
         # use melpaVersion so that it works for unstable releases too

     

       49
       49
       -
         postPatch = ''

     

       50
       50
       -
           lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \

     

       51
       51
       -
             substituteAllInPlace bin/cask

     

       52
       52
       -
         '';

     

       77
       77
       +
           postPatch = ''

     

       78
       78
       +
             # use melpaVersion so that it works for unstable releases too

     

       79
       79
       +
             substituteInPlace bin/cask \

     

       80
       80
       +
               --replace-fail @lispdir@ $out/share/emacs/site-lisp/elpa/$ename-$melpaVersion

     

       53
       81
        
       

     

       54
       54
       -
         # TODO: use installBin as soon as installBin arrives Master branch

     

       55
       55
       -
         postInstall = ''

     

       56
       56
       -
           install -D -t $out/bin bin/cask

     

       57
       57
       -
         '';

     

       82
       82
       +
             # using `replaceVars` results in wrong result of `placeholder "out"`

     

       83
       83
       +
             substituteInPlace cask-bootstrap.el \

     

       84
       84
       +
               --replace-fail @depsMod@ '${depsMod}' \

     

       85
       85
       +
               --replace-fail @loadPaths@ '${loadPaths}' \

     

       86
       86
       +
               --replace-fail @nativeLoadPaths@ '${nativeLoadPaths}'

     

       87
       87
       +
           '';

     

       58
       88
        
       

     

       59
       59
       -
         meta = {

     

       60
       60
       -
           homepage = "https://github.com/cask/cask";

     

       61
       61
       -
           description = "Project management for Emacs";

     

       62
       62
       -
           longDescription = ''

     

       63
       63
       -
             Cask is a project management tool for Emacs that helps automate the

     

       64
       64
       -
             package development cycle; development, dependencies, testing, building,

     

       65
       65
       -
             packaging and more.

     

       89
       89
       +
           postInstall = ''

     

       90
       90
       +
             installBin bin/cask

     

       66
       91
        
           '';

     

       67
       67
       -
           license = lib.licenses.gpl3Plus;

     

       68
       68
       -
           mainProgram = "cask";

     

       69
       69
       -
           maintainers = with lib.maintainers; [ ];

     

       70
       70
       -
         };

     

       71
       71
       -
       })

     

       92
       92
       +
       

     

       93
       93
       +
           meta = {

     

       94
       94
       +
             homepage = "https://github.com/cask/cask";

     

       95
       95
       +
             description = "Project management for Emacs";

     

       96
       96
       +
             longDescription = ''

     

       97
       97
       +
               Cask is a project management tool for Emacs that helps automate the

     

       98
       98
       +
               package development cycle; development, dependencies, testing, building,

     

       99
       99
       +
               packaging and more.

     

       100
       100
       +
             '';

     

       101
       101
       +
             license = lib.licenses.gpl3Plus;

     

       102
       102
       +
             mainProgram = "cask";

     

       103
       103
       +
             maintainers = with lib.maintainers; [ ];

     

       104
       104
       +
           };

     

       105
       105
       +
         }

     

       106
       106
       +
       )