update packages, and add noto-font packages

pkgs/_sources/generated.json

@@ -2,11 +2,11 @@
     "dioxionary": {
         "cargoLocks": {
             "./Cargo.lock": [
-                "./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock",
+                "./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock",
                 {}
             ]
         },
-        "date": "2025-03-17",
+        "date": "2025-04-04",
         "extract": null,
         "name": "dioxionary",
         "passthru": null,
@@ -16,13 +16,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "20d7b44e49e51c2fce3b0369bd544ec561476108",
+            "rev": "71f064e2cca49d36950b505873e05b256b868b56",
             "sha256": "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://github.com/vaaandark/dioxionary.git"
         },
-        "version": "20d7b44e49e51c2fce3b0369bd544ec561476108"
+        "version": "71f064e2cca49d36950b505873e05b256b868b56"
     },
     "juicity": {
         "cargoLocks": null,
@@ -44,9 +44,55 @@
         },
         "version": "4c5e8bd948ba2f72a0dd38681cf13ae532f6c9f5"
     },
+    "noto-sans-cjk": {
+        "cargoLocks": null,
+        "date": null,
+        "extract": null,
+        "name": "noto-sans-cjk",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "notofonts",
+            "repo": "noto-cjk",
+            "rev": "Serif2.003",
+            "sha256": "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY=",
+            "sparseCheckout": [
+                "Sans/OTC"
+            ],
+            "type": "github"
+        },
+        "version": "Serif2.003"
+    },
+    "noto-serif-cjk": {
+        "cargoLocks": null,
+        "date": null,
+        "extract": null,
+        "name": "noto-serif-cjk",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "notofonts",
+            "repo": "noto-cjk",
+            "rev": "Serif2.003",
+            "sha256": "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4=",
+            "sparseCheckout": [
+                "Serif/OTC"
+            ],
+            "type": "github"
+        },
+        "version": "Serif2.003"
+    },
     "rime-ice": {
         "cargoLocks": null,
-        "date": "2025-03-30",
+        "date": "2025-04-01",
         "extract": null,
         "name": "rime-ice",
         "passthru": null,
@@ -58,12 +104,12 @@
             "name": null,
             "owner": "iDvel",
             "repo": "rime-ice",
-            "rev": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d",
+            "rev": "a5f5404e369100fcfc5562f86f1205827453e31c",
-            "sha256": "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk=",
+            "sha256": "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "af3ea15b5c843d2c2d9ce904356073f962e8aa3d"
+        "version": "a5f5404e369100fcfc5562f86f1205827453e31c"
     },
     "tree-sitter-idris": {
         "cargoLocks": null,

pkgs/_sources/generated.nix

@@ -3,10 +3,10 @@
 {
   dioxionary = {
     pname = "dioxionary";
-    version = "20d7b44e49e51c2fce3b0369bd544ec561476108";
+    version = "71f064e2cca49d36950b505873e05b256b868b56";
     src = fetchgit {
       url = "https://github.com/vaaandark/dioxionary.git";
-      rev = "20d7b44e49e51c2fce3b0369bd544ec561476108";
+      rev = "71f064e2cca49d36950b505873e05b256b868b56";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
@@ -14,12 +14,12 @@
       sha256 = "sha256-FAt0WKxVzM+JCGEVJRKUmMebj0MMwHOo8SlPeHn8s/0=";
     };
     cargoLock."./Cargo.lock" = {
-      lockFile = ./dioxionary-20d7b44e49e51c2fce3b0369bd544ec561476108/./Cargo.lock;
+      lockFile = ./dioxionary-71f064e2cca49d36950b505873e05b256b868b56/./Cargo.lock;
       outputHashes = {
         
       };
     };
-    date = "2025-03-17";
+    date = "2025-04-04";
   };
   juicity = {
     pname = "juicity";
@@ -35,17 +35,45 @@
     };
     date = "2025-02-20";
   };
+  noto-sans-cjk = {
+    pname = "noto-sans-cjk";
+    version = "Serif2.003";
+    src = fetchFromGitHub {
+      owner = "notofonts";
+      repo = "noto-cjk";
+      rev = "Serif2.003";
+      fetchSubmodules = false;
+      deepClone = false;
+      leaveDotGit = false;
+      sparseCheckout = [ "Sans/OTC" ];
+      sha256 = "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY=";
+    };
+  };
+  noto-serif-cjk = {
+    pname = "noto-serif-cjk";
+    version = "Serif2.003";
+    src = fetchFromGitHub {
+      owner = "notofonts";
+      repo = "noto-cjk";
+      rev = "Serif2.003";
+      fetchSubmodules = false;
+      deepClone = false;
+      leaveDotGit = false;
+      sparseCheckout = [ "Serif/OTC" ];
+      sha256 = "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4=";
+    };
+  };
   rime-ice = {
     pname = "rime-ice";
-    version = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d";
+    version = "a5f5404e369100fcfc5562f86f1205827453e31c";
     src = fetchFromGitHub {
       owner = "iDvel";
       repo = "rime-ice";
-      rev = "af3ea15b5c843d2c2d9ce904356073f962e8aa3d";
+      rev = "a5f5404e369100fcfc5562f86f1205827453e31c";
       fetchSubmodules = false;
-      sha256 = "sha256-52Iu5qikFJzYc5jL604C/zklLozV6p+C0/zr/DUvlGk=";
+      sha256 = "sha256-s3r8cdEliiPnKWs64Wgi0rC9Ngl1mkIrLnr2tIcyXWw=";
     };
-    date = "2025-03-30";
+    date = "2025-04-01";
   };
   tree-sitter-idris = {
     pname = "tree-sitter-idris";

pkgs/default.nix

@@ -14,6 +14,9 @@ in
   juicity = callPackage ./juicity.nix { };
   rime-ice = callPackage ./rime-ice.nix { };
   dioxionary = callPackage ./dioxionary.nix { };
+
+  noto-serif-cjk = callPackage ./noto-serif-cjk.nix { };
+  noto-sans-cjk = callPackage ./noto-sans-cjk.nix { };
 }
 // (
   let

pkgs/noto-sans-cjk.nix

@@ -0,0 +1,21 @@
+{
+  nixosTests,
+  srcs,
+  stdenvNoCC,
+  ...
+}:
+let
+  source = srcs.noto-sans-cjk;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "noto-sans-cjk";
+  version = source.version;
+
+  src = source.src;
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/opentype/noto-sans-cjk Sans/OTC/*.ttc
+  '';
+
+  passthru.tests.noto-fonts = nixosTests.noto-fonts;
+})

pkgs/noto-serif-cjk.nix

@@ -0,0 +1,21 @@
+{
+  nixosTests,
+  srcs,
+  stdenvNoCC,
+  ...
+}:
+let
+  source = srcs.noto-serif-cjk;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "noto-serif-cjk";
+  version = source.version;
+
+  src = source.src;
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/opentype/noto-serif-cjk Serif/OTC/*.ttc
+  '';
+
+  passthru.tests.noto-fonts = nixosTests.noto-fonts;
+})

pkgs/nvfetcher.toml

@@ -15,3 +15,13 @@ fetch.github = "iDvel/rime-ice"
 src.git = "https://github.com/vaaandark/dioxionary.git"
 fetch.git = "https://github.com/vaaandark/dioxionary.git"
 cargo_locks = ["./Cargo.lock"]
+
+[noto-serif-cjk]
+src.github = "notofonts/noto-cjk"
+fetch.github = "notofonts/noto-cjk"
+git.sparseCheckout = ["Serif/OTC"]
+
+[noto-sans-cjk]
+src.github = "notofonts/noto-cjk"
+fetch.github = "notofonts/noto-cjk"
+git.sparseCheckout = ["Sans/OTC"]