From 0adeeb3a08c31342874ffb0e78a8732ceb35a9fc Mon Sep 17 00:00:00 2001 From: sstent Date: Tue, 21 Feb 2023 11:07:58 -0500 Subject: [PATCH] sync --- hosts/wsl2/flake.lock | 43 ------------------------------------- hosts/wsl2/flake.nix | 33 ---------------------------- hosts/wsl2/result | 1 - pkgs/npiperelay/default.nix | 2 +- pkgs/npiperelay/flake.nix | 29 ------------------------- 5 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 hosts/wsl2/flake.lock delete mode 100644 hosts/wsl2/flake.nix delete mode 120000 hosts/wsl2/result delete mode 100644 pkgs/npiperelay/flake.nix diff --git a/hosts/wsl2/flake.lock b/hosts/wsl2/flake.lock deleted file mode 100644 index 6f5f869..0000000 --- a/hosts/wsl2/flake.lock +++ /dev/null @@ -1,43 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "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" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1676721149, - "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/wsl2/flake.nix b/hosts/wsl2/flake.nix deleted file mode 100644 index f5ff58d..0000000 --- a/hosts/wsl2/flake.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - description = - "npiperelay"; - - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage = pkgs.symlinkJoin { - name = "npiperealy-0.1"; - paths = builtins.attrValues - self.packages.${system}; - }; - - packages.npiperelay = pkgs.stdenvNoCC.mkDerivation { - name = "npiperelay"; - 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" "patchPhase"]; - installPhase = '' - mkdir -p $out/bin - cp $src $out/bin/npiperelay.exe - chmod +x $out/bin/npiperelay.exe - ''; - meta = { description = "npipe"; }; - }; - }); -} diff --git a/hosts/wsl2/result b/hosts/wsl2/result deleted file mode 120000 index 76ea116..0000000 --- a/hosts/wsl2/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/ga8wddim12rk83xfji4f0llqxyv900gc-npiperealy-0.1 \ No newline at end of file diff --git a/pkgs/npiperelay/default.nix b/pkgs/npiperelay/default.nix index 8cb7a68..9b62fb1 100644 --- a/pkgs/npiperelay/default.nix +++ b/pkgs/npiperelay/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gzip, gnutar }: +{ lib, stdenv, fetchurl }: let version = "1.6.3"; diff --git a/pkgs/npiperelay/flake.nix b/pkgs/npiperelay/flake.nix deleted file mode 100644 index 77c5fd7..0000000 --- a/pkgs/npiperelay/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - 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}; - }); -}