summary refs log tree commit diff
diff options
context:
space:
mode:
authorDennis Gosnell <cdep.illabout@gmail.com>2020-05-16 09:40:37 +0900
committerGitHub <noreply@github.com>2020-05-16 09:40:37 +0900
commit82263944a73ed7526e623bac9be69a811e335c86 (patch)
treebd1c1bf8f0ef3742555d5b24ad1601a0f3abd683
parent2c74af6d977125add18c64c1826a8e0f2bd033a8 (diff)
parentb94e8cc448e1c834b42bf0704748981833ef1a72 (diff)
downloadnixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar.gz
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar.bz2
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar.lz
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar.xz
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.tar.zst
nixpkgs-82263944a73ed7526e623bac9be69a811e335c86.zip
Merge pull request #87875 from wnklmnn/jugglinglab
jugglinglab: init at 1.2
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/tools/misc/jugglinglab/default.nix30
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 38 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cc2ea541d69..fda8fd8d204 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8301,6 +8301,12 @@
     githubId = 54934;
     name = "Wout Mertens";
   };
+  wnklmnn = {
+    email = "pascal@wnklmnn.de";
+    github = "wnklmnn";
+    githubId = 9423014;
+    name = "Pascal Winkelmann";
+  };
   woffs = {
     email = "github@woffs.de";
     github = "woffs";
diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix
new file mode 100644
index 00000000000..32c45b31a17
--- /dev/null
+++ b/pkgs/tools/misc/jugglinglab/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "jugglinglab";
+  src = fetchFromGitHub {
+    owner = "jkboyce";
+    repo = "jugglinglab";
+    rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github
+    sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z";
+  };
+  buildInputs = [ jre ];
+  nativeBuildInputs = [ ant jdk makeWrapper ];
+  buildPhase = "ant";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/lib"
+    cp bin/JugglingLab.jar $out/lib/
+
+    makeWrapper ${jre}/bin/java $out/bin/jugglinglab \
+      --add-flags "-jar $out/lib/JugglingLab.jar"
+  '';
+
+  meta = with stdenv.lib; {
+      description = "A program to visualize different juggling pattens";
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ wnklmnn ];
+      platforms = platforms.all;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e87f34a0284..71e9927fd5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4470,6 +4470,8 @@ in
 
   jucipp = callPackage ../applications/editors/jucipp { };
 
+  jugglinglab = callPackage ../tools/misc/jugglinglab { };
+
   jupp = callPackage ../applications/editors/jupp { };
 
   jupyter = callPackage ../applications/editors/jupyter { };