4 files changed, 71 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix
new file mode 100644
index 000000000000..c4dbde9e0d23
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.2";
+
+in stdenv.mkDerivation {
+  name = "writegood-mode-${version}";
+  src = fetchurl {
+    url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
+    sha256 = "1kgi2i5pq0vk751z079yp7kdw721cclfg9d9p28h3a8xbr95l7b6";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs minor mode that aids in finding common writing problems";
+    homepage = https://github.com/bnbeckwith/writegood-mode;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.pSub ];
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
new file mode 100644
index 000000000000..234ee1f065e4
--- /dev/null
+++ b/pkgs/applications/editors/scite/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk }:
+
+let
+  version = "3.3.7";
+
+  version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
+in stdenv.mkDerivation {
+  name = "scite-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz";
+    sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
+  };
+
+  buildInputs = [ pkgconfig gtk ];
+  sourceRoot = "scintilla/gtk";
+
+  buildPhase = ''
+    make
+    cd ../../scite/gtk
+    make prefix=$out/
+  '';
+
+  installPhase = ''
+    make install prefix=$out/
+  '';
+
+  meta = {
+    homepage = "http://www.scintilla.org/SciTE.html";
+    description = "SCIntilla based Text Editor";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = stdenv.lib.maintainers.rszibele;
+  };
+}
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index ffeb9a8cd7c1..db7ebfbb77a8 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "xmlstarlet-1.0.2";
+  name = "xmlstarlet-1.5.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
-    sha256 = "07a5c3fhqpvyy07pggl3ky7ahvlcpsmppy71x4h4albvanfbpjwj";
+    sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27";
   };
 
   buildInputs = [ pkgconfig libxml2 libxslt ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3ab10fdeefc..13de0149ed85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7795,6 +7795,8 @@ let
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
 
+    writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
+
     xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
   };
 
@@ -8732,6 +8734,8 @@ let
 
   sbagen = callPackage ../applications/misc/sbagen { };
 
+  scite = callPackage ../applications/editors/scite { };
+
   scribus = callPackage ../applications/office/scribus {
     inherit (gnome) libart_lgpl;
   };