fix(gir): correct name of astal4 types

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('node_modules')
-            !path.parentPath.includes('mk-types') // FIXME: latest breaks
         ) {
             await updatePackageJson(path.parentPath, updates);
 

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;

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} \
+      echo -e '\n${buildPhase}\n'
-          ${concatMapStringsSep "\n" (p: "-g ${p.package.dev}/share/gir-1.0 \\") withGirNames}
+      ${buildPhase}
-          -g ${ts-for-gir-src}/girs \
-          --ignoreVersionConflicts \
-          -o ./types
     '';
 
     installPhase = ''

lib/pkgs/mk-types/package.json

@@ -1,5 +1,5 @@
 {
     "dependencies": {
-        "@ts-for-gir/cli": "4.0.0-beta.16"
+        "@ts-for-gir/cli": "4.0.0-beta.19"
     }
 }