From 1b0a2d8447505616835b220147f0a0a50d8b4ff6 Mon Sep 17 00:00:00 2001
From: Thiago Franco de Moraes <totonixsame@gmail.com>
Date: Thu, 25 Mar 2021 16:57:17 -0300
Subject: [PATCH] zettlr: remove pandoc-citeproc from dependencies
Pandoc-citeproc is no longer maintained. Pandoc now uses the citeproc
library, and no external filter is needed. Also use nixpkgs-fmt to
format archive.
---
pkgs/applications/misc/zettlr/default.nix | 14 ++++++++++----
pkgs/top-level/all-packages.nix | 1 -
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix
index 4b9627a843b..eb8c81dae7e 100644
--- a/pkgs/applications/misc/zettlr/default.nix
+++ b/pkgs/applications/misc/zettlr/default.nix
@@ -1,5 +1,10 @@
-{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas
-, texlive, pandoc, pandoc-citeproc
+{ appimageTools
+, lib
+, fetchurl
+, gtk3
+, gsettings-desktop-schemas
+, texlive
+, pandoc
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
@@ -14,7 +19,8 @@ let
appimageContents = appimageTools.extractType2 {
inherit name src;
};
-in appimageTools.wrapType2 rec {
+in
+appimageTools.wrapType2 rec {
inherit name src;
profile = ''
@@ -22,7 +28,7 @@ in appimageTools.wrapType2 rec {
'';
multiPkgs = null; # no 32bit needed
- extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ];
+ extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e02ba5c0a9..548470b1646 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30479,7 +30479,6 @@ in
zettlr = callPackage ../applications/misc/zettlr {
texlive = texlive.combined.scheme-medium;
- inherit (haskellPackages) pandoc-citeproc;
};
unifi-poller = callPackage ../servers/monitoring/unifi-poller {};