Merge pull request #15 from cspr-rad/refactor-nix

Refactor nix

flake.nix

@@ -46,21 +46,27 @@
     in
     {
       herculesCI.ciSystems = [ "x86_64-linux" ];
+      overlays.default = import ./overlay.nix;
       templates.default = {
         path = ./templates/default;
         description = "risc0 project template";
       };
     }
     // eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages.${system}.extend (import rust-overlay);
-        risc0pkgs = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs { });
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            (import rust-overlay)
+            self.overlays.default
+          ];
+        };
         lib = pkgs.recurseIntoAttrs (pkgs.callPackage ./lib { pkgs = pkgs; });
       in
       {
-        inherit lib;
+        inherit (pkgs) lib;
         packages = {
-          inherit (risc0pkgs) r0vm;
+          inherit (pkgs) r0vm;
         };
 
         formatter = pkgs.nixpkgs-fmt;

overlay.nix

@@ -0,0 +1,6 @@
+final: prev: {
+  r0vm = final.callPackage ./pkgs/r0vm { };
+  lib = (prev.lib or { }) // {
+    buildRisc0Package = final.callPackage ./lib/buildRisc0Package.nix { };
+  };
+}

templates/default/flake.nix

@@ -13,7 +13,7 @@
   inputs = {
     nixpkgs.follows = "risc0pkgs/nixpkgs";
     # Always use the commit hash that is being updated
-    risc0pkgs.url = "github:cspr-rad/risc0pkgs/9b72640223c1c7d305581c70900a22294d7a5667";
+    risc0pkgs.url = "github:cspr-rad/risc0pkgs";
   };
 
   outputs = { self, nixpkgs, risc0pkgs }: