public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zettlr: remove pandoc-citeproc from dependencies

Browse Source 
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.
This commit is contained in:
Thiago Franco de Moraes 2021-03-25 16:57:17 -03:00 committed by sterni
parent dba181a2dc
commit 1b0a2d8447
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/zettlr/default.nix
View File

@ -1,5 +1,10 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas { appimageTools
, texlive, pandoc, pandoc-citeproc , lib
, fetchurl
, gtk3
, gsettings-desktop-schemas
, texlive
, pandoc
}: }:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
@ -14,7 +19,8 @@ let
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
inherit name src; inherit name src;
}; };
in appimageTools.wrapType2 rec { in
appimageTools.wrapType2 rec {
inherit name src; inherit name src;
profile = '' profile = ''
@ -22,7 +28,7 @@ in appimageTools.wrapType2 rec {
''; '';
multiPkgs = null; # no 32bit needed multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop

1
pkgs/top-level/all-packages.nix
View File

@ -30479,7 +30479,6 @@ in
zettlr = callPackage ../applications/misc/zettlr { zettlr = callPackage ../applications/misc/zettlr {
texlive = texlive.combined.scheme-medium; texlive = texlive.combined.scheme-medium;
inherit (haskellPackages) pandoc-citeproc;
}; };
unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; unifi-poller = callPackage ../servers/monitoring/unifi-poller {};