diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 08:36:28 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 08:36:28 +0200 |
commit | 89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e (patch) | |
tree | a6d9edb3c73ada52a6207e8a5ad2d32cad77600c /pkgs/applications/office | |
parent | 7b2ed00ef62476080fe439ce91219376ab8c8a2e (diff) | |
parent | 18fcc337affa09238a42e9a0ca21e08363c65eeb (diff) | |
download | nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.gz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.bz2 nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.lz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.xz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.zst nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/homebank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/jameica/default.nix | 24 |
2 files changed, 9 insertions, 19 deletions
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 039e2fc1fde9..12b5aef898d1 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.1"; + name = "homebank-5.2.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz"; + sha256 = "19cm49p2x6nwia2yvwj3fv7jxbhw0vx4bs1zqbfvdr5vzwgj5j5c"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 8d17ef2acaa4..61cc3ea78f05 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.1"; - _build = "449"; + _version = "2.8.2"; + _build = "450"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { inherit name version; - nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; @@ -31,23 +31,13 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # and is not able to build the application itself buildPhase = '' - (cd build; ant init compile jar) - ''; - - # jameica itself loads ./plugin.xml to determine it's version. - # Unfortunately, the version attribute there seems to be wrong, - # so it thinks it's older than it really is, - # and refuses to load plugins destined for its version. - # Set version manually to workaround that. - postPatch = '' - xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new - mv plugin.xml.new plugin.xml + (cd build; ant -Dsystem.version=${version} init compile jar) ''; installPhase = '' @@ -73,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.willuhn.de/products/jameica/; - description = "Free Runtime Environment for Java Applications."; + description = "Free Runtime Environment for Java Applications"; longDescription = '' Runtime Environment for plugins like Hibiscus (HBCI Online Banking), SynTAX (accounting) and JVerein (club management). |