git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #116286 from ioplker/textadept-11.1

textadept: 11.0_beta -> 11.1

commit96e9fdaf6536af20dd06f5f5e3e36638869e0d59 authorMichael Raskin <7c6f434c@mail.ru> dateFri 26 Mar 2021, 11:51 (6 years ago) parentcc98474d946d15
2 files changed+21−19
pkgs/applications/editors/textadept/11/default.nix+9−7 pkgs/applications/editors/textadept/11/deps.nix+12−12
pkgs/applications/editors/textadept/11/default.nix+9−7
@@ -1,20 +1,20 @@
1−{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
1+{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
22
33stdenv.mkDerivation rec {
4− version = "11.0_beta";
4+ version = "11.1";
55 pname = "textadept11";
66
7− nativeBuildInputs = [ pkg-config unzip ];
7+ nativeBuildInputs = [ pkg-config unzip zip ];
88 buildInputs = [
9− gtk2 ncurses glib zip
9+ gtk2 ncurses glib
1010 ];
1111
1212 src = fetchFromGitHub {
1313 name = "textadept11";
1414 owner = "orbitalquark";
1515 repo = "textadept";
16− rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1";
17− sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs";
16+ rev = "1df99d561dd2055a01efa9183bb9e1b2ad43babc";
17+ sha256 = "0g4bh5dp391vi32aa796vszpbxyl2dm5231v9dwc8l9v0b2786qn";
1818 };
1919
2020 preConfigure =
@@ -40,7 +40,9 @@ stdenv.mkDerivation rec {
4040 '';
4141
4242 makeFlags = [
43− "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
43+ "PREFIX=$(out)"
44+ "WGET=true"
45+ "PIXMAPS_DIR=$(out)/share/pixmaps"
4446 ];
4547
4648 meta = with lib; {
pkgs/applications/editors/textadept/11/deps.nix+12−12
@@ -3,13 +3,13 @@
33 url = "https://www.scintilla.org/scintilla445.tgz";
44 sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag";
55 };
6− "9e2ffa159299899c9345aea15c17ba1941953871.zip" = {
7− url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip";
8− sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122";
6+ "6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip" = {
7+ url = "https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip";
8+ sha256 = "083xvpw14dxbyrv4i48q76bmr44hs637qv363n6ibfs8xv1kq7iv";
99 };
10− "scintillua_4.4.5-1.zip" = {
11− url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip";
12− sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04";
10+ "scintillua_4.4.5-2.zip" = {
11+ url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip";
12+ sha256 = "1061y2gg78zb2mml8msyarxgdwbf7g8g2v08fr1qqsqi2pbb7mfc";
1313 };
1414 "lua-5.3.5.tar.gz" = {
1515 url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
@@ -19,17 +19,17 @@
1919 url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
2020 sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8";
2121 };
22− "v1_7_0_2.zip" = {
23− url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
24− sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i";
22+ "v1_8_0.zip" = {
23+ url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
24+ sha256 = "12p1p5qpdql44y3cc035h8rs8rgdqp6nrnrixlp5544agb5bx9p3";
2525 };
2626 "64587546482a1a6324706d75c80b77d2f87118a4.zip" = {
2727 url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip";
2828 sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9";
2929 };
30− "cdk-5.0-20150928.tgz" = {
31− url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
32− sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
30+ "cdk-5.0-20200923.tgz" = {
31+ url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz";
32+ sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
3333 };
3434 "libtermkey-0.20.tar.gz" = {
3535 url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";