git.iko.soy/typeable/nixpkgs
on master help sign in
incorporate suggested changes from pull request
commitb94e8cc448e1c834b42bf0704748981833ef1a72 authorPascal Winkelmann <pascal@wnklmnn.de> dateFri 15 May 2020, 16:03 (7 years ago) parent8f475b0
2 files changed+10−10
pkgs/tools/misc/jugglinglab/default.nix+8−8 pkgs/top-level/all-packages.nix+2−2
pkgs/tools/misc/jugglinglab/default.nix+8−8
@@ -1,13 +1,12 @@
1−{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }:
1+{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }:
22stdenv.mkDerivation rec {
3− major= "1";
4− minor = "2";
5− version = "${major}.${minor}";
3+ version = "1.2.1";
64 name = "jugglinglab";
7− src = fetchgit {
8− url = "https://github.com/jkboyce/jugglinglab";
9− rev = "v${major}.${minor}";
10− sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92";
5+ src = fetchFromGitHub {
6+ owner = "jkboyce";
7+ repo = "jugglinglab";
8+ rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github
9+ sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z";
1110 };
1211 buildInputs = [ jre ];
1312 nativeBuildInputs = [ ant jdk makeWrapper ];
@@ -26,5 +25,6 @@ stdenv.mkDerivation rec {
2625 description = "A program to visualize different juggling pattens";
2726 license = licenses.gpl2;
2827 maintainers = with maintainers; [ wnklmnn ];
28+ platforms = platforms.all;
2929 };
3030}
pkgs/top-level/all-packages.nix+2−2
@@ -4468,6 +4468,8 @@ in
44684468
44694469 jucipp = callPackage ../applications/editors/jucipp { };
44704470
4471+ jugglinglab = callPackage ../tools/misc/jugglinglab { };
4472+
44714473 jupp = callPackage ../applications/editors/jupp { };
44724474
44734475 jupyter = callPackage ../applications/editors/jupyter { };
@@ -7204,8 +7206,6 @@ in
72047206
72057207 umlet = callPackage ../tools/misc/umlet { };
72067208
7207− jugglinglab = callPackage ../tools/misc/jugglinglab { };
7208−
72097209 unetbootin = callPackage ../tools/cd-dvd/unetbootin { };
72107210
72117211 unfs3 = callPackage ../servers/unfs3 { };