Unverified Commit 3ea079fb authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #214780 from mhwombat/textadept3

textadept:11.4 -> 12.0
parents 4f3a41ff 98c77ecf
Loading
Loading
Loading
Loading
+14 −36
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:

{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }:
stdenv.mkDerivation rec {
  version = "11.4";
  version = "12.0";
  pname = "textadept";

  nativeBuildInputs = [ pkg-config unzip zip ];
  buildInputs = [
    gtk2 ncurses glib
  ];

  enableParallelBuilding = true;

  src = fetchFromGitHub {
    name = "textadept11";
    owner = "orbitalquark";
    repo = "textadept";
    rev = "textadept_${version}";
    sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0=";
    sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c=";
  };

  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
  '';
  nativeBuildInputs = [ cmake wrapQtAppsHook ];
  buildInputs = [ qtbase ];

  preInstall = ''
    mkdir -p $out/share/applications
    mkdir -p $out/share/pixmaps
  '';
  cmakeFlags = [
    "CMAKE_INSTALL_PREFIX=build/install"
  ];

  postInstall = ''
    make curses install PREFIX=$out MAKECMDGOALS=curses
  '';
  preConfigure = ''
    mkdir -p $PWD/build/_deps

  makeFlags = [
    "PREFIX=$(out)"
    "WGET=true"
    "PIXMAPS_DIR=$(out)/share/pixmaps"
    "GTK2=1"
  ];
    '' +
    lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
      "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
    ) (import ./deps.nix));

  meta = with lib; {
    description = "An extensible text editor based on Scintilla with Lua scripting.";
+22 −22
Original line number Diff line number Diff line
{
  "scintilla524.tgz" = {
    url = "https://www.scintilla.org/scintilla524.tgz";
    sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY=";
  "scintilla536.tgz" = {
    url = "https://www.scintilla.org/scintilla536.tgz";
    sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ=";
  };
  "lexilla510.tgz" = {
    url = "https://www.scintilla.org/lexilla510.tgz";
    sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g=";
  };
  "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = {
    url =
      "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip";
    sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo=";
  "scinterm_5.0.zip" = {
    url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip";
    sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24=";
  };
  "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = {
    url =
      "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip";
    sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE=";
  "scintillua_6.2.zip" = {
    url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip";
    sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik=";
  };
  "lua-5.4.4.tar.gz" = {
    url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz";
    sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E=";
  "lua-5.4.6.tar.gz" = {
    url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz";
    sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
  };
  "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=";
  "lpeg-1.1.0.tar.gz" = {
    url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz";
    sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo=";
  };
  "v1_8_0.zip" = {
    url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
    sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo=";
  };
  "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = {
    url =
      "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip";
    sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg=";
  };
  "cdk-5.0-20200923.tgz" = {
    url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz";
    sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0=";
@@ -42,4 +35,11 @@
    url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz";
    sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";
  };
  # lua-std-regex
  "1.0.zip" = {
    url = "https://github.com/orbitalquark/lua-std-regex/archive/1.0.zip";
    sha256 = "sha256-W2hKHOfqYyo3qk+YvPJlzZfZ1wxZmMVphSlcaql+dOE=";
  };
}

+1 −1
Original line number Diff line number Diff line
@@ -1697,7 +1697,7 @@ mapAliases ({
  tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22
  tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22
  tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22
  textadept11 = textadept; # Added 2022-06-07
  textadept11 = throw "textadept11 has been removed. Please use textadept instead"; # Added 2022-12-23 TODO: UPDATE THE DATE
  tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22
  thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25";
  thunderbird-bin-68 = thunderbird-68;
+1 −1
Original line number Diff line number Diff line
@@ -13473,7 +13473,7 @@ with pkgs;
  texstudio = qt6Packages.callPackage ../applications/editors/texstudio { };
  textadept = callPackage ../applications/editors/textadept { };
  textadept = libsForQt5.callPackage ../applications/editors/textadept { };
  texworks = qt6Packages.callPackage ../applications/editors/texworks { };