From 86123c9c989a718f4480d9b437a93843d7fd5b97 Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Mon, 14 Jun 2021 23:29:21 +0900 Subject: [PATCH 1/2] maintainers: add nessdoor --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 60c6f093f3b..d9924a04a4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7063,6 +7063,11 @@ githubId = 628342; name = "Tim Steinbach"; }; + nessdoor = { + name = "Tomas Antonio Lopez"; + email = "entropy.overseer@protonmail.com"; + githubId = 25993494; + }; netcrns = { email = "jason.wing@gmx.de"; github = "netcrns"; From 9aa967338779ab46167bd305160461e0c19db083 Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Mon, 14 Jun 2021 23:32:00 +0900 Subject: [PATCH 2/2] jquake: init at 1.6.1 --- pkgs/applications/misc/jquake/default.nix | 66 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/misc/jquake/default.nix diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix new file mode 100644 index 00000000000..eccd8b4c189 --- /dev/null +++ b/pkgs/applications/misc/jquake/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }: + +stdenv.mkDerivation rec { + pname = "jquake"; + version = "1.6.1"; + + src = fetchurl { + url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; + sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + sourceRoot = "."; + + postPatch = '' + # JQuake emits a lot of debug-like messages in console, but I + # don't think it's in our interest to void them by default. Log them at + # the appropriate level. + sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh + + # By default, an 'errors.log' file is created in the current directory. + # cd into a temporary directory and let it be created there. + substituteInPlace JQuake.sh \ + --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \ + --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + chmod +x JQuake.sh + + mkdir -p $out/{bin,lib} + mv JQuake.sh $out/bin/JQuake + mv {JQuake.jar,JQuake_lib} $out/lib + mv sounds $out/lib + + mkdir -p $out/share/licenses/jquake + mv LICENSE* $out/share/licenses/jquake + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "JQuake"; + desktopName = "JQuake"; + exec = "JQuake"; + comment = "Real-time earthquake map of Japan"; + }) + ]; + + meta = with lib; { + description = "Real-time earthquake map of Japan"; + homepage = "http://jquake.net"; + downloadPage = "https://jquake.net/?down"; + changelog = "https://jquake.net/?docu"; + maintainers = with maintainers; [ nessdoor ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58727237795..e45b27b2b26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29989,6 +29989,8 @@ in j2cli = with python3Packages; toPythonApplication j2cli; + jquake = callPackage ../applications/misc/jquake { }; + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; keynav = callPackage ../tools/X11/keynav { };