snyc

flake.lock

@@ -224,20 +224,36 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1659914493,
-        "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.05",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "npiperelay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-jYKyhSKWW8XZHwETg4ix7lGrfQdcd3bwNWq9Jdn0WtU=",
+        "path": "pkgs/npiperelay",
+        "type": "path"
+      },
+      "original": {
+        "path": "pkgs/npiperelay",
+        "type": "path"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -246,23 +262,7 @@
         "nixos-generators": "nixos-generators",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
-        "trivial-flake": "trivial-flake"
-      }
-    },
-    "trivial-flake": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-KRbXLHhUv+dSb8ykuuuQOL/fLKe9IUHllMHuBfdB7Tk=",
-        "path": "pkgs/npiperelay",
-        "type": "path"
-      },
-      "original": {
-        "path": "pkgs/npiperelay",
-        "type": "path"
+        "npiperelay": "npiperelay"
       }
     },
     "utils": {

flake.nix

@@ -28,7 +28,7 @@
     nixos-wsl.url = github:nix-community/NixOS-WSL;
     nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
 
-    npiperelay.url = "path:pkgs/npiperelay";
+    npiperelay.url = "path:./pkgs/npiperelay";
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, nixos-generators, nixos-wsl,deploy-rs
@@ -36,7 +36,7 @@
     let
       system = "x86_64-linux";
       myData = import ./data.nix;
-
+      overlays = [ (final: prev: { npiperelay = npiperelay.defaultPackage.x86_64-linux; }) ];
     in {
       nixosConfigurations = {
         HyperV = nixpkgs.lib.nixosSystem {

hosts/wsl2/default.nix

@@ -28,7 +28,7 @@
   };
 
   environment.systemPackages =
-    [ pkgs.socat pkgs.npiperelay];
+    [ pkgs.socat pkgs.npiperelay ];
 
 
 systemd.user.services.ssh-proxy = {