From 8f475b0470dbf4f84a7a1598e6640c761495ed6c Mon Sep 17 00:00:00 2001
From: Pascal Winkelmann <pascal@wnklmnn.de>
Date: Fri, 15 May 2020 10:42:45 +0200
Subject: [PATCH 1/2] jugglinglab: init at 1.2

---
 maintainers/maintainer-list.nix         |  6 +++++
 pkgs/tools/misc/jugglinglab/default.nix | 30 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/misc/jugglinglab/default.nix

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..6ef3a39353d
--- /dev/null
+++ b/pkgs/tools/misc/jugglinglab/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }:
+stdenv.mkDerivation rec {
+  major= "1";
+  minor = "2";
+  version = "${major}.${minor}";
+  name = "jugglinglab";
+  src = fetchgit {
+    url = "https://github.com/jkboyce/jugglinglab";
+    rev = "v${major}.${minor}";
+    sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92";
+  };
+  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 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0db4b476682..21b192ff3f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7204,6 +7204,8 @@ in
 
   umlet = callPackage ../tools/misc/umlet { };
 
+  jugglinglab = callPackage ../tools/misc/jugglinglab { };
+
   unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
 
   unfs3 = callPackage ../servers/unfs3 { };

From b94e8cc448e1c834b42bf0704748981833ef1a72 Mon Sep 17 00:00:00 2001
From: Pascal Winkelmann <pascal@wnklmnn.de>
Date: Fri, 15 May 2020 16:03:26 +0200
Subject: [PATCH 2/2] incorporate suggested changes from pull request

---
 pkgs/tools/misc/jugglinglab/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix
index 6ef3a39353d..32c45b31a17 100644
--- a/pkgs/tools/misc/jugglinglab/default.nix
+++ b/pkgs/tools/misc/jugglinglab/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }:
+{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
 stdenv.mkDerivation rec {
-  major= "1";
-  minor = "2";
-  version = "${major}.${minor}";
+  version = "1.2.1";
   name = "jugglinglab";
-  src = fetchgit {
-    url = "https://github.com/jkboyce/jugglinglab";
-    rev = "v${major}.${minor}";
-    sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92";
+  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 ];
@@ -26,5 +25,6 @@ stdenv.mkDerivation rec {
       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 21b192ff3f9..3331594eeb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4468,6 +4468,8 @@ in
 
   jucipp = callPackage ../applications/editors/jucipp { };
 
+  jugglinglab = callPackage ../tools/misc/jugglinglab { };
+
   jupp = callPackage ../applications/editors/jupp { };
 
   jupyter = callPackage ../applications/editors/jupyter { };
@@ -7204,8 +7206,6 @@ in
 
   umlet = callPackage ../tools/misc/umlet { };
 
-  jugglinglab = callPackage ../tools/misc/jugglinglab { };
-
   unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
 
   unfs3 = callPackage ../servers/unfs3 { };