This commit is contained in:
Your Name
2023-02-20 04:00:12 +00:00
parent 2ae1f8eb4f
commit 386c081bdd
4 changed files with 82 additions and 4 deletions

50
flake.lock generated
View File

@@ -112,6 +112,21 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -207,6 +222,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1659914493,
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@@ -214,7 +245,24 @@
"home-manager": "home-manager",
"nixos-generators": "nixos-generators",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs"
"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"
}
},
"utils": {

View File

@@ -28,10 +28,11 @@
nixos-wsl.url = github:nix-community/NixOS-WSL;
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
npiperelay.url = "path:pkgs/npiperelay";
};
outputs = inputs@{ self, nixpkgs, home-manager, nixos-generators, nixos-wsl,deploy-rs
, agenix, ... }:
, agenix, npiperelay, ... }:
let
system = "x86_64-linux";
myData = import ./data.nix;

View File

@@ -28,7 +28,7 @@
};
environment.systemPackages =
[ pkgs.socat];
[ pkgs.socat pkgs.npiperelay];
systemd.user.services.ssh-proxy = {
@@ -43,4 +43,4 @@ systemd.user.services.ssh-proxy = {
};
#pkgs.callPackage ./npiperelay.nix {};
}
}

29
pkgs/npiperelay/flake.nix Normal file
View File

@@ -0,0 +1,29 @@
{
description = "A flake for building My Hello World";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
packageName = "npiperelay";
in {
packages.${packageName} = pkgs.stdenv.mkDerivation {
name = "${packageName}";
src = pkgs.fetchurl {
url =
"https://github.com/rupor-github/wsl-ssh-agent/releases/download/v1.6.3/wsl-ssh-agent.zip";
sha256 = "sha256-A1ykYteoNZi6QACkYHSxa1hY55GfqgClIFZFX2GuLMU=";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/bin
cp $src $out/bin/npiperelay.exe
chmod +x $out/bin/npiperelay.exe
'';
};
defaultPackage = self.packages.${system}.${packageName};
});
}