diff options
| author | Pascal Winkelmann <pascal@wnklmnn.de> | 2020-05-15 16:03:26 +0200 |
|---|---|---|
| committer | Pascal Winkelmann <pascal@wnklmnn.de> | 2020-05-15 16:03:26 +0200 |
| commit | b94e8cc448e1c834b42bf0704748981833ef1a72 (patch) | |
| tree | 8fb764af0277264a16bf610edf4b14a8cba1ecbd | |
| parent | 8f475b0470dbf4f84a7a1598e6640c761495ed6c (diff) | |
| download | nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar.gz nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar.bz2 nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar.lz nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar.xz nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.tar.zst nixpkgs-b94e8cc448e1c834b42bf0704748981833ef1a72.zip | |
incorporate suggested changes from pull request
| -rw-r--r-- | pkgs/tools/misc/jugglinglab/default.nix | 16 | ||||
| -rw-r--r-- | 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 { }; |