From c2e576b1986c48487159b8135efeecda839d4a4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 May 2020 06:23:31 +0000 Subject: mupdf: 1.16.1 -> 1.17.0 (cherry picked from commit f51b59383bdb13d70cc564e904baeacb75dc95c3) --- pkgs/applications/misc/mupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 34ada062c717..61eb32bbd5cd 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7"; + sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; }; patches = -- cgit 1.4.1 From 859f1c7ddaa9d1ce9df00eccad2f00436ada5b36 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 26 May 2020 08:54:42 +0200 Subject: zathura-pdf-mupdf: add patch for MuPDF 1.17 support --- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 82c94d48068a..32a2ec420110 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl +{ stdenv, lib, meson, ninja, fetchurl, fetchpatch , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq"; }; + patches = [ + # compatibility with MuPDF 1.17 + (fetchpatch { + url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/commit/c7f341addb76d5e6fd8c24c666d8fe97c451a4cb.patch"; + sha256 = "12rikx2j7dpngfma9x4i504w58a8xx3rc0gmyz183v19hn54c075"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ -- cgit 1.4.1 From 54e37df5251757c68ce5012f211bec22d2db329f Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sat, 6 Jun 2020 13:33:00 +0200 Subject: llpp: v31 -> v32 compatibility with muPDF 1.17 --- pkgs/applications/misc/llpp/default.nix | 4 +-- pkgs/applications/misc/llpp/fix-build-bash.patch | 32 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e2ec64932ff2..d7752258df98 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "31"; + version = "32"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg"; + sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y"; fetchSubmodules = false; }; diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch index 13dbdb926c8f..fbc341c8af78 100644 --- a/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -17,48 +17,48 @@ index 7c278b6..41494c5 100755 -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -isfresh "$mulibs" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs -- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past +- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past -) && vecho "fresh mupdf" - oincs() { local i= local incs1= -@@ -90,34 +83,6 @@ mflags() { +@@ -89,34 +82,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.08" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz +-test "$overs" = "4.10.0" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz - txz=$outd/$(basename $url) -- isfresh $txz $url || { +- keycmd="printf $url; digest $txz;" +- isfresh $txz "$(eval $keycmd)" || { - executable_p() { command -v "$1" >/dev/null 2>&1; } - if executable_p wget; then dl() { wget -q "$1" -O "$2"; } - elif executable_p curl; then dl() { curl -L "$1" -o "$2"; } - else die "no program to fetch remote urls found" - fi - dl $url $txz -- echo "k=$url" >$txz.past +- eval $keycmd >$txz.past - } && vecho "fresh $txz" - absprefix=$(cd $outd &>/dev/null; pwd -P) - export PATH=$absprefix/bin:$PATH -- isfresh $absprefix/bin/ocamlc "$url" || ( +- ocamlc=$absprefix/bin/ocamlc +- keycmd="printf $url; digest $ocamlc;" +- isfresh $ocamlc "$(eval $keycmd)" || ( - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure --disable-vmthreads --disable-graph-lib \ -- --disable-ocamldoc --enable-debugger=no \ -- --disable-flat-float-array \ -- --prefix=$absprefix +- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix - make -j $mjobs world - make install -- echo "k='$url'" >$absprefix/bin/ocamlc.past +- eval $keycmd >$absprefix/bin/ocamlc.past - ) && vecho "fresh ocamlc" - overs=$(ocamlc -vnum 2>/dev/null) -} - bocaml1() { - grep -q "$3" $outd/ordered || { -@@ -227,7 +192,7 @@ bobjc() { + ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \ + { read _ c; echo $c; })} +@@ -230,7 +195,7 @@ bobjc() { } && vecho "fresh $o" } @@ -67,7 +67,7 @@ index 7c278b6..41494c5 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" -- cgit 1.4.1 From 232651e3b66762e97bdf3173fcbcba7f0d4d8ad7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 16:47:27 +0000 Subject: pueue: 0.5.0 -> 0.5.1 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 3882debd9980..a51cd75e7990 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; + sha256 = "1n85b41kvx7x7qdizdnq1p0zrkap4gkwnnvhh4pz6j9njxj8d9ir"; }; - cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; + cargoSha256 = "0hkkz74hllc5dzmgls6bgdxsdr871df2fn51sa3shv68ah0avxff"; nativeBuildInputs = [ installShellFiles ]; -- cgit 1.4.1