git.iko.soy/typeable/nixpkgs
on master help sign in
ttyrec: 1.0.8 -> ovh-ttyrec 1.1.6.6 (#108182)

Replace unmaintained/broken upstream ttyrec with a maintained, compatible fork

commit854096fa4f9535178510b3ecfcea7f5a533a8763 authorCharles Duffy <charles@dyfis.net> dateSat 2 Jan 2021, 13:20 (6 years ago) parent4856e0d
5 files changed+34−54
pkgs/tools/misc/ovh-ttyrec/default.nix+29 pkgs/tools/misc/ttyrec/clang-fixes.patch−21 pkgs/tools/misc/ttyrec/default.nix−31 pkgs/top-level/aliases.nix+3 pkgs/top-level/all-packages.nix+2−2
pkgs/tools/misc/ovh-ttyrec/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchFromGitHub, zstd }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "ovh-ttyrec";
5+ version = "1.1.6.6";
6+
7+ src = fetchFromGitHub {
8+ owner = "ovh";
9+ repo = "ovh-ttyrec";
10+ rev = "v${version}";
11+ sha256 = "176g3k2pzw6zpvmcc2f8idn6vhlygf7lfzxvrhysav2izc5dd130";
12+ };
13+
14+ nativeBuildInputs = [ zstd ];
15+
16+ installPhase = ''
17+ mkdir -p $out/{bin,man}
18+ cp ttytime ttyplay ttyrec $out/bin
19+ cp docs/*.1 $out/man
20+ '';
21+
22+ meta = with stdenv.lib; {
23+ homepage = "https://github.com/ovh/ovh-ttyrec/";
24+ description = "Terminal interaction recorder and player";
25+ license = licenses.bsd3;
26+ platforms = platforms.all;
27+ maintainers = with maintainers; [ chaduffy zimbatm ];
28+ };
29+}
pkgs/tools/misc/ttyrec/clang-fixes.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff -ru ttyrec-1.0.8.orig/io.h ttyrec-1.0.8/io.h
2−--- ttyrec-1.0.8.orig/io.h 2006-06-11 17:52:50.000000000 +0200
3−+++ ttyrec-1.0.8/io.h 2015-11-15 09:59:54.000000000 +0100
4−@@ -9,5 +9,6 @@
5− int edup (int oldfd);
6− int edup2 (int oldfd, int newfd);
7− FILE* efdopen (int fd, const char *mode);
8−+void set_progname (const char *name);
9−
10− #endif
11−diff -ru ttyrec-1.0.8.orig/ttyrec.c ttyrec-1.0.8/ttyrec.c
12−--- ttyrec-1.0.8.orig/ttyrec.c 2006-06-11 17:52:50.000000000 +0200
13−+++ ttyrec-1.0.8/ttyrec.c 2015-11-15 09:59:41.000000000 +0100
14−@@ -54,6 +54,7 @@
15− #include <unistd.h>
16− #include <string.h>
17− #include <stdlib.h>
18−+#include <signal.h>
19−
20− #if defined(SVR4)
21− #include <fcntl.h>
pkgs/tools/misc/ttyrec/default.nixdeleted−31
@@ -1,31 +0,0 @@
1−{ stdenv, fetchurl }:
2−
3−stdenv.mkDerivation rec {
4− pname = "ttyrec";
5− version = "1.0.8";
6−
7− src = fetchurl {
8− url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz";
9− sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec";
10− };
11−
12− patches = [ ./clang-fixes.patch ];
13−
14− makeFlags = stdenv.lib.optional stdenv.buildPlatform.isLinux "CFLAGS=-DSVR4"
15− ++ stdenv.lib.optional stdenv.cc.isClang "CC=clang";
16−
17− installPhase = ''
18− mkdir -p $out/{bin,man}
19− cp ttytime ttyplay ttyrec $out/bin
20− cp *.1 $out/man
21− '';
22−
23− meta = with stdenv.lib; {
24− homepage = "http://0xcc.net/ttyrec/";
25− description = "Terminal interaction recorder and player";
26− license = licenses.bsd3;
27− platforms = platforms.all;
28− maintainers = with maintainers; [ zimbatm ];
29− broken = true; # 2020-01-28
30− };
31−}
pkgs/top-level/aliases.nix+3
@@ -798,6 +798,9 @@ mapAliases ({
798798
799799 ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";
800800
801+ /* Added 2021-01-02 */
802+ ttyrec = ovh-ttyrec;
803+
801804 /* If these are in the scope of all-packages.nix, they cause collisions
802805 between mixed versions of qt. See:
803806 https://github.com/NixOS/nixpkgs/pull/101369 */
pkgs/top-level/all-packages.nix+2−2
@@ -6438,6 +6438,8 @@ in
64386438
64396439 overmind = callPackage ../applications/misc/overmind { };
64406440
6441+ ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { };
6442+
64416443 owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { };
64426444
64436445 oxidized = callPackage ../tools/admin/oxidized { };
@@ -7967,8 +7969,6 @@ in
79677969
79687970 ttyplot = callPackage ../tools/misc/ttyplot { };
79697971
7970− ttyrec = callPackage ../tools/misc/ttyrec { };
7971−
79727972 ttygif = callPackage ../tools/misc/ttygif { };
79737973
79747974 ttylog = callPackage ../tools/misc/ttylog { };