nix: add wakucanary Flake package

Signed-off-by: Jakub Sokołowski <[email protected]>

Author: jakubgs

.github/workflows/nix-builds.yml

@@ -0,0 +1,19 @@
+---
+name: ci / nix-builds
+on:
+  pull_request:
+    branches: [master]
+jobs:
+  build:
+    name: Build Nix Flake packages
+    runs-on: [self-hosted, Linux]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build wakucanary
+        shell: bash
+        run: nix build '.?submodules=1#wakucanary'
+
+      - name: Build Android library
+        shell: bash
+        run: nix build '.?submodules=1#libwaku-android-arm64'

Makefile

@@ -177,12 +177,11 @@ nimbus-build-system-nimble-dir:
 .PHONY: librln
 
 LIBRLN_BUILDDIR := $(CURDIR)/vendor/zerokit
-LIBRLN_VERSION := v0.7.0
+LIBRLN_VERSION ?= v0.7.0
 
+LIBRLN_FILE ?= librln_$(LIBRLN_VERSION).a
 ifeq ($(detected_OS),Windows)
-LIBRLN_FILE := rln.lib
-else
-LIBRLN_FILE := librln_$(LIBRLN_VERSION).a
+LIBRLN_FILE ?= rln.lib
 endif
 
 $(LIBRLN_FILE):
@@ -543,4 +542,3 @@ release-notes:
 			sed -E 's@#([0-9]+)@[#\1](https://github.com/waku-org/nwaku/issues/\1)@g'
 # I could not get the tool to replace issue ids with links, so using sed for now,
 # asked here: https://github.com/bvieira/sv4git/discussions/101
-

flake.lock

@@ -9,7 +9,8 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs?rev=f44bd8ca21e026135061a0a57dcf3d0775b67a49";
     zerokit = {
-      url = "github:vacp2p/zerokit?rev=c60e0c33fc6350a4b1c20e6b6727c44317129582";
+      # FIXME: This is patched v0.8.0, use v0.9.0 when ready.
+      url = "github:vacp2p/zerokit?rev=8196edb206dda6d9a5d4a4eb9f660c95a4d25f57";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -49,16 +50,23 @@
         libwaku-android-arm64 = pkgs.callPackage ./nix/default.nix {
           inherit stableSystems;
           src = self;
-          targets = ["libwaku-android-arm64"]; 
-          androidArch = "aarch64-linux-android";
+          targets = ["libwaku-android-arm64"];
           abidir = "arm64-v8a";
-          zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
+          zerokitRln = zerokit.packages.${system}.rln-android-arm64;
         };
+
+        wakucanary = pkgs.callPackage ./nix/default.nix {
+          inherit stableSystems;
+          src = self;
+          targets = ["wakucanary"];
+          zerokitRln = zerokit.packages.${system}.rln;
+        };
+
         default = libwaku-android-arm64;
       });
 
       devShells = forAllSystems (system: {
         default = pkgsFor.${system}.callPackage ./nix/shell.nix {};
       });
     };
-}
+}

flake.nix

@@ -6,7 +6,7 @@ let
 in pkgs.fetchFromGitHub {
   owner = "nim-lang";
   repo = "checksums";
-  rev = tools.findKeyValue "^ +ChecksumsStableCommit = \"([a-f0-9]+)\"$" sourceFile;
+  rev = tools.findKeyValue "^ +ChecksumsStableCommit = \"([a-f0-9]+)\".*$" sourceFile;
   # WARNING: Requires manual updates when Nim compiler version changes.
-  hash = "sha256-Bm5iJoT2kAvcTexiLMFBa9oU5gf7d4rWjo3OiN7obWQ=";
+  hash = "sha256-JZhWqn4SrAgNw/HLzBK0rrj3WzvJ3Tv1nuDMn83KoYY=";
 }

nix/atlas.nix

@@ -9,4 +9,4 @@ in pkgs.fetchFromGitHub {
   rev = tools.findKeyValue "^nim_csourcesHash=([a-f0-9]+)$" sourceFile;
   # WARNING: Requires manual updates when Nim compiler version changes.
   hash = "sha256-UCLtoxOcGYjBdvHx7A47x6FjLMi6VZqpSs65MN7fpBs=";
-}
+}

nix/checksums.nix

@@ -9,9 +9,8 @@
   stableSystems ? [
     "x86_64-linux" "aarch64-linux"
   ],
-  androidArch,
-  abidir,
-  zerokitPkg,
+  abidir ? null,
+  zerokitRln,
 }:
 
 assert pkgs.lib.assertMsg ((src.submodules or true) == true)
@@ -20,15 +19,11 @@ assert pkgs.lib.assertMsg ((src.submodules or true) == true)
 let
   inherit (pkgs) stdenv lib writeScriptBin callPackage;
 
-  revision = lib.substring 0 8 (src.rev or "dirty");
+  version = lib.substring 0 8 (src.sourceInfo.rev or "dirty");
 
 in stdenv.mkDerivation rec {
-
   pname = "nwaku";
-
-  version = "1.0.0-${revision}";
-
-  inherit src;
+  inherit src version;
 
   buildInputs = with pkgs; [
     openssl
@@ -40,30 +35,22 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = let
     # Fix for Nim compiler calling 'git rev-parse' and 'lsb_release'.
     fakeGit = writeScriptBin "git" "echo ${version}";
-    # Fix for the zerokit package that is built with cargo/rustup/cross.
-    fakeCargo = writeScriptBin "cargo" "echo ${version}";
-    # Fix for the zerokit package that is built with cargo/rustup/cross.
-    fakeRustup = writeScriptBin "rustup" "echo ${version}";
-    # Fix for the zerokit package that is built with cargo/rustup/cross.
-    fakeCross = writeScriptBin "cross" "echo ${version}";
   in
     with pkgs; [
       cmake
       which
       lsb-release
-      zerokitPkg
-      nim-unwrapped-2_0
+      zerokitRln
+      nim-unwrapped-2_2
       fakeGit
-      fakeCargo
-      fakeRustup
-      fakeCross
   ];
 
   # Environment variables required for Android builds
   ANDROID_SDK_ROOT="${pkgs.androidPkgs.sdk}";
   ANDROID_NDK_HOME="${pkgs.androidPkgs.ndk}";
   NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${revision}";
   XDG_CACHE_HOME = "/tmp";
+  LIBRLN_FILE = "${zerokitRln}/lib/librln.a";
   androidManifest = "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\" package=\"com.example.mylibrary\" />";
 
   makeFlags = targets ++ [
@@ -84,27 +71,20 @@ in stdenv.mkDerivation rec {
     pushd vendor/nimbus-build-system/vendor/Nim
     mkdir dist
     cp -r ${callPackage ./nimble.nix {}}    dist/nimble
-    chmod 777 -R dist/nimble
-    mkdir -p dist/nimble/dist
-    cp -r ${callPackage ./checksums.nix {}} dist/checksums  # need both
-    cp -r ${callPackage ./checksums.nix {}} dist/nimble/dist/checksums
-    cp -r ${callPackage ./atlas.nix {}}     dist/atlas
-    chmod 777 -R dist/atlas
-    mkdir dist/atlas/dist
-    cp -r ${callPackage ./sat.nix {}}       dist/nimble/dist/sat
-    cp -r ${callPackage ./sat.nix {}}       dist/atlas/dist/sat
+    cp -r ${callPackage ./checksums.nix {}} dist/checksums
     cp -r ${callPackage ./csources.nix {}}  csources_v2
     chmod 777 -R dist/nimble csources_v2
     popd
-    mkdir -p vendor/zerokit/target/${androidArch}/release
-    cp ${zerokitPkg}/librln.so vendor/zerokit/target/${androidArch}/release/
   '';
 
-  installPhase = ''
+  installPhase = if abidir != null then ''
     mkdir -p $out/jni
     cp -r ./build/android/${abidir}/* $out/jni/
     echo '${androidManifest}' > $out/jni/AndroidManifest.xml
     cd $out && zip -r libwaku.aar *
+  '' else ''
+    mkdir -p $out/bin
+    cp -r build/* $out/bin
   '';
 
   meta = with pkgs.lib; {

nix/csources.nix

@@ -6,7 +6,7 @@ let
 in pkgs.fetchFromGitHub {
   owner = "nim-lang";
   repo = "nimble";
-  rev = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".+" sourceFile;
+  rev = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".*$" sourceFile;
   # WARNING: Requires manual updates when Nim compiler version changes.
-  hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us=";
-}
+  hash = "sha256-8iutVgNzDtttZ7V+7S11KfLEuwhKA9TsgS51mlUI08k=";
+}