Merge pull request #99931 from sikmir/cudatext

cudatext: 1.111.0 -> 1.115.0
This commit is contained in:
Kevin Cox 2020-10-23 15:23:25 -04:00 committed by GitHub
commit 7eddff6821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 16 deletions

View File

@ -30,22 +30,21 @@ let
deps = lib.mapAttrs deps = lib.mapAttrs
(name: spec: (name: spec:
fetchFromGitHub { fetchFromGitHub {
owner = "Alexey-T";
repo = name; repo = name;
inherit (spec) rev sha256; inherit (spec) owner rev sha256;
} }
) )
(builtins.fromJSON (builtins.readFile ./deps.json)); (builtins.fromJSON (builtins.readFile ./deps.json));
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";
version = "1.111.0"; version = "1.115.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexey-T"; owner = "Alexey-T";
repo = "CudaText"; repo = "CudaText";
rev = version; rev = version;
sha256 = "1ai0g8fmw4m237dqh5dkr8w9qqricyvp49ijz2ivvmg9dsdfzjfp"; sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8";
}; };
patches = [ patches = [
@ -74,6 +73,7 @@ stdenv.mkDerivation rec {
cp -r --no-preserve=mode ${dep} ${name} cp -r --no-preserve=mode ${dep} ${name}
'') deps) + '' '') deps) + ''
lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \
bgrabitmap/bgrabitmap/bgrabitmappack.lpk \
EncConv/encconv/encconv_package.lpk \ EncConv/encconv/encconv_package.lpk \
ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \ ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \
ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \ ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \

View File

@ -1,42 +1,57 @@
{ {
"EncConv": { "EncConv": {
"owner": "Alexey-T",
"rev": "2020.06.15", "rev": "2020.06.15",
"sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3"
}, },
"ATBinHex-Lazarus": { "ATBinHex-Lazarus": {
"owner": "Alexey-T",
"rev": "2020.09.05", "rev": "2020.09.05",
"sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072"
}, },
"ATFlatControls": { "ATFlatControls": {
"rev": "2020.08.23", "owner": "Alexey-T",
"sha256": "1axzwiz5h62v11ncynxcg431dfbky9pwyha7cd6kpizjdjagfklw" "rev": "2020.09.20",
"sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x"
}, },
"ATSynEdit": { "ATSynEdit": {
"rev": "2020.09.05", "owner": "Alexey-T",
"sha256": "0qn0fp7rbi48f3nrysb0knkd7a3a6pl5w72yf95g5iibal4zrib2" "rev": "2020.10.12",
"sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr"
}, },
"ATSynEdit_Cmp": { "ATSynEdit_Cmp": {
"rev": "2020.09.05", "owner": "Alexey-T",
"sha256": "1bd25zc97001b7lg0bvi8va9mazkr6jih6d2ddkabcxcnsj0dxnq" "rev": "2020.10.11",
"sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw"
}, },
"EControl": { "EControl": {
"rev": "2020.09.05", "owner": "Alexey-T",
"sha256": "1n7s1zkhrr216gqdqvq6wq0n3jq7s78mwpi5s5j8054p0fak1ywi" "rev": "2020.10.04",
"sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq"
}, },
"ATSynEdit_Ex": { "ATSynEdit_Ex": {
"rev": "2020.09.05", "owner": "Alexey-T",
"sha256": "17y2cx5syj3jvrszjgdyf1p6vilp2qgaggz4y8yqnz99cvd0shs7" "rev": "2020.10.04",
"sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k"
}, },
"Python-for-Lazarus": { "Python-for-Lazarus": {
"owner": "Alexey-T",
"rev": "2020.07.31", "rev": "2020.07.31",
"sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j"
}, },
"Emmet-Pascal": { "Emmet-Pascal": {
"owner": "Alexey-T",
"rev": "2020.09.05", "rev": "2020.09.05",
"sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg"
}, },
"CudaText-lexers": { "CudaText-lexers": {
"owner": "Alexey-T",
"rev": "2020.08.10", "rev": "2020.08.10",
"sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6"
},
"bgrabitmap": {
"owner": "bgrabitmap",
"rev": "v11.2.4",
"sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"
} }
} }

View File

@ -1,8 +1,8 @@
diff --git i/app/formmain.pas w/app/formmain.pas diff --git i/app/formmain.pas w/app/formmain.pas
index 8c1131680..6c6c0043f 100644 index f6f37febb..cf993d75e 100644
--- i/app/formmain.pas --- i/app/formmain.pas
+++ w/app/formmain.pas +++ w/app/formmain.pas
@@ -2135,6 +2135,7 @@ begin @@ -2156,6 +2156,7 @@ begin
false false
{$endif}; {$endif};
*) *)