git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #100266 from jnetod/textadept-update

textadept: 10.2 -> 10.8

commita2aa0cbf899c1cb82c5e5e28bfd43ba3419f356b authorBenjamin Hipple <bhipple@protonmail.com> dateThu 29 Oct 2020, 22:24 (6 years ago) parent57ea265698836e
2 files changed+21−19
pkgs/applications/editors/textadept/default.nix+9−7 pkgs/applications/editors/textadept/deps.nix+12−12
pkgs/applications/editors/textadept/default.nix+9−7
@@ -1,6 +1,7 @@
11{ lib, stdenv, fetchhg, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }:
2+
23stdenv.mkDerivation rec {
3− version = "10.2";
4+ version = "10.8";
45 pname = "textadept";
56
67 nativeBuildInputs = [ pkgconfig ];
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
1112 src = fetchhg {
1213 url = "http://foicica.com/hg/textadept";
1314 rev = "textadept_${version}";
14− sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl";
15+ sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
1516 };
1617
1718 preConfigure =
@@ -19,10 +20,6 @@ stdenv.mkDerivation rec {
1920 "ln -s ${fetchurl params} $PWD/src/${name}"
2021 ) (import ./deps.nix)) + ''
2122
22− # work around trying to download stuff in `make deps`
23− function wget() { true; }
24− export -f wget
25−
2623 cd src
2724 make deps
2825 '';
@@ -31,12 +28,17 @@ stdenv.mkDerivation rec {
3128 make curses
3229 '';
3330
31+ preInstall = ''
32+ mkdir -p $out/share/applications
33+ mkdir -p $out/share/pixmaps
34+ '';
35+
3436 postInstall = ''
3537 make curses install PREFIX=$out MAKECMDGOALS=curses
3638 '';
3739
3840 makeFlags = [
39− "PREFIX=$(out)"
41+ "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
4042 ];
4143
4244 meta = with stdenv.lib; {
pkgs/applications/editors/textadept/deps.nix+12−12
@@ -1,23 +1,23 @@
11{
2− "542782a4df7d.zip" = {
3− url = "http://foicica.com/hg/scintilla/archive/542782a4df7d.zip";
4− sha256 = "1qwxxcj86z9y7ij05j60lcp1awy2c9ck0vnn9z6c732sqjza0zx5";
2+ "99fa62b828ee.zip" = {
3+ url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
4+ sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
55 };
66 "lua-5.3.5.tar.gz" = {
77 url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
88 sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
99 };
10− "lpeg-1.0.0.tar.gz" = {
11− url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.0.tar.gz";
12− sha256 = "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h";
10+ "lpeg-1.0.2.tar.gz" = {
11+ url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
12+ sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
1313 };
14− "v_1_6_3.zip" = {
15− url = "https://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip";
16− sha256 = "044s125im2irb4i42nnc5shvjj25fp4vsdbzd6b0va5igj0f6h4y";
14+ "v1_7_0_2.zip" = {
15+ url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
16+ sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
1717 };
18− "6435a42450c7.zip" = {
19− url = "http://foicica.com/hg/gtdialog/archive/6435a42450c7.zip";
20− sha256 = "1vxn89sif3qccksb6x5iprysqhjg69g7nyxlgrg31q397dmsg1ym";
18+ "db67f8a489e8.zip" = {
19+ url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
20+ sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
2121 };
2222 "cdk-5.0-20150928.tgz" = {
2323 url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";