textadept:12.0 -> 12.1

+30 -14
+15 -8
pkgs/applications/editors/textadept/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchurl, cmake, qtbase, wrapQtAppsHook }: 1 + { lib, stdenv, fetchFromGitHub, fetchurl, cmake 2 + , withQt ? true, qtbase, wrapQtAppsHook 3 + , withCurses ? false, ncurses 4 + }: 2 5 stdenv.mkDerivation rec { 3 - version = "12.0"; 6 + version = "12.1"; 4 7 pname = "textadept"; 5 8 6 9 src = fetchFromGitHub { ··· 8 11 owner = "orbitalquark"; 9 12 repo = "textadept"; 10 13 rev = "textadept_${version}"; 11 - sha256 = "sha256-KziVN0Fl/IvSnIJKK5s7UikXi3iP5mTauP0YxffKy9c="; 14 + sha256 = "sha256-ce7U/GR/4zkjnRN3fx3FLecc9vuvFqCONy275SWnpNc="; 12 15 }; 13 16 14 - nativeBuildInputs = [ cmake wrapQtAppsHook ]; 15 - buildInputs = [ qtbase ]; 17 + nativeBuildInputs = [ cmake ] 18 + ++ lib.optionals withQt [ wrapQtAppsHook ]; 19 + 20 + buildInputs = 21 + lib.optionals withQt [ qtbase ] 22 + ++ lib.optionals withCurses ncurses; 16 23 17 - cmakeFlags = [ 18 - "CMAKE_INSTALL_PREFIX=build/install" 19 - ]; 24 + cmakeFlags = 25 + lib.optional withQt [ "-DQT=ON" ] 26 + ++ lib.optional withCurses [ "-DCURSES=ON" "-DQT=OFF"]; 20 27 21 28 preConfigure = '' 22 29 mkdir -p $PWD/build/_deps
+15 -6
pkgs/applications/editors/textadept/deps.nix
··· 1 1 { 2 + # scintilla 2 3 "scintilla536.tgz" = { 3 4 url = "https://www.scintilla.org/scintilla536.tgz"; 4 5 sha256 = "sha256-ib6CeKg+eBOSWq/il32quH0r1r69F7AXn+cq/dVIyyQ="; 5 6 }; 7 + # lexilla 6 8 "lexilla510.tgz" = { 7 9 url = "https://www.scintilla.org/lexilla510.tgz"; 8 10 sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; 9 11 }; 12 + # scinterm 10 13 "scinterm_5.0.zip" = { 11 14 url = "https://github.com/orbitalquark/scinterm/archive/scinterm_5.0.zip"; 12 15 sha256 = "sha256-l1qeLMCrhyoZA/GfmXFR20rY5EsUoO5e+1vZJtYdb24="; 13 16 }; 14 - "scintillua_6.2.zip" = { 15 - url = "https://github.com/orbitalquark/scintillua/archive/scintillua_6.2.zip"; 16 - sha256 = "sha256-vjlN6MBz0xjBwWd8dpx/ks37WvdXt2vE1A71YM3uDik="; 17 + # scintillua 18 + "e88bbcfecae46b48b79d8156ea7129411b5c847d.zip" = { 19 + url = "https://github.com/orbitalquark/scintillua/archive/e88bbcfecae46b48b79d8156ea7129411b5c847d.zip"; 20 + sha256 = "sha256-sWqpVtcAwysGn86XFwaEkKSPemk2247SydOQi6klFrQ="; 17 21 }; 22 + # lua 18 23 "lua-5.4.6.tar.gz" = { 19 24 url = "http://www.lua.org/ftp/lua-5.4.6.tar.gz"; 20 25 sha256 = "sha256-fV6huctqoLWco93hxq3LV++DobqOVDLA7NBr9DmzrYg="; 21 26 }; 27 + # lpeg 22 28 "lpeg-1.1.0.tar.gz" = { 23 29 url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; 24 30 sha256 = "sha256-SxVdZ9IkbB/6ete8RmweqJm7xA/vAlfMnAPOy67UNSo="; 25 31 }; 32 + # luafilesystem 26 33 "v1_8_0.zip" = { 27 34 url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; 28 35 sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; 29 36 }; 30 - "cdk-5.0-20200923.tgz" = { 31 - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; 32 - sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; 37 + # cdk 38 + "t20200923.tar.gz" = { 39 + url = "http://github.com/ThomasDickey/cdk-snapshots/archive/refs/tags/t20200923.tar.gz"; 40 + sha256 = "sha256-rjL4oMSDJZWAZJ8pG8FApfpvrVNJvY+6D8ZV+gwvDnI="; 33 41 }; 42 + # libtermkey 34 43 "libtermkey-0.22.tar.gz" = { 35 44 url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; 36 45 sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";