diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-28 08:59:50 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-28 08:59:50 +0100 |
| commit | 21635748a8183c535bef5377f6e43e922e933b67 (patch) | |
| tree | de134465131c6a9248a8bda7ef26766b7b65dcd9 /pkgs/applications/misc | |
| parent | 5e85873d70ddfb7f34723fb52ebf829e6bcaf926 (diff) | |
| parent | 8dc21739057079bdd749537dccb1fa31205ff0ff (diff) | |
| download | nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar.gz nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar.bz2 nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar.lz nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar.xz nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.tar.zst nixpkgs-21635748a8183c535bef5377f6e43e922e933b67.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/hubstaff/revision.json | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/mu-repo/default.nix | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 64cad5c0292..31d26559dd2 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh", - "version": "1.4.11-a12e5bad", - "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh", + "version": "1.5.0-4309ed45", + "sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1" } diff --git a/pkgs/applications/misc/mu-repo/default.nix b/pkgs/applications/misc/mu-repo/default.nix new file mode 100644 index 00000000000..ddee1939b02 --- /dev/null +++ b/pkgs/applications/misc/mu-repo/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildPythonApplication, pytest, git }: + +buildPythonApplication rec { + pname = "mu-repo"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "fabioz"; + repo = pname; + rev = with lib; + "mu_repo_" + concatStringsSep "_" (splitVersion version); + sha256 = "1dxfggzbhiips0ww2s93yba9842ycp0i3x2i8vvcx0vgicv3rv6f"; + }; + + checkInputs = [ pytest git ]; + # disable test which assumes it's a git repo + checkPhase = "py.test mu_repo --ignore=mu_repo/tests/test_checkout.py"; + + meta = with lib; { + description = "Tool to help in dealing with multiple git repositories"; + homepage = "http://fabioz.github.io/mu-repo/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} |