Merge pull request #335440 from linj-fork/pr/emacs-manualPackages-resepct-compilation-error

emacs: let nix build for manualPackages fail if native-comp fails
2024-08-22 08:08:47 +08:00
parent fb9cc6a2ee 2421239d66
commit 90f1516eb8
43 changed files with 90 additions and 70 deletions
@@ -23,10 +23,6 @@ lib.packagesFromDirectoryRecursive {
    inherit (pkgs) basedpyright git go gopls python3;
  };

-  matrix-client = callPackage ./manual-packages/matrix-client {
-    _map = self.map;
-  };
-
  structured-haskell-mode = self.shm;

  texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
@@ -48,5 +44,6 @@ lib.packagesFromDirectoryRecursive {
  ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15
  ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17
  haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17
+  matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17
  perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19
 }
@@ -23,6 +23,8 @@ melpaBuild {
    popon
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -15,6 +15,8 @@ melpaBuild {

  files = ''("acm/*.el" "acm/icons")'';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Asynchronous Completion Menu";
    homepage = "https://github.com/manateelazycat/lsp-bridge";
@@ -8,6 +8,8 @@ melpaBuild {

  files = ''("src/data/emacs-mode/*.el")'';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (Agda.meta) homepage license;
    description = "Agda2-mode for Emacs extracted from Agda package";
@@ -25,6 +25,8 @@ melpaBuild {
    })
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/control-lock.el";
    description = "Like caps-lock, but for your control key";
@@ -30,6 +30,8 @@ melpaBuild {

  propagatedUserEnvPkgs = [ nodejs ];

+  ignoreCompilationError = false;
+
  meta = {
    description = "Unofficial copilot plugin for Emacs";
    homepage = "https://github.com/copilot-emacs/copilot.el";
@@ -13,6 +13,8 @@ melpaBuild rec {
    hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/";
    description = "Major modes for Gentoo package files";
@@ -21,6 +21,8 @@ melpaBuild {

  files = ''(:defaults "msg")'';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };

  meta = {
@@ -27,6 +27,8 @@ melpaBuild {
    make
  '';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -23,6 +23,8 @@ melpaBuild {
    markdown-mode
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -22,6 +22,8 @@ melpaBuild {
    helm
  ];

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://github.com/emacsmirror/helm-words";
    description = "Helm extension for looking up words in dictionaries and thesauri";
@@ -16,6 +16,8 @@ melpaBuild {

  packageRequires = [ haskell-mode ];

+  ignoreCompilationError = false;
+
  meta = {
    inherit (hsc3.meta) homepage license;
    description = "Emacs mode for hsc3";
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -24,6 +24,8 @@ melpaBuild {
    prop-menu
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -27,6 +27,8 @@ melpaBuild rec {
    mv tmp.el jam-mode.el
  '';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Emacs major mode for editing Jam files";
    license = lib.licenses.gpl2Plus;
@@ -19,6 +19,8 @@ melpaBuild {

  files = ''("tools/emacs/ligo-mode.el")'';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -9,6 +9,8 @@ melpaBuild {
     "llvm/utils/emacs/README")
  '';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (llvmPackages.llvm.meta) homepage license;
    description = "Major mode for the LLVM assembler language";
@@ -87,6 +87,8 @@ melpaBuild {

  __darwinAllowLocalNetworking = true;

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -24,6 +24,8 @@ melpaBuild {
  # to compile lspce.el, it needs lspce-module.so
  files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")'';

+  ignoreCompilationError = false;
+
  passthru = {
    inherit lspce-module;
    updateScript = nix-update-script {
@@ -1,65 +0,0 @@
-{
-  lib,
-  melpaBuild,
-  fetchFromGitHub,
-  fetchpatch,
-  # Emacs packages
-  _map,
-  a,
-  anaphora,
-  cl-lib,
-  dash,
-  dash-functional,
-  esxml,
-  f,
-  frame-purpose,
-  ht,
-  ov,
-  rainbow-identifiers,
-  request,
-  s,
-  tracking,
-}:
-
-melpaBuild {
-  pname = "matrix-client";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "alphapapa";
-    repo = "matrix-client.el";
-    rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
-    hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk=";
-  };
-
-  patches = [
-    # Fix: avatar loading when imagemagick support is not available
-    (fetchpatch {
-      url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
-      hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0=";
-    })
-  ];
-
-  packageRequires = [
-    _map
-    a
-    anaphora
-    cl-lib
-    dash
-    dash-functional
-    esxml
-    f
-    frame-purpose
-    ht
-    ov
-    rainbow-identifiers
-    request
-    s
-    tracking
-  ];
-
-  meta = {
-    description = "Chat client and API wrapper for Matrix.org";
-    license = lib.licenses.gpl3Plus;
-  };
-}
@@ -27,6 +27,8 @@ elpaBuild {
    popd
  '';

+  ignoreCompilationError = false;
+
  meta = mu.meta // {
    description = "Full-featured e-mail client";
  };
@@ -59,6 +59,8 @@ melpaBuild {
    install -D --target-directory=$out/bin source/notdeft-xapian
  '';

+  ignoreCompilationError = false;
+
  passthru = {
    updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
  };
@@ -15,6 +15,8 @@ melpaBuild {
    popd
  '';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Emacs ott mode (from ott sources)";
    inherit (ott.meta) homepage license;
@@ -26,6 +26,8 @@ melpaBuild {
    install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README
  '';

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://metacpan.org/dist/pod-mode";
    description = "Major mode for editing .pod-files";
@@ -3,13 +3,17 @@
  fetchFromGitHub,
  melpaBuild,
  js2-mode,
+  lsp-mode,
 }:

 melpaBuild {
  pname = "prisma-mode";
  version = "0-unstable-2021-12-07";

-  packageRequires = [ js2-mode ];
+  packageRequires = [
+    js2-mode
+    lsp-mode
+  ];

  src = fetchFromGitHub {
    owner = "pimeys";
@@ -18,6 +22,8 @@ melpaBuild {
    hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    description = "Major mode for Prisma Schema Language";
    license = lib.licenses.gpl2Only;
@@ -19,6 +19,8 @@ melpaBuild {
      --replace-fail ";; prolog.el ---" ";;; prolog.el ---"
  '';

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
    description = "Prolog mode for Emacs";
@@ -19,6 +19,8 @@ melpaBuild {
    hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
    description = "Swedish calendar for Emacs";
@@ -10,6 +10,8 @@ melpaBuild {

  files = ''("emacs/*.el")'';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (texpresso.meta) homepage license;
    description = "Emacs mode for TeXpresso";
@@ -44,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: {
          fi
        '') plugins);

+  ignoreCompilationError = false;
+
  passthru = old.passthru or {} // {
    inherit plugins;
    withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; };
@@ -20,6 +20,8 @@ melpaBuild {

  dontConfigure = true;

+  ignoreCompilationError = false;
+
  meta = {
    description = "Major mode for editing Ur/Web";
    inherit (urweb.meta) license homepage;
@@ -15,6 +15,7 @@
  porthole,
  unstableGitUpdater,
  yasnippet,
+  el-patch,
 }:

 melpaBuild {
@@ -45,8 +46,11 @@ melpaBuild {
    nav-flash
    porthole
    yasnippet
+    el-patch
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/yes-no.el";
    description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {