diff options
| author | Charles Duffy <charles@dyfis.net> | 2021-01-02 13:20:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 19:20:31 +0000 |
| commit | 854096fa4f9535178510b3ecfcea7f5a533a8763 (patch) | |
| tree | 2803bb950b5587e3f7e2e49daad6078fbfeb17bc /pkgs/top-level | |
| parent | 4856e0d285bcf743ec2ec03ae50a798be9967b52 (diff) | |
ttyrec: 1.0.8 -> ovh-ttyrec 1.1.6.6 (#108182)
Replace unmaintained/broken upstream ttyrec with a maintained, compatible fork
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e5da1bf34ec1..6f95da017edd8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -798,6 +798,9 @@ mapAliases ({ ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + /* Added 2021-01-02 */ + ttyrec = ovh-ttyrec; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c84a1622178..62a7cd003fbd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6438,6 +6438,8 @@ in overmind = callPackage ../applications/misc/overmind { }; + ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -7967,8 +7969,6 @@ in ttyplot = callPackage ../tools/misc/ttyplot { }; - ttyrec = callPackage ../tools/misc/ttyrec { }; - ttygif = callPackage ../tools/misc/ttygif { }; ttylog = callPackage ../tools/misc/ttylog { }; |