diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix deleted file mode 100644 index 626fb5c2321e..000000000000 --- a/pkgs/tools/misc/asciinema/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages }: - -goPackages.buildGoPackage rec { - name = "asciinema-${version}"; - version = "1.1.1"; - - goPackagePath = "github.com/asciinema/asciinema"; - - src = fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2"; - sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173"; - }; - - meta = { - homepage = https://asciinema.org/; - license = stdenv.lib.licenses.gpl3; - description = "Terminal session recorder"; - maintainers = with stdenv.lib.maintainers; [ lassulus ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb9fc9c4376c..94bce20d75bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,7 +611,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asciinema = callPackage ../tools/misc/asciinema { }; + asciinema = pkgs.goPackages.asciinema.bin // { outputs = [ "bin" ]; }; asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 81681bb186a5..a3bbc6ed4fdf 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -167,6 +167,13 @@ let sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; }; + asciinema = buildFromGitHub { + rev = "v1.1.1"; + owner = "asciinema"; + repo = "asciinema"; + sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc"; + }; + asn1-ber = buildGoPackage rec { rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";