Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2019-10-20 17:03:09 +02:00
commit e91f8dddc8

View File

@ -8,7 +8,7 @@
}: }:
let # beware: updates often break cups-filters build let # beware: updates often break cups-filters build
version = "0.79.0"; version = "0.74.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz"; url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr"; sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];