diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index cee4ec925c01..da96bde2fd52 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ lib, python3Packages, fetchFromGitHub }: -buildGoPackage rec { +let + pythonPackages = python3Packages; +in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "20160520-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "6683bdaa263d0ce3645b87fe54aa87276b89988a"; + version = "1.3.0"; - - goPackagePath = "github.com/asciinema/asciinema"; + buildInputs = with pythonPackages; [ nose ]; + propagatedBuildInputs = with pythonPackages; [ requests2 ]; - src = fetchgit { - inherit rev; - url = "https://github.com/asciinema/asciinema"; - sha256 = "08jyvnjpd5jdgyvkly9fswac4p10bqim5v4rhmivpg4y8pbcmxkz"; + src = fetchFromGitHub { + owner = "asciinema"; + repo = "asciinema"; + rev = "v${version}"; + sha256 = "1hx7xipyy9w72iwlawldlif9qk3f7b8jx8c1wcx114pqbjz5d347"; + }; + + checkPhase = '' + nosetests + ''; + + meta = { + description = "Terminal session recorder and the best companion of asciinema.org"; + homepage = https://asciinema.org/; + license = with lib.licenses; [ gpl3 ]; }; } + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e11d2de015b3..d39c8d85cdd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1167,33 +1167,6 @@ in modules // { }; }); - asciinema = buildPythonPackage rec { - name = "asciinema-${version}"; - version = "1.3.0"; - - disabled = pythonOlder "3.3"; - - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ requests2 ]; - - src = pkgs.fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - rev = "v${version}"; - sha256 = "1hx7xipyy9w72iwlawldlif9qk3f7b8jx8c1wcx114pqbjz5d347"; - }; - - checkPhase = '' - nosetests - ''; - - meta = { - description = "Terminal session recorder and the best companion of asciinema.org"; - homepage = https://asciinema.org/; - license = with licenses; [ gpl3 ]; - }; - }; - astroid = buildPythonPackage rec { name = "astroid-1.4.4";