about summary refs log tree commit diff
path: root/pkgs/applications/misc/st
diff options
context:
space:
mode:
authorLéo Gaspard <leo@gaspard.io>2018-03-15 14:06:40 +0100
committerLéo Gaspard <leo@gaspard.io>2018-03-15 14:06:40 +0100
commitce6e336842a7371640a0b1c49bb1959163643306 (patch)
treedbe665c61da7fe51f7abb707deb286605f66a5b3 /pkgs/applications/misc/st
parentcc4677c36ee8d880e881459ad114fd2224b3ac1c (diff)
downloadnixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar.gz
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar.bz2
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar.lz
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar.xz
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.tar.zst
nixlib-ce6e336842a7371640a0b1c49bb1959163643306.zip
st: 0.7 -> 0.8
Diffstat (limited to 'pkgs/applications/misc/st')
-rw-r--r--pkgs/applications/misc/st/default.nix6
-rw-r--r--pkgs/applications/misc/st/st-fix-deletekey.patch15
2 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 59e67fc65e2e..4b6873ea33f0 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -5,14 +5,14 @@ with stdenv.lib;
 
 let patches' = if patches == null then [] else patches;
 in stdenv.mkDerivation rec {
-  name = "st-0.7";
+  name = "st-0.8";
 
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
+    sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
   };
 
-  patches = patches' ++ [ ./st-fix-deletekey.patch ];
+  patches = patches';
 
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch
deleted file mode 100644
index cf0093220539..000000000000
--- a/pkgs/applications/misc/st/st-fix-deletekey.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1896246..b41747f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -315,8 +315,8 @@ static Key key[] = {
- 	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0,    0},
- 	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0,    0},
- 	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0,    0},
--	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0,    0},
--	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0,    0},
-+	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       +1,    0,    0},
-+	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      -1,    0,    0},
- 	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0,    0},
- 	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0,    0},
- 	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1,    0},