4 files changed, 124 insertions, 19 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/default.nix
index bb771c89010b..0456d013bbbe 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
+
 stdenv.mkDerivation rec {
-  version = "10.2";
+  version = "10.8";
   pname = "textadept";
 
   nativeBuildInputs = [ pkgconfig ];
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchhg {
     url = "http://foicica.com/hg/textadept";
     rev = "textadept_${version}";
-    sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl";
+    sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
   };
 
   preConfigure =
@@ -19,10 +20,6 @@ stdenv.mkDerivation rec {
       "ln -s ${fetchurl params} $PWD/src/${name}"
     ) (import ./deps.nix)) + ''
 
-    # work around trying to download stuff in `make deps`
-    function wget() { true; }
-    export -f wget
-
     cd src
     make deps
   '';
@@ -31,12 +28,17 @@ stdenv.mkDerivation rec {
     make curses
   '';
 
+  preInstall = ''
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/pixmaps
+  '';
+
   postInstall = ''
     make curses install PREFIX=$out MAKECMDGOALS=curses
   '';
 
   makeFlags = [
-    "PREFIX=$(out)"
+    "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
   ];
 
   meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix
index 80306191ff12..3ab778dddb2a 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/deps.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix
@@ -1,23 +1,23 @@
 {
-    "542782a4df7d.zip" = {
-      url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip";
-      sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5";
+    "99fa62b828ee.zip" = {
+      url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
+      sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
     };
     "lua-5.3.5.tar.gz" = {
       url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
       sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
     };
-    "lpeg-1.0.0.tar.gz" = {
-      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz";
-      sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h";
+    "lpeg-1.0.2.tar.gz" = {
+      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
+      sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
     };
-    "v_1_6_3.zip" = {
-      url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip";
-      sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y";
+    "v1_7_0_2.zip" = {
+      url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
+      sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
     };
-    "6435a42450c7.zip" = {
-      url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip";
-      sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym";
+    "db67f8a489e8.zip" = {
+      url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
+      sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
     };
     "cdk-5.0-20150928.tgz" = {
       url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
new file mode 100644
index 000000000000..487f1b3767f1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
+
+stdenv.mkDerivation rec {
+  version = "11.0_beta";
+  pname = "textadept11";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    gtk2 ncurses glib unzip zip
+  ];
+
+  src = fetchFromGitHub {
+    name = "textadept11";
+    owner = "orbitalquark";
+    repo = "textadept";
+    rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1";
+    sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs";
+  };
+
+  preConfigure =
+    lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
+      "ln -s ${fetchurl params} $PWD/src/${name}"
+    ) (import ./deps.nix)) + ''
+
+    cd src
+    make deps
+  '';
+
+  postBuild = ''
+    make curses
+  '';
+
+  preInstall = ''
+    mkdir -p $out/share/applications
+    mkdir -p $out/share/pixmaps
+  '';
+
+  postInstall = ''
+    make curses install PREFIX=$out MAKECMDGOALS=curses
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta";
+    homepage = "http://foicica.com/textadept";
+    license = licenses.mit;
+    maintainers = with maintainers; [ raskin mirrexagon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix
new file mode 100644
index 000000000000..2ab72574bbd0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix
@@ -0,0 +1,50 @@
+{
+    "scintilla445.tgz" = {
+      url = "https://www.scintilla.org/scintilla445.tgz";
+      sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag";
+    };
+    "9e2ffa159299899c9345aea15c17ba1941953871.zip" = {
+      url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip";
+      sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122";
+    };
+    "scintillua_4.4.5-1.zip" = {
+      url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip";
+      sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04";
+    };
+    "lua-5.3.5.tar.gz" = {
+      url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
+      sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
+    };
+    "lpeg-1.0.2.tar.gz" = {
+      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
+      sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8";
+    };
+    "v1_7_0_2.zip" = {
+      url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
+      sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i";
+    };
+    "64587546482a1a6324706d75c80b77d2f87118a4.zip" = {
+      url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip";
+      sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9";
+    };
+    "cdk-5.0-20150928.tgz" = {
+      url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
+      sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
+    };
+    "libtermkey-0.20.tar.gz" = {
+      url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
+      sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
+    };
+    "pdcurs39.zip" = {
+      url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip";
+      sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w";
+    };
+    "bombay.zip" = {
+      url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
+      sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
+    };
+    "cloc-1.60.pl" = {
+      url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
+      sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
+    };
+}