Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b8e8c7d5b95b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 066bf7dd5d13
Choose a head ref
  • 3 commits
  • 60 files changed
  • 1 contributor

Commits on Oct 28, 2020

  1. A directory-category for terminal emulators

    This is a mostly cosmetical commit, in the sense it doesn't change the contents
    of any package, but reorganizes the overall Nixpkgs expressions.
    
    Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
    are routinely familiarized to it. And, manifestly, there are many
    implementations of terminal emulators out there, from those traditionally made
    in C and C++ to those written in Haskell and Go.
    
    Terminal emulators deserve more highlight. This commit does that by creating a
    category for them.
    AndersonTorres committed Oct 28, 2020
    Copy the full SHA
    2bb3a9d View commit details

Commits on Oct 29, 2020

  1. Terminal emulators: whitespace cleanup and regroup

    Because editorconfig complains, and also why not to organize them
    "ascii-betically"?
    AndersonTorres committed Oct 29, 2020
    Copy the full SHA
    5b5aac4 View commit details
  2. Merge pull request #101894 from AndersonTorres/terminal-emulators

    Create a directory-category for terminal emulators
    AndersonTorres authored Oct 29, 2020
    Copy the full SHA
    066bf7d View commit details
Showing with 116 additions and 104 deletions.
  1. +10 −0 doc/contributing/coding-conventions.xml
  2. 0 pkgs/applications/{misc → terminal-emulators}/alacritty/default.nix
  3. 0 pkgs/applications/{misc → terminal-emulators}/aminal/default.nix
  4. 0 pkgs/applications/{misc → terminal-emulators}/cool-retro-term/default.nix
  5. 0 pkgs/applications/{misc → terminal-emulators}/eterm/default.nix
  6. 0 pkgs/applications/{misc → terminal-emulators}/evilvte/default.nix
  7. 0 pkgs/applications/{misc → terminal-emulators}/foot/default.nix
  8. 0 pkgs/applications/{misc → terminal-emulators}/guake/default.nix
  9. 0 pkgs/applications/{misc → terminal-emulators}/havoc/default.nix
  10. 0 pkgs/applications/{misc → terminal-emulators}/hyper/default.nix
  11. 0 pkgs/applications/{misc → terminal-emulators}/iterm2/default.nix
  12. 0 pkgs/applications/{misc → terminal-emulators}/iterm2/disable_updates.patch
  13. 0 pkgs/applications/{misc → terminal-emulators}/kitty/default.nix
  14. 0 pkgs/applications/{misc → terminal-emulators}/kitty/fix-paths.patch
  15. 0 pkgs/applications/{misc → terminal-emulators}/lilyterm/default.nix
  16. 0 pkgs/applications/{misc → terminal-emulators}/lxterminal/default.nix
  17. 0 pkgs/applications/{misc → terminal-emulators}/lxterminal/respect-xml-catalog-files-var.patch
  18. 0 pkgs/applications/{misc → terminal-emulators}/microcom/default.nix
  19. 0 pkgs/applications/{misc → terminal-emulators}/mlterm/default.nix
  20. 0 pkgs/applications/{misc → terminal-emulators}/mrxvt/default.nix
  21. 0 pkgs/applications/{misc → terminal-emulators}/nimmm/default.nix
  22. 0 pkgs/applications/{misc → terminal-emulators}/roxterm/default.nix
  23. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/default.nix
  24. 0 ...ns/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
  25. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-bidi/default.nix
  26. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-font-size/default.nix
  27. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-perl/default.nix
  28. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-perls/default.nix
  29. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-resize-font/default.nix
  30. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
  31. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
  32. +2 −2 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
  33. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode/default.nix
  34. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode/patches/256-color-resources.patch
  35. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode/patches/9.06-font-width.patch
  36. 0 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode/patches/makefile-phony.patch
  37. +1 −1 pkgs/applications/{misc → terminal-emulators}/rxvt-unicode/wrapper.nix
  38. 0 pkgs/applications/{misc → terminal-emulators}/rxvt/default.nix
  39. 0 pkgs/applications/{misc → terminal-emulators}/sakura/default.nix
  40. 0 pkgs/applications/{misc → terminal-emulators}/st/default.nix
  41. 0 pkgs/applications/{misc → terminal-emulators}/st/xst.nix
  42. 0 pkgs/applications/{misc → terminal-emulators}/stupidterm/default.nix
  43. 0 pkgs/applications/{misc → terminal-emulators}/terminator/default.nix
  44. 0 pkgs/applications/{misc → terminal-emulators}/terminus/default.nix
  45. 0 pkgs/applications/{misc → terminal-emulators}/termite/add_errno_header.patch
  46. 0 pkgs/applications/{misc → terminal-emulators}/termite/default.nix
  47. 0 pkgs/applications/{misc → terminal-emulators}/termite/remove_ldflags_macos.patch
  48. 0 pkgs/applications/{misc → terminal-emulators}/termite/url_regexp_trailing.patch
  49. 0 pkgs/applications/{misc → terminal-emulators}/termite/wrapper.nix
  50. 0 pkgs/applications/{misc → terminal-emulators}/termonad/default.nix
  51. 0 pkgs/applications/{misc → terminal-emulators}/tilda/default.nix
  52. 0 pkgs/applications/{misc → terminal-emulators}/tilix/default.nix
  53. 0 pkgs/applications/{misc → terminal-emulators}/wayst/default.nix
  54. 0 pkgs/applications/{misc → terminal-emulators}/wayst/utf8proc.patch
  55. 0 pkgs/applications/{misc → terminal-emulators}/x3270/default.nix
  56. 0 pkgs/applications/{misc → terminal-emulators}/xterm/default.nix
  57. 0 pkgs/applications/{misc → terminal-emulators}/xterm/sixel-256.support.patch
  58. 0 pkgs/applications/{misc → terminal-emulators}/xtermcontrol/default.nix
  59. 0 pkgs/applications/{misc → terminal-emulators}/yaft/default.nix
  60. +103 −101 pkgs/top-level/all-packages.nix
10 changes: 10 additions & 0 deletions doc/contributing/coding-conventions.xml
Original file line number Diff line number Diff line change
@@ -522,6 +522,16 @@ args.stdenv.mkDerivation (args // {
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
If it’s a <emphasis>terminal emulator</emphasis>:
</term>
<listitem>
<para>
<filename>applications/terminal-emulators</filename> (e.g. <filename>alacritty</filename> or <filename>rxvt</filename> or <filename>termite</filename>)
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
If it’s for <emphasis>video playback / editing</emphasis>:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
};

installPhase = ''
sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel
mkdir -p $out/lib/urxvt/perl
@@ -23,5 +23,5 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ danbst ];
platforms = with platforms; unix;
};

}
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ let
# This provides simple way to customize urxvt using
# the `.override` mechanism.
wrapper = { configure, ... }:
let
let
config = configure { inherit availablePlugins; };
plugins = config.plugins or (builtins.attrValues availablePlugins);
extraDeps = config.extraDeps or [ ];
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading