From 93547b18fab0d962dab07f3d2b72a1bc434afd63 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 19 Dec 2024 20:54:26 -0500 Subject: [PATCH] fix(gir): correct name of astal4 types --- apps/update-sources/src/node-modules.ts | 3 +-- lib/pkgs/default.nix | 2 ++ lib/pkgs/mk-types/default.nix | 17 +++++++++++------ lib/pkgs/mk-types/package-lock.json | Bin 66736 -> 64686 bytes lib/pkgs/mk-types/package.json | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apps/update-sources/src/node-modules.ts b/apps/update-sources/src/node-modules.ts index cfbf5929..6f24ec2e 100644 --- a/apps/update-sources/src/node-modules.ts +++ b/apps/update-sources/src/node-modules.ts @@ -61,8 +61,7 @@ export default async() => { for (const path of packages) { if ( path.name === 'package.json' && - !path.parentPath.includes('node_modules') && - !path.parentPath.includes('mk-types') // FIXME: latest breaks + !path.parentPath.includes('node_modules') ) { await updatePackageJson(path.parentPath, updates); diff --git a/lib/pkgs/default.nix b/lib/pkgs/default.nix index 3fab5aca..6e14e1f1 100644 --- a/lib/pkgs/default.nix +++ b/lib/pkgs/default.nix @@ -42,6 +42,8 @@ in { then "AstalIO-0.1" else if package.name == "astal-3.0.0" then "Astal-3.0" + else if package.name == "astal-4.0.0" + then "Astal-4.0" else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1"; }) packages; diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix index fc397453..2797c2d9 100644 --- a/lib/pkgs/mk-types/default.nix +++ b/lib/pkgs/mk-types/default.nix @@ -7,22 +7,27 @@ ... }: let inherit (lib) concatMapStringsSep; + + buildPhase = '' + npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \ + ${concatMapStringsSep "\n" (p: "-g ${p.package.dev}/share/gir-1.0 \\") withGirNames} + -g ${ts-for-gir-src}/girs \ + --ignoreVersionConflicts \ + -o ./types + ''; in buildNpmPackage { pname = "${pname}-types"; version = "0.0.0"; - npmDepsHash = "sha256-3ll4Xd5F8ZH/7q/gOF0jgerM6QRk71d93XIwtDssfxU="; + npmDepsHash = "sha256-QqLwPJJbAeiGMKUwhpUL1LME0DYm/rIgu8pAyt98KVI="; src = ./.; dontNpmBuild = true; buildPhase = '' - npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \ - ${concatMapStringsSep "\n" (p: "-g ${p.package.dev}/share/gir-1.0 \\") withGirNames} - -g ${ts-for-gir-src}/girs \ - --ignoreVersionConflicts \ - -o ./types + echo -e '\n${buildPhase}\n' + ${buildPhase} ''; installPhase = '' diff --git a/lib/pkgs/mk-types/package-lock.json b/lib/pkgs/mk-types/package-lock.json index 50c538187628906896b4afe6fb22b0a4db7b4fb6..15c08a265cc5ad967d8fa3bfe8f9dee2ca524c3c 100644 GIT binary patch delta 5153 zcmb7IYs}l`b;cLlNgdnqC3c)Rs2w{+e4#({CQ_smw;^>Qb)!U4lqe18BJm=T;zcAy ziB#JmM$ua?PMsJ1F$|cK?$5dngM+VIHemZRtV6e9U5cy&25d-EVAz1ISW@Iqe{31` z-Tb+B?BPT0|11|>R zh11~uebm#>o30<3fgZqHDtL8UT+LiUF5%!hd``|4rZk(;sYS8QO;xzs)y0@_DA({s zor5!;Ak2`4JX1Ihagq?4H{s5pjI)`FA&Hry8sLm*Ow6cQH*upqa~j4>7{uVs56*xO zawvG`m52AKUZ9`3{M4B*q6m2JY>ZC-In91V4jwcFZL$1}E$a#!nXV zFfTwkYXoDAn}3fXSDRfU|#k0aUO3 z!y~t>)irYpR%)lfx8L6lzW)*RxrmSY*vIC&7^%OQsm>29Eav*3VW)p)$mgMm7#Q3v}F5GA6f(V~da~J*P}{ zpikqQW#BblJptZ*Fb{r;AHJK94s7{Ik0*T>yai6~N^=PObRT_c2fU?DTf$oxZe>}k zmJb(xC&PEyNxSASUIG^x+U{3_p-0iQ%nbX8IW1UWH(;luimB&&f{N%UIn>;&fU6>s zmkgL(ge|sLi}KyPC}+mt>OVhyk0iS-`j!YkA+5mWqez;M*Y{?@caJ^=2LF3ro>nx- z3Z0RUp-cmidgJmFzw$i2#&vxfB+CRwNtR;h zQ8$}G6HZxZlw78pR2acV6eV>`hfGb&dhKf0YGC-hQYK5)W~s!huA);g$#~u2yeVOe zNv0u$9XNu`9+pV}`j@Svw}|o%qPp!4f1M0=BWD1_zdpV4tD&(}q+GlTZwRaSHUaYt z+{tv?5TWUnoIWZ=Q-fm{Lfqj|cQli8WVW6$a&%-!rsZa_Bs5URoY^B7Z zhS=|ROi1;G0^R7dv`d1kZ`_N3e_dSLlsoB%;oJ*$#{G^8v#DK1{+4(v_GR4fSYvV| zA!dKT(Q%B(=)|6j)jX@hDfm%mQ7snxQzk!Yl8R9vv8vw)Xl_ze*l|@xDx%ykDLtAd z2LcCSi9GXEp8B-u{qZZu!FR98_e||c;5ic@zH|!w>_4B|QB&5RPs1g;<&J5%n%&?n zrQ0Jst{n`ZQEs6Q?S|gggEAo%=ep}U`Fg`pe6*A3y;9KN5~(_{GaZuaOCejFMR=!F z!bzrHArh8q)=GuKn6-@CfF0Q?-RtFZqh@c`%>$d|ZC$f0f{%h1kMCJl)cqUWy73Bl z>!WSOp$%5L^ILn?^X&ECKe>GU&_;l+@7f5`%@dDox%SQv91i+(+YG07Y7T{ZKTt<^ zel1nly1Mg?H?Ott=AC_8#G9T0UYMQUqTSQC=wkEq)IXcjj^HC|Bh!@@hEq3tcGGL< z3u92$jCQVPj(Z_aS$(`z_d0r(N42<$*mw`K7nvpgYOfV_mM4V8<(`~XF%geyO-_Tj-s-mOu=mkJD9@}Te*QIcy^1Maa=oBmP%yb z$j?oQYqcSxR&5kYwS0M4YLits#Gz)lIfOCqXLewJW&VAf>4}|yVPPd!5 zWy8Ad%3rY5@mqnqRHZ1FKdU%6)x9V~qu5*@@}Y> zVxAql1qY9WX^1=COmbMyP*ED8SRo;FtrDtnS7)@of(pu*m&mkFtmkIJM5B-qV{{i~+RNqQ8EoWIQ%-{a`|)#NdiLU>?Lxar zqu{mUC&7)gP-?)EW8OOpZ%Q}LJ_hJ>Pj0XFgC9Xh)0Oxq$H0wqFFt@`>$AcuKiI#P zKToctnhiLQfgfHtvs|Tce7G9)+}P;1^{iQKMY(!d&?PI8Vvn71I8|hsMcC&PQKYj1 zlCj+mW}(K|8cI{!>n5ex6$3S)?GEiutE|u;wpf-=BWDB7jk8-ey?HGLzj2Yem^xtf7sxMmHzWn557BGbr2wIVWhGX;r7yCH}6 zz)G@p8+Tf=^yt4KKijrsKiGvWL+yRl+e0<0AG%uIxRcxs{{Q)E^aX_+cGso0L zGoE>FJ<(Bm?k~eyN=w~O_?av z87LbPnkjGgWe4|7bUjF`;xveKa2-OAMXqM5=IZ*iyR4SKMP9-X@EVJ+J(~IVz2NVD z2Lh9qc7xx%Os!qWJ-@Q{FWl$$ti9V19t7TjJ!@|${$7B_6etZ&g1nY3mviUdC#5fYy^igmNa6_R|*ESHlQi4p=86)ouurVKAc{ftsx z$Q8AZ*B2F8!)NQm;ZrZ}0aw(YtUYM(2S7@1;OpTtApHD!IUxxmrzf%qSyr~f4!Sip zQ{)h|P4z_I5};we%asYFIWu&#TY>m!;^D6lX{pgjoCtmyLfwi08`Q;&S>U$T! zSKp?<)$ctCh%4u16vKVKX_Q&V!z?8~@Zdhtt&2g~{b^q){VZ94k(qZ&lP}ouglPc{h0ND;Y5PgDbyx>5q1UcfRu+ zux_4M!Ct?9QSNlKQanklf(sQ#Vp$YtbYEn;Htz{-ZBbgti6peqAul)blGZEZNzctr z7-k@wOK?_s81JrZ3t<{Se(mb+MS)p9{D0lT|%>$kf*-<<)=P>1w$?o>#^T` zn?AVq?hjXYtvUaAc-PujfAaoAYY)EnwFBwA`XNh$AN=>BR9gNS;+2aLo#Dj+RB3CG zB#YJT+?_bSYdF=kw8AbkA_ruFN9MVLS3zK>p(`?}rh{U>P2sh1J>nZpekv)IicHfb zw!e^IY{|51;m@CWVDENvUcZ{Q(|h;tUeC@CAE!_4%-fVgb}m=bOBa#)5kIu6xp6F}vL!5sO20;?il delta 6019 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