summary refs log tree commit diff
path: root/pkgs/tools/typesetting/biber/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/typesetting/biber/default.nix')
-rw-r--r--pkgs/tools/typesetting/biber/default.nix21
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 123147cb5f1..4556bd8b639 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchFromGitHub, perlPackages }:
+{ stdenv, fetchFromGitHub, perlPackages, texlive }:
 
-# builds but doesn't work with perl 5.24, see discussion in #40826
-# TODO: build with perl >=5.26 and try to enable tests
+let
+  biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
+in
 
 perlPackages.buildPerlModule rec {
   name = "biber-${version}";
-  version = "2.11";
+  inherit (biberSource) version;
 
-  src = fetchFromGitHub {
-    owner = "plk";
-    repo = "biber";
-    rev = "v${version}";
-    sha256 = "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz";
-  };
+  src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
   buildInputs = with perlPackages; [
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
@@ -25,8 +21,9 @@ perlPackages.buildPerlModule rec {
     TestDifferences
   ];
 
-  # Tests depend on the precise Unicode-Collate version (expects 1.19, but we have 1.25)
-  doCheck = false;
+  checkInputs = with perlPackages; [
+    UnicodeCollate
+  ];
 
   meta = with stdenv.lib; {
     description = "Backend for BibLaTeX";