diff --git a/flake.lock b/flake.lock index eabe566..0cee636 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,40 @@ { "nodes": { + "nim2nix": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1724878933, + "narHash": "sha256-VP0+Lal3jJJqDH1EzQX73rP9Ue8ZTIyAErJvDz6PQSg=", + "owner": "daylinmorgan", + "repo": "nim2nix", + "rev": "5153c772e4c6a4f5645efa85ce536fe1c5063ebb", + "type": "github" + }, + "original": { + "owner": "daylinmorgan", + "repo": "nim2nix", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1724479785, + "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1723637854, "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", @@ -18,7 +52,8 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nim2nix": "nim2nix", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flake.nix b/flake.nix index 862e05d..5feb94a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nim2nix.url = "github:daylinmorgan/nim2nix"; }; outputs = - { nixpkgs, ... }: + { nixpkgs, nim2nix, ... }: let inherit (nixpkgs.lib) genAttrs; systems = [ @@ -15,7 +16,17 @@ "aarch64-linux" "aarch64-darwin" ]; - forAllSystems = f: genAttrs systems (system: f (import nixpkgs { inherit system; })); + forAllSystems = + f: + genAttrs systems ( + system: + f ( + import nixpkgs { + inherit system; + overlays = [ nim2nix.overlays.default ]; + } + ) + ); in { packages = forAllSystems (pkgs: rec { diff --git a/meta.nix b/meta.nix index 739a65b..95516f6 100644 --- a/meta.nix +++ b/meta.nix @@ -10,7 +10,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "meta"; version = "unstable"; - # src = buildInputs = [ tunnel ]; phases = [ "installPhase" ]; diff --git a/tunnel-nim/default.nix b/tunnel-nim/default.nix index 05b798b..310abb6 100644 --- a/tunnel-nim/default.nix +++ b/tunnel-nim/default.nix @@ -1,14 +1,14 @@ { lib, - buildNimPackage, makeWrapper, + buildNimblePackage, }: -buildNimPackage { +buildNimblePackage { pname = "tunnel"; version = "unstable"; src = lib.cleanSource ./.; - lockFile = ./lock.json; nativeBuildInputs = [ makeWrapper ]; doCheck = false; + nimbleDepsHash = "sha256-9tv/dQ+2H24QkZYuJWpLVH2yvzP8t5GLLbmV0eQOWVk="; }