diff options
author | J. Neto <xablau@tuta.io> | 2020-10-11 15:30:19 -0300 |
---|---|---|
committer | J. Neto <xablau@tuta.io> | 2020-10-11 15:30:19 -0300 |
commit | 698836ecb7dad3efe8c8b69faafedeee8c8a0cfd (patch) | |
tree | 8077fee856151eaaf5bb1d7ff475d8b7fe9e32fa /pkgs/applications/editors/textadept | |
parent | 24c9b05ac53e422f1af81a156f1fd58499eb27fb (diff) |
textadept: 10.2 -> 10.8
Diffstat (limited to 'pkgs/applications/editors/textadept')
-rw-r--r-- | pkgs/applications/editors/textadept/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/editors/textadept/deps.nix | 24 |
2 files changed, 21 insertions, 19 deletions
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index bb771c89010b..0456d013bbbe 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + stdenv.mkDerivation rec { - version = "10.2"; + version = "10.8"; pname = "textadept"; nativeBuildInputs = [ pkgconfig ]; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; - sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; + sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; }; preConfigure = @@ -19,10 +20,6 @@ stdenv.mkDerivation rec { "ln -s ${fetchurl params} $PWD/src/${name}" ) (import ./deps.nix)) + '' - # work around trying to download stuff in `make deps` - function wget() { true; } - export -f wget - cd src make deps ''; @@ -31,12 +28,17 @@ stdenv.mkDerivation rec { make curses ''; + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + postInstall = '' make curses install PREFIX=$out MAKECMDGOALS=curses ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix index 80306191ff12..3ab778dddb2a 100644 --- a/pkgs/applications/editors/textadept/deps.nix +++ b/pkgs/applications/editors/textadept/deps.nix @@ -1,23 +1,23 @@ { - "542782a4df7d.zip" = { - url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip"; - sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5"; + "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.0.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz"; - sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; + "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="; }; - "v_1_6_3.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip"; - sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y"; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; }; - "6435a42450c7.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip"; - sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym"; + "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"; |