public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incorporate suggested changes from pull request

This commit is contained in:
Pascal Winkelmann 2020-05-15 16:03:26 +02:00
parent 8f475b0470
commit b94e8cc448
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/misc/jugglinglab/default.nix
View File

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };