diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
| commit | 960f062825d22e328828766f4910b702f81ddade (patch) | |
| tree | fa16e624b184fa3ee21681ac9a98eaf6fbef4ce3 /pkgs/applications/misc | |
| parent | 1a654573b0a29c5ac8bbe16169cd544c02e945a9 (diff) | |
| parent | e5672143d86ef0beb4b200105330e7da65c9d773 (diff) | |
| download | nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.gz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.bz2 nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.lz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.xz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.zst nixpkgs-960f062825d22e328828766f4910b702f81ddade.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/sidequest/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/tuir/default.nix | 32 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 30aa45c14ff..7059eeb2a0d 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.7.6"; + version = "0.8.4"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1yyba5495ydyyfl62pjd4hbga86k7f2a72ds2j2qzkinngyl14j8"; + sha256 = "1fiqjzvl7isjn7w6vbbs439pp3bdhw6mnbf8483kvfb0fqhh3vs2"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix new file mode 100644 index 00000000000..e479dc26f17 --- /dev/null +++ b/pkgs/applications/misc/tuir/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitLab, python3Packages }: + +with python3Packages; +buildPythonApplication rec { + pname = "tuir"; + version = "1.28.3"; + + src = fetchFromGitLab { + owner = "ajak"; + repo = pname; + rev = "v${version}"; + sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; + }; + + # Tests try to access network + doCheck = false; + + checkPhase = '' + py.test + ''; + + checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; + + propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests ]; + + meta = with lib; { + description = "Browse Reddit from your Terminal (fork of rtv)"; + homepage = "https://gitlab.com/ajak/tuir/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 matthiasbeyer ]; + }; +} |