diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-04 14:52:43 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-04 14:52:43 -0500 |
| commit | 15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8 (patch) | |
| tree | 5b978b42798dde8f847abcf25d79736b77964ebe /pkgs/servers/sql | |
| parent | fdf97c5df39292a877d5c700bec573f5b7a912fd (diff) | |
| download | nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar.gz nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar.bz2 nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar.lz nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar.xz nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.tar.zst nixlib-15d6da87408b14beaa8f4d3c9e7aaf9c6a73c3c8.zip | |
psql: Use less as the default pager
less is more common and better than more Fixes #1681
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/8.4.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.0.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.1.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.3.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/less-is-more.patch | 12 |
6 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index f91f78c4d574..58d7159034ad 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; }; meta = { diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index c50c6a4aba20..033328cbcfe1 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + passthru = { inherit readline; psqlSchema = "9.0"; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 9bc971b9dfd6..7e876322808b 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + patches = [ ./less-is-more.patch ]; + postInstall = '' mkdir -p $out/share/man diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 3d1e0d6ec334..da0516a96181 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 2230c3703355..7f6e2d25d187 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - patches = [ ./disable-resolve_symlinks.patch ]; + patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/less-is-more.patch new file mode 100644 index 000000000000..d640d24bdaad --- /dev/null +++ b/pkgs/servers/sql/postgresql/less-is-more.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.7-orig/src/bin/psql/print.h postgresql-9.2.7/src/bin/psql/print.h +--- postgresql-9.2.7-orig/src/bin/psql/print.h 2014-02-17 14:38:15.000000000 -0500 ++++ postgresql-9.2.7/src/bin/psql/print.h 2014-03-04 14:42:28.874014415 -0500 +@@ -178,7 +178,7 @@ + extern const printTextFormat *get_line_style(const printTableOpt *opt); + + #ifndef __CYGWIN__ +-#define DEFAULT_PAGER "more" ++#define DEFAULT_PAGER "less" + #else + #define DEFAULT_PAGER "less" + #endif |