summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2024-01-07 17:41:52 +0100
committerGitHub <noreply@github.com>2024-01-07 17:41:52 +0100
commit46ffff7b8f964695258b8ce5de4462c21db4bf3a (patch)
tree493814b2bc2cbcefb6754c4c3105297203c6ad0a
parentMerge pull request #279266 from wegank/osinfo-db-bump (diff)
downloadnixpkgs-origin/revert-249970-pandoc-version-match-lib.tar.gz
Revert "pandoc: use library's version"origin/revert-249970-pandoc-version-match-lib
-rw-r--r--pkgs/development/tools/pandoc/default.nix9
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix
index a2ceef50eb6f..e7f78bdb8fda 100644
--- a/pkgs/development/tools/pandoc/default.nix
+++ b/pkgs/development/tools/pandoc/default.nix
@@ -6,15 +6,6 @@ let
in
(haskell.lib.compose.overrideCabal (drv: {
- # pandoc-cli's pandoc executable report the libraries version via --version, match that,
- inherit (static.scope.pandoc) version;
- # but prevent haskellPackages.mkDerivation from recomputing the src tarball based on that.
- inherit (static) src;
- # Make it possible to recover the cli version if necessary.
- passthru = drv.passthru or {} // {
- cliVersion = static.version;
- };
-
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
buildTools = (drv.buildTools or []) ++ [