ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-05 22:06:00 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #262966 from mhwombat/master

Browse Source 
textadept:12.0 -> 12.1
This commit is contained in:
7c6f434c 2023-10-25 06:00:46 +00:00 committed by GitHub
commit 7fb9ba1b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/editors/textadept/default.nix
View File

@ -1,6 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: { lib, stdenv, fetchFromGitHub, fetchurl, cmake
, withQt ? true, qtbase, wrapQtAppsHook
, withCurses ? false, ncurses
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "12.0"; version = "12.1";
pname = "textadept"; pname = "textadept";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -8,15 +11,19 @@ stdenv.mkDerivation rec {
owner = "orbitalquark"; owner = "orbitalquark";
repo = "textadept"; repo = "textadept";
rev = "textadept_${version}"; rev = "textadept_${version}";
sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; sha256 = "sha256-ce7U/GR/4zkjnRN3fx3FLecc9vuvFqCONy275SWnpNc=";
}; };
nativeBuildInputs = [ cmake wrapQtAppsHook ]; nativeBuildInputs = [ cmake ]
buildInputs = [ qtbase ]; ++ lib.optionals withQt [ wrapQtAppsHook ];
cmakeFlags = [ buildInputs =
"CMAKE_INSTALL_PREFIX=build/install" lib.optionals withQt [ qtbase ]
]; ++ lib.optionals withCurses ncurses;
cmakeFlags =
lib.optional withQt [ "-DQT=ON" ]
++ lib.optional withCurses [ "-DCURSES=ON" "-DQT=OFF"];
preConfigure = '' preConfigure = ''
mkdir -p $PWD/build/_deps mkdir -p $PWD/build/_deps

21
pkgs/applications/editors/textadept/deps.nix generated
View File

@ -1,36 +1,45 @@
{ {
# scintilla
"scintilla536.tgz" = { "scintilla536.tgz" = {
url = "https://www.scintilla.org/scintilla536.tgz"; url = "https://www.scintilla.org/scintilla536.tgz";
sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ=";
}; };
# lexilla
"lexilla510.tgz" = { "lexilla510.tgz" = {
url = "https://www.scintilla.org/lexilla510.tgz"; url = "https://www.scintilla.org/lexilla510.tgz";
sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g=";
}; };
# scinterm
"scinterm_5.0.zip" = { "scinterm_5.0.zip" = {
url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip";
sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24=";
}; };
"scintillua_6.2.zip" = { # scintillua
url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; "e88bbcfecae46b48b79d8156ea7129411b5c847d.zip" = {
sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; url = "https://github.com/orbitalquark/scintillua/archive/e88bbcfecae46b48b79d8156ea7129411b5c847d.zip";
sha256 = "sha256-sWqpVtcAwysGn86XFwaEkKSPemk2247SydOQi6klFrQ=";
}; };
# lua
"lua-5.4.6.tar.gz" = { "lua-5.4.6.tar.gz" = {
url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz";
sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg=";
}; };
# lpeg
"lpeg-1.1.0.tar.gz" = { "lpeg-1.1.0.tar.gz" = {
url = "http://www.inf.puc-rio.br/~roberto/lpeg/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="; sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo=";
}; };
# luafilesystem
"v1_8_0.zip" = { "v1_8_0.zip" = {
url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo=";
}; };
"cdk-5.0-20200923.tgz" = { # cdk
url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; "t20200923.tar.gz" = {
sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; url = "http://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz";
sha256 = "sha256-rjL4oMSDJZWAZJ8pG8FApfpvrVNJvY+6D8ZV+gwvDnI=";
}; };
# libtermkey
"libtermkey-0.22.tar.gz" = { "libtermkey-0.22.tar.gz" = {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz";
sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";