Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master
- Loading branch information
Showing
33 changed files
with
389 additions
and
267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) | ||
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty | ||
, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg | ||
, poppler_data, qt4 | ||
}: | ||
|
||
let | ||
# Last version supporting QT4 | ||
version = "0.61.1"; | ||
in | ||
stdenv.mkDerivation rec { | ||
name = "poppler-qt4-${version}"; | ||
|
||
src = fetchurl { | ||
url = "${meta.homepage}/poppler-${version}.tar.xz"; | ||
sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; | ||
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; | ||
|
||
propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; | ||
|
||
nativeBuildInputs = [ cmake ninja pkgconfig ]; | ||
|
||
cmakeFlags = [ | ||
"-DENABLE_XPDF_HEADERS=on" | ||
"-DENABLE_UTILS=off" | ||
]; | ||
|
||
meta = with lib; { | ||
homepage = https://poppler.freedesktop.org/; | ||
description = "A PDF rendering library"; | ||
|
||
longDescription = '' | ||
Poppler is a PDF rendering library based on the xpdf-3.0 code base. | ||
''; | ||
|
||
license = licenses.gpl2; | ||
platforms = platforms.all; | ||
maintainers = with maintainers; [ ttuegel ]; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
{ lib, buildPythonPackage, fetchPypi, chardet, hypothesis }: | ||
|
||
buildPythonPackage rec { | ||
pname = "binaryornot"; | ||
version = "0.4.4"; | ||
|
||
src = fetchPypi { | ||
inherit pname version; | ||
sha256 = "359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"; | ||
}; | ||
|
||
prePatch = '' | ||
# See https://github.com/audreyr/binaryornot/issues/40 | ||
substituteInPlace tests/test_check.py \ | ||
--replace "average_size=512" "average_size=128" | ||
''; | ||
|
||
propagatedBuildInputs = [ chardet ]; | ||
|
||
checkInputs = [ hypothesis ]; | ||
|
||
meta = with lib; { | ||
homepage = https://github.com/audreyr/binaryornot; | ||
description = "Ultra-lightweight pure Python package to check if a file is binary or text"; | ||
license = licenses.bsd3; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
fc23242
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@FRidh: well, this staging evaluation is missing almost half of the binaries. Why did you merge it? I specifically cancel some staging evaluations, because it's just infeasible to fully build each. The main point of staging is reducing the total number of rebuilds.
fc23242
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't see any reaction, reverting in 6168c2e.