$out/bin/cura
- #!${bash}/bin/bash
- PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@"
- EOT
-
- chmod 555 $out/bin/cura
- '';
-
- meta = with stdenv.lib; {
- description = "3D printing host software for the Lulzbot";
-
- longDescription = ''
- Cura LulzBot Edition is a fork of the 3D printing/slicing
- software from Ultimaker, with changes to support 3D printers
- from Aleph Objects.
- '';
-
- homepage = https://www.lulzbot.com/cura/;
- license = licenses.agpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ pjones ];
- };
-}
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
new file mode 100644
index 00000000000..90f5f307d85
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -0,0 +1,26 @@
+{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
+
+stdenv.mkDerivation rec {
+ pname = "curaengine-lulzBot";
+ version = "3.6.18";
+
+ src = fetchgit {
+ url = https://code.alephobjects.com/source/curaengine-lulzbot.git;
+ rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d";
+ sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libarcusLulzbot stb protobuf ];
+
+ cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
+
+ meta = with stdenv.lib; {
+ description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
+ homepage = https://code.alephobjects.com/source/curaengine-lulzbot/;
+ license = licenses.agpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
+
diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix
new file mode 100644
index 00000000000..2d32d1895f9
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/default.nix
@@ -0,0 +1,78 @@
+{ lib, callPackage, fetchgit, cmake, jq, python3Packages, qtbase, qtquickcontrols2 }:
+
+let
+ # admittedly, we're using (printer firmware) blobs when we could compile them ourselves.
+ curaBinaryDataVersion = "3.6.18"; # Marlin v2.0.0.144. Keep this accurate wrt. the below.
+ curaBinaryData = fetchgit {
+ url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git;
+ rev = "cdc046494bbfe1f65bfb34659a257eef9a0100a0";
+ sha256 = "0v0s036gxdjiglas2yzw95alv60sw3pq5k1zrrhmw9mxr4irrblb";
+ };
+
+ libarcusLulzbot = callPackage ./libarcus.nix {
+ inherit (python3Packages) buildPythonPackage sip pythonOlder;
+ };
+ libsavitarLulzbot = callPackage ./libsavitar.nix {
+ inherit (python3Packages) buildPythonPackage sip pythonOlder;
+ };
+
+ inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
+ curaengine = callPackage ./curaengine.nix {
+ inherit libarcusLulzbot;
+ };
+ uraniumLulzbot = callPackage ./uranium.nix {
+ inherit callPackage libarcusLulzbot;
+ inherit (python3Packages) buildPythonPackage pyqt5 numpy scipy shapely pythonOlder;
+ };
+in
+python3Packages.buildPythonApplication rec {
+ name = "cura-lulzbot-${version}";
+ version = "3.6.18";
+
+ src = fetchgit {
+ url = https://code.alephobjects.com/source/cura-lulzbot.git;
+ rev = "71f1ac5a2b9f535175a3858a565930348358a9ca";
+ sha256 = "0by06fpxvdgy858lwhsccbmvkdq67j2s1cz8v6jnrnjrsxk7vzka";
+ };
+
+ format = "other"; # using cmake to build
+ buildInputs = [ qtbase qtquickcontrols2 ];
+ # numpy-stl temporarily disabled due to https://code.alephobjects.com/T8415
+ propagatedBuildInputs = with python3Packages; [ pyserial requests zeroconf ] ++ [ libsavitarLulzbot uraniumLulzbot libarcusLulzbot ]; # numpy-stl
+ nativeBuildInputs = [ cmake python3Packages.wrapPython ];
+
+ cmakeFlags = [
+ "-DURANIUM_DIR=${uraniumLulzbot.src}"
+ "-DCURA_VERSION=${version}"
+ ];
+
+ postPatch = ''
+ sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+ sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
+ '';
+
+ preFixup = ''
+ substituteInPlace "$out/bin/cura-lulzbot" --replace 'import cura.CuraApplication' 'import Savitar; import cura.CuraApplication'
+ ln -sT "${curaBinaryData}/cura/resources/firmware" "$out/share/cura/resources/firmware"
+ ln -sT "${uraniumLulzbot}/share/uranium" "$out/share/uranium"
+ ${jq}/bin/jq --arg out "$out" '.build=$out' >"$out/version.json" <<'EOF'
+ ${builtins.toJSON {
+ cura = version;
+ cura_version = version;
+ binarydata = curaBinaryDataVersion;
+ engine = curaengine.version;
+ libarcus = libarcusLulzbot.version;
+ libsavitar = libsavitarLulzbot.version;
+ uranium = uraniumLulzbot.version;
+ }}
+ EOF
+ '';
+
+ meta = with lib; {
+ description = "3D printer / slicing GUI built on top of the Uranium framework";
+ homepage = https://code.alephobjects.com/diffusion/CURA/;
+ license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
new file mode 100644
index 00000000000..4d32328af8b
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
+
+buildPythonPackage {
+ pname = "libarcus";
+ version = "3.6.18";
+ format = "other";
+
+ src = fetchgit {
+ url = https://code.alephobjects.com/source/arcus.git;
+ rev = "c795c0644591703ce04e1fd799fc97b1539031aa";
+ sha256 = "1yap9wbqxbjx3kqyqcsldny4mlcm33ywiwpdjlfgs0wjahfg4ip0";
+ };
+
+ disabled = pythonOlder "3.4.0";
+
+ propagatedBuildInputs = [ sip ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ protobuf ];
+
+ postPatch = ''
+ # To workaround buggy SIP detection which overrides PYTHONPATH
+ sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Communication library between internal components for Ultimaker software";
+ homepage = https://code.alephobjects.com/source/arcus/;
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
+
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
new file mode 100644
index 00000000000..f8ffbf041bd
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
+
+buildPythonPackage {
+ pname = "libsavitar-lulzbot";
+ name = "libsavitar-lulzbot";
+ version = "3.6.18";
+ format = "other";
+
+ src = fetchgit {
+ url = https://code.alephobjects.com/source/savitar.git;
+ rev = "988a26d35b2a1d042f8c38938ccda77ab146af7d";
+ sha256 = "146agw3a92azkgs5ahmn2rrck4an78m2r3pcss6ihmb60lx165k7";
+ };
+
+ postPatch = ''
+ # To workaround buggy SIP detection which overrides PYTHONPATH
+ sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+ '';
+
+ nativeBuildInputs = [ cmake ];
+
+ propagatedBuildInputs = [ sip ];
+
+ disabled = pythonOlder "3.4.0";
+
+ meta = with stdenv.lib; {
+ description = "C++ implementation of 3mf loading with SIP python bindings";
+ homepage = https://github.com/Ultimaker/libSavitar;
+ license = licenses.lgpl3Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch b/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
new file mode 100644
index 00000000000..2c666a98c8f
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/uranium-qt512-support.patch
@@ -0,0 +1,16 @@
+diff --git a/UM/Qt/Bindings/i18nCatalogProxy.py b/UM/Qt/Bindings/i18nCatalogProxy.py
+index 7e2bb16c..cec70dd6 100644
+--- a/UM/Qt/Bindings/i18nCatalogProxy.py
++++ b/UM/Qt/Bindings/i18nCatalogProxy.py
+@@ -86,9 +86,9 @@ class i18nCatalogProxy(QObject): # [CodeStyle: Ultimaker code style requires cla
+ # \todo Move this to a more generic place so more things can use it.
+ def _wrapFunction(self, engine, this_object, function):
+ # JavaScript code that wraps the Python method call in a closure
+- wrap_js = """function(this_object) {{
++ wrap_js = """(function(this_object) {{
+ return function({args}) {{ return this_object.{function}({args}) }}
+- }}"""
++ }})"""
+
+ # Get the function name and argument list.
+ function_name = function.__name__
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
new file mode 100644
index 00000000000..1ad755cdfbd
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -0,0 +1,41 @@
+{ stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
+, pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
+
+buildPythonPackage {
+ version = "3.6.18";
+ pname = "uranium";
+ name = "uraniumLulzbot";
+ format = "other";
+
+ src = fetchgit {
+ url = https://code.alephobjects.com/diffusion/U/uranium.git;
+ rev = "33df88a7414375ac924ac761113baa48d2ced2b4";
+ sha256 = "109cbv7y105crbrzfp70lmcr9n20ap5c97i5qd46fmxbx86yj7f8";
+ };
+
+ disabled = pythonOlder "3.5.0";
+
+ buildInputs = [ python gettext ];
+ propagatedBuildInputs = [ pyqt5 numpy scipy shapely libarcusLulzbot ];
+ nativeBuildInputs = [ cmake doxygen ];
+
+ # Qt 5.12+ support; see https://code.alephobjects.com/rU70b73ba0a270799b9eacf78e400aa8b8ab3fb2ee
+ patches = [ ./uranium-qt512-support.patch ];
+
+ postPatch = ''
+ sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+ sed -i \
+ -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
+ -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
+ UM/Application.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Python framework for building Desktop applications";
+ homepage = https://code.alephobjects.com/diffusion/U/;
+ license = licenses.lgpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ chaduffy ];
+ };
+}
+
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index a5a196a7810..bdbf8f24136 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -6,13 +6,13 @@ let
octoprint = stdenv.mkDerivation rec {
pname = "Cura-OctoPrintPlugin";
- version = "3.5.5";
+ version = "3.5.8";
src = fetchFromGitHub {
owner = "fieldOfView";
repo = pname;
- rev = "d05a9a4c1a01c584d5cec4f4b7d170077235467a";
- sha256 = "0ik69g3kbn7rz2wh0cfq9ww8x222kagd8jvsd4xlqgq4yrf0jk7x";
+ rev = "46548cbb8d32d10fe3aee12f272d5d8f34271738";
+ sha256 = "0pllba8qx1746pnf5ccbkqn2j6f8hhknpgyrrv244ykvigrlczx0";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
index a53b001b0e9..1972042f805 100644
--- a/pkgs/applications/misc/cura/stable.nix
+++ b/pkgs/applications/misc/cura/stable.nix
@@ -4,7 +4,8 @@ let
version = "15.04";
in
stdenv.mkDerivation rec {
- name = "cura-${version}";
+ pname = "cura";
+ inherit version;
src = fetchurl {
url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix
index 4e620425d5c..a367efaaef3 100644
--- a/pkgs/applications/misc/curabydagoma/default.nix
+++ b/pkgs/applications/misc/curabydagoma/default.nix
@@ -14,7 +14,7 @@
# If, however, someone needs it, we certainly can find a solution.
stdenv.mkDerivation rec {
- name = "curabydagoma-${version}";
+ pname = "curabydagoma";
# Version is the date, UNIX format
version = "1520506579";
# Hash of the user's choice: os, arch, package type...
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index a7339acddee..3e4c77aafc6 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, libarcus, stb, protobuf }:
stdenv.mkDerivation rec {
- name = "curaengine-${version}";
- version = "4.1.0";
+ pname = "curaengine";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "14zy9ir46vndsi4l8kapm6byw02fimm7ava2rfi0kvcckf5yq9w8";
+ sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd";
};
nativeBuildInputs = [ cmake ];
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Ultimaker/CuraEngine;
license = licenses.agpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ abbradar ];
+ maintainers = with maintainers; [ abbradar gebner ];
};
}
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
index ce743a00879..41f110e9ee1 100644
--- a/pkgs/applications/misc/curaengine/stable.nix
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -3,7 +3,8 @@ let
version = "15.04.6";
in
stdenv.mkDerivation {
- name = "curaengine-${version}";
+ pname = "curaengine";
+ inherit version;
src = fetchurl {
url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 77a25f2755f..2e821701216 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -6,8 +6,8 @@
# See `pkgs/applications/editors/eclipse/*.nix`
stdenv.mkDerivation rec {
- name = "dbeaver-ce-${version}";
- version = "6.1.0";
+ pname = "dbeaver-ce";
+ version = "6.1.5";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "0ngfv5pcj8hs7zcddwk0jw0l7hnm768wp76yrfyk38wkijk9f412";
+ sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m";
};
installPhase = ''
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.samueldr ];
+ maintainers = [ maintainers.jojosch ];
};
}
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix
index b010e5401b8..3cbb091a4e2 100644
--- a/pkgs/applications/misc/ddgr/default.nix
+++ b/pkgs/applications/misc/ddgr/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.6";
- name = "ddgr-${version}";
+ pname = "ddgr";
src = fetchFromGitHub {
owner = "jarun";
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix
index 7f4629100d5..a1fdabd8ccb 100644
--- a/pkgs/applications/misc/deco/default.nix
+++ b/pkgs/applications/misc/deco/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "deco";
version = "0.0.2";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 4fb9ca5fa71..5699396a084 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }:
stdenv.mkDerivation rec {
- name = "devilspie2-${version}";
+ pname = "devilspie2";
version = "0.43";
src = fetchurl {
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index eeb7a8ccf52..1bfb6bbfeaf 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
+{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }:
let
version = "git-2016-01-10";
in
-stdenv.mkDerivation {
- name = "dfilemanager-${version}";
+mkDerivation {
+ pname = "dfilemanager";
+ inherit version;
src = fetchgit {
url = "git://git.code.sf.net/p/dfilemanager/code";
rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
@@ -13,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake qtbase qttools file solid ];
- cmakeFlags = "-DQT5BUILD=true";
+ cmakeFlags = [ "-DQT5BUILD=true" ];
meta = {
homepage = http://dfilemanager.sourceforge.net/;
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 467c2b3c2d5..af47afcc601 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -8,14 +8,14 @@ let
[ wxGTK ];
in
stdenv.mkDerivation rec {
- name = "diff-pdf-${version}";
- version = "2017-12-30";
+ pname = "diff-pdf";
+ version = "0.3";
src = fetchFromGitHub {
owner = "vslavik";
repo = "diff-pdf";
- rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc";
- sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m";
+ rev = "v${version}";
+ sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i";
};
nativeBuildInputs = [ autoconf automake pkgconfig ];
@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
preConfigure = "./bootstrap";
meta = with stdenv.lib; {
- homepage = http://vslavik.github.io/diff-pdf;
+ homepage = "https://vslavik.github.io/diff-pdf/";
description = "Simple tool for visually comparing two PDF files";
license = licenses.gpl2;
+ platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
};
}
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index daea20835c8..37ed8eb23fb 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "2.1.3";
- name = "diffpdf-${version}";
+ pname = "diffpdf";
src = fetchurl {
- url = "http://www.qtrac.eu/${name}.tar.gz";
+ url = "http://www.qtrac.eu/${pname}-${version}.tar.gz";
sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
};
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
install -Dpm755 -D diffpdf $out/bin/diffpdf
install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
- install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications
- install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
- install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
+ install -dpm755 $out/share/doc/${pname}-${version} $out/share/licenses/${pname}-${version} $out/share/icons $out/share/pixmaps $out/share/applications
+ install -Dpm644 CHANGES README help.html $out/share/doc/${pname}-${version}/
+ install -Dpm644 gpl-2.0.txt $out/share/licenses/${pname}-${version}/
install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 58bc483d43f..a4f6b1ce988 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -47,7 +47,7 @@ let
copyUdevRuleToOutput = name: rule:
"cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
in stdenv.mkDerivation rec {
- name = "digitalbitbox-${version}";
+ pname = "digitalbitbox";
version = "2.2.2";
src = fetchFromGitHub {
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
LUPDATE="${qttools.dev}/bin/lupdate";
LRELEASE="${qttools.dev}/bin/lrelease";
MOC="${qtbase.dev}/bin/moc";
- QTDIR="${qtbase.dev}";
+ QTDIR=qtbase.dev;
RCC="${qtbase.dev}/bin/rcc";
UIC="${qtbase.dev}/bin/uic";
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index f1e33ea5357..8f7dbd2d2ed 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -5,7 +5,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "direwolf-${version}";
+ pname = "direwolf";
version = "1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index e6b62817b90..8d13ac42e1f 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }:
stdenv.mkDerivation rec {
name = "dmenu-4.9";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = https://tools.suckless.org/dmenu;
license = licenses.mit;
- maintainers = with maintainers; [ pSub ];
+ maintainers = with maintainers; [ pSub globin ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/dmenu/xim.patch b/pkgs/applications/misc/dmenu/xim.patch
new file mode 100644
index 00000000000..f77d48324da
--- /dev/null
+++ b/pkgs/applications/misc/dmenu/xim.patch
@@ -0,0 +1,31 @@
+Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html
+
+Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -552,7 +552,7 @@ run(void)
+ XEvent ev;
+
+ while (!XNextEvent(dpy, &ev)) {
+- if (XFilterEvent(&ev, None))
++ if (XFilterEvent(&ev, win))
+ continue;
+ switch(ev.type) {
+ case Expose:
+@@ -664,7 +664,6 @@ setup(void)
+ XNClientWindow, win, XNFocusWindow, win, NULL);
+
+ XMapRaised(dpy, win);
+- XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+ if (embed) {
+ XSelectInput(dpy, parentwin, FocusChangeMask);
+ if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
+@@ -730,8 +729,6 @@ main(int argc, char *argv[])
+
+ if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ fputs("warning: no locale support\n", stderr);
+- if (!XSetLocaleModifiers(""))
+- fputs("warning: no locale modifiers support\n", stderr);
+ if (!(dpy = XOpenDisplay(NULL)))
+ die("cannot open display");
+ screen = DefaultScreen(dpy);
diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix
deleted file mode 100644
index 3d567603359..00000000000
--- a/pkgs/applications/misc/dmenu2/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- name = "dmenu2-0.3pre-2014-07-08";
-
- src = fetchhg {
- url = "https://bitbucket.org/melek/dmenu2";
- rev = "36cb94a16edf928bdaaa636123392517ed469be0";
- sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv";
- };
-
- buildInputs = [ libX11 libXinerama zlib libXft ];
-
- postPatch = ''
- sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
- '';
-
- preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
-
- meta = {
- description = "A patched fork of the original dmenu - an efficient dynamic menu for X";
- homepage = https://bitbucket.org/melek/dmenu2;
- license = licenses.mit;
- maintainers = [ maintainers.cstrahan ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix
index 9ae2ea41d83..d72a5b84826 100644
--- a/pkgs/applications/misc/doing/default.nix
+++ b/pkgs/applications/misc/doing/default.nix
@@ -1,15 +1,15 @@
-{ lib, bundlerEnv, ruby
+{ lib, bundlerEnv, ruby, bundlerUpdateScript
}:
-# Bundix:
-# nix-shell -p bundix zlib
-bundlerEnv rec {
+bundlerEnv {
pname = "doing";
version = (import ./gemset.nix).doing.version;
inherit ruby;
gemdir = ./.;
+ passthru.updateScript = bundlerUpdateScript "doing";
+
meta = with lib; {
description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done.";
longDescription = ''
@@ -19,7 +19,7 @@ bundlerEnv rec {
'';
homepage = https://brettterpstra.com/projects/doing/;
license = licenses.mit;
- maintainers = with maintainers; [ ktf ];
+ maintainers = with maintainers; [ ktf nicknovitski ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fd08ed9c391..1332b265d54 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
-stdenv.mkDerivation rec {
- name = "doomseeker-${version}";
+stdenv.mkDerivation {
+ pname = "doomseeker";
version = "2018-03-05";
src = fetchFromBitbucket {
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
index 1d3c405b703..5150f13fb80 100644
--- a/pkgs/applications/misc/dotfiles/default.nix
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -2,7 +2,6 @@
pythonPackages.buildPythonApplication rec {
pname = "dotfiles";
- name = "${pname}-${version}";
version = "0.6.4";
src = pythonPackages.fetchPypi {
diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix
index b5ae9fb567c..226bdea0301 100644
--- a/pkgs/applications/misc/dozenal/default.nix
+++ b/pkgs/applications/misc/dozenal/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "12010904";
- name = "dozenal-${version}";
+ pname = "dozenal";
src = fetchFromGitHub {
owner = "dgoodmaniii";
repo = "dozenal";
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 309d4d54ae5..7da2ae421d7 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ stdenv, lib, fetchFromGitHub, makeWrapper
, pkgconfig, which, perl, libXrandr
-, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
+, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
}:
stdenv.mkDerivation rec {
- name = "dunst-${version}";
- version = "1.4.0";
+ pname = "dunst";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "1rwbylygd88r61yrxc7ckg9svgq8b1i2falr0mk9sabqxzn9050s";
+ sha256 = "0xjj1f2jr1ja5grj6wrx5jjz1sx5fpqnvkw7nqi4452j3nc4p4l2";
};
nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
buildInputs = [
- cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
+ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver
libXinerama libnotify pango xorgproto librsvg libXrandr
];
@@ -33,19 +33,19 @@ stdenv.mkDerivation rec {
buildFlags = if dunstify then [ "dunstify" ] else [];
- postInstall = stdenv.lib.optionalString dunstify ''
+ postInstall = lib.optionalString dunstify ''
install -Dm755 dunstify $out/bin
'' + ''
wrapProgram $out/bin/dunst \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Lightweight and customizable notification daemon";
- homepage = https://dunst-project.org/;
+ homepage = "https://dunst-project.org/";
license = licenses.bsd3;
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = platforms.linux;
- maintainers = [ maintainers.domenkozar ];
+ maintainers = with maintainers; [ domenkozar ];
};
}
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 6c802e683ce..ae83802a7b4 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -2,11 +2,11 @@
librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
stdenv.mkDerivation rec {
- name = "eaglemode-${version}";
+ pname = "eaglemode";
version = "0.94.1";
src = fetchurl {
- url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
+ url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
sha256 = "0mpnk0fzy02jxbafipkdkj48m6k38h42j599gw4sdnag7ymlms89";
};
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index cc7b9cf27c2..913afd766d3 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,14 +1,14 @@
-{ lib, fetchurl, python3Packages, qtbase, makeWrapper }:
+{ lib, fetchurl, python3Packages, qtbase, wrapQtAppsHook }:
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "4.0.7";
+ version = "4.0.10";
src = fetchurl {
url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "d63ef2d52cff0b821b745067d752fd0c7f2902fa23eaf8e9392c54864cae5c77";
+ sha256 = "48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5";
};
propagatedBuildInputs = with python3Packages; [
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
btchip
];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ wrapQtAppsHook ];
postPatch = ''
substituteInPlace contrib/requirements/requirements.txt \
@@ -54,10 +54,6 @@ python3Packages.buildPythonApplication rec {
postInstall = ''
substituteInPlace $out/share/applications/electron-cash.desktop \
--replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
-
- # Please remove this when #44047 is fixed
- wrapProgram $out/bin/electron-cash \
- --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
'';
doInstallCheck = true;
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 98ed10b0c7c..8ba562de1cb 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -2,7 +2,7 @@
python2Packages.buildPythonApplication rec {
version = "2.9.3.1";
- name = "electrum-dash-${version}";
+ pname = "electrum-dash";
src = fetchurl {
url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz";
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 2f8b98f3a44..0ebeb1beffa 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1
+{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
+, enableQt ? !stdenv.isDarwin
# for updater.nix
@@ -14,14 +15,23 @@
}:
let
- version = "3.3.6";
+ version = "3.3.8";
+
+ libsecp256k1_name =
+ if stdenv.isLinux then "libsecp256k1.so.0"
+ else if stdenv.isDarwin then "libsecp256k1.0.dylib"
+ else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}";
+
+ libzbar_name =
+ if stdenv.isLinux then "libzbar.so.0"
+ else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
# Not provided in official source releases, which are what upstream signs.
tests = fetchFromGitHub {
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3";
+ sha256 = "1di8ba77kgapcys0d7h5nx1qqakv3s60c6sp8skw8p69ramsl73c";
extraPostFetch = ''
mv $out ./all
@@ -30,13 +40,13 @@ let
};
in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "electrum";
inherit version;
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz";
+ sha256 = "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2";
};
postUnpack = ''
@@ -44,6 +54,8 @@ python3Packages.buildPythonApplication rec {
cp -ar ${tests} $sourceRoot/electrum/tests
'';
+ nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
+
propagatedBuildInputs = with python3Packages; [
aiorpcx
aiohttp
@@ -56,9 +68,7 @@ python3Packages.buildPythonApplication rec {
protobuf
pyaes
pycryptodomex
- pyqt5
pysocks
- qdarkstyle
qrcode
requests
tlslite-ng
@@ -70,15 +80,20 @@ python3Packages.buildPythonApplication rec {
# TODO plugins
# amodem
- ];
+ ] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ];
preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
- sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py
- substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0
- '';
+ substituteInPlace ./electrum/ecc_fast.py \
+ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
+ '' + (if enableQt then ''
+ substituteInPlace ./electrum/qrscanner.py \
+ --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+ '' else ''
+ sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
+ '');
- postInstall = ''
+ postInstall = stdenv.lib.optionalString stdenv.isLinux ''
# Despite setting usr_share above, these files are installed under
# $out/nix ...
mv $out/${python3.sitePackages}/nix/store"/"*/share $out
@@ -89,6 +104,11 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
+
+ '';
+
+ postFixup = stdenv.lib.optionalString enableQt ''
+ wrapQtApp $out/bin/electrum
'';
checkInputs = with python3Packages; [ pytest ];
@@ -123,6 +143,7 @@ python3Packages.buildPythonApplication rec {
'';
homepage = https://electrum.org/;
license = licenses.mit;
+ platforms = platforms.all;
maintainers = with maintainers; [ ehmry joachifm np ];
};
}
diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index a5e4bd74a6e..88f44c6cc85 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -5,7 +5,7 @@
python3Packages.buildPythonApplication rec {
pname = "electrum-ltc";
- version = "3.1.3.1";
+ version = "3.3.8.1";
src = fetchurl {
url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
homepage = https://electrum-ltc.org/;
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ asymmetric ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index d447e7f50d5..62358d41cc5 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
pname = "emem";
version = "0.2.50";
- name = "${pname}-${version}";
inherit jdk;
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
index b6c10dbebca..de922bb3990 100644
--- a/pkgs/applications/misc/epdfview/default.nix
+++ b/pkgs/applications/misc/epdfview/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }:
stdenv.mkDerivation rec {
- name = "epdfview-${version}";
+ pname = "epdfview";
version = "0.1.8";
src = fetchurl {
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://packages.debian.org/wheezy/epdfview;
- description = "A lightweight PDF document viewer using Poppler and GTK+";
+ description = "A lightweight PDF document viewer using Poppler and GTK";
longDescription = ''
- ePDFView is a free lightweight PDF document viewer using Poppler and
- GTK+ libraries. The aim of ePDFView is to make a simple PDF document
- viewer, in the lines of Evince but without using the Gnome libraries.
+ ePDFView is a free lightweight PDF document viewer using Poppler and
+ GTK libraries. The aim of ePDFView is to make a simple PDF document
+ viewer, in the lines of Evince but without using the Gnome libraries.
'';
license = licenses.gpl2;
maintainers = [ maintainers.astsmtl ];
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index 4aaaa333998..d8b355efe86 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
stdenv.mkDerivation rec {
- name = "et-${version}";
+ pname = "et";
version = "0.1.1";
src = fetchFromGitHub {
owner = "geistesk";
repo = "et";
- rev = "${version}";
+ rev = version;
sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
};
- buildInputs = [ libnotify gdk_pixbuf ];
+ buildInputs = [ libnotify gdk-pixbuf ];
nativeBuildInputs = [ pkgconfig ];
installPhase = ''
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 98b47990314..56cac7ca918 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -3,7 +3,7 @@
, pkgconfig, imlib2, libast }:
stdenv.mkDerivation rec {
- name = "eterm-${version}";
+ pname = "eterm";
version = "0.9.6";
srcName = "Eterm-${version}";
diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix
index b8bd0a59bea..e9d1317390e 100644
--- a/pkgs/applications/misc/eureka-editor/default.nix
+++ b/pkgs/applications/misc/eureka-editor/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }:
stdenv.mkDerivation rec {
- name = "eureka-editor-${version}";
+ pname = "eureka-editor";
version = "1.21";
shortver = "121";
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index c7fcf18e4e3..984ade077a8 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig,
- gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
+ gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? ""
}:
-stdenv.mkDerivation rec {
- name = "evilvte-${version}";
+stdenv.mkDerivation {
+ pname = "evilvte";
version = "0.5.2-20140827";
src = fetchgit {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
+ gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkgconfig
];
diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix
new file mode 100644
index 00000000000..86f2d007092
--- /dev/null
+++ b/pkgs/applications/misc/evtest-qt/default.nix
@@ -0,0 +1,25 @@
+{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }:
+
+mkDerivation rec {
+ pname = "evtest-qt";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "Grumbel";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1wfzkgq81764qzxgk0y5vvpxcrb3icvrr4dd4mj8njrqgbwmn0mw";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qtbase ];
+
+ meta = with lib; {
+ description = "Simple input device tester for linux with Qt GUI";
+ homepage = "https://github.com/Grumbel/evtest-qt";
+ maintainers = with maintainers; [ alexarice ];
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 3d715a1d16b..d6d20367b06 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
stdenv.mkDerivation rec {
- name = "evtest-1.33";
+ pname = "evtest";
+ version = "1.34";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxml2 ];
src = fetchgit {
- url = "git://anongit.freedesktop.org/evtest";
- rev = "refs/tags/evtest-1.33";
+ url = "git://anongit.freedesktop.org/${pname}";
+ rev = "refs/tags/${pname}-${version}";
sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g";
};
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 21fed2e28de..6d04cef76ce 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "exercism-${version}";
+ pname = "exercism";
version = "3.0.11";
goPackagePath = "github.com/exercism/cli";
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix
index 2b7888c9cd0..f96d3f0f57c 100644
--- a/pkgs/applications/misc/extract_url/default.nix
+++ b/pkgs/applications/misc/extract_url/default.nix
@@ -10,7 +10,7 @@ let
++ lib.optional uriFindSupport perlPackages.URIFind;
in stdenv.mkDerivation rec {
- name = "extract_url-${version}";
+ pname = "extract_url";
version = "1.6.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index e9d19466609..bbbf1a0aff9 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -4,7 +4,8 @@ let
version = "6.3.26";
in
stdenv.mkDerivation {
- name="fetchmail-${version}";
+ pname = "fetchmail";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix
new file mode 100644
index 00000000000..e93d0ab69a7
--- /dev/null
+++ b/pkgs/applications/misc/firestarter/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, python3, cudatoolkit,
+ withCuda ? true
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ pname = "firestarter";
+ version = "1.7.3";
+
+ src = fetchFromGitHub {
+ owner = "tud-zih-energy";
+ repo = "FIRESTARTER";
+ rev = "v${version}";
+ sha256 = "1gc7kmzx9nw22lyfmpyz72p974jf1hvw5nvszcaq7x6h8cz9ip15";
+ };
+
+ nativeBuildInputs = [ python3 ];
+ buildInputs = optionals withCuda [ cudatoolkit ];
+ preBuild = ''
+ mkdir -p build
+ cd build
+ python ../code-generator.py ${optionalString withCuda "--enable-cuda"}
+ '';
+ makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ];
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp FIRESTARTER $out/bin/firestarter
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter;
+ description = "Processor Stress Test Utility";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ astro ];
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index f70042884a8..06cf3c06ffa 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "0.9.3.1";
- name = "flamerobin-${version}";
+ pname = "flamerobin";
src = fetchFromGitHub {
owner = "mariuz";
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 4e786bfb36f..2ca059820ef 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec{
- name = "fme-${version}";
+ pname = "fme";
version = "1.1.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index f0da4e88351..5df34c84f09 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://fontmanager.github.io/;
- description = "Simple font management for GTK+ desktop environments";
+ description = "Simple font management for GTK desktop environments";
longDescription = ''
Font Manager is intended to provide a way for average users to
easily manage desktop fonts, without having to resort to command
line tools or editing configuration files by hand. While designed
primarily with the Gnome Desktop Environment in mind, it should
- work well with other Gtk+ desktop environments.
+ work well with other GTK desktop environments.
Font Manager is NOT a professional-grade font management solution.
'';
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 5152c8aa3f7..aee3937689b 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jdk, jre, ant }:
stdenv.mkDerivation rec {
- name = "freemind-${version}";
+ pname = "freemind";
version = "1.0.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix
index 062bca5b215..67d4bd65a9f 100644
--- a/pkgs/applications/misc/gImageReader/default.nix
+++ b/pkgs/applications/misc/gImageReader/default.nix
@@ -15,14 +15,14 @@ let
pythonEnv = python3.withPackages( ps: with ps;[ pygobject3 ] );
in
stdenv.mkDerivation rec {
- name = "gImageReader-${version}";
- version = "3.3.0";
+ pname = "gImageReader";
+ version = "3.3.1";
src = fetchFromGitHub {
owner= "manisandro";
repo = "gImageReader";
rev = "v${version}";
- sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz";
+ sha256 = "17hz2dgxx2j7hsk0lx3riidqvlsg0ylnicjd2gphsi3yp7w20zdj";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 44071b32875..ecf8ae9da8d 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -3,7 +3,7 @@
, gtk, pkgconfig, flex }:
stdenv.mkDerivation rec {
- name = "galculator-${version}";
+ pname = "galculator";
version = "2.1.4";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index cb04be4b6ea..169c5c11b8c 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.8.6";
+ version = "1.10.3";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0in47v6c82a6mqg4wzxrji7wd8a9qh5386rsr77s3a8613am1n2x";
+ sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz";
};
doCheck = false;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 739df59b31c..fb6902634da 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -7,7 +7,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gammu-${version}";
+ pname = "gammu";
version = "1.40.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix
index dd0a5c9a4f6..96d3d34046e 100644
--- a/pkgs/applications/misc/ganttproject-bin/default.nix
+++ b/pkgs/applications/misc/ganttproject-bin/default.nix
@@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
- name = "ganttproject-bin-${version}";
+ pname = "ganttproject-bin";
version = "2.8.10";
src = let build = "r2364"; in fetchzip {
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index a3aebf22733..f5eb6e188b7 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
- name = "gcal-${version}";
+ pname = "gcal";
version = "4.1";
src = fetchurl {
- url = "mirror://gnu/gcal/${name}.tar.xz";
+ url = "mirror://gnu/gcal/${pname}-${version}.tar.xz";
sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
};
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6f380114a27..8381f182e5d 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -5,13 +5,13 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "gcalcli";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "insanum";
repo = pname;
rev = "v${version}";
- sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf";
+ sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72";
};
postPatch = lib.optionalString stdenv.isLinux ''
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 5e8bb629ce2..baf2f5165d6 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
perlPackages.buildPerlPackage rec {
- name = "get_iplayer-${version}";
+ pname = "get_iplayer";
version = "2.99";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix
index a77f87f6f1f..b2a992b850e 100644
--- a/pkgs/applications/misc/getxbook/default.nix
+++ b/pkgs/applications/misc/getxbook/default.nix
@@ -1,14 +1,16 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "getxbook-${version}";
+ pname = "getxbook";
version = "1.2";
src = fetchurl {
- url = "https://njw.me.uk/getxbook/${name}.tar.xz";
+ url = "https://njw.me.uk/getxbook/${pname}-${version}.tar.xz";
sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs";
};
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ];
+
buildInputs = [ openssl ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 919f20f1398..c2b7487cd72 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,28 +1,43 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gtk, gettext, libiconv, libintl
+{ stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl
}:
stdenv.mkDerivation rec {
- name = "girara-${version}";
+ pname = "girara";
version = "0.3.2";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
- url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
+ url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz";
sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
};
- nativeBuildInputs = [ meson ninja pkgconfig gettext ];
- buildInputs = [ libintl libiconv ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ];
+ buildInputs = [ libintl libiconv json_c ];
propagatedBuildInputs = [ glib gtk ];
+ doCheck = true;
+
+ mesonFlags = [
+ "-Ddocs=disabled" # docs do not seem to be installed
+ ];
+
+ checkPhase = ''
+ export NO_AT_BRIDGE=1
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ '';
+
meta = with stdenv.lib; {
homepage = https://pwmt.org/projects/girara/;
description = "User interface library";
longDescription = ''
- girara is a library that implements a GTK+ based VIM-like user interface
+ girara is a library that implements a GTK based VIM-like user interface
that focuses on simplicity and minimalism.
'';
license = licenses.zlib;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = [ maintainers.garbas ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index b4fac899f66..f44cdd0bad7 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "gkrellm-2.3.10";
+ name = "gkrellm-2.3.11";
src = fetchurl {
url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
- sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
+ sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y";
};
nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 4af776674e6..4a806cbb183 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -5,10 +5,9 @@
stdenv.mkDerivation rec {
version = "2.0.2";
pname = "gksu";
- name = "${pname}-${version}";
src = fetchurl {
- url = "http://people.debian.org/~kov/gksu/${name}.tar.gz";
+ url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
};
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A graphical frontend for libgksu";
longDescription = ''
- GKSu is a library that provides a Gtk+ frontend to su and sudo.
+ GKSu is a library that provides a GTK frontend to su and sudo.
It supports login shells and preserving environment when acting as
a su frontend. It is useful to menu items or other graphical
programs that need to ask a user's password to run another program
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 3831780c791..6f5146161a6 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -21,7 +21,7 @@ let
'';
in
stdenv.mkDerivation rec {
- name = "glava-${version}";
+ pname = "glava";
version = "1.6.3";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 47fb50242c1..50dda9510b9 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -5,10 +5,11 @@ let
in
stdenv.mkDerivation rec {
- name = "gmrun-${version}";
+ pname = "gmrun";
+ inherit version;
src = fetchurl {
- url = "mirror://sourceforge/gmrun/${name}.tar.gz";
+ url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
};
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Gnome Completion-Run Utility";
longDescription = ''
A simple program which provides a "run program" window, featuring a bash-like TAB completion.
- It uses GTK+ interface.
+ It uses GTK interface.
Also, supports CTRL-R / CTRL-S / "!" for searching through history.
Running commands in a terminal with CTRL-Enter. URL handlers.
'';
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index bb1556c7c4d..c8bbcf2aa7f 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -5,7 +5,8 @@
let version = "1.3.11"; in
stdenv.mkDerivation {
- name = "gmtp-${version}";
+ pname = "gmtp";
+ inherit version;
src = fetchurl {
url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix
new file mode 100644
index 00000000000..11bfbaaacd0
--- /dev/null
+++ b/pkgs/applications/misc/gnome-multi-writer/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchurl
+, appstream-glib
+, desktop-file-utils
+, gettext
+, glib
+, gnome3
+, gtk3
+, gusb
+, libcanberra-gtk3
+, libgudev
+, meson
+, ninja
+, pkgconfig
+, wrapGAppsHook
+, polkit
+, udisks
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-multi-writer";
+ version = "3.32.1";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
+ };
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ gettext
+ meson
+ ninja
+ pkgconfig
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ gusb
+ libcanberra-gtk3
+ libgudev
+ polkit
+ udisks
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "Tool for writing an ISO file to multiple USB devices at once";
+ homepage = https://wiki.gnome.org/Apps/MultiWriter;
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index e2cf8245ce6..7a918d961f6 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
name = "gnome15-2016-06-10";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
index b80ddb8f303..f8da250dbc7 100644
--- a/pkgs/applications/misc/go-jira/default.nix
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -2,7 +2,7 @@
{ stdenv, buildGoPackage, fetchgit }:
buildGoPackage rec {
- name = "go-jira-${version}";
+ pname = "go-jira";
version = "1.0.17";
goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index edf16f806a6..7fba1d49d74 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl
-, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
+{ stdenv, fetchFromGitHub, mkDerivation
+, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
+, qtconnectivity, qtcharts
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
}:
@@ -13,34 +14,39 @@ let
comment = "Performance software for cyclists, runners and triathletes";
categories = "Application;Utility;";
};
-in stdenv.mkDerivation rec {
- name = "golden-cheetah-${version}";
- version = "3.4";
- src = fetchurl {
- name = "${name}.tar.gz";
- url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
- sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
+in mkDerivation rec {
+ pname = "golden-cheetah";
+ version = "3.5-DEV1903";
+
+ src = fetchFromGitHub {
+ owner = "GoldenCheetah";
+ repo = "GoldenCheetah";
+ rev = "v${version}";
+ sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3";
};
+
buildInputs = [
qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
- qtconnectivity
+ qtconnectivity qtcharts
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
- NIX_LDFLAGS = [
- "-lz"
- ];
+
+ NIX_LDFLAGS = [ "-lz" ];
+
+ qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];
+
preConfigure = ''
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
'';
+
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp src/GoldenCheetah $out/bin
- wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 42d5d83f7bd..e917cc024d5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
-, libao, ffmpeg, libeb, lzo, xz, libtiff
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
+, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-stdenv.mkDerivation rec {
+mkDerivation {
- name = "goldendict-2018-06-13";
+ name = "goldendict-2019-08-01";
src = fetchFromGitHub {
owner = "goldendict";
repo = "goldendict";
- rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb";
- sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9";
+ rev = "0f951b06a55f3a201891cf645a556e773bda5f52";
+ sha256 = "1d1hn95vhvsmbq9q96l5adn90g0hg25dl01knb4y4v6v9x4yrl2x";
};
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
qtbase qtsvg qtwebkit qtx11extras qttools
- libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
+ libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff opencc
];
- qmakeFlags = [ "CONFIG+=zim_support" ];
+ qmakeFlags = [
+ "goldendict.pro"
+ "CONFIG+=zim_support"
+ "CONFIG+=chinese_conversion_support"
+ ];
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://goldendict.org/;
description = "A feature-rich dictionary lookup program";
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 9a12ba2bfd5..6cd77318754 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
mime-types-data (3.2019.0331)
mini_portile2 (2.4.0)
mustache (0.99.8)
- nokogiri (1.10.3)
+ nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
rack (1.6.11)
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 4a0a4e38a61..e9a177ee193 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, bundlerEnv, ruby, makeWrapper
+{ stdenv, bundlerEnv, ruby, makeWrapper, bundlerUpdateScript
, git }:
stdenv.mkDerivation rec {
- name = "${pname}-${version}";
pname = "gollum";
# nix-shell -p bundix icu zlib
version = (import ./gemset.nix).gollum.version;
@@ -10,7 +9,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
- name = "${name}-gems";
+ name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
@@ -23,11 +22,13 @@ stdenv.mkDerivation rec {
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}
'';
+ passthru.updateScript = bundlerUpdateScript "gollum";
+
meta = with stdenv.lib; {
description = "A simple, Git-powered wiki";
homepage = https://github.com/gollum/gollum;
license = licenses.mit;
- maintainers = with maintainers; [ jgillich primeos ];
+ maintainers = with maintainers; [ jgillich primeos nicknovitski ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 6de5553ac7c..f9bdf94db17 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -151,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+ sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
- version = "1.10.3";
+ version = "1.10.4";
};
posix-spawn = {
groups = ["default"];
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 0fccf83acf7..961efe4b057 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -40,7 +40,8 @@ let
];
in
stdenv.mkDerivation rec {
- name = "googleearth-${version}";
+ pname = "googleearth";
+ inherit version;
src = fetchurl {
url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
inherit sha256;
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 3dcbcaf38b8..12eb8839b8a 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "3.9";
- name = "googler-${version}";
+ pname = "googler";
src = fetchFromGitHub {
owner = "jarun";
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 464e0ba5334..41cdf267f5d 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchsvn {
url = http://svn.openstreetmap.org/applications/rendering/gosmore;
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
- rev = "${version}";
+ rev = version;
ignoreExternals = true;
};
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index 4143f6fde55..9954ff660ad 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -3,7 +3,8 @@
let version = "0.7.4";
in stdenv.mkDerivation {
# mdp renamed to gpg-mdp because there is a mdp package already.
- name = "gpg-mdp-${version}";
+ pname = "gpg-mdp";
+ inherit version;
meta = {
homepage = https://tamentis.com/projects/mdp/;
license = [stdenv.lib.licenses.isc];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 7b23fca2121..c1c2a44bd7f 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }:
stdenv.mkDerivation rec {
- name = "gphoto2fs-${version}";
+ pname = "gphoto2fs";
version = "0.5.0";
src = fetchurl {
url="mirror://sourceforge/gphoto/gphotofs/${version}/gphotofs-0.5.tar.bz2";
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index aa0ed5f6463..9d244ca18f3 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
stdenv.mkDerivation rec {
- name = "gpsbabel-${version}";
+ pname = "gpsbabel";
version = "1.6.0";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 5bcaccb43bc..bf7bec38afb 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -3,15 +3,17 @@
stdenv.mkDerivation rec {
pname = "gpscorrelate";
- version = "unstable-2019-06-05";
+ version = "unstable-2019-09-03";
src = fetchFromGitHub {
owner = "dfandrich";
repo = pname;
- rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85";
- sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6";
+ rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2";
+ sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv";
};
+ patches = [ ./fix-localedir.diff ];
+
nativeBuildInputs = [
desktop-file-utils
docbook_xml_dtd_42
@@ -27,15 +29,16 @@ stdenv.mkDerivation rec {
];
makeFlags = [
- "prefix=${placeholder ''out''}"
+ "prefix=${placeholder "out"}"
"GTK=3"
"CC=cc"
"CXX=c++"
+ "CFLAGS=-DENABLE_NLS"
];
doCheck = true;
- installTargets = [ "install" "install-desktop-file" ];
+ installTargets = [ "install" "install-po" "install-desktop-file" ];
meta = with stdenv.lib; {
description = "A GPS photo correlation tool, to add EXIF geotags";
@@ -59,5 +62,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = "https://github.com/dfandrich/gpscorrelate";
platforms = platforms.linux;
+ maintainers = with maintainers; [ sikmir ];
};
}
diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
new file mode 100644
index 00000000000..5f9cb296ecd
--- /dev/null
+++ b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
@@ -0,0 +1,27 @@
+diff --git i/Makefile w/Makefile
+index 47919ca..408fd68 100644
+--- i/Makefile
++++ w/Makefile
+@@ -33,8 +33,9 @@ datadir = $(prefix)/share
+ mandir = $(datadir)/man
+ docdir = $(datadir)/doc/gpscorrelate
+ applicationsdir = $(datadir)/applications
++localedir = ${datadir}/locale
+
+-DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
++DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+
+ TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
+
+diff --git i/main-gui.c w/main-gui.c
+index fdace6f..8a6197b 100644
+--- i/main-gui.c
++++ w/main-gui.c
+@@ -40,6 +40,7 @@
+ int main(int argc, char* argv[])
+ {
+ /* Initialize gettext (gtk_init initializes the locale) */
++ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
+ (void) textdomain(TEXTDOMAIN);
+ (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
+
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 4f0c1864677..9c0dc48d42e 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
stdenv.mkDerivation rec {
- name = "gpsprune-${version}";
+ pname = "gpsprune";
version = "19.2";
src = fetchurl {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
index a5ee6c8e4ae..04ab062c1a1 100644
--- a/pkgs/applications/misc/gpx-viewer/default.nix
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "gpx-viewer-${version}";
+ pname = "gpx-viewer";
version = "0.4.0";
src = fetchurl {
- url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
};
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
};
patchFlags = [ "-p0" ];
+ configureFlags = [ "--disable-database-updates" ];
+
nativeBuildInputs = [
intltool pkgconfig
- shared-mime-info # For update-mime-database
- desktop-file-utils # For update-desktop-database
wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
];
buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ];
diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix
index 9fef9381949..a341a212a37 100644
--- a/pkgs/applications/misc/gpx/default.nix
+++ b/pkgs/applications/misc/gpx/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "gpx-${version}";
+ pname = "gpx";
version = "2.5.2";
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 8c9833ae40d..4b2ed9af24e 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, qmake, qttools, makeWrapper }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qttools }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "gpxsee";
- version = "7.9";
+ version = "7.13";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "029l5dhc9nnxiw7p0s4gyfkcqw709z7lz96aq8krs75mfk4fv07k";
+ sha256 = "08cg5k4ffj2wrcm4rk7vyixbyyz0424276fw2fn8lmziklkdqyjw";
};
- nativeBuildInputs = [ qmake makeWrapper ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [ qttools ];
preConfigure = ''
@@ -20,12 +20,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- postInstall = ''
- wrapProgram $out/bin/gpxsee \
- --prefix XDG_DATA_DIRS ":" $out/share
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://www.gpxsee.org/;
description = "GPS log file viewer and analyzer";
longDescription = ''
@@ -33,7 +28,7 @@ stdenv.mkDerivation rec {
all common GPS log file formats.
'';
license = licenses.gpl3;
- maintainers = [ maintainers.womfoo ];
+ maintainers = with maintainers; [ womfoo sikmir ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index e9026ded470..84be50ccb5e 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -10,7 +10,7 @@ let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
version = "5.0.1";
- name = "gramps-${version}";
+ pname = "gramps";
nativeBuildInputs = [ wrapGAppsHook gettext ];
buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ]
@@ -48,7 +48,7 @@ in buildPythonApplication rec {
eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
if [ -e "$eapth" ]; then
# move colliding easy_install.pth to specifically named one
- mv "$eapth" $(dirname "$eapth")/${name}.pth
+ mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth
fi
rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 00421a2e033..d86db7adb9d 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
+{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
-stdenv.mkDerivation rec {
- name = "green-pdfviewer-${version}";
+stdenv.mkDerivation {
+ pname = "green-pdfviewer";
version = "nightly-2014-04-22";
src = fetchFromGitHub {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
+ buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index 9274c2d0521..87e636b9c03 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -1,7 +1,7 @@
{ fetchzip, stdenv, makeWrapper, openjdk }:
stdenv.mkDerivation rec {
- name = "gremlin-console-${version}";
+ pname = "gremlin-console";
version = "3.3.4";
src = fetchzip {
url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index cb407fca66c..7f2057b2947 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = {
- description = "GTK+-based audio CD player/ripper";
+ description = "GTK-based audio CD player/ripper";
homepage = http://nostatic.org/grip;
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix
new file mode 100644
index 00000000000..b84053b94ad
--- /dev/null
+++ b/pkgs/applications/misc/gsctl/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ pname = "gsctl";
+ version = "0.15.4";
+
+ goPackagePath = "github.com/giantswarm/gsctl";
+
+ src = fetchFromGitHub {
+ owner = "giantswarm";
+ repo = pname;
+ rev = version;
+ sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj";
+ };
+
+ meta = with stdenv.lib; {
+ description = "The Giant Swarm command line interface";
+ homepage = https://github.com/giantswarm/gsctl;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ joesalisbury ];
+ };
+}
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 7f3b3a8d6dc..ea78331e476 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
stdenv.mkDerivation rec {
- name = "gsimplecal-${version}";
+ pname = "gsimplecal";
version = "2.1";
src = fetchurl {
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index 8f683272e12..9b8d6a7f976 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
version = "0.1";
- name = "gtk2fontsel-${version}";
+ pname = "gtk2fontsel";
src = fetchurl {
- url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz";
+ url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz";
sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
};
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
preferLocalBuild = true;
meta = with stdenv.lib; {
- description = "A font selection program for X11 using the GTK2 toolkit";
+ description = "A font selection program for X11 using the GTK 2 toolkit";
longDescription = ''
- Font selection tool similar to xfontsel implemented using GTK+ 2.
+ Font selection tool similar to xfontsel implemented using GTK 2.
Trivial, but useful nonetheless.
'';
homepage = http://gtk2fontsel.sourceforge.net/;
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 37352915cb8..97303c43fb1 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -3,7 +3,7 @@
let
version = "3.6.3";
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
name = "guake-${version}";
format = "other";
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 1e237923d05..273be11ac63 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
version = "0.6.6";
- name = "gummi-${version}";
+ pname = "gummi";
src = pkgs.fetchFromGitHub {
owner = "alexandervdm";
repo = "gummi";
- rev = "${version}";
+ rev = version;
sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
};
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index a9e6d905c28..a7313e7c969 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }:
stdenv.mkDerivation rec {
- name = "gxmessage-${version}";
+ pname = "gxmessage";
version = "3.4.3";
src = fetchurl {
- url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+ url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
};
diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix
index e2f5f653d47..989dfb886ec 100644
--- a/pkgs/applications/misc/hdate/default.nix
+++ b/pkgs/applications/misc/hdate/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.6.02";
- name = "hdate-${version}";
+ pname = "hdate";
src = fetchurl {
url = "https://sourceforge.net/projects/libhdate/files/libhdate/libhdate-${version}/libhdate-${version}.tar.bz2";
sha256 = "3c930a8deb57c01896dc37f0d7804e5a330ee8e88c4ff610b71f9d2b02c17762";
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index 1647a09edfd..a5a9187ab0f 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,7 +1,7 @@
{ stdenv, runtimeShell }:
-stdenv.mkDerivation rec {
- name = "example-unfree-package-${version}";
+stdenv.mkDerivation {
+ pname = "example-unfree-package";
version = "1.0";
phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 63a8af99f7c..8bae8ce373c 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "hello-${version}";
+ pname = "hello";
version = "2.10";
src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
+ url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index 0431f35057b..84f5bad24d2 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "hivemind-${version}";
+ pname = "hivemind";
version = "1.0.4";
goPackagePath = "github.com/DarthSim/hivemind";
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 607dff29318..ce35e91d927 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -2,7 +2,7 @@
let
houdini-runtime = callPackage ./runtime.nix { };
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
name = "houdini-${houdini-runtime.version}";
extraBuildCommands = ''
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 500f1df36a0..88c87eaca87 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -30,7 +30,7 @@ let
in
stdenv.mkDerivation rec {
version = "17.0.352";
- name = "houdini-runtime-${version}";
+ pname = "houdini-runtime";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg";
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
index 2fd56e3c555..437c42b0331 100644
--- a/pkgs/applications/misc/hr/default.nix
+++ b/pkgs/applications/misc/hr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "hr-${version}";
+ pname = "hr";
version = "1.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 1eae8c57fc4..0d25d3d686c 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,15 +1,29 @@
-{ stdenv, fetchurl, readline, ncurses }:
+{ stdenv, fetchFromGitHub, readline, ncurses
+, autoreconfHook, pkgconfig, gettext }:
stdenv.mkDerivation rec {
- name = "hstr-${version}";
- version = "1.25";
+ pname = "hstr";
+ version = "2.0";
- src = fetchurl {
- url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
- sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg";
+ src = fetchFromGitHub {
+ owner = "dvorka";
+ repo = "hstr";
+ rev = version;
+ sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20";
};
- buildInputs = [ readline ncurses ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ readline ncurses gettext ];
+
+ configurePhase = ''
+ autoreconf -fvi
+ ./configure
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ mv src/hstr $out/bin/
+ '';
meta = {
homepage = https://github.com/dvorka/hstr;
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
index acdeec10d30..b2997ece5d5 100644
--- a/pkgs/applications/misc/hubstaff/default.nix
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -17,7 +17,8 @@ let
in
stdenv.mkDerivation {
- name = "hubstaff-${version}";
+ pname = "hubstaff";
+ inherit version;
src = fetchurl { inherit sha256 url; };
diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json
index f39860fac58..64cad5c0292 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@@ -1,5 +1,5 @@
{
- "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.6-4aba8ab5/Hubstaff-1.4.6-4aba8ab5.sh",
- "version": "1.4.6-4aba8ab5",
- "sha256": "14js4d7wazn5r5p9n3iic9kwqrinm079jj1k7r00v684jrgq62fc"
+ "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh",
+ "version": "1.4.11-a12e5bad",
+ "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn"
}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 0bb3f15fdc1..720445be9be 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
- name = "hugo-${version}";
- version = "0.55.4";
+ pname = "hugo";
+ version = "0.58.0";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "0hbkl8dhhdic0admrkvlp1h1bmfrrwfnvipx27clyk0f88jcvb7y";
+ sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d";
};
- modSha256 = "0yrwkaaasj9ihjjfbywnzkppix1y2znagg3dkyikk21sl5n0nz23";
+ modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790";
buildFlags = "-tags extended";
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 2fd7e2f94af..f21675e60b2 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
- stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+ stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
];
in
stdenv.mkDerivation rec {
version = "2.1.2";
- name = "hyper-${version}";
+ pname = "hyper";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm";
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index c0c1faef09d..c197e1a8fd3 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -3,7 +3,7 @@ let
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
in
stdenv.mkDerivation rec {
- name = "iceSL-${version}";
+ pname = "iceSL";
version = "2.1.10";
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index d9bccee889a..7daa2704e22 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
- name = "ipmicfg-${version}";
+ pname = "ipmicfg";
version = "1.29.0";
buildVersion = "181029";
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b5fa9143ddb..64e0f0d325b 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
stdenv.mkDerivation rec {
- name = "IPMIView-${version}";
+ pname = "IPMIView";
version = "2.14.0";
buildVersion = "180213";
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index e493226be60..d63576d5cbd 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "iterm2-${version}";
+ pname = "iterm2";
version = "3.0.14";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index f24951624c5..c20fa4ed9d9 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, dmenu }:
stdenv.mkDerivation rec {
- name = "j4-dmenu-desktop-${version}";
- version = "2.16";
+ pname = "j4-dmenu-desktop";
+ version = "2.17";
src = fetchFromGitHub {
- owner = "enkore";
- repo = "j4-dmenu-desktop";
- rev = "r${version}";
- sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f";
+ owner = "enkore";
+ repo = pname;
+ rev = "r${version}";
+ sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc";
};
postPatch = ''
@@ -18,13 +18,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# tests are fetching an external git repository
- cmakeFlags = [ "-DNO_TESTS:BOOL=ON" ];
+ cmakeFlags = [
+ "-DWITH_TESTS=OFF"
+ "-DWITH_GIT_CATCH=OFF"
+ ];
meta = with stdenv.lib; {
description = "A wrapper for dmenu that recognize .desktop files";
- homepage = "https://github.com/enkore/j4-dmenu-desktop";
- license = licenses.gpl3;
+ homepage = "https://github.com/enkore/j4-dmenu-desktop";
+ license = licenses.gpl3;
maintainers = with maintainers; [ ericsagnes ];
- platforms = with platforms; unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 72a24026a89..c8951059d4c 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
pname = "jbidwatcher";
version = "2.5.6";
- name = "${pname}-${version}";
-
src = fetchurl {
url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
@@ -15,7 +13,7 @@ stdenv.mkDerivation rec {
jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
- unpackPhase = "true";
+ dontUnpack = true;
dontBuild = true;
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile b/pkgs/applications/misc/jekyll/basic/Gemfile
index 2d3446a8113..c4ba46e2ac6 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile
@@ -1,8 +1,6 @@
source "https://rubygems.org"
gem "jekyll"
# jekyll alone might be enough for most use-cases
-gem "rouge"
-gem "activesupport", "~> 4.2"
gem "jekyll-avatar"
gem "jekyll-mentions"
gem "jekyll-seo-tag"
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index f4c1aceb4f0..54c703bb859 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,11 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.2.11.1)
- i18n (~> 0.7)
+ activesupport (6.0.0)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
+ zeitwerk (~> 2.1, >= 2.1.8)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
@@ -14,46 +15,50 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.10.0)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
- gemoji (3.0.0)
- html-pipeline (2.11.0)
+ gemoji (3.0.1)
+ html-pipeline (2.12.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
- jekyll (3.8.5)
+ jekyll (4.0.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
- jekyll-sass-converter (~> 1.0)
+ i18n (>= 0.9.5, < 2)
+ jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
- jekyll-avatar (0.6.0)
- jekyll (~> 3.0)
+ terminal-table (~> 1.8)
+ jekyll-avatar (0.7.0)
+ jekyll (>= 3.0, < 5.0)
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
- jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
- jekyll-seo-tag (2.6.0)
- jekyll (~> 3.3)
+ jekyll-sass-converter (2.0.0)
+ sassc (> 2.0.1, < 3.0)
+ jekyll-seo-tag (2.6.1)
+ jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
- jemoji (0.11.0)
+ jemoji (0.11.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (1.17.0)
+ kramdown (2.1.0)
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -62,38 +67,37 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.4.0)
minitest (5.11.3)
- nokogiri (1.10.3)
+ nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.0.3)
+ public_suffix (3.1.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- rouge (3.3.0)
+ rouge (3.9.0)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
+ sassc (2.1.0)
+ ffi (~> 1.9)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
+ unicode-display_width (1.6.0)
+ zeitwerk (2.1.9)
PLATFORMS
ruby
DEPENDENCIES
- activesupport (~> 4.2)
jekyll
jekyll-avatar
jekyll-mentions
jekyll-seo-tag
jekyll-sitemap
jemoji
- rouge
BUNDLED WITH
1.17.2
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 0c71fbe653d..41e599c0202 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
+ sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v";
type = "gem";
};
- version = "4.2.11.1";
+ version = "6.0.0";
};
addressable = {
dependencies = ["public_suffix"];
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
forwardable-extended = {
groups = ["default"];
@@ -87,10 +87,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779";
+ sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
type = "gem";
};
- version = "2.11.0";
+ version = "2.12.0";
};
"http_parser.rb" = {
groups = ["default"];
@@ -119,21 +119,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "0.9.5";
+ version = "1.6.0";
};
jekyll = {
- dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
+ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
+ sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa";
type = "gem";
};
- version = "3.8.5";
+ version = "4.0.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -141,10 +141,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
+ sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk";
type = "gem";
};
- version = "0.6.0";
+ version = "0.7.0";
};
jekyll-mentions = {
dependencies = ["html-pipeline" "jekyll"];
@@ -158,15 +158,15 @@
version = "1.5.1";
};
jekyll-sass-converter = {
- dependencies = ["sass"];
+ dependencies = ["sassc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk";
+ sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
type = "gem";
};
- version = "1.5.2";
+ version = "2.0.0";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@@ -174,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am";
+ sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
type = "gem";
};
- version = "2.6.0";
+ version = "2.6.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -207,20 +207,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k";
+ sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6";
type = "gem";
};
- version = "0.11.0";
+ version = "0.11.1";
};
kramdown = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+ sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
type = "gem";
};
- version = "1.17.0";
+ version = "2.1.0";
+ };
+ kramdown-parser-gfm = {
+ dependencies = ["kramdown"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+ type = "gem";
+ };
+ version = "1.1.0";
};
liquid = {
groups = ["default"];
@@ -279,10 +290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+ sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
- version = "1.10.3";
+ version = "1.10.4";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -300,10 +311,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.0.3";
+ version = "3.1.1";
};
rb-fsevent = {
groups = ["default"];
@@ -331,10 +342,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3";
type = "gem";
};
- version = "3.3.0";
+ version = "3.9.0";
};
ruby_dep = {
groups = ["default"];
@@ -356,27 +367,27 @@
};
version = "1.0.5";
};
- sass = {
- dependencies = ["sass-listen"];
+ sassc = {
+ dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
+ sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs";
type = "gem";
};
- version = "3.7.4";
+ version = "2.1.0";
};
- sass-listen = {
- dependencies = ["rb-fsevent" "rb-inotify"];
+ terminal-table = {
+ dependencies = ["unicode-display_width"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+ sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
type = "gem";
};
- version = "4.0.0";
+ version = "1.8.0";
};
thread_safe = {
groups = ["default"];
@@ -399,4 +410,24 @@
};
version = "1.2.5";
};
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
+ zeitwerk = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw";
+ type = "gem";
+ };
+ version = "2.1.9";
+ };
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 9ae9ab254e8..4d4dd248bc5 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -21,7 +21,7 @@ let
# Else: Don't modify the arguments:
exec ${ruby}/bin/ruby "$@"
'';
-in bundlerApp rec {
+in bundlerApp {
pname = "jekyll";
exes = [ "jekyll" ];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile
index aba5e06e376..8e7499bad61 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile
+++ b/pkgs/applications/misc/jekyll/full/Gemfile
@@ -1,30 +1,27 @@
source "https://rubygems.org"
+
gem "jekyll"
-gem "rouge"
-gem "activesupport", "~> 4.2"
+
gem "jekyll-avatar"
gem "jekyll-mentions"
gem "jekyll-seo-tag"
gem "jekyll-sitemap"
gem "jemoji"
+
# Optional dependencies:
-gem "coderay", "~> 1.1.0"
gem "jekyll-coffeescript"
#gem "jekyll-docs"
gem "jekyll-feed", "~> 0.9"
gem "jekyll-gist"
gem "jekyll-paginate"
gem "jekyll-redirect-from"
-gem "kramdown", "~> 1.14"
+gem "kramdown-syntax-coderay"
gem "mime-types", "~> 3.0"
-gem "rdoc", RUBY_VERSION >= "2.2.2" ? "~> 6.0" : "~> 5.1"
+gem "rdoc", "~> 6.0"
gem "tomlrb", "~> 1.2"
platform :ruby, :mswin, :mingw, :x64_mingw do
- gem "classifier-reborn", "~> 2.2.0"
- gem "liquid-c", "~> 3.0"
- gem "pygments.rb", "~> 1.0"
- gem "rdiscount", "~> 2.0"
- gem "redcarpet", "~> 3.2", ">= 3.2.3"
- gem "yajl-ruby", "~> 1.3.1"
+ gem "classifier-reborn", "~> 2.2"
+ gem "liquid-c", "~> 4.0"
+ gem "yajl-ruby", "~> 1.4"
end
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index f61e985cbf7..6410b885ea4 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,12 +1,13 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.2.11.1)
- i18n (~> 0.7)
+ activesupport (6.0.0)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.5.2)
+ zeitwerk (~> 2.1, >= 2.1.8)
+ addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
classifier-reborn (2.2.0)
fast-stemmer (~> 1.0)
@@ -25,30 +26,32 @@ GEM
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
- ffi (1.10.0)
+ ffi (1.11.1)
forwardable-extended (2.6.0)
- gemoji (3.0.0)
- html-pipeline (2.11.0)
+ gemoji (3.0.1)
+ html-pipeline (2.12.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.6.0)
concurrent-ruby (~> 1.0)
- jekyll (3.8.5)
+ jekyll (4.0.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
- jekyll-sass-converter (~> 1.0)
+ i18n (>= 0.9.5, < 2)
+ jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
- jekyll-avatar (0.6.0)
- jekyll (~> 3.0)
+ terminal-table (~> 1.8)
+ jekyll-avatar (0.7.0)
+ jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (1.2.2)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
@@ -62,21 +65,26 @@ GEM
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.15.0)
jekyll (>= 3.3, < 5.0)
- jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
- jekyll-seo-tag (2.6.0)
- jekyll (~> 3.3)
+ jekyll-sass-converter (2.0.0)
+ sassc (> 2.0.1, < 3.0)
+ jekyll-seo-tag (2.6.1)
+ jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.3.1)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
- jemoji (0.11.0)
+ jemoji (0.11.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (1.17.0)
+ kramdown (2.1.0)
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
+ kramdown-syntax-coderay (1.0.1)
+ coderay (~> 1.1)
+ kramdown (~> 2.0)
liquid (4.0.3)
- liquid-c (3.0.0)
+ liquid-c (4.0.0)
liquid (>= 3.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -88,47 +96,41 @@ GEM
mime-types-data (3.2019.0331)
mini_portile2 (2.4.0)
minitest (5.11.3)
- multi_json (1.13.1)
- multipart-post (2.0.0)
- nokogiri (1.10.3)
+ multipart-post (2.1.1)
+ nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.0.3)
- pygments.rb (1.2.1)
- multi_json (>= 1.0.0)
+ public_suffix (3.1.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- rdiscount (2.2.0.1)
rdoc (6.1.1)
- redcarpet (3.4.0)
- rouge (3.3.0)
+ rouge (3.9.0)
ruby_dep (1.5.0)
safe_yaml (1.0.5)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
+ sassc (2.1.0)
+ ffi (~> 1.9)
+ sawyer (0.8.2)
+ addressable (>= 2.3.5)
+ faraday (> 0.8, < 2.0)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tomlrb (1.2.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- yajl-ruby (1.3.1)
+ unicode-display_width (1.6.0)
+ yajl-ruby (1.4.1)
+ zeitwerk (2.1.9)
PLATFORMS
ruby
DEPENDENCIES
- activesupport (~> 4.2)
- classifier-reborn (~> 2.2.0)
- coderay (~> 1.1.0)
+ classifier-reborn (~> 2.2)
jekyll
jekyll-avatar
jekyll-coffeescript
@@ -140,16 +142,12 @@ DEPENDENCIES
jekyll-seo-tag
jekyll-sitemap
jemoji
- kramdown (~> 1.14)
- liquid-c (~> 3.0)
+ kramdown-syntax-coderay
+ liquid-c (~> 4.0)
mime-types (~> 3.0)
- pygments.rb (~> 1.0)
- rdiscount (~> 2.0)
rdoc (~> 6.0)
- redcarpet (~> 3.2, >= 3.2.3)
- rouge
tomlrb (~> 1.2)
- yajl-ruby (~> 1.3.1)
+ yajl-ruby (~> 1.4)
BUNDLED WITH
1.17.2
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index de3de298fd3..80d67022e7a 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
+ sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v";
type = "gem";
};
- version = "4.2.11.1";
+ version = "6.0.0";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+ sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
- version = "2.5.2";
+ version = "2.6.0";
};
classifier-reborn = {
dependencies = ["fast-stemmer"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
+ sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.1";
};
forwardable-extended = {
groups = ["default"];
@@ -184,10 +184,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h85qpn2xbmsn8ssf2fqzlqg181j000m5z4l3g26r7vblncg162d";
+ sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.1";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -195,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779";
+ sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
type = "gem";
};
- version = "2.11.0";
+ version = "2.12.0";
};
"http_parser.rb" = {
groups = ["default"];
@@ -216,21 +216,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "0.9.5";
+ version = "1.6.0";
};
jekyll = {
- dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
+ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nn2sc308l2mz0yiall4r90l6vy67qp4sy9zapi73a948nd4a5k3";
+ sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa";
type = "gem";
};
- version = "3.8.5";
+ version = "4.0.0";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -238,10 +238,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p";
+ sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk";
type = "gem";
};
- version = "0.6.0";
+ version = "0.7.0";
};
jekyll-coffeescript = {
dependencies = ["coffee-script" "coffee-script-source"];
@@ -309,15 +309,15 @@
version = "0.15.0";
};
jekyll-sass-converter = {
- dependencies = ["sass"];
+ dependencies = ["sassc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk";
+ sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
type = "gem";
};
- version = "1.5.2";
+ version = "2.0.0";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@@ -325,10 +325,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104v01vh7frgyra3s32wap1ag9fxcm8pgb8v957khzskqy2jh7am";
+ sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m";
type = "gem";
};
- version = "2.6.0";
+ version = "2.6.1";
};
jekyll-sitemap = {
dependencies = ["jekyll"];
@@ -358,20 +358,42 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k";
+ sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6";
type = "gem";
};
- version = "0.11.0";
+ version = "0.11.1";
};
kramdown = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+ sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
type = "gem";
};
- version = "1.17.0";
+ version = "2.1.0";
+ };
+ kramdown-parser-gfm = {
+ dependencies = ["kramdown"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
+ kramdown-syntax-coderay = {
+ dependencies = ["coderay" "kramdown"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03vpfpmxcdbqyh6kxrjf5xa9qgvwqj0cfv2khz5h32fp5f5dmrda";
+ type = "gem";
+ };
+ version = "1.0.1";
};
liquid = {
groups = ["default"];
@@ -413,10 +435,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a5n7q314ma32y7v9a1g6ps60b14zfn2q4nip4j5aknblz51v7gi";
+ sha256 = "0ibcpajsgq530xrz3dk578mfvivrlfd624j6ifz6ms4w69j8jqj6";
type = "gem";
};
- version = "3.0.0";
+ version = "4.0.0";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
@@ -480,37 +502,15 @@
};
version = "5.11.3";
};
- multi_json = {
- groups = ["default"];
- platforms = [{
- engine = "maglev";
- } {
- engine = "mingw";
- } {
- engine = "mingw";
- } {
- engine = "mswin";
- } {
- engine = "rbx";
- } {
- engine = "ruby";
- }];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
- type = "gem";
- };
- version = "1.13.1";
- };
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+ sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
- version = "2.0.0";
+ version = "2.1.1";
};
nokogiri = {
dependencies = ["mini_portile2"];
@@ -518,10 +518,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
+ sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
type = "gem";
};
- version = "1.10.3";
+ version = "1.10.4";
};
octokit = {
dependencies = ["sawyer"];
@@ -550,33 +550,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.0.3";
- };
- "pygments.rb" = {
- dependencies = ["multi_json"];
- groups = ["default"];
- platforms = [{
- engine = "maglev";
- } {
- engine = "mingw";
- } {
- engine = "mingw";
- } {
- engine = "mswin";
- } {
- engine = "rbx";
- } {
- engine = "ruby";
- }];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0lbvnwvz770ambm4d6lxgc2097rydn5rcc5d6986bnkzyxfqqjnv";
- type = "gem";
- };
- version = "1.2.1";
+ version = "3.1.1";
};
rb-fsevent = {
groups = ["default"];
@@ -599,28 +576,6 @@
};
version = "0.10.0";
};
- rdiscount = {
- groups = ["default"];
- platforms = [{
- engine = "maglev";
- } {
- engine = "mingw";
- } {
- engine = "mingw";
- } {
- engine = "mswin";
- } {
- engine = "rbx";
- } {
- engine = "ruby";
- }];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
- type = "gem";
- };
- version = "2.2.0.1";
- };
rdoc = {
groups = ["default"];
platforms = [];
@@ -631,37 +586,15 @@
};
version = "6.1.1";
};
- redcarpet = {
- groups = ["default"];
- platforms = [{
- engine = "maglev";
- } {
- engine = "mingw";
- } {
- engine = "mingw";
- } {
- engine = "mswin";
- } {
- engine = "rbx";
- } {
- engine = "ruby";
- }];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
+ sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3";
type = "gem";
};
- version = "3.3.0";
+ version = "3.9.0";
};
ruby_dep = {
groups = ["default"];
@@ -683,27 +616,16 @@
};
version = "1.0.5";
};
- sass = {
- dependencies = ["sass-listen"];
+ sassc = {
+ dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
+ sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs";
type = "gem";
};
- version = "3.7.4";
- };
- sass-listen = {
- dependencies = ["rb-fsevent" "rb-inotify"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
- type = "gem";
- };
- version = "4.0.0";
+ version = "2.1.0";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -711,10 +633,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+ sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
type = "gem";
};
- version = "0.8.1";
+ version = "0.8.2";
+ };
+ terminal-table = {
+ dependencies = ["unicode-display_width"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+ type = "gem";
+ };
+ version = "1.8.0";
};
thread_safe = {
groups = ["default"];
@@ -747,6 +680,16 @@
};
version = "1.2.5";
};
+ unicode-display_width = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
yajl-ruby = {
groups = ["default"];
platforms = [{
@@ -764,9 +707,19 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rn4kc9fha990yd252wglh6rcyh35cavm1vpyfj8krlcwph09g30";
+ sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.1";
+ };
+ zeitwerk = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw";
+ type = "gem";
+ };
+ version = "2.1.9";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index 6ba0bed7847..879f344a5af 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jgmenu";
- version = "3.0";
+ version = "3.3";
src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
- sha256 = "01r92nili4v4pdmw4g5z0rsg1q7m7q3a5hjc47mnchgibdiissvl";
+ sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index 410b04d5dcb..ff0332e1e5f 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "joplin-desktop";
- version = "1.0.158";
+ version = "1.0.167";
in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage";
- sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q";
+ sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw";
};
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 4f7acb7731a..4b70530987f 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:
stdenv.mkDerivation rec {
- name = "josm-${version}";
- version = "15155";
+ pname = "josm";
+ version = "15322";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0qws5bgv7mm1iynsdrn7cdi16rd8k4139iia3bnjpm04xn69i5im";
+ sha256 = "1i6cxs6rvqjwh7yfji5701xdzpnaxcv97gsd692fjrwasnsx1f1i";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index 138ee397d3f..2a9e162e7ea 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.7";
- name = "jp2a-${version}";
+ pname = "jp2a";
src = fetchFromGitHub {
owner = "cslarsen";
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 7c5845b3541..a2eba8e08c2 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "k2pdfopt-${version}";
+ pname = "k2pdfopt";
version = "2.51a";
src = (fetchzip {
@@ -30,73 +30,25 @@ stdenv.mkDerivation rec {
cp -r ${v251a_src}/* $sourceRoot
'';
- patches = [ ./k2pdfopt.patch ];
+ patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs =
let
+ # The patches below were constructed by taking the files from k2pdfopt in
+ # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the
+ # corresponding files in the respective source trees, resolving any errors
+ # with more recent versions of these depencencies, and running diff.
mupdf_modded = mupdf.overrideAttrs (attrs: {
- # Excluded the pdf-*.c files, since they mostly just broke the #includes
- prePatch = ''
- cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/
- cp ${src}/mupdf_mod/font-win32.c source/pdf/
- '';
+ patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1
});
-
leptonica_modded = leptonica.overrideAttrs (attrs: {
- name = "leptonica-1.74.4";
- # Modified source files apply to this particular version of leptonica
- version = "1.74.4";
-
- src = fetchurl {
- url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz";
- sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9";
- };
-
- prePatch = ''
- cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
- '';
- patches = [
- # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
- ./leptonica-CVE-2018-3836.patch
- (fetchpatch {
- # CVE-2018-7186
- url = "https://github.com/DanBloomberg/leptonica/commit/"
- + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
- sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
- })
- (fetchpatch {
- # CVE-2018-7247
- url = "https://github.com/DanBloomberg/leptonica/commit/"
- + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
- sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
- })
- (fetchpatch {
- # CVE-2018-7440
- url = "https://github.com/DanBloomberg/leptonica/commit/"
- + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
- sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
- })
- ];
+ patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0
});
tesseract_modded = tesseract4.override {
tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
- prePatch = ''
- cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/
- cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/
- cp ${src}/tesseract_mod/genericvector.h src/ccutil/
- cp ${src}/tesseract_mod/input.cpp src/lstm/
- cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/
- cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/
- cp ${src}/tesseract_mod/params.cpp src/ccutil/
- cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/
- cp ${src}/tesseract_mod/tesscapi.cpp src/api/
- cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/
- cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/
- cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/
- '';
- patches = [ ./tesseract.patch ];
+ patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4
});
};
in
diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
new file mode 100644
index 00000000000..3a9eca30e75
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch
@@ -0,0 +1,151 @@
+diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c
+index 81627ef..f14a96c 100644
+--- a/willuslib/wmupdf.c
++++ b/willuslib/wmupdf.c
+@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_
+ pdf_write_opts.do_compress=1;
+ pdf_write_opts.do_linear=0;
+ pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */
+- pdf_write_opts.continue_on_error=0;
+- pdf_write_opts.errors=NULL;
+ write_failed=0;
+ wpdfpageinfo_sort(pageinfo);
+ xref=NULL;
+@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename)
+ /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */
+ pdf_install_load_system_font_funcs(ctx);
+ fz_try(ctx) { doc=fz_open_document(ctx,filename); }
+- fz_catch(ctx)
+- {
++ fz_catch(ctx)
++ {
+ fz_drop_context(ctx);
+ return(NULL);
+ }
+@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string)
+ willus_mem_free((double **)&utfbuf,funcname);
+ return(pdfobj);
+ }
+-
++
+ #endif /* HAVE_MUPDF_LIB */
+diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c
+index 5c7f38c..9b9e6fd 100644
+--- a/willuslib/wmupdfinfo.c
++++ b/willuslib/wmupdfinfo.c
+@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
+ pdf_obj *robj;
+
+ robj=pdf_resolve_indirect(ctx,obj);
+- n=pdf_sprint_obj(ctx,NULL,0,robj,1);
+- buf=malloc(n+2);
++ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0);
+ if (buf==NULL)
+ {
+ fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj));
+- pdf_print_obj(ctx,out,robj,1);
++ pdf_print_obj(ctx,out,robj,1,0);
+ }
+ else
+ {
+- pdf_sprint_obj(ctx,buf,n+2,robj,1);
++ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0);
+ display_pdf_field(ctx,out,buf,"Title","TITLE");
+ display_pdf_field(ctx,out,buf,"CreationDate","CREATED");
+ display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED");
+ display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER");
+ display_pdf_field(ctx,out,buf,"Creator","CREATOR");
+ display_file_size(ctx,out,filename);
+- free(buf);
++ fz_free(ctx,buf);
+ }
+ }
+ if (glo->dims==1)
+@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename)
+ if (obj)
+ {
+ fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj));
+- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1);
++ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0);
+ }
+ }
+
+@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_
+ if (j < glo->dims)
+ return;
+
+- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info));
++ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info);
+ glo->dims++;
+
+ glo->dim[glo->dims - 1].page = page;
+@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
+ if (k < glo->fonts)
+ continue;
+
+- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info));
++ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info);
+ glo->fonts++;
+
+ glo->font[glo->fonts - 1].page = page;
+@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
+ if (k < glo->images)
+ continue;
+
+- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info));
++ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info);
+ glo->images++;
+
+ glo->image[glo->images - 1].page = page;
+@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
+ if (k < glo->forms)
+ continue;
+
+- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info));
++ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info);
+ glo->forms++;
+
+ glo->form[glo->forms - 1].page = page;
+@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
+ if (k < glo->psobjs)
+ continue;
+
+- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info));
++ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info);
+ glo->psobjs++;
+
+ glo->psobj[glo->psobjs - 1].page = page;
+@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
+ if (k < glo->shadings)
+ continue;
+
+- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info));
++ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info);
+ glo->shadings++;
+
+ glo->shading[glo->shadings - 1].page = page;
+@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
+ if (k < glo->patterns)
+ continue;
+
+- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info));
++ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info);
+ glo->patterns++;
+
+ glo->pattern[glo->patterns - 1].page = page;
+@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf)
+ if (fout==NULL)
+ return;
+ */
+-
++
+ ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);
+ if (!ctx)
+ {
+@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src)
+ else if (src[i]!='\0')
+ sprintf(&dst[strlen(dst)]," %s",&src[i]);
+ }
+-
++
+ #endif /* HAVE_MUPDF_LIB */
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
deleted file mode 100644
index f1b4170fbaa..00000000000
--- a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/src/allheaders.h
-+++ b/src/allheaders.h
-@@ -2600,6 +2600,7 @@
- LEPT_DLL extern char * stringReverse ( const char *src );
- LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
- LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
-+LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
- LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
- LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
- LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
---- a/src/gplot.c
-+++ b/src/gplot.c
-@@ -141,9 +141,10 @@
- const char *xlabel,
- const char *ylabel)
- {
--char *newroot;
--char buf[L_BUF_SIZE];
--GPLOT *gplot;
-+char *newroot;
-+char buf[L_BUF_SIZE];
-+l_int32 badchar;
-+GPLOT *gplot;
-
- PROCNAME("gplotCreate");
-
-@@ -152,6 +153,9 @@
- if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
- outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
- return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
-+ stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
-+ if (badchar) /* danger of command injection */
-+ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
-
- if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
- return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
---- a/src/utils2.c
-+++ b/src/utils2.c
-@@ -42,6 +42,7 @@
- * l_int32 stringSplitOnToken()
- *
- * Find and replace string and array procs
-+ * l_int32 stringCheckForChars()
- * char *stringRemoveChars()
- * l_int32 stringFindSubstr()
- * char *stringReplaceSubstr()
-@@ -701,6 +702,48 @@
- /*--------------------------------------------------------------------*
- * Find and replace procs *
- *--------------------------------------------------------------------*/
-+/*!
-+ * \brief stringCheckForChars()
-+ *
-+ * \param[in] src input string; can be of zero length
-+ * \param[in] chars string of chars to be searched for in %src
-+ * \param[out] pfound 1 if any characters are found; 0 otherwise
-+ * \return 0 if OK, 1 on error
-+ *
-+ *
-+ * Notes:
-+ * (1) This can be used to sanitize an operation by checking for
-+ * special characters that don't belong in a string.
-+ *
-+ */
-+l_int32
-+stringCheckForChars(const char *src,
-+ const char *chars,
-+ l_int32 *pfound)
-+{
-+char ch;
-+l_int32 i, n;
-+
-+ PROCNAME("stringCheckForChars");
-+
-+ if (!pfound)
-+ return ERROR_INT("&found not defined", procName, 1);
-+ *pfound = FALSE;
-+ if (!src || !chars)
-+ return ERROR_INT("src and chars not both defined", procName, 1);
-+
-+ n = strlen(src);
-+ for (i = 0; i < n; i++) {
-+ ch = src[i];
-+ if (strchr(chars, ch)) {
-+ *pfound = TRUE;
-+ break;
-+ }
-+ }
-+ return 0;
-+}
-+
-+
- /*!
- * \brief stringRemoveChars()
- *
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch
new file mode 100644
index 00000000000..dfab99fd013
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/leptonica.patch
@@ -0,0 +1,254 @@
+From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer
+Date: Fri, 13 Sep 2019 15:54:21 -0400
+Subject: [PATCH] Willus mod for k2pdfopt
+
+---
+ src/allheaders.h | 4 ++
+ src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++-----
+ src/leptwin.c | 6 ++-
+ 3 files changed, 104 insertions(+), 12 deletions(-)
+
+diff --git a/src/allheaders.h b/src/allheaders.h
+index e68eff1..b3cc729 100644
+--- a/src/allheaders.h
++++ b/src/allheaders.h
+@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size );
+ LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa );
+ LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa );
+ LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa );
++/* WILLUS MOD */
++ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order );
++ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order );
++ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order );
+ LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile );
+ LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag );
+ LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa );
+diff --git a/src/dewarp2.c b/src/dewarp2.c
+index 220eec1..2e29500 100644
+--- a/src/dewarp2.c
++++ b/src/dewarp2.c
+@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */
+ * longest textlines.
+ *
+ */
++/* WILLUS MOD */
+ l_ok
+-dewarpBuildPageModel(L_DEWARP *dew,
+- const char *debugfile)
++dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile)
++{
++return(dewarpBuildPageModel_ex(dew,debugfile,2));
++}
++
++l_ok
++dewarpBuildPageModel_ex(L_DEWARP *dew,
++ const char *debugfile,
++ l_int32 fit_order)
+ {
+ l_int32 linecount, topline, botline, ret;
+ PIX *pixs, *pix1, *pix2, *pix3;
+@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2;
+ /* Get the sampled vertical disparity from the textline centers.
+ * The disparity array will push pixels vertically so that each
+ * textline is flat and centered at the y-position of the mid-point. */
+- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) {
++ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) {
+ L_WARNING("vertical disparity not built\n", procName);
+ ptaaDestroy(&ptaa2);
+ return 1;
+@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2;
+ * a pdf. Non-pix debug output goes to /tmp.
+ *
+ */
++/* WILLUS MOD */
+ l_ok
+ dewarpFindVertDisparity(L_DEWARP *dew,
+ PTAA *ptaa,
+ l_int32 rotflag)
+ {
++return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2));
++}
++/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */
++l_int32
++dewarpFindVertDisparity_ex(L_DEWARP *dew,
++ PTAA *ptaa,
++ l_int32 rotflag,
++ l_int32 fit_order)
++{
+ l_int32 i, j, nlines, npts, nx, ny, sampling;
+-l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval;
++/* WILLUS MOD */
++l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval;
+ l_float32 *famidys;
+ NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves;
+ NUMA *namidy, *namidys, *namidysi;
+@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb;
+ PTA *pta, *ptad, *ptacirc;
+ PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat;
+ FPIX *fpix;
++/* WILLUS MOD */
++l_int32 fit_order1,fit_order2;
+
+ PROCNAME("dewarpFindVertDisparity");
+
+ if (!dew)
+ return ERROR_INT("dew not defined", procName, 1);
++/* WILLUS MOD */
++ if (fit_order < 10)
++ fit_order1 = fit_order2 = fit_order;
++ else
++ {
++ fit_order1=fit_order % 10;
++ fit_order2=fit_order / 10;
++ fit_order2=fit_order2 % 10;
++ }
+ dew->vsuccess = 0;
+ if (!ptaa)
+ return ERROR_INT("ptaa not defined", procName, 1);
+@@ -331,12 +361,32 @@ FPIX *fpix;
+ pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs);
+ for (i = 0; i < nlines; i++) { /* for each line */
+ pta = ptaaGetPta(ptaa, i, L_CLONE);
+- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
+- numaAddNumber(nacurve0, c2);
++/* WILLUS MOD */
++if (fit_order1>3)
++ {
++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
++ numaAddNumber(nacurve0, c4);
++ }
++else if (fit_order1==3)
++ {
++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
++ numaAddNumber(nacurve0, c3);
++ }
++else
++ {
++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
++ numaAddNumber(nacurve0, c2);
++ }
+ ptad = ptaCreate(nx);
+ for (j = 0; j < nx; j++) { /* uniformly sampled in x */
+ x = j * sampling;
+- applyQuadraticFit(c2, c1, c0, x, &y);
++/* WILLUS MOD */
++if (fit_order1>3)
++ applyQuarticFit(c4, c3, c2, c1, c0, x, &y);
++else if (fit_order1==3)
++ applyCubicFit(c3, c2, c1, c0, x, &y);
++else
++ applyQuadraticFit(c2, c1, c0, x, &y);
+ ptaAddPt(ptad, x, y);
+ }
+ ptaaAddPta(ptaa0, ptad, L_INSERT);
+@@ -350,7 +400,13 @@ FPIX *fpix;
+ for (i = 0; i < nlines; i++) {
+ pta = ptaaGetPta(ptaa, i, L_CLONE);
+ ptaGetArrays(pta, &nax, NULL);
+- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
++/* WILLUS MOD */
++if (fit_order1>3)
++ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit);
++else if (fit_order1==3)
++ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit);
++else
++ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit);
+ ptad = ptaCreateFromNuma(nax, nafit);
+ ptaaAddPta(ptaat, ptad, L_INSERT);
+ ptaDestroy(&pta);
+@@ -494,11 +550,24 @@ FPIX *fpix;
+ ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */
+ for (j = 0; j < nx; j++) { /* for each column */
+ pta = ptaaGetPta(ptaa4, j, L_CLONE);
+- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
++/* WILLUS MOD */
++/* Order higher than 2 can cause a little craziness here. */
++if (fit_order2>3)
++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL);
++else if (fit_order2==3)
++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL);
++else
++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL);
+ ptad = ptaCreate(ny);
+ for (i = 0; i < ny; i++) { /* uniformly sampled in y */
+ y = i * sampling;
+- applyQuadraticFit(c2, c1, c0, y, &val);
++/* WILLUS MOD */
++if (fit_order2>3)
++ applyQuarticFit(c4, c3, c2, c1, c0, y, &val);
++else if (fit_order2==3)
++ applyCubicFit(c3, c2, c1, c0, y, &val);
++else
++ applyQuadraticFit(c2, c1, c0, y, &val);
+ ptaAddPt(ptad, y, val);
+ }
+ ptaaAddPta(ptaa5, ptad, L_INSERT);
+@@ -1602,11 +1671,21 @@ FPIX *fpix;
+ * See notes there.
+ *
+ */
++/* WILLUS MOD */
+ l_ok
+ dewarpBuildLineModel(L_DEWARP *dew,
+ l_int32 opensize,
+ const char *debugfile)
+ {
++return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2));
++}
++
++l_int32
++dewarpBuildLineModel_ex(L_DEWARP *dew,
++ l_int32 opensize,
++ const char *debugfile,
++ l_int32 fit_order)
++{
+ char buf[64];
+ l_int32 i, j, bx, by, ret, nlines;
+ BOXA *boxa;
+@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2;
+
+ /* Remove all lines that are not at least 0.75 times the length
+ * of the longest line. */
++/* WILLUS MOD */
++/*
+ ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES);
+ if (debugfile) {
+ pix1 = pixConvertTo32(pix);
+@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2;
+ pixDestroy(&pix1);
+ pixDestroy(&pix2);
+ }
++*/
++ptaa2=ptaa1;
+ ptaaDestroy(&ptaa1);
+ nlines = ptaaGetCount(ptaa2);
+ if (nlines < dew->minlines) {
+@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2;
+ * centers. The disparity array will push pixels vertically
+ * so that each line is flat and centered at the y-position
+ * of the mid-point. */
+- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i);
++/* WILLUS MOD */
++ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order);
+
+ /* If i == 0, move the result to the horizontal disparity,
+ * rotating it back by -90 degrees. */
+diff --git a/src/leptwin.c b/src/leptwin.c
+index 72643a0..573d33e 100644
+--- a/src/leptwin.c
++++ b/src/leptwin.c
+@@ -364,5 +364,9 @@ PIXCMAP *cmap;
+
+ return hBitmap;
+ }
+-
++#else
++/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */
++int leptwin_my_empty_func(void);
++int leptwin_my_empty_func(void)
++{return(0);}
+ #endif /* _WIN32 */
+--
+2.22.0
+
diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch
new file mode 100644
index 00000000000..0c59a1d2016
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/mupdf.patch
@@ -0,0 +1,1060 @@
+From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer
+Date: Fri, 13 Sep 2019 15:11:45 -0400
+Subject: [PATCH] Willus mod for k2pdfopt
+
+---
+ source/fitz/filter-basic.c | 3 +
+ source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++
+ source/fitz/font.c | 3 +
+ source/fitz/stext-device.c | 5 +
+ source/fitz/string.c | 5 +
+ source/pdf/pdf-annot.c | 14 +-
+ source/pdf/pdf-link.c | 3 +
+ source/pdf/pdf-parse.c | 5 +
+ source/pdf/pdf-xref.c | 9 +
+ 9 files changed, 912 insertions(+), 1 deletion(-)
+ create mode 100644 source/fitz/font-win32.c
+
+diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c
+index 0713a62e7..b8ef4d292 100644
+--- a/source/fitz/filter-basic.c
++++ b/source/fitz/filter-basic.c
+@@ -259,7 +259,10 @@ look_for_endstream:
+ if (!state->warned)
+ {
+ state->warned = 1;
++/* willus mod -- no warning */
++/*
+ fz_warn(ctx, "PDF stream Length incorrect");
++*/
+ }
+ return *stm->rp++;
+ }
+diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c
+new file mode 100644
+index 000000000..45de8cfd3
+--- /dev/null
++++ b/source/fitz/font-win32.c
+@@ -0,0 +1,866 @@
++/*
++** Routines to access MS Windows system fonts.
++** From sumatra PDF distro.
++** Modified for MuPDF v1.9a by willus.com
++*/
++#include "mupdf/pdf.h"
++
++/*
++ Which fonts are embedded is based on a few preprocessor definitions.
++
++ The base 14 fonts are always embedded.
++ For CJK font substitution we embed DroidSansFallback.
++
++ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps)
++ Set NOCJKFONT to skip the embedded CJK font.
++ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support.
++*/
++
++#ifdef NOCJK
++#define NOCJKFONT
++#endif
++
++/* SumatraPDF: also load fonts included with Windows */
++#ifdef _WIN32
++
++#ifndef UNICODE
++#define UNICODE
++#endif
++#ifndef _UNICODE
++#define _UNICODE
++#endif
++
++#include
++
++// TODO: Use more of FreeType for TTF parsing (for performance reasons,
++// the fonts can't be parsed completely, though)
++#include
++#include FT_TRUETYPE_IDS_H
++#include FT_TRUETYPE_TAGS_H
++
++#define TTC_VERSION1 0x00010000
++#define TTC_VERSION2 0x00020000
++
++#define MAX_FACENAME 128
++
++// Note: the font face must be the first field so that the structure
++// can be treated like a simple string for searching
++typedef struct pdf_fontmapMS_s
++{
++ char fontface[MAX_FACENAME];
++ char fontpath[MAX_PATH];
++ int index;
++} pdf_fontmapMS;
++
++typedef struct pdf_fontlistMS_s
++{
++ pdf_fontmapMS *fontmap;
++ int len;
++ int cap;
++} pdf_fontlistMS;
++
++typedef struct _tagTT_OFFSET_TABLE
++{
++ ULONG uVersion;
++ USHORT uNumOfTables;
++ USHORT uSearchRange;
++ USHORT uEntrySelector;
++ USHORT uRangeShift;
++} TT_OFFSET_TABLE;
++
++typedef struct _tagTT_TABLE_DIRECTORY
++{
++ ULONG uTag; //table name
++ ULONG uCheckSum; //Check sum
++ ULONG uOffset; //Offset from beginning of file
++ ULONG uLength; //length of the table in bytes
++} TT_TABLE_DIRECTORY;
++
++typedef struct _tagTT_NAME_TABLE_HEADER
++{
++ USHORT uFSelector; //format selector. Always 0
++ USHORT uNRCount; //Name Records count
++ USHORT uStorageOffset; //Offset for strings storage, from start of the table
++} TT_NAME_TABLE_HEADER;
++
++typedef struct _tagTT_NAME_RECORD
++{
++ USHORT uPlatformID;
++ USHORT uEncodingID;
++ USHORT uLanguageID;
++ USHORT uNameID;
++ USHORT uStringLength;
++ USHORT uStringOffset; //from start of storage area
++} TT_NAME_RECORD;
++
++typedef struct _tagFONT_COLLECTION
++{
++ ULONG Tag;
++ ULONG Version;
++ ULONG NumFonts;
++} FONT_COLLECTION;
++
++static struct {
++ char *name;
++ char *pattern;
++} baseSubstitutes[] = {
++ { "Courier", "CourierNewPSMT" },
++ { "Courier-Bold", "CourierNewPS-BoldMT" },
++ { "Courier-Oblique", "CourierNewPS-ItalicMT" },
++ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" },
++ { "Helvetica", "ArialMT" },
++ { "Helvetica-Bold", "Arial-BoldMT" },
++ { "Helvetica-Oblique", "Arial-ItalicMT" },
++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" },
++ { "Times-Roman", "TimesNewRomanPSMT" },
++ { "Times-Bold", "TimesNewRomanPS-BoldMT" },
++ { "Times-Italic", "TimesNewRomanPS-ItalicMT" },
++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" },
++ { "Symbol", "SymbolMT" },
++};
++static const char *base_font_names[][10] =
++{
++ { "Courier", "CourierNew", "CourierNewPSMT", NULL },
++ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold",
++ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL },
++ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic",
++ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL },
++ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic",
++ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL },
++ { "Helvetica", "ArialMT", "Arial", NULL },
++ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold",
++ "Helvetica,Bold", NULL },
++ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic",
++ "Helvetica,Italic", "Helvetica-Italic", NULL },
++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT",
++ "Arial,BoldItalic", "Arial-BoldItalic",
++ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL },
++ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman",
++ "TimesNewRomanPS", NULL },
++ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold",
++ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL },
++ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic",
++ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL },
++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT",
++ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic",
++ "TimesNewRoman-BoldItalic", NULL },
++ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic",
++ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL },
++ { "ZapfDingbats", NULL }
++};
++
++static pdf_fontlistMS fontlistMS =
++{
++ NULL,
++ 0,
++ 0,
++};
++static int strcmp_ignore_space(const char *a, const char *b);
++static const char *clean_font_name(const char *fontname);
++static const char *pdf_clean_base14_name(const char *fontname);
++
++static inline USHORT BEtoHs(USHORT x)
++{
++ BYTE *data = (BYTE *)&x;
++ return (data[0] << 8) | data[1];
++}
++
++static inline ULONG BEtoHl(ULONG x)
++{
++ BYTE *data = (BYTE *)&x;
++ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
++}
++
++static int strcmp_ignore_space(const char *a, const char *b)
++{
++ while (1)
++ {
++ while (*a == ' ')
++ a++;
++ while (*b == ' ')
++ b++;
++ if (*a != *b)
++ return 1;
++ if (*a == 0)
++ return *a != *b;
++ if (*b == 0)
++ return *a != *b;
++ a++;
++ b++;
++ }
++}
++
++/* A little bit more sophisticated name matching so that e.g. "EurostileExtended"
++ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */
++static int
++lookup_compare(const void *elem1, const void *elem2)
++{
++ const char *val1 = elem1;
++ const char *val2 = elem2;
++ int len1 = strlen(val1);
++ int len2 = strlen(val2);
++
++ if (len1 != len2)
++ {
++ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1;
++ if (',' == *rest || !_stricmp(rest, "-roman"))
++ return _strnicmp(val1, val2, fz_mini(len1, len2));
++ }
++
++ return _stricmp(val1, val2);
++}
++
++static void
++remove_spaces(char *srcDest)
++{
++ char *dest;
++
++ for (dest = srcDest; *srcDest; srcDest++)
++ if (*srcDest != ' ')
++ *dest++ = *srcDest;
++ *dest = '\0';
++}
++
++static int
++str_ends_with(const char *str, const char *end)
++{
++ size_t len1 = strlen(str);
++ size_t len2 = strlen(end);
++
++ return len1 >= len2 && !strcmp(str + len1 - len2, end);
++}
++
++static pdf_fontmapMS *
++pdf_find_windows_font_path(const char *fontname)
++{
++ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare);
++}
++
++/* source and dest can be same */
++static void
++decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen)
++{
++ WCHAR *tmp;
++ int converted, i;
++
++ if (sourcelen % 2 != 0)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
++
++ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR));
++ for (i = 0; i < sourcelen / 2; i++)
++ tmp[i] = BEtoHs(((WCHAR *)source)[i]);
++ tmp[sourcelen / 2] = '\0';
++
++ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL);
++ fz_free(ctx, tmp);
++ if (!converted)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string");
++}
++
++static void
++decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen)
++{
++ switch (platform)
++ {
++ case TT_PLATFORM_APPLE_UNICODE:
++ switch (enctype)
++ {
++ case TT_APPLE_ID_DEFAULT:
++ case TT_APPLE_ID_UNICODE_2_0:
++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
++ return;
++ }
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++ case TT_PLATFORM_MACINTOSH:
++ switch (enctype)
++ {
++ case TT_MAC_ID_ROMAN:
++ if (sourcelen + 1 > destlen)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source);
++ // TODO: Convert to UTF-8 from what encoding?
++ memcpy(dest, source, sourcelen);
++ dest[sourcelen] = 0;
++ return;
++ }
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++ case TT_PLATFORM_MICROSOFT:
++ switch (enctype)
++ {
++ case TT_MS_ID_SYMBOL_CS:
++ case TT_MS_ID_UNICODE_CS:
++ case TT_MS_ID_UCS_4:
++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen);
++ return;
++ }
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++ default:
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype);
++ }
++}
++
++static void
++grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl)
++{
++ int newcap;
++ pdf_fontmapMS *newitems;
++
++ if (fl->cap == 0)
++ newcap = 1024;
++ else
++ newcap = fl->cap * 2;
++
++ // use realloc/free for the fontmap, since the list can
++ // remain in memory even with all fz_contexts destroyed
++ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS));
++ if (!newitems)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list");
++ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap));
++
++ fl->fontmap = newitems;
++ fl->cap = newcap;
++}
++
++static void
++append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index)
++{
++ if (fl->len == fl->cap)
++ grow_system_font_list(ctx, fl);
++
++ if (fl->len >= fl->cap)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow");
++
++ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface));
++ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath));
++ fl->fontmap[fl->len].index = index;
++
++ ++fl->len;
++}
++
++static void
++safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size)
++{
++ int n;
++ fz_seek(ctx, file, offset, 0);
++ n = fz_read(ctx, file, (unsigned char *)buf, size);
++ if (n != size)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size);
++}
++
++static void
++read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size)
++{
++ char szTemp[MAX_FACENAME * 2];
++ // ignore empty and overlong strings
++ int stringLength = BEtoHs(ttRecordBE->uStringLength);
++ if (stringLength == 0 || stringLength >= sizeof(szTemp))
++ return;
++
++ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength);
++ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID),
++ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size);
++}
++
++static void
++makeFakePSName(char szName[MAX_FACENAME], const char *szStyle)
++{
++ // append the font's subfamily, unless it's a Regular font
++ if (*szStyle && _stricmp(szStyle, "Regular") != 0)
++ {
++ fz_strlcat(szName, "-", MAX_FACENAME);
++ fz_strlcat(szName, szStyle, MAX_FACENAME);
++ }
++ remove_spaces(szName);
++}
++
++static void
++parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path)
++{
++ TT_OFFSET_TABLE ttOffsetTableBE;
++ TT_TABLE_DIRECTORY tblDirBE;
++ TT_NAME_TABLE_HEADER ttNTHeaderBE;
++ TT_NAME_RECORD ttRecordBE;
++
++ char szPSName[MAX_FACENAME] = { 0 };
++ char szTTName[MAX_FACENAME] = { 0 };
++ char szStyle[MAX_FACENAME] = { 0 };
++ char szCJKName[MAX_FACENAME] = { 0 };
++ int i, count, tblOffset;
++
++ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE));
++
++ // check if this is a TrueType font of version 1.0 or an OpenType font
++ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 &&
++ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO)
++ {
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion));
++ }
++
++ // determine the name table's offset by iterating through the offset table
++ count = BEtoHs(ttOffsetTableBE.uNumOfTables);
++ for (i = 0; i < count; i++)
++ {
++ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY);
++ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY));
++ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name)
++ break;
++ }
++ if (count == i || !BEtoHl(tblDirBE.uTag))
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font");
++ tblOffset = BEtoHl(tblDirBE.uOffset);
++
++ // read the 'name' table for record count and offsets
++ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER));
++ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER);
++ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset);
++
++ // read through the strings for PostScript name and font family
++ count = BEtoHs(ttNTHeaderBE.uNRCount);
++ for (i = 0; i < count; i++)
++ {
++ short langId, nameId;
++ BOOL isCJKName;
++
++ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD));
++
++ langId = BEtoHs(ttRecordBE.uLanguageID);
++ nameId = BEtoHs(ttRecordBE.uNameID);
++ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId);
++
++ // ignore non-English strings (except for Chinese font names)
++ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName)
++ continue;
++ // ignore names other than font (sub)family and PostScript name
++ fz_try(ctx)
++ {
++ if (isCJKName)
++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName));
++ else if (TT_NAME_ID_FONT_FAMILY == nameId)
++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName));
++ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId)
++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle));
++ else if (TT_NAME_ID_PS_NAME == nameId)
++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName));
++ }
++ fz_catch(ctx)
++ {
++ fz_warn(ctx, "ignoring face name decoding fonterror");
++ }
++ }
++
++ // try to prevent non-Arial fonts from accidentally substituting Arial
++ if (!strcmp(szPSName, "ArialMT"))
++ {
++ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471
++ if (strcmp(szTTName, "Arial") != 0)
++ szPSName[0] = '\0';
++ // TODO: is there a better way to distinguish Arial Caps from Arial proper?
++ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290
++ else if (strstr(path, "caps") || strstr(path, "Caps"))
++ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path);
++ }
++
++ if (szPSName[0])
++ append_mapping(ctx, &fontlistMS, szPSName, path, index);
++ if (szTTName[0])
++ {
++ // derive a PostScript-like name and add it, if it's different from the font's
++ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376
++ makeFakePSName(szTTName, szStyle);
++ // compare the two names before adding this one
++ if (lookup_compare(szTTName, szPSName))
++ append_mapping(ctx, &fontlistMS, szTTName, path, index);
++ }
++ if (szCJKName[0])
++ {
++ makeFakePSName(szCJKName, szStyle);
++ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName))
++ append_mapping(ctx, &fontlistMS, szCJKName, path, index);
++ }
++}
++
++static void
++parseTTFs(fz_context *ctx, const char *path)
++{
++ fz_stream *file = fz_open_file(ctx, path);
++ /* "fonterror : %s not found", path */
++ fz_try(ctx)
++ {
++ parseTTF(ctx, file, 0, 0, path);
++ }
++ fz_always(ctx)
++ {
++ fz_drop_stream(ctx,file);
++ }
++ fz_catch(ctx)
++ {
++ fz_rethrow(ctx);
++ }
++}
++
++static void
++parseTTCs(fz_context *ctx, const char *path)
++{
++ FONT_COLLECTION fontcollectionBE;
++ ULONG i, numFonts, *offsettableBE = NULL;
++
++ fz_stream *file = fz_open_file(ctx, path);
++ /* "fonterror : %s not found", path */
++
++ fz_var(offsettableBE);
++
++ fz_try(ctx)
++ {
++ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION));
++ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag));
++ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 &&
++ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2)
++ {
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version));
++ }
++
++ numFonts = BEtoHl(fontcollectionBE.NumFonts);
++ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG));
++
++ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG));
++ for (i = 0; i < numFonts; i++)
++ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path);
++ }
++ fz_always(ctx)
++ {
++ fz_free(ctx, offsettableBE);
++ fz_drop_stream(ctx,file);
++ }
++ fz_catch(ctx)
++ {
++ fz_rethrow(ctx);
++ }
++}
++
++static void
++extend_system_font_list(fz_context *ctx, const WCHAR *path)
++{
++ WCHAR szPath[MAX_PATH], *lpFileName;
++ WIN32_FIND_DATA FileData;
++ HANDLE hList;
++
++ GetFullPathName(path, nelem(szPath), szPath, &lpFileName);
++
++ hList = FindFirstFile(szPath, &FileData);
++ if (hList == INVALID_HANDLE_VALUE)
++ {
++ // Don't complain about missing directories
++ if (GetLastError() == ERROR_FILE_NOT_FOUND)
++ return;
++ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError());
++ }
++ do
++ {
++ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
++ {
++ char szPathUtf8[MAX_PATH], *fileExt;
++ int res;
++ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName);
++ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL);
++ if (!res)
++ {
++ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath);
++ continue;
++ }
++ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4;
++ fz_try(ctx)
++ {
++ if (!_stricmp(fileExt, ".ttc"))
++ parseTTCs(ctx, szPathUtf8);
++ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf"))
++ parseTTFs(ctx, szPathUtf8);
++ }
++ fz_catch(ctx)
++ {
++ // ignore errors occurring while parsing a given font file
++ }
++ }
++ } while (FindNextFile(hList, &FileData));
++ FindClose(hList);
++}
++
++static void
++destroy_system_font_list(void)
++{
++ free(fontlistMS.fontmap);
++ memset(&fontlistMS, 0, sizeof(fontlistMS));
++}
++
++static void
++create_system_font_list(fz_context *ctx)
++{
++ WCHAR szFontDir[MAX_PATH];
++ UINT cch;
++
++ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12);
++ if (0 < cch && cch < nelem(szFontDir) - 12)
++ {
++ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */
++#ifdef _WIN64
++ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?");
++#else
++ wcscat(szFontDir,L"\\Fonts\\*.?t?");
++#endif
++ extend_system_font_list(ctx, szFontDir);
++ }
++
++ if (fontlistMS.len == 0)
++ fz_warn(ctx, "couldn't find any usable system fonts");
++
++#ifdef NOCJKFONT
++ {
++ // If no CJK fallback font is builtin but one has been shipped separately (in the same
++ // directory as the main executable), add it to the list of loadable system fonts
++ WCHAR szFile[MAX_PATH], *lpFileName;
++ GetModuleFileName(0, szFontDir, MAX_PATH);
++ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName);
++ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName);
++ extend_system_font_list(ctx, szFile);
++ }
++#endif
++
++ // sort the font list, so that it can be searched binarily
++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
++
++#ifdef DEBUG
++ // allow to overwrite system fonts for debugging purposes
++ // (either pass a full path or a search pattern such as "fonts\*.ttf")
++ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir));
++ if (0 < cch && cch < nelem(szFontDir))
++ {
++ int i, prev_len = fontlistMS.len;
++ extend_system_font_list(ctx, szFontDir);
++ for (i = prev_len; i < fontlistMS.len; i++)
++ {
++ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare);
++ if (entry)
++ *entry = fontlistMS.fontmap[i];
++ }
++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp);
++ }
++#endif
++
++ // make sure to clean up after ourselves
++ atexit(destroy_system_font_list);
++}
++
++static fz_font *
++pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name)
++{
++ pdf_fontmapMS *found = NULL;
++ char *comma, *fontname;
++ fz_font *font;
++
++ /* WILLUS MOD--not multi-threaded for k2pdfopt */
++ /* fz_synchronize_begin(); */
++ if (fontlistMS.len == 0)
++ {
++ fz_try(ctx)
++ {
++ create_system_font_list(ctx);
++ }
++ fz_catch(ctx) { }
++ }
++ /* WILLUS MOD--not multi-threaded for k2pdfopt */
++ /* fz_synchronize_end(); */
++ if (fontlistMS.len == 0)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts");
++
++ // work on a normalized copy of the font name
++ fontname = fz_strdup(ctx, orig_name);
++ remove_spaces(fontname);
++
++ // first, try to find the exact font name (including appended style information)
++ comma = strchr(fontname, ',');
++ if (comma)
++ {
++ *comma = '-';
++ found = pdf_find_windows_font_path(fontname);
++ *comma = ',';
++ }
++ // second, substitute the font name with a known PostScript name
++ else
++ {
++ int i;
++ for (i = 0; i < nelem(baseSubstitutes) && !found; i++)
++ if (!strcmp(fontname, baseSubstitutes[i].name))
++ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern);
++ }
++ // third, search for the font name without additional style information
++ if (!found)
++ found = pdf_find_windows_font_path(fontname);
++ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold")
++ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic")))
++ {
++ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6;
++ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char));
++ comma = fontname + strlen(fontname) - styleLen;
++ memmove(comma + 1, comma, styleLen + 1);
++ *comma = '-';
++ found = pdf_find_windows_font_path(fontname);
++ *comma = ',';
++ if (!found)
++ found = pdf_find_windows_font_path(fontname);
++ }
++ // fifth, try to convert the font name from the common Chinese codepage 936
++ if (!found && fontname[0] < 0)
++ {
++ WCHAR cjkNameW[MAX_FACENAME];
++ char cjkName[MAX_FACENAME];
++ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) &&
++ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL))
++ {
++ comma = strchr(cjkName, ',');
++ if (comma)
++ {
++ *comma = '-';
++ found = pdf_find_windows_font_path(cjkName);
++ *comma = ',';
++ }
++ if (!found)
++ found = pdf_find_windows_font_path(cjkName);
++ }
++ }
++
++ fz_free(ctx, fontname);
++ if (!found)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name);
++
++ /*
++ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath);
++ */
++
++ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index,
++ strcmp(found->fontface, "DroidSansFallback") != 0);
++ /* willus mod for MuPDF v1.10, 10-21-2016 */
++ {
++ fz_font_flags_t *flags;
++ flags=fz_font_flags(font);
++ if (flags!=NULL)
++ flags->ft_substitute = 1;
++ }
++ return font;
++}
++
++static fz_font *
++pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics)
++{
++ if (needs_exact_metrics)
++ {
++ const char *clean_name;
++ /* WILLUS: Declare pdf_clean_base14_name() */
++ extern const char *pdf_clean_base14_name(const char *fontname);
++
++ /* TODO: the metrics for Times-Roman and Courier don't match
++ those of Windows' Times New Roman and Courier New; for
++ some reason, Poppler doesn't seem to have this problem */
++ int len;
++ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len))
++ return NULL;
++
++ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */
++ clean_name = pdf_clean_base14_name(fontname);
++ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6))
++ return NULL;
++ }
++
++ // TODO: unset font->ft_substitute for base14/needs_exact_metrics?
++ return pdf_load_windows_font_by_name(ctx, fontname);
++}
++
++static const char *clean_font_name(const char *fontname)
++{
++ int i, k;
++ for (i = 0; i < nelem(base_font_names); i++)
++ for (k = 0; base_font_names[i][k]; k++)
++ if (!strcmp_ignore_space(base_font_names[i][k], fontname))
++ return base_font_names[i][0];
++ return fontname;
++}
++
++
++/* SumatraPDF: expose clean_font_name */
++static const char * pdf_clean_base14_name(const char *fontname)
++{
++ return clean_font_name(fontname);
++}
++
++static fz_font *
++pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif)
++{
++ fz_font *font;
++
++ font=NULL; /* WILLUS: Avoid compiler warning */
++ /* try to find a matching system font before falling back to an approximate one */
++ fz_try(ctx)
++ {
++ font = pdf_load_windows_font_by_name(ctx, fontname);
++ }
++ fz_catch(ctx)
++ {
++ font = NULL;
++ }
++ if (font)
++ return font;
++
++ /* try to fall back to a reasonable system font */
++ fz_try(ctx)
++ {
++ if (serif)
++ {
++ switch (ros)
++ {
++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break;
++ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break;
++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break;
++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break;
++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros");
++ }
++ }
++ else
++ {
++ switch (ros)
++ {
++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break;
++ case FZ_ADOBE_GB:
++ fz_try(ctx)
++ {
++ font = pdf_load_windows_font_by_name(ctx, "KaiTi");
++ }
++ fz_catch(ctx)
++ {
++ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312");
++ }
++ break;
++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break;
++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break;
++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros");
++ }
++ }
++ }
++ fz_catch(ctx)
++ {
++#ifdef NOCJKFONT
++ /* If no CJK fallback font is builtin, maybe one has been shipped separately */
++ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback");
++#else
++ fz_rethrow(ctx);
++#endif
++ }
++
++ return font;
++}
++
++#endif
++
++void pdf_install_load_system_font_funcs(fz_context *ctx)
++{
++#ifdef _WIN32
++ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL);
++#endif
++}
+diff --git a/source/fitz/font.c b/source/fitz/font.c
+index 00c6e8f99..1448b4a56 100644
+--- a/source/fitz/font.c
++++ b/source/fitz/font.c
+@@ -4,8 +4,11 @@
+ #include "draw-imp.h"
+
+ #include
++/* willus mod -- remove hb includes */
++/*
+ #include "hb.h"
+ #include "hb-ft.h"
++*/
+
+ #include
+
+diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c
+index 2df90305e..b1f99e056 100644
+--- a/source/fitz/stext-device.c
++++ b/source/fitz/stext-device.c
+@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options
+ dev->lastchar = ' ';
+ dev->curdir = 1;
+ dev->lasttext = NULL;
++ /* willus mod -- seems like this should be here, but not sure. */
++ if (opts)
++ dev->flags = opts->flags;
++ else
++ dev->flags = 0;
+
+ return (fz_device*)dev;
+ }
+diff --git a/source/fitz/string.c b/source/fitz/string.c
+index f8eedb682..7a767983d 100644
+--- a/source/fitz/string.c
++++ b/source/fitz/string.c
+@@ -560,6 +560,10 @@ fz_utflen(const char *s)
+ */
+ float fz_atof(const char *s)
+ {
++/* willus mod: atof(s), #if-#else-#endif */
++#if (!defined(__SSE__))
++ return(atof(s));
++#else
+ float result;
+
+ if (s == NULL)
+@@ -572,6 +576,7 @@ float fz_atof(const char *s)
+ return 1;
+ result = fz_clamp(result, -FLT_MAX, FLT_MAX);
+ return result;
++#endif
+ }
+
+ /*
+diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
+index 4dfdf36fe..acff7d12a 100644
+--- a/source/pdf/pdf-annot.c
++++ b/source/pdf/pdf-annot.c
+@@ -5,8 +5,20 @@
+ #include
+ #include
+
++/* willus mod--don't use _mkgmtime--not available in Win XP */
+ #ifdef _WIN32
+-#define timegm _mkgmtime
++static time_t timegm(struct tm *date);
++static time_t timegm(struct tm *date)
++
++ {
++ time_t t,z;
++ struct tm gmz;
++
++ z=(time_t)0;
++ gmz=(*gmtime(&z));
++ t=mktime(date)-mktime(&gmz);
++ return(t);
++ }
+ #endif
+
+ #define isdigit(c) (c >= '0' && c <= '9')
+diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c
+index 37444b471..613cc05b9 100644
+--- a/source/pdf/pdf-link.c
++++ b/source/pdf/pdf-link.c
+@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp,
+ }
+ return page;
+ }
++/* willus mod -- be quiet */
++/*
+ fz_warn(ctx, "unknown link uri '%s'", uri);
++*/
+ return -1;
+ }
+diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
+index 04a772204..9dd0cd898 100644
+--- a/source/pdf/pdf-parse.c
++++ b/source/pdf/pdf-parse.c
+@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+ if (c == '\r')
+ {
+ c = fz_peek_byte(ctx, file);
++/* willus mod -- no warning */
++/*
+ if (c != '\n')
+ fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen);
+ else
++*/
++if (c=='\n')
++/* willus mod -- end */
+ fz_read_byte(ctx, file);
+ }
+ stm_ofs = fz_tell(ctx, file);
+diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
+index 8f888059b..08de7bfba 100644
+--- a/source/pdf/pdf-xref.c
++++ b/source/pdf/pdf-xref.c
+@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b
+ if (!s)
+ fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing");
+ len = fz_atoi(fz_strsep(&s, " "));
++/* willus mod -- no warning */
++/*
+ if (len < 0)
+ fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive");
++*/
+
+ /* broken pdfs where the section is not on a separate line */
+ if (s && *s != '\0')
+@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
+ {
+ pdf_drop_xref_sections(ctx, doc);
+ fz_rethrow_if(ctx, FZ_ERROR_TRYLATER);
++/* willus mod -- be quiet */
++/*
+ fz_warn(ctx, "trying to repair broken xref");
++*/
+ repaired = 1;
+ }
+
+@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc)
+ /* Swallow error, but continue dropping */
+ }
+
++/* willu smod -- no pdf_drop_js */
++/*
+ pdf_drop_js(ctx, doc->js);
++*/
+
+ pdf_drop_xref_sections(ctx, doc);
+ fz_free(ctx, doc->xref_index);
+--
+2.22.0
+
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch
index b882f5b949c..adfee9ae282 100644
--- a/pkgs/applications/misc/k2pdfopt/tesseract.patch
+++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch
@@ -1,13 +1,675 @@
+From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer
+Date: Fri, 13 Sep 2019 13:45:05 -0400
+Subject: [PATCH] Willus mod changes from k2pdfopt
+
+---
+ src/api/Makefile.am | 1 +
+ src/api/baseapi.cpp | 87 +++++++++++
+ src/api/baseapi.h | 3 +
+ src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++
+ src/api/tesseract.h | 29 ++++
+ src/ccmain/tessedit.cpp | 5 +-
+ src/ccutil/ccutil.h | 7 +
+ src/ccutil/genericvector.h | 21 ++-
+ src/ccutil/mainblk.cpp | 17 +-
+ src/ccutil/params.cpp | 3 +-
+ src/ccutil/serialis.cpp | 3 +
+ src/ccutil/serialis.h | 2 +
+ src/lstm/input.cpp | 3 +
+ 13 files changed, 488 insertions(+), 4 deletions(-)
+ create mode 100644 src/api/tesscapi.cpp
+ create mode 100644 src/api/tesseract.h
+
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
-index d8c1e54..46ead13 100644
+index d9b76eb6..cd2dc30f 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
-@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
- if VISIBILITY
- libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS
- endif
--libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp
-+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp
+@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp
+ libtesseract_api_la_SOURCES += pdfrenderer.cpp
+ libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp
+ libtesseract_api_la_SOURCES += renderer.cpp
++libtesseract_api_la_SOURCES += tesscapi.cpp
lib_LTLIBRARIES += libtesseract.la
- libtesseract_la_LDFLAGS =
+ libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS)
+diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp
+index 9245d07c..ea964ee6 100644
+--- a/src/api/baseapi.cpp
++++ b/src/api/baseapi.cpp
+@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI()
+ // Use the current locale if building debug code.
+ std::locale::global(std::locale(""));
+ #endif
++ const char *locale;
++ locale = std::setlocale(LC_ALL, nullptr);
++/* willus mod Remove assertions--taken care of in tesscapi.cpp */
++// ASSERT_HOST(!strcmp(locale, "C"));
++ locale = std::setlocale(LC_CTYPE, nullptr);
++// ASSERT_HOST(!strcmp(locale, "C"));
++ locale = std::setlocale(LC_NUMERIC, nullptr);
++// ASSERT_HOST(!strcmp(locale, "C"));
+ }
+
+ TessBaseAPI::~TessBaseAPI() {
+@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level,
+ text->add_str_int("\t", bottom - top);
+ }
+
++/* willus mod */
++int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0,
++ char **utf8words)
++
++ {
++ int iword,nwords,totlen,it8;
++ int *x0,*y0,*x1,*y1,*ybaseline;
++ char *tutf8;
++
++ ResultIterator *res_it = GetIterator();
++ /* Count words */
++ iword=0;
++ totlen=0;
++ while (!res_it->Empty(RIL_BLOCK))
++ {
++ if (res_it->Empty(RIL_WORD))
++ {
++ res_it->Next(RIL_WORD);
++ continue;
++ }
++ iword++;
++ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
++ totlen+=strlen(textstr.string())+1;
++ res_it->Next(RIL_WORD);
++ }
++ nwords=iword;
++/*
++printf("\nnwords=%d, totlen=%d\n",nwords,totlen);
++*/
++ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords);
++ y0=(*y00)=&x0[nwords];
++ x1=(*x11)=&y0[nwords];
++ y1=(*y11)=&x1[nwords];
++ ybaseline=(*ybaseline0)=&y1[nwords];
++ tutf8=(*utf8words)=(char *)malloc(totlen);
++ iword=0;
++ it8=0;
++ res_it->Begin();
++ while (!res_it->Empty(RIL_BLOCK))
++ {
++ if (res_it->Empty(RIL_WORD))
++ {
++ res_it->Next(RIL_WORD);
++ continue;
++ }
++ STRING textstr=std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
++ strcpy(&tutf8[it8],textstr.string());
++ it8 += strlen(&tutf8[it8])+1;
++ /*
++ STRING textstr("");
++ textstr += std::unique_ptr(res_it->GetUTF8Text(RIL_WORD)).get();
++ */
++/*
++printf("Word %d: '%s'\n",iword,textstr.string());
++*/
++ int left, top, right, bottom;
++ int u1,v1,u2,v2;
++ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom);
++ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2);
++ x0[iword]=left;
++ x1[iword]=right;
++ y0[iword]=top;
++ y1[iword]=bottom;
++ ybaseline[iword]=(v1+v2)/2;
++ iword++;
++/*
++printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2);
++*/
++ res_it->Next(RIL_WORD);
++ }
++/*
++printf("iword=%d\n",iword);
++*/
++ return(iword);
++ }
++
++/* willus mod */
++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
++
+ /**
+ * Make a TSV-formatted string from the internal data structures.
+ * page_number is 0-based but will appear in the output as 1-based.
+diff --git a/src/api/baseapi.h b/src/api/baseapi.h
+index 3724dd92..23be5920 100644
+--- a/src/api/baseapi.h
++++ b/src/api/baseapi.h
+@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI {
+ */
+ char* GetHOCRText(ETEXT_DESC* monitor, int page_number);
+
++/* willus mod */
++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words);
++
+ /**
+ * Make a HTML-formatted string with hOCR markup from the internal
+ * data structures.
+diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp
+new file mode 100644
+index 00000000..1752fafe
+--- /dev/null
++++ b/src/api/tesscapi.cpp
+@@ -0,0 +1,311 @@
++/*
++** tesscapi.cpp willus.com attempt at C wrapper for tesseract.
++** (Butchered from tesseractmain.cpp)
++** Last udpated 9-1-12
++**
++** Copyright (C) 2012 http://willus.com
++**
++** This program is free software: you can redistribute it and/or modify
++** it under the terms of the GNU Affero General Public License as
++** published by the Free Software Foundation, either version 3 of the
++** License, or (at your option) any later version.
++**
++** This program is distributed in the hope that it will be useful,
++** but WITHOUT ANY WARRANTY; without even the implied warranty of
++** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++** GNU Affero General Public License for more details.
++**
++** You should have received a copy of the GNU Affero General Public License
++** along with this program. If not, see .
++**
++*/
++
++/*
++#include "mfcpch.h"
++*/
++// #define USE_VLD //Uncomment for Visual Leak Detector.
++#if (defined _MSC_VER && defined USE_VLD)
++#include
++#endif
++
++// Include automatically generated configuration file if running autoconf
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++#include
++#ifdef USING_GETTEXT
++#include
++#define _(x) gettext(x)
++#else
++#define _(x) (x)
++#endif
++
++#include "allheaders.h"
++#include "baseapi.h"
++#include "strngs.h"
++#include "params.h"
++#include "blobs.h"
++#include "simddetect.h"
++#include "tesseractclass.h"
++/*
++#include "notdll.h"
++*/
++
++/* C Wrappers */
++#include "tesseract.h"
++
++// static tesseract::TessBaseAPI api[4];
++
++/*
++** ocr_type=0: OEM_DEFAULT
++** ocr_type=1: OEM_TESSERACT_ONLY
++** ocr_type=2: OEM_LSTM_ONLY
++** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED
++*/
++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
++ char *initstr,int maxlen,int *status)
++
++ {
++ char original_locale[256];
++ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI;
++/*
++printf("@tess_capi_init\n");
++printf(" datapath='%s'\n",datapath);
++printf(" language='%s'\n",language);
++printf(" ocr_type=%d\n",ocr_type);
++*/
++#ifdef USE_NLS
++ setlocale (LC_ALL, "");
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ textdomain (PACKAGE);
++#endif
++ /* willus mod, 11-24-16 */
++ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */
++/*
++printf("locale='%s'\n",setlocale(LC_ALL,NULL));
++printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL));
++printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
++*/
++ strncpy(original_locale,setlocale(LC_ALL,NULL),255);
++ original_locale[255]='\0';
++/*
++printf("original_locale='%s'\n",original_locale);
++*/
++ setlocale(LC_ALL,"C");
++/*
++printf("new locale='%s'\n",setlocale(LC_ALL,NULL));
++printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL));
++printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL));
++*/
++ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version());
++ // Make the order of args a bit more forgiving than it used to be.
++ const char* lang = "eng";
++ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK;
++ if (language!=NULL && language[0]!='\0')
++ lang = language;
++ /*
++ if (output == NULL)
++ {
++ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] "
++ "[-psm pagesegmode] [configfile...]\n"), argv[0]);
++ fprintf(stderr,
++ _("pagesegmode values are:\n"
++ "0 = Orientation and script detection (OSD) only.\n"
++ "1 = Automatic page segmentation with OSD.\n"
++ "2 = Automatic page segmentation, but no OSD, or OCR\n"
++ "3 = Fully automatic page segmentation, but no OSD. (Default)\n"
++ "4 = Assume a single column of text of variable sizes.\n"
++ "5 = Assume a single uniform block of vertically aligned text.\n"
++ "6 = Assume a single uniform block of text.\n"
++ "7 = Treat the image as a single text line.\n"
++ "8 = Treat the image as a single word.\n"
++ "9 = Treat the image as a single word in a circle.\n"
++ "10 = Treat the image as a single character.\n"));
++ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any"
++ "configfile.\n"));
++ exit(1);
++ }
++ */
++/*
++printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
++printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE");
++*/
++/*
++v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE.
++*/
++ ocr_type=0; /* Ignore specified and use default */
++ api->SetOutputName(NULL);
++ (*status)=api->Init(datapath,lang,
++ ocr_type==0 ? tesseract::OEM_DEFAULT :
++ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY :
++ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY :
++ (tesseract::OEM_TESSERACT_LSTM_COMBINED))));
++ if ((*status)!=0)
++ {
++ /* willus mod, 11-24-16 */
++ setlocale(LC_ALL,original_locale);
++ api->End();
++ delete api;
++ return(NULL);
++ }
++ /*
++ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT,
++ &(argv[arg]), argc - arg, NULL, NULL, false);
++ */
++ // We have 2 possible sources of pagesegmode: a config file and
++ // the command line. For backwards compatability reasons, the
++ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the
++ // default for this program is tesseract::PSM_AUTO. We will let
++ // the config file take priority, so the command-line default
++ // can take priority over the tesseract default, so we use the
++ // value from the command line only if the retrieved mode
++ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change
++ // in any config file. Therefore the only way to force
++ // tesseract::PSM_SINGLE_BLOCK is from the command line.
++ // It would be simpler if we could set the value before Init,
++ // but that doesn't work.
++ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK)
++ api->SetPageSegMode(pagesegmode);
++
++ /*
++ ** Initialization message
++ */
++ {
++ char istr[1024];
++ int sse,avx;
++
++// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode);
++ sprintf(istr,"%s",api->Version());
++ sse=tesseract::SIMDDetect::IsSSEAvailable();
++ avx=tesseract::SIMDDetect::IsAVXAvailable();
++ if (sse || avx)
++ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX"));
++ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath);
++ strcat(istr,"\n Tesseract languages: ");
++ GenericVector languages;
++ api->GetLoadedLanguagesAsVector(&languages);
++/*
++printf("OEM=%d\n",api->oem());
++printf("Langs='%s'\n",api->GetInitLanguagesAsString());
++printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang());
++printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang());
++printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs());
++printf("languages.size()=%d\n",(int)languages.size());
++*/
++
++ for (int i=0;i<=api->tesseract()->num_sub_langs();i++)
++ {
++ tesseract::Tesseract *lang1;
++ int eng;
++ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1);
++ eng=(int)lang1->tessedit_ocr_engine_mode;
++ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(),
++ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess"));
++ }
++/*
++printf("%d. '%s'\n",i+1,languages[i].string());
++printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode);
++*/
++
++ /*
++ if (ocr_type==0 || ocr_type==3)
++ sprintf(&istr[strlen(istr)],"[LSTM+] (lang=");
++ else if (ocr_type==2)
++ sprintf(&istr[strlen(istr)],"[LSTM] (lang=");
++ strncpy(&istr[strlen(istr)],language,253-strlen(istr));
++ istr[253]='\0';
++ strcat(istr,")");
++ */
++ if (out!=NULL)
++ fprintf(out,"%s\n",istr);
++ if (initstr!=NULL)
++ {
++ strncpy(initstr,istr,maxlen-1);
++ initstr[maxlen-1]='\0';
++ }
++ }
++
++
++ /* Turn off LSTM debugging output */
++ api->SetVariable("lstm_debug_level","0");
++#if (WILLUSDEBUG & 1)
++ api->SetVariable("lstm_debug_level","9");
++ api->SetVariable("paragraph_debug_level","9");
++ api->SetVariable("tessdata_manager_debug_level","9");
++ api->SetVariable("tosp_debug_level","9");
++ api->SetVariable("wordrec_debug_level","9");
++ api->SetVariable("segsearch_debug_level","9");
++#endif
++ /* willus mod, 11-24-16 */
++ setlocale(LC_ALL,original_locale);
++ return((void *)api);
++ }
++
++
++int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out)
++
++ {
++ tesseract::TessBaseAPI *api;
++ static int old_segmode=-1;
++
++ api=(tesseract::TessBaseAPI *)vapi;
++ if (old_segmode != segmode)
++ {
++ old_segmode=segmode;
++ api->SetPageSegMode((tesseract::PageSegMode)segmode);
++ }
++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
++ {
++ /* pixDestroy(&pix); */
++ if (out!=NULL)
++ fprintf(out,"tesscapi: Error during bitmap processing.\n");
++ api->Clear();
++ return(-1);
++ }
++ strncpy(outstr,api->GetUTF8Text(),maxlen-1);
++ outstr[maxlen-1]='\0';
++ api->Clear();
++ return(0);
++ }
++
++
++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
++ int **left,int **top,int **right,int **bottom,
++ int **ybase,char **text,int *nw,
++ FILE *out)
++
++ {
++ tesseract::TessBaseAPI *api;
++ static int old_segmode=-1;
++
++ api=(tesseract::TessBaseAPI *)vapi;
++ if (old_segmode != segmode)
++ {
++ old_segmode=segmode;
++ api->SetPageSegMode((tesseract::PageSegMode)segmode);
++ }
++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL))
++ {
++ if (out!=NULL)
++ fprintf(out,"tesscapi: Error during bitmap processing.\n");
++ api->Clear();
++ (*nw)=0;
++ return(-1);
++ }
++ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text);
++ api->Clear();
++ return(0);
++ }
++
++
++void tess_capi_end(void *vapi)
++
++ {
++ tesseract::TessBaseAPI *api;
++
++ if (vapi==NULL)
++ return;
++ api=(tesseract::TessBaseAPI *)vapi;
++ api->End();
++ delete api;
++ }
+diff --git a/src/api/tesseract.h b/src/api/tesseract.h
+new file mode 100644
+index 00000000..575948cc
+--- /dev/null
++++ b/src/api/tesseract.h
+@@ -0,0 +1,29 @@
++/*
++** Willus.com's Tesseract C Wrappers
++**
++** 6-8-12
++**
++*/
++
++#ifndef _TESSERACT_H_
++#define _TESSERACT_H_
++
++//#include
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
++ char *initstr,int maxlen,int *status);
++int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out);
++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
++ int **left,int **top,int **right,int **bottom,
++ int **ybase,char **text,int *nw,
++ FILE *out);
++void tess_capi_end(void *api);
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp
+index 17f0951b..7af94ee2 100644
+--- a/src/ccmain/tessedit.cpp
++++ b/src/ccmain/tessedit.cpp
+@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data(
+ " to your \"tessdata\" directory.\n");
+ return false;
+ }
++ /* willus mod */
++ TFile fp;
++ strncpy(fp.tfile_filename,tessdata_path.string(),511);
++ fp.tfile_filename[511]='\0';
+ #ifndef DISABLED_LEGACY_ENGINE
+ if (oem == OEM_DEFAULT) {
+ // Set the engine mode from availability, which can then be overridden by
+@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data(
+ #endif // ndef DISABLED_LEGACY_ENGINE
+
+ // If a language specific config file (lang.config) exists, load it in.
+- TFile fp;
+ if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) {
+ ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp,
+ this->params());
+diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h
+index 71e89c60..bdeccc14 100644
+--- a/src/ccutil/ccutil.h
++++ b/src/ccutil/ccutil.h
+@@ -80,6 +80,13 @@ class CCUtil {
+ // Member parameters.
+ // These have to be declared and initialized after params_ member, since
+ // params_ should be initialized before parameters are added to it.
++/* willus mod */
++/*
++ #ifdef _WIN32
++ STRING_VAR_H(tessedit_module_name, WINDLLNAME,
++ "Module colocated with tessdata dir");
++ #endif
++*/
+ INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities");
+ BOOL_VAR_H(use_definite_ambigs_for_classifier, false,
+ "Use definite ambiguities when running character classifier");
+diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h
+index 3556d153..3a5e8662 100644
+--- a/src/ccutil/genericvector.h
++++ b/src/ccutil/genericvector.h
+@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector* data) {
+ // reserve an extra byte in case caller wants to append a '\0' character
+ data->reserve(size + 1);
+ data->resize_no_init(size);
+- result = static_cast(fread(&(*data)[0], 1, size, fp)) == size;
++ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */
++ /* Can't read entire file at once -- need to break up into smaller blocksize reads */
++ {
++ int frs,n;
++ int blocksize;
++ blocksize=1024*1024;
++ for (n=0;1;)
++ {
++ int bs;
++ bs= size-n > blocksize ? blocksize : size-n;
++ frs=(int)fread(&(*data)[n],1,bs,fp);
++ n+=frs;
++ if (frs=size)
++ break;
++ }
++ result = static_cast((long)n==size);
++ }
++ /*
++ result = static_cast(fread(&(*data)[0], 1, size, fp)) == size;
++ */
+ }
+ fclose(fp);
+ }
+diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp
+index 52b04b04..80b26044 100644
+--- a/src/ccutil/mainblk.cpp
++++ b/src/ccutil/mainblk.cpp
+@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
+ #if defined(_WIN32)
+ } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) {
+ /* Look for tessdata in directory of executable. */
++ /*
++ char drive[_MAX_DRIVE];
++ char dir[_MAX_DIR];
++ */
+ char path[_MAX_PATH];
+- DWORD length = GetModuleFileName(nullptr, path, sizeof(path));
++ int i;
++ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path));
++ /* willus mod--avoid _splitpath_s -- not in XP */
++ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--);
++ if (i>=0)
++ {
++ path[i]='\0';
++ datadir=path;
++ datadir += "/tessdata";
++ }
++ /*
+ if (length > 0 && length < sizeof(path)) {
+ char* separator = std::strrchr(path, '\\');
+ if (separator != nullptr) {
+@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) {
+ datadir += "/tessdata";
+ }
+ }
++ */
+ #endif /* _WIN32 */
+ #if defined(TESSDATA_PREFIX)
+ } else {
+diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp
+index 00bf2563..486c5ce0 100644
+--- a/src/ccutil/params.cpp
++++ b/src/ccutil/params.cpp
+@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp,
+
+ if (!foundit) {
+ anyerr = true; // had an error
+- tprintf("Warning: Parameter not found: %s\n", line);
++ /* willus mod */
++ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename);
+ }
+ }
+ }
+diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp
+index 7def011f..6107a494 100644
+--- a/src/ccutil/serialis.cpp
++++ b/src/ccutil/serialis.cpp
+@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) {
+ offset_ = 0;
+ is_writing_ = false;
+ swap_ = false;
++ /* willus mod */
++ strncpy(tfile_filename,filename.string(),511);
++ tfile_filename[511]='\0';
+ if (reader == nullptr)
+ return LoadDataFromFile(filename, data_);
+ else
+diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h
+index 095b9227..4cc8251e 100644
+--- a/src/ccutil/serialis.h
++++ b/src/ccutil/serialis.h
+@@ -77,6 +77,8 @@ class TFile {
+ public:
+ TFile();
+ ~TFile();
++ /* willus mod */
++ char tfile_filename[512];
+
+ // All the Open methods load the whole file into memory for reading.
+ // Opens a file with a supplied reader, or nullptr to use the default.
+diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp
+index 73b584b3..0b0b54c3 100644
+--- a/src/lstm/input.cpp
++++ b/src/lstm/input.cpp
+@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data,
+ return nullptr;
+ }
+ if (width < min_width || height < min_width) {
++ /* willus mod -- no warning */
++ /*
+ tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width,
+ height, min_width);
++ */
+ pixDestroy(&pix);
+ return nullptr;
+ }
+--
+2.22.0
+
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ecfcc771728..0a42d5e4f28 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "kanboard-${version}";
+ pname = "kanboard";
version = "1.2.9";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index b518481e29a..4c4b461303f 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, requireFile, unzip, rlwrap, bash }:
+{ stdenv, requireFile, unzip, rlwrap, bash, zlib }:
assert (stdenv.hostPlatform.system == "i686-linux");
let
libPath = stdenv.lib.makeLibraryPath
- [ stdenv.cc.libc stdenv.cc.cc ];
+ [ stdenv.cc.libc stdenv.cc.cc zlib ];
in
stdenv.mkDerivation rec {
- name = "kdbplus-${version}";
- version = "3.3";
+ pname = "kdbplus";
+ version = "3.6";
- src = requireFile {
+ src = requireFile rec {
message = ''
Nix can't download kdb+ for you automatically. Go to
http://kx.com and download the free, 32-bit version for
- Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in
- the directory where you saved it. Note you need version 3.3.
+ Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in
+ the directory where you saved it. Note you need version ${version}.
'';
- name = "linux.zip";
- sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940";
+ name = "linuxx86.zip";
+ sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p";
};
dontStrip = true;
buildInputs = [ unzip ];
phases = "unpackPhase installPhase";
- unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+ unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
installPhase = ''
mkdir -p $out/bin $out/libexec
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index b92a7ac476c..ed3c8672269 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ mkDerivation
, lib
, fetchurl
, extra-cmake-modules
@@ -18,13 +18,13 @@
, kwayland
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "kdeconnect";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz";
- sha256 = "12ijvp86wm6k81dggypxh3c0dmwg5mczxy43ra8rgv63aavmf42h";
+ sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5";
};
buildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
postInstall = ''
- wrapProgram $out/lib/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
+ wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index 80bf5deceb1..c3d26077443 100644
--- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -3,7 +3,8 @@
let
version = "0.10.1";
drv = stdenv.mkDerivation {
- name = "keeagent-${version}";
+ pname = "keeagent";
+ inherit version;
src = fetchzip {
url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index e64632d529b..76ea9df78c2 100644
--- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -3,7 +3,8 @@
let
version = "1.8.4.2";
drv = stdenv.mkDerivation {
- name = "keepasshttp-${version}";
+ pname = "keepasshttp";
+ inherit version;
src = fetchFromGitHub {
owner = "pfn";
repo = "keepasshttp";
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index b45cb24b1b5..562835159eb 100644
--- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -3,7 +3,8 @@
let
version = "1.8.0";
drv = stdenv.mkDerivation {
- name = "keepassrpc-${version}";
+ pname = "keepassrpc";
+ inherit version;
src = fetchurl {
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 8a3aaf202a7..36734a97516 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
stdenv.mkDerivation rec {
- name = "keepassx2-${version}";
+ pname = "keepassx2";
version = "2.0.3";
src = fetchurl {
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index b52cff784e5..22e6cd2f666 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -17,6 +17,7 @@
, qtsvg
, qtx11extras
, quazip
+, wrapQtAppsHook
, yubikey-personalization
, zlib
@@ -30,14 +31,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "keepassxc-${version}";
- version = "2.4.1";
+ pname = "keepassxc";
+ version = "2.4.3";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
- rev = "${version}";
- sha256 = "1cbfsfdvb4qw6yb0zl6mymdbphnb7lxbfrc5a8cjmn9w8b09kv6m";
+ rev = version;
+ sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -73,12 +74,12 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = ''
export LC_ALL="en_US.UTF-8"
- export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
export QT_QPA_PLATFORM=offscreen
+ export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
make test ARGS+="-E testgui --output-on-failure"
'';
- nativeBuildInputs = [ cmake makeWrapper qttools ];
+ nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
buildInputs = [
curl
@@ -102,10 +103,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras;
- postInstall = optionalString stdenv.isDarwin ''
+ preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH.
- wrapProgram $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC \
- --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}
+ wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC
'';
meta = {
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser).";
homepage = https://keepassxc.org/;
license = licenses.gpl2;
- maintainers = with maintainers; [ s1lvester jonafato ];
+ maintainers = with maintainers; [ jonafato ];
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch
index d7ffb7dbba1..6232d1118a7 100644
--- a/pkgs/applications/misc/keepassx/darwin.patch
+++ b/pkgs/applications/misc/keepassx/darwin.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 658548f7..f8f10bdb 100644
+index 74b1a7ff..0a713a32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -288,6 +288,7 @@ if(MINGW)
+@@ -307,6 +307,7 @@ if(MINGW)
set(PLUGIN_INSTALL_DIR ".")
set(DATA_INSTALL_DIR "share")
elseif(APPLE AND WITH_APP_BUNDLE)
@@ -10,24 +10,24 @@ index 658548f7..f8f10bdb 100644
set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
-@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
+@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON)
if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
- if(NOT MACDEPLOYQT_EXE)
-- message(FATAL_ERROR "macdeployqt is required to build in macOS")
+- message(FATAL_ERROR "macdeployqt is required to build on macOS")
- else()
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
- endif()
- endif()
-
- # Debian sets the the build type to None for package builds.
+ elseif(MINGW)
+ find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
+ if(NOT WINDEPLOYQT_EXE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 110dc606..f9b58818 100644
+index f142f368..0742512d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
+@@ -351,11 +351,6 @@ if(APPLE AND WITH_APP_BUNDLE)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
include(CPack)
@@ -40,10 +40,10 @@ index 110dc606..f9b58818 100644
install(TARGETS ${PROGNAME}
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
-index f1c5387f..abf70b48 100644
+index 7427450a..a0a58d71 100644
--- a/src/autotype/mac/CMakeLists.txt
+++ b/src/autotype/mac/CMakeLists.txt
-@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
+@@ -8,7 +8,6 @@ if(WITH_APP_BUNDLE)
add_custom_command(TARGET keepassx-autotype-cocoa
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index 05ad9b05abb..7adbcb86c50 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
stdenv.mkDerivation rec {
- name = "keepassx-${version}";
+ pname = "keepassx";
version = "0.4.4";
src = fetchurl {
- url = "https://www.keepassx.org/releases/${version}/${name}.tar.gz";
+ url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz";
sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry";
};
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 2e32bbd611a..6aa94b2fecb 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, python3 }:
+{ stdenv, pkgs, python3, fetchpatch }:
with python3.pkgs; buildPythonApplication rec {
pname = "khal";
@@ -9,6 +9,14 @@ with python3.pkgs; buildPythonApplication rec {
sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l";
};
+ # Include a khal.desktop file via upstream commit.
+ # This patch should be removed when updating to the next version, probably.
+ patches = [ (fetchpatch {
+ name = "add-khal-dot-desktop.patch";
+ url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch";
+ sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c";
+ }) ];
+
propagatedBuildInputs = [
atomicwrites
click
@@ -26,11 +34,19 @@ with python3.pkgs; buildPythonApplication rec {
pkginfo
freezegun
];
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ];
checkInputs = [ pytest ];
postInstall = ''
+ # zsh completion
install -D misc/__khal $out/share/zsh/site-functions/__khal
+
+ # man page
+ make -C doc man
+ install -Dm755 doc/build/man/khal.1 -t $out/share/man/man1
+
+ # desktop
+ install -Dm755 misc/khal.desktop -t $out/share/applications
'';
doCheck = !stdenv.isAarch64;
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 61eb959a1dd..99b9c38d53f 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -17,13 +17,13 @@ let
};
in with python.pkgs; buildPythonApplication rec {
- version = "0.13.0";
- name = "khard-${version}";
+ version = "0.14.0";
+ pname = "khard";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
+ sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq";
};
# setup.py reads the UTF-8 encoded readme.
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 9b77bdcd2a5..3b7e9e9d139 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,6 +1,6 @@
{ stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring,
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
- libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
+ libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
which, dbus,
Cocoa,
@@ -9,7 +9,7 @@
IOKit,
Kernel,
OpenGL,
- cf-private,
+ libcanberra,
libicns,
libpng,
librsvg,
@@ -21,18 +21,19 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.14.2";
+ version = "0.14.3";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "15iv3k7iryf10n8n67d37x24pzcarq97a3dr42lbld00k1lx19az";
+ sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b";
};
buildInputs = [
- ncurses harfbuzz
+ harfbuzz
+ ncurses
] ++ stdenv.lib.optionals stdenv.isDarwin [
Cocoa
CoreGraphics
@@ -40,12 +41,11 @@ buildPythonApplication rec {
IOKit
Kernel
OpenGL
- cf-private
libpng
python3
zlib
] ++ stdenv.lib.optionals stdenv.isLinux [
- fontconfig glfw libunistring libX11
+ fontconfig glfw libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
wayland-protocols wayland dbus
];
@@ -59,6 +59,8 @@ buildPythonApplication rec {
optipng
];
+ propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL;
+
outputs = [ "out" "terminfo" ];
patches = [
@@ -72,6 +74,10 @@ buildPythonApplication rec {
./png2icns.patch
];
+ preConfigure = stdenv.lib.optional (!stdenv.isDarwin) ''
+ substituteInPlace glfw/egl_context.c --replace "libEGL.so.1" "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"
+ '';
+
buildPhase = if stdenv.isDarwin then ''
make app
'' else ''
@@ -89,7 +95,7 @@ buildPythonApplication rec {
'' else ''
cp -r linux-package/{bin,share,lib} $out
''}
- wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}"
+ wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
runHook postInstall
# ZSH completions need to be invoked with `source`:
diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/pkgs/applications/misc/kitty/png2icns.patch
index d2d0806c862..68566e2a899 100644
--- a/pkgs/applications/misc/kitty/png2icns.patch
+++ b/pkgs/applications/misc/kitty/png2icns.patch
@@ -1,19 +1,21 @@
---- a/setup.py
-+++ b/setup.py
-@@ -744,9 +744,15 @@ Categories=System;TerminalEmulator;
- if not os.path.exists(logo_dir):
- raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py')
- subprocess.check_call([
-- 'iconutil', '-c', 'icns', logo_dir, '-o',
-+ 'png2icns',
- os.path.join('Resources', os.path.basename(logo_dir).partition('.')[0] + '.icns')
-- ])
-+ ] + [os.path.join(logo_dir, logo) for logo in (
-+ 'icon_128x128.png',
-+ 'icon_16x16.png',
-+ 'icon_256x256.png',
-+ 'icon_32x32.png',
-+ 'icon_512x512.png',
-+ )])
- # }}}
- # }}}
+diff -aru a/setup.py b/setup.py
+--- a/setup.py 2019-07-29 11:09:32.000000000 -0400
++++ b/setup.py 2019-07-29 11:11:37.000000000 -0400
+@@ -784,9 +784,15 @@
+ def create_macos_app_icon(where='Resources'):
+ logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset'))
+ subprocess.check_call([
+- 'iconutil', '-c', 'icns', logo_dir, '-o',
++ 'png2icns',
+ os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')
+- ])
++ ] + [os.path.join(logo_dir, logo) for logo in [
++ 'icon_128x128.png',
++ 'icon_16x16.png',
++ 'icon_256x256.png',
++ 'icon_32x32.png',
++ 'icon_512x512.png',
++ ]])
+
+
+ def create_minimal_macos_bundle(args, where):
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index bc49e810d4e..898186b714b 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
-, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
+, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib
}:
@@ -31,10 +31,10 @@ let
pugixml = stdenv.mkDerivation rec {
version = "1.2";
- name = "pugixml-${version}";
+ pname = "pugixml";
src = fetchurl {
- url = "http://download.kiwix.org/dev/${name}.tar.gz";
+ url = "http://download.kiwix.org/dev/${pname}-${version}.tar.gz";
sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
};
@@ -42,8 +42,8 @@ let
unpackPhase = ''
# not a nice src archive: all the files are in the root :(
- mkdir ${name}
- cd ${name}
+ mkdir ${pname}-${version}
+ cd ${pname}-${version}
tar -xf ${src}
# and the build scripts are in there :'(
@@ -54,7 +54,7 @@ let
in
stdenv.mkDerivation rec {
- name = "kiwix-${version}";
+ pname = "kiwix";
version = "0.9";
src = fetchurl {
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
"--disable-staticbins"
];
@@ -93,7 +92,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
- --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
+ --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk-pixbuf pango cairo freetype fontconfig alsaLib atk]} \
--suffix PATH : ${aria2}/bin
'';
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix
new file mode 100644
index 00000000000..7868e74d010
--- /dev/null
+++ b/pkgs/applications/misc/kjv/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, fetchpatch }:
+
+let
+
+patch-base = https://github.com/LukeSmithxyz/kjv/commit/;
+
+add-apocrypha = fetchpatch {
+ url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch";
+ sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k";
+};
+
+add-install-target = fetchpatch {
+ url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch";
+ sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q";
+};
+
+in
+
+stdenv.mkDerivation rec {
+ pname = "kjv";
+ version = "unstable-2018-12-25";
+
+ src = fetchFromGitHub {
+ owner = "bontibon";
+ repo = pname;
+ rev = "fda81a610e4be0e7c5cf242de655868762dda1d4";
+ sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf";
+ };
+
+ patches = [ add-apocrypha add-install-target ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "The Bible, King James Version";
+ homepage = "https://github.com/bontibon/kjv";
+ license = licenses.publicDomain;
+ maintainers = [ maintainers.jtobin ];
+ };
+}
+
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 70915ca8707..cf81d572c61 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -8,10 +8,11 @@ let
pname = "krusader";
version = "2.7.1";
in mkDerivation rec {
- name = "krusader-${version}";
+ pname = "krusader";
+ inherit version;
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+ url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
};
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index bdbdef45fe7..0bd91994418 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -4,12 +4,11 @@
mkDerivation rec {
pname = "latte-dock";
version = "0.8.9";
- name = "${pname}-${version}";
src = fetchurl {
- url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
+ url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
- name = "${name}.tar.xz";
+ name = "${pname}-${version}.tar.xz";
};
buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index 9018a592642..76abe7c9b4b 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -6,7 +6,7 @@
}:
stdenv.mkDerivation rec {
- name = "lenmus-${version}";
+ pname = "lenmus";
version = "5.4.2";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index c9583961de4..846ce309842 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- name = "libosmocore-${version}";
- version = "1.1.0";
+ pname = "libosmocore";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "libosmocore";
rev = version;
- sha256 = "1ayxpq03mv547sirdy3j9vnsjd1q07adhwwnl3wffz3c39wlax68";
+ sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index c049ed2374f..142dafe38eb 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,42 +1,64 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
+{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
+, qtbase, qtsvg, qttools, qmake
+, boost, muparser }:
-stdenv.mkDerivation rec {
- version = "2.1.3";
- name = "librecad-${version}";
+mkDerivation rec {
+ pname = "librecad";
+ version = "2.2.0-rc1";
- src = fetchurl {
- url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
- name = name + ".tar.gz";
- sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
+ src = fetchFromGitHub {
+ owner = "LibreCAD";
+ repo = "LibreCAD";
+ rev = version;
+ sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
};
- patchPhase = ''
- sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
- sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+ patches = [ ./fix_qt_5_11_build.patch ];
+
+ postPatch = ''
+ substituteInPlace scripts/postprocess-unix.sh \
+ --replace /bin/sh ${runtimeShell}
+
+ substituteInPlace librecad/src/lib/engine/rs_system.cpp \
+ --replace /usr/share $out/share
+
+ substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
+ --replace __DATE__ 0
'';
- qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];
+ qmakeFlags = [
+ "MUPARSER_DIR=${muparser}"
+ "BOOST_DIR=${boost.dev}"
+ ];
installPhase = ''
- install -m 555 -D unix/librecad $out/bin/librecad
- install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop
- install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
- install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
+ runHook preInstall
+
+ install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
+ install -Dm444 -t $out/share/applications desktop/librecad.desktop
+ install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
+ install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
+ install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
$out/share/icons/hicolor/scalable/apps/librecad.svg
+
+ installManPage desktop/librecad.?
+
cp -R unix/resources $out/share/librecad
+
+ runHook postInstall
'';
- buildInputs = [ qt4 muparser which boost ];
- nativeBuildInputs = [ pkgconfig qmake4Hook ];
+ buildInputs = [ boost muparser qtbase qtsvg ];
+
+ nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
enableParallelBuilding = true;
- meta = {
- description = "A 2D CAD package based upon Qt";
- homepage = https://librecad.org;
- repositories.git = git://github.com/LibreCAD/LibreCAD.git;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ meta = with lib; {
+ description = "2D CAD package based on Qt";
+ homepage = "https://librecad.org";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
new file mode 100644
index 00000000000..04701e5ab1e
--- /dev/null
+++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
@@ -0,0 +1,36 @@
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 835e47d..2c878e8 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+
+ #include
+
++#include
+ #include
+ #include
+ #include
+diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
+index 2beaceb..84068ad 100644
+--- a/librecad/src/ui/generic/colorwizard.cpp
++++ b/librecad/src/ui/generic/colorwizard.cpp
+@@ -27,6 +27,7 @@
+ #include "colorwizard.h"
+ #include "ui_colorwizard.h"
+
++#include
+ #include
+ #include
+ #include
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index 7c35144..0e394f2 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,7 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include
+ #include
+ #include
+ #include
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 948ae7b14a1..e9dba4bcf46 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -29,8 +29,8 @@ let
};
in
-stdenv.mkDerivation rec {
- name = "lilyterm-${version}";
+stdenv.mkDerivation {
+ pname = "lilyterm";
inherit (stuff) src version;
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 5ae652d750d..2c2acb6a743 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,13 +4,13 @@ libGLU_combined, freetype, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
stdenv.mkDerivation rec {
- name = "llpp-${version}";
- version = "30";
+ pname = "llpp";
+ version = "31";
src = fetchgit {
url = "git://repo.or.cz/llpp.git";
rev = "v${version}";
- sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd";
+ sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg";
fetchSubmodules = false;
};
diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch
index 25d503290ce..13dbdb926c8 100644
--- a/pkgs/applications/misc/llpp/fix-build-bash.patch
+++ b/pkgs/applications/misc/llpp/fix-build-bash.patch
@@ -1,14 +1,5 @@
-From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
-From: Michael Hoang
-Date: Mon, 10 Dec 2018 15:08:01 +1100
-Subject: [PATCH] Patch build.bash for nixpkgs
-
----
- build.bash | 37 ++-----------------------------------
- 1 file changed, 2 insertions(+), 35 deletions(-)
-
diff --git a/build.bash b/build.bash
-index 1588011..72117d9 100755
+index 7c278b6..41494c5 100755
--- a/build.bash
+++ b/build.bash
@@ -29,7 +29,6 @@ srcd="$(dirname $0)"
@@ -20,10 +11,10 @@ index 1588011..72117d9 100755
mkdir -p $outd/{$wsid,lablGL}
:>$outd/ordered
@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
- mbt=native
+ mbt=${mbt:-native}
mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
--keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs"
+-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
@@ -32,12 +23,12 @@ index 1588011..72117d9 100755
oincs() {
local i=
local incs1=
-@@ -90,32 +83,6 @@ mflags() {
+@@ -90,34 +83,6 @@ mflags() {
}
overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
--test "$overs" = "4.07.0" || {
-- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz
+-test "$overs" = "4.08" || {
+- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz
- txz=$outd/$(basename $url)
- isfresh $txz $url || {
- executable_p() { command -v "$1" >/dev/null 2>&1; }
@@ -54,8 +45,10 @@ index 1588011..72117d9 100755
- tar xf $txz -C $outd
- bn=$(basename $url)
- cd $outd/${bn%.tar.xz}
-- ./configure -prefix $absprefix \
-- -no-graph -no-debugger -no-ocamldoc -no-native-compiler
+- ./configure --disable-vmthreads --disable-graph-lib \
+- --disable-ocamldoc --enable-debugger=no \
+- --disable-flat-float-array \
+- --prefix=$absprefix
- make -j $mjobs world
- make install
- echo "k='$url'" >$absprefix/bin/ocamlc.past
@@ -65,7 +58,7 @@ index 1588011..72117d9 100755
bocaml1() {
grep -q "$3" $outd/ordered || {
-@@ -224,7 +191,7 @@ bobjc() {
+@@ -227,7 +192,7 @@ bobjc() {
} && vecho "fresh $o"
}
@@ -74,7 +67,7 @@ index 1588011..72117d9 100755
cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
-@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do
+@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do
done
libs="str.cma unix.cma"
@@ -83,6 +76,3 @@ index 1588011..72117d9 100755
if $darwin; then
mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
clibs="$clibs -framework Cocoa -framework OpenGL"
---
-2.19.2
-
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 291e225d6c4..f84ac6d600a 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -3,7 +3,7 @@ let
py = python27Packages;
python = py.python;
in
-py.buildPythonApplication rec {
+py.buildPythonApplication {
name = "loxodo-0.20150124";
src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 4972aa28e58..61151cb1550 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -1,9 +1,8 @@
{ stdenv, libusb1, pkgconfig, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "ltwheelconf";
version = "0.2.7";
- name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "thk";
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
new file mode 100644
index 00000000000..2334221f926
--- /dev/null
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -0,0 +1,117 @@
+{ lib, buildFHSUserEnv, lutris-unwrapped
+, steamSupport ? true
+}:
+
+let
+
+ qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
+ gnome3Deps = pkgs: with pkgs.gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
+ xorgDeps = pkgs: with pkgs.xorg; [
+ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
+ libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
+ ];
+
+in buildFHSUserEnv {
+ name = "lutris";
+
+ runScript = "lutris";
+
+ targetPkgs = pkgs: with pkgs; [
+ lutris-unwrapped
+
+ # Adventure Game Studio
+ allegro dumb
+
+ # Desmume
+ lua agg soundtouch openal desktop-file-utils pangox_compat atk
+
+ # DGen // TODO: libarchive is broken
+
+ # Dolphin
+ bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
+ wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader
+
+ # DOSBox
+ SDL_net SDL_sound
+
+ # GOG
+ glib-networking
+
+ # Higan // TODO: "higan is not available for the x86_64 architecture"
+
+ # Libretro
+ fluidsynth hidapi mesa libdrm
+
+ # MAME
+ qt48 fontconfig SDL2_ttf
+
+ # Mednafen
+ freeglut mesa_glu
+
+ # MESS
+ expat
+
+ # Minecraft
+ nss
+
+ # Mupen64Plus
+ boost dash
+
+ # Osmose
+ qt4
+
+ # PPSSPP
+ glew snappy
+
+ # Redream // "redream is not available for the x86_64 architecture"
+
+ # ResidualVM
+ flac
+
+ # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
+ llvm_4
+
+ # ScummVM
+ nasm sndio
+
+ # Snes9x
+ epoxy minizip
+
+ # Vice
+ bison flex
+
+ # WINE
+ xorg.xrandr perl which p7zip gnused gnugrep psmisc opencl-headers
+
+ # ZDOOM
+ soundfont-fluid bzip2 game-music-emu
+ ] ++ qt5Deps pkgs
+ ++ gnome3Deps pkgs
+ ++ lib.optional steamSupport pkgs.steam;
+
+ multiPkgs = pkgs: with pkgs; [
+ # Common
+ libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
+ libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
+ libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
+ libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
+ alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
+ readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
+ vulkan-loader xdg_utils sqlite
+
+ # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
+
+ # WINE
+ cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
+ ocl-icd utillinux
+
+ # Winetricks
+ fribidi
+ ] ++ xorgDeps pkgs;
+
+ extraInstallCommands = ''
+ mkdir -p $out/share
+ ln -sf ${lutris-unwrapped}/share/applications $out/share
+ ln -sf ${lutris-unwrapped}/share/icons $out/share
+ '';
+}
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 5a74bd931c0..c9ea146f063 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -1,178 +1,66 @@
-{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub
-, wrapGAppsHook, python3Packages }:
+{ buildPythonApplication, lib, fetchFromGitHub
+, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
+, gdk-pixbuf, atk, webkitgtk, gst_all_1
+, evdev, pyyaml, pygobject3, requests, pillow
+, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma
+, libstrangle, wine, fluidsynth, xorgserver
+}:
let
- qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ];
- gnome3Deps = with pkgs; with gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
-
- python3Deps = with pkgs; with python3Packages; [
- evdev pyyaml pyxdg pygobject3 pyqt5 dbus-python requests pillow
+ # See lutris/util/linux.py
+ binPath = lib.makeBinPath [
+ xrandr
+ pciutils
+ psmisc
+ glxinfo
+ vulkan-tools
+ xboxdrv
+ pulseaudio
+ p7zip
+ xgamma
+ libstrangle
+ wine
+ fluidsynth
+ xorgserver
];
- xorgDeps = with pkgs; with xorg; [
- libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
- libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
- xrandr xdg_utils
- ];
-
- gstDeps = with pkgs; with gst_all_1; [
+ gstDeps = with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
gst-libav
];
- deps = with pkgs; [
- # Common
- stdenv.cc.cc libGL libGLU_combined libsndfile libtheora libogg libvorbis
- libopus libGLU libpcap libpulseaudio libao libusb libevdev libudev libgcrypt
- libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio
- libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2
- libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus
- keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl
- graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader
+in buildPythonApplication rec {
+ pname = "lutris-original";
+ version = "0.5.3";
- # Lutris
- gobject-introspection gdk_pixbuf hicolor-icon-theme pango openssl sqlite xterm libnotify procps
-
- # Adventure Game Studio
- allegro dumb
-
- # Desmume
- lua agg soundtouch openal desktop-file-utils pangox_compat atk
-
- # DGen // TODO: libarchive is broken
-
- # Dolphin
- bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
- wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader
-
- # DOSBox
- SDL_net SDL_sound
-
- # GOG
- glib-networking
-
- # Higan // TODO: "higan is not available for the x86_64 architecture"
-
- # Libretro
- fluidsynth hidapi mesa libdrm
-
- # MAME
- qt48 fontconfig SDL2_ttf
-
- # Mednafen
- freeglut mesa_glu
-
- # MESS
- expat
-
- # Minecraft
- nss
-
- # Mupen64Plus
- boost dash
-
- # Osmose
- qt4
-
- # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
-
- # PPSSPP
- glew snappy
-
- # Redream // "redream is not available for the x86_64 architecture"
-
- # ResidualVM
- flac
-
- # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
- llvm_4
-
- # ScummVM
- nasm sndio
-
- # Snes9x
- epoxy minizip
-
- # Steam
- steam
-
- # Vice
- bison flex
-
- # WINE
- perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
- samba4 sane-backends openldap opencl-headers ocl-icd utillinux
-
- wineWowPackages.staging
-
- # ZDOOM
- soundfont-fluid bzip2 game-music-emu
- ] ++ qt5Deps
- ++ gnome3Deps
- ++ python3Deps
- ++ xorgDeps
- ++ gstDeps;
-
- lutris = python3Packages.buildPythonApplication rec {
- name = "lutris-original-${version}";
- version = "0.5.2.1";
-
- src = fetchFromGitHub {
- owner = "lutris";
- repo = "lutris";
- rev = "v${version}";
- sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv";
- };
-
- enableParallelBuilding = true;
- nativeBuildInputs = [ wrapGAppsHook ];
- propagatedBuildInputs = deps;
- fullPath = stdenv.lib.makeLibraryPath deps;
- preConfigure = "export HOME=$PWD";
-
- makeWrapperArgs = [
- "--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib"
- "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
- "--prefix XDG_DATA_DIRS : $out/share"
- "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- ];
-
- postInstall = ''
- mkdir -p $out/lib
- ln -sf ${pkgs.gsm}/lib/libgsm.so $out/lib/libgsm.so.1
- mv $out/bin/lutris $out/bin/lutris-${version}
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://lutris.net";
- description = "Open Source gaming platform for GNU/Linux";
- license = licenses.gpl3;
- maintainers = with maintainers; [ chiiruno ];
- platforms = platforms.linux;
- };
+ src = fetchFromGitHub {
+ owner = "lutris";
+ repo = "lutris";
+ rev = "v${version}";
+ sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv";
};
- desktopItem = makeDesktopItem {
- name = "Lutris";
- exec = "lutris";
- icon = "lutris";
- comment = lutris.meta.description;
- desktopName = "Lutris";
- genericName = "Gaming Platform";
- categories = "Network;Game;Emulator;";
- startupNotify = "false";
+ buildInputs = [
+ wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
+ gdk-pixbuf atk webkitgtk
+ ] ++ gstDeps;
+
+ makeWrapperArgs = [
+ "--prefix PATH : ${binPath}"
+ ];
+
+ propagatedBuildInputs = [
+ evdev pyyaml pygobject3 requests pillow
+ ];
+
+ preCheck = "export HOME=$PWD";
+
+ meta = with lib; {
+ homepage = "https://lutris.net";
+ description = "Open Source gaming platform for GNU/Linux";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ chiiruno ];
+ platforms = platforms.linux;
};
-
-in buildFHSUserEnv rec {
- name = "lutris";
-
- runScript = "lutris-${lutris.version}";
- targetPkgs = pkgs: [ lutris pkgs.glxinfo pkgs.pciutils ];
- passthru.lutris = lutris;
-
- extraInstallCommands = ''
- mkdir -p $out/share
- cp -r ${desktopItem}/share/applications $out/share
- ln -sf ${lutris}/share/icons $out/share
- '';
}
+
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 4fd86a5a4f5..0802a32d92b 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -4,8 +4,9 @@
let version = "0.3.2"; in
-stdenv.mkDerivation rec {
- name = "lxterminal-${version}";
+stdenv.mkDerivation {
+ pname = "lxterminal";
+ inherit version;
src = fetchurl {
url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index ad3bd499cde..f7964e4e5c6 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,13 +1,13 @@
-{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch
+{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch
, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "2.3.0";
- name = "lyx-${version}";
+ pname = "lyx";
src = fetchurl {
- url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${name}.tar.xz";
+ url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "0axri2h8xkna4mkfchfyyysbjl7s486vx80p5hzj9zgsvdm5a3ri";
};
@@ -30,10 +30,9 @@ stdenv.mkDerivation rec {
doCheck = true;
# python is run during runtime to do various tasks
- postFixup = ''
- wrapProgram "$out/bin/lyx" \
- --prefix PATH : '${python}/bin'
- '';
+ qtWrapperArgs = [
+ " --prefix PATH : ${python}/bin"
+ ];
patches = [
(fetchpatch {
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
})
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "WYSIWYM frontend for LaTeX, DocBook";
homepage = http://www.lyx.org;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index f2dacb7890f..9a134343d29 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
- name = "madonctl-${version}";
+ pname = "madonctl";
version = "1.1.0";
goPackagePath = "github.com/McKael/madonctl";
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a6af1762e28..f2585f78146 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "2.4.0";
- name = "makeself-${version}";
+ pname = "makeself";
src = fetchFromGitHub {
owner = "megastep";
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
patches = [ ./Use-rm-from-PATH.patch ];
postPatch = ''
- sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
+ sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh
'';
installPhase = ''
- mkdir -p $out/{bin,share/{${name},man/man1}}
- cp makeself.lsm README.md $out/share/${name}
+ mkdir -p $out/{bin,share/{${pname}-${version},man/man1}}
+ cp makeself.lsm README.md $out/share/${pname}-${version}
cp makeself.sh $out/bin/makeself
cp makeself.1 $out/share/man/man1/
- cp makeself-header.sh $out/share/${name}
+ cp makeself-header.sh $out/share/${pname}-${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
index f076a2838eb..ffb938f30a5 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/pkgs/applications/misc/mako/default.nix
@@ -1,24 +1,22 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
-, systemd, pango, cairo, gdk_pixbuf
+, systemd, pango, cairo, gdk-pixbuf
, wayland, wayland-protocols }:
stdenv.mkDerivation rec {
pname = "mako";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6";
+ sha256 = "11ymiq6cr2ma0iva1mqybn3j6k73bsc6lv6pcbdq7hkhd4f9b7j9";
};
nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
- buildInputs = [ systemd pango cairo gdk_pixbuf wayland ];
+ buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
- mesonFlags = [
- "-Dicons=enabled" "-Dman-pages=enabled" "-Dzsh-completions=true"
- ];
+ mesonFlags = [ "-Dzsh-completions=true" ];
meta = with stdenv.lib; {
description = "A lightweight Wayland notification daemon";
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 7acebfad488..1474ea2fc4f 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,27 +1,23 @@
-{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
+{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, wrapQtAppsHook }:
let
version = "5.4.10";
in stdenv.mkDerivation {
- name = "masterpdfeditor-${version}";
+ pname = "masterpdfeditor";
+ inherit version;
src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
};
- nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+ nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ];
dontStrip = true;
- # Please remove this when #44047 is fixed
- postInstall = ''
- wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
- '';
-
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 6c58dde00d3..03f30d64fb2 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "1.0.15";
- name = "mdp-${version}";
+ pname = "mdp";
src = fetchFromGitHub {
owner = "visit1985";
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 0d9fffd1bb7..b84bc08ddb3 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop-file-utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "19.04";
- name = "mediainfo-gui-${version}";
+ version = "19.09";
+ pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
+ sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 8bbb179d9d5..f084d17e389 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "19.04";
- name = "mediainfo-${version}";
+ version = "19.09";
+ pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5";
+ sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index b3e73986417..bc753c5a7a9 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -15,23 +15,25 @@
, libuv
, libzen
, lsb-release
+, mkDerivation
, pkgconfig
-, qt5
+, qtbase
+, qttools
, sqlite
, swig
, unzip
, wget
}:
-stdenv.mkDerivation rec {
- name = "megasync-${version}";
- version = "4.1.1.0";
+mkDerivation rec {
+ pname = "megasync";
+ version = "4.2.3.0";
src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
- sha256 = "0lc228q3s9xp78dxjn22g6anqlsy1hi7a6yfs4q3l6gyfc3qcxl2";
+ sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
fetchSubmodules = true;
};
@@ -41,8 +43,7 @@ stdenv.mkDerivation rec {
doxygen
lsb-release
pkgconfig
- qt5.qmake
- qt5.qttools
+ qttools
swig
];
buildInputs = [
@@ -57,8 +58,7 @@ stdenv.mkDerivation rec {
libtool
libuv
libzen
- qt5.qtbase
- qt5.qtsvg
+ qtbase
sqlite
unzip
wget
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index c112cf0c928..3749f568aef 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -7,15 +7,15 @@ assert pandocSupport -> pandoc != null;
stdenv.mkDerivation rec {
- name = "memo-${version}";
+ pname = "memo";
- version = "0.6";
+ version = "0.8";
src = fetchFromGitHub {
owner = "mrVanDalo";
repo = "memo";
- rev = "${version}";
- sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr";
+ rev = version;
+ sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
};
installPhase = let
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
index 56854e7863f..e06f2a88ade 100644
--- a/pkgs/applications/misc/menumaker/default.nix
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- name = "menumaker-${version}";
- version = "0.99.10";
+ pname = "menumaker";
+ version = "0.99.11";
src = fetchurl {
- url = "mirror://sourceforge/menumaker/${name}.tar.gz";
- sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky";
+ url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
+ sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx";
};
format = "other";
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 0833464f2c2..3023a5b5930 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtsvg, qtwebkit }:
stdenv.mkDerivation rec {
- name = "merkaartor-${version}";
+ pname = "merkaartor";
version = "0.18.3";
src = fetchFromGitHub {
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
+
postInstall = ''
wrapProgram $out/bin/merkaartor \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 602d4a032ef..a81aec9d036 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -2,8 +2,8 @@
, python27, python2Packages
}:
-stdenv.mkDerivation rec {
- name = "metamorphose2-${version}";
+stdenv.mkDerivation {
+ pname = "metamorphose2";
version = "0.9.0beta";
# exif-py vendored via submodule
diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix
new file mode 100644
index 00000000000..015a326fdc9
--- /dev/null
+++ b/pkgs/applications/misc/michabo/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, mkDerivation
+, makeDesktopItem
+, fetchFromGitLab
+, qmake
+# qt
+, qtbase
+, qtwebsockets
+}:
+
+let
+ desktopItem = makeDesktopItem {
+ type = "Application";
+ name = "Michabo";
+ desktopName = "Michabo";
+ exec = "Michabo";
+ };
+
+in mkDerivation rec {
+ pname = "michabo";
+ version = "0.1";
+
+ src = fetchFromGitLab {
+ domain = "git.pleroma.social";
+ owner = "kaniini";
+ repo = "michabo";
+ rev = "v${version}";
+ sha256 = "0pl4ymdb36r0kwlclfjjp6b1qml3fm9ql7ag5inprny5y8vcjpzn";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ ];
+ buildInputs = [
+ qtbase
+ qtwebsockets
+ ];
+
+ qmakeFlags = [ "michabo.pro" "DESTDIR=${placeholder "out"}/bin" ];
+
+ postInstall = ''
+ ln -s ${desktopItem}/share $out/share
+ '';
+
+ meta = with lib; {
+ description = "A native desktop app for Pleroma and Mastodon servers";
+ homepage = "https://git.pleroma.social/kaniini/michabo";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 09c4d1db290..2eee9ad40c1 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
-stdenv.mkDerivation rec {
- name = "milu-nightly-${version}";
+stdenv.mkDerivation {
+ pname = "milu-nightly";
version = "2016-05-09";
src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
new file mode 100644
index 00000000000..4b92a43451a
--- /dev/null
+++ b/pkgs/applications/misc/minder/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, pkgconfig, meson, ninja, python3
+, wrapGAppsHook, vala, shared-mime-info
+, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive
+, hicolor-icon-theme # for setup-hook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "minder";
+ version = "1.5.0";
+
+ src = fetchFromGitHub {
+ owner = "phase1geo";
+ repo = pname;
+ rev = version;
+ sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc";
+ };
+
+ nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
+ buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ postFixup = ''
+ for x in $out/bin/*; do
+ ln -vrs $x "$out/bin/''${x##*.}"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Mind-mapping application for Elementary OS";
+ homepage = "https://github.com/phase1geo/Minder";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
+
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 6aa7eea3d7e..eff93c8e99c 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, dpkg, makeWrapper, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.2";
- name = "minergate-cli-${version}";
+ pname = "minergate-cli";
src = fetchurl {
url = "https://minergate.com/download/ubuntu-cli";
sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index d11e889e932..a8402d97593 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -1,8 +1,8 @@
{ fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
version = "8.1";
- name = "minergate-${version}";
+ pname = "minergate";
src = fetchurl {
url = "https://minergate.com/download/ubuntu";
sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/pkgs/applications/misc/mkgmap/build.xml.patch
new file mode 100644
index 00000000000..6ec40786b24
--- /dev/null
+++ b/pkgs/applications/misc/mkgmap/build.xml.patch
@@ -0,0 +1,11 @@
+--- a/build.xml 2019-08-26 23:22:55.104829846 +0300
++++ b/build.xml 2019-08-27 00:11:07.366257594 +0300
+@@ -227,7 +227,7 @@
+ 
+
+ 
+
+
+# License
+
+Nixpkgs is licensed under the [MIT License](COPYING).
+
+Note: MIT license does not apply to the packages built by Nixpkgs,
+merely to the files in this repository (the Nix expressions, build
+scripts, NixOS modules, etc.). It also might not apply to patches
+included in Nixpkgs, which may be derivative works of the packages to
+which they apply. The aforementioned artifacts are all covered by the
+licenses of the respective packages.
diff --git a/doc/Makefile b/doc/Makefile
index 5badfe4138d..e7ca31b20d7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,10 +8,10 @@ debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
.PHONY: format
-format:
+format: doc-support/result
find . -iname '*.xml' -type f | while read f; do \
echo $$f ;\
- xmlformat --config-file "$$XMLFORMAT_CONFIG" -i $$f ;\
+ xmlformat --config-file "doc-support/result/xmlformat.conf" -i $$f ;\
done
.PHONY: fix-misc-xml
@@ -21,19 +21,19 @@ fix-misc-xml:
.PHONY: clean
clean:
- rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml functions/library/generated
+ rm -f ${MD_TARGETS} doc-support/result .version manual-full.xml functions/library/locations.xml functions/library/generated
rm -rf ./out/ ./highlightjs
.PHONY: validate
-validate: manual-full.xml
- jing "$$RNG" manual-full.xml
+validate: manual-full.xml doc-support/result
+ jing doc-support/result/docbook.rng manual-full.xml
-out/html/index.html: manual-full.xml style.css highlightjs
+out/html/index.html: doc-support/result manual-full.xml style.css highlightjs
mkdir -p out/html
- xsltproc ${xsltFlags} \
+ xsltproc \
--nonet --xinclude \
--output $@ \
- "$$XSL/docbook/xhtml/docbook.xsl" \
+ doc-support/result/xhtml.xsl \
./manual-full.xml
mkdir -p out/html/highlightjs/
@@ -43,49 +43,48 @@ out/html/index.html: manual-full.xml style.css highlightjs
cp ./style.css out/html/style.css
mkdir -p out/html/images/callouts
- cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
+ cp doc-support/result/xsl/docbook/images/callouts/*.svg out/html/images/callouts/
chmod u+w -R out/html/
out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
- xsltproc ${xsltFlags} --nonet \
+ xsltproc --nonet \
--output out/epub/scratch/ \
- "$$XSL/docbook/epub/docbook.xsl" \
+ doc-support/result/epub.xsl \
./manual-full.xml
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
- cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
+ cp doc-support/result/xsl/docbook/images/callouts/*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
rm -rf "out/epub/scratch/"
-highlightjs:
+highlightjs: doc-support/result
mkdir -p highlightjs
- cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
- cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
- cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
- cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
+ cp -r doc-support/result/highlightjs/highlight.pack.js highlightjs/
+ cp -r doc-support/result/highlightjs/LICENSE highlightjs/
+ cp -r doc-support/result/highlightjs/mono-blue.css highlightjs/
+ cp -r doc-support/result/highlightjs/loader.js highlightjs/
manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml functions/library/generated *.xml **/*.xml **/**/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
-.version:
- nix-instantiate --eval \
- -E '(import ../lib).version' > .version
+.version: doc-support/result
+ ln -rfs ./doc-support/result/version .version
-functions/library/locations.xml:
- nix-build ./lib-function-locations.nix \
- --out-link $@
+doc-support/result: doc-support/default.nix
+ (cd doc-support; nix-build)
-functions/library/generated: functions/library/locations.xml
- nix-build ./lib-function-docs.nix \
- --arg locationsXml $< \
- --out-link $@
+functions/library/locations.xml: doc-support/result
+ ln -rfs ./doc-support/result/function-locations.xml functions/library/locations.xml
+
+functions/library/generated: doc-support/result
+ ln -rfs ./doc-support/result/function-docs functions/library/generated
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 48356247a49..799f1479467 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -8,24 +8,17 @@