Merge pull request #176633 from patricksjackson/textadept-merge

textadept: 10.8 -> 11.3

maintainers/maintainer-list.nix

@@ -9856,6 +9856,12 @@
     githubId = 6931743;
     name = "pasqui23";
   };
+  patricksjackson = {
+    email = "patrick@jackson.dev";
+    github = "patricksjackson";
+    githubId = 160646;
+    name = "Patrick Jackson";
+  };
   patryk27 = {
     email = "pwychowaniec@pm.me";
     github = "Patryk27";

pkgs/applications/editors/textadept/10/default.nix

@@ -1,51 +0,0 @@
-{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
-
-gcc10Stdenv.mkDerivation rec {
-  version = "10.8";
-  pname = "textadept";
-
-  nativeBuildInputs = [ pkg-config unzip ];
-  buildInputs = [
-    gtk2 ncurses glib zip
-  ];
-
-  src = fetchhg {
-    url = "http://foicica.com/hg/textadept";
-    rev = "textadept_${version}";
-    sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
-  };
-
-  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 lib; {
-    description = "An extensible text editor based on Scintilla with Lua scripting";
-    homepage = "http://foicica.com/textadept";
-    license = licenses.mit;
-    maintainers = with maintainers; [ raskin mirrexagon ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/editors/textadept/10/deps.nix

@@ -1,42 +0,0 @@
-{
-    "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.2.tar.gz" = {
-      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
-      sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
-    };
-    "v1_7_0_2.zip" = {
-      url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
-      sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
-    };
-    "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";
-      sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
-    };
-    "libtermkey-0.20.tar.gz" = {
-      url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
-      sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
-    };
-    "pdcurs36.zip" = {
-      url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip";
-      sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b";
-    };
-    "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";
-    };
-}

pkgs/applications/editors/textadept/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "11.3";
-  pname = "textadept11";
+  pname = "textadept";
 
   nativeBuildInputs = [ pkg-config unzip zip ];
   buildInputs = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "An extensible text editor based on Scintilla with Lua scripting.";
     homepage = "http://foicica.com/textadept";
     license = licenses.mit;
-    maintainers = with maintainers; [ raskin mirrexagon ];
+    maintainers = with maintainers; [ raskin mirrexagon patricksjackson ];
     platforms = platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -10846,9 +10846,7 @@ with pkgs;
 
   texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
 
-  textadept = callPackage ../applications/editors/textadept/10 { };
-
-  textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
+  textadept = callPackage ../applications/editors/textadept { };
 
   texworks = libsForQt5.callPackage ../applications/editors/texworks { };