README.md

@@ -7,8 +7,6 @@ moxxmpp is a XMPP library written purely in Dart for usage in Moxxy.
 
 This package contains the actual XMPP code that is platform-independent.
 
-Documentation is available [here](https://moxxy.org/developers/docs/moxxmpp/).
-
 ### [moxxmpp_socket_tcp](./packages/moxxmpp_socket_tcp)
 
 `moxxmpp_socket_tcp` contains the implementation of the `BaseSocketWrapper` class that

flake.lock

@@ -15,7 +15,56 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nix-dart": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs",
+        "pub2nix": "pub2nix"
+      },
+      "locked": {
+        "lastModified": 1652213615,
+        "narHash": "sha256-+eehm2JlhoKgY+Ea4DTxDMei/x4Fgz7S+ZPqWpZysuI=",
+        "owner": "tadfisher",
+        "repo": "nix-dart",
+        "rev": "6f686ddf984306d944e9b5adf9f35f3a0a0a70b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tadfisher",
+        "repo": "nix-dart",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1652133925,
+        "narHash": "sha256-kfATGChLe9/fQVZkXN9G71JAVMlhePv1qDbaRKklkQs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1667610399,
         "narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=",
@@ -31,10 +80,27 @@
         "type": "github"
       }
     },
+    "pub2nix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1594192744,
+        "narHash": "sha256-pDvcXSG1Mh2BpwkqAcNDJzcupV3pIAAtZJLfkiHMAz4=",
+        "owner": "paulyoung",
+        "repo": "pub2nix",
+        "rev": "0c7ecca590fcd1616db8c6468f799ffef36c85e9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "paulyoung",
+        "repo": "pub2nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nix-dart": "nix-dart",
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },

flake.nix

@@ -3,15 +3,23 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    nix-dart.url = "github:tadfisher/nix-dart";
   };
 
-  outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let
+  outputs = { self, nixpkgs, flake-utils, nix-dart }: flake-utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs {
       inherit system;
       config = {
         android_sdk.accept_license = true;
         allowUnfree = true;
       };
+
+      overlays = [
+        (prev: final: {
+          pub2nix-lock = nix-dart.packages."${system}".pub2nix-lock;
+          buildDartPackage = (nix-dart.overlay prev final).buildDartPackage;
+        })
+      ];
     };
     android = pkgs.androidenv.composeAndroidPackages {
       # TODO: Find a way to pin these
@@ -48,7 +56,7 @@
 
     devShell = pkgs.mkShell {
       buildInputs = with pkgs; [
-        flutter pinnedJDK android.platform-tools dart # Dart
+        flutter pinnedJDK android.platform-tools dart pub2nix-lock # Dart
 	      gitlint # Code hygiene
 	      ripgrep # General utilities 
 
@@ -69,7 +77,7 @@
         xorg.libX11
         xorg.xorgproto
 
-        # For the scripts in ./scripts/
+        # Dev
         pythonEnv
       ];
 

packages/moxxmpp/README.md

@@ -9,11 +9,9 @@ Include the following as a dependency in your pubspec file:
 ```
  moxxmpp:
     hosted: https://git.polynom.me/api/packages/Moxxy/pub
-    version: 0.2.0
+    version: 0.1.6+1
 ```
 
-You can find the documentation [here](https://moxxy.org/developers/docs/moxxmpp/).
-
 ## License
 
 See `./LICENSE`.

scripts/lock2nix.py

@@ -1,9 +1,3 @@
-'''
-This script generates a .nix file containing all dependencies specified in the
-special lock file. The .nix file also contains the derivation "pubCache", which can
-be used as the path in the PUB_CACHE environment variable.
-'''
-
 import sys
 import yaml
 import urllib.parse

scripts/pubspec2lock.py

@@ -1,9 +1,3 @@
-'''
-Takes a Dart pubspec.lock file as input and outputs a specialized lock file
-that contains archive URLs and sha256 hashes for nix. Only useful in combination
-with lock2nix.py.
-'''
-
 import sys
 import subprocess
 import urllib