From cf6708279cbcd9a1ac4f234fc53b6ece8bf63b3f Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Wed, 12 May 2021 15:44:23 +0300 Subject: feat: add nix build files (flakes==experimental, default==legacy) --- default.nix | 25 +++++++++++++++++++++++++ flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 23 +++++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 default.nix create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..3cf4137 --- /dev/null +++ b/default.nix @@ -0,0 +1,25 @@ +{ pkgs ? (import {}), lib ? (import ), system ? builtins.currentSystem }: + +assert lib.versionAtLeast pkgs.go.version "1.14"; + +pkgs.buildGoModule rec { + name = "wally-cli"; + version = "v2.0.0"; + + src = ./.; + + vendorSha256 = "HffgkuKmaOjTYi+jQ6vBlC50JqqbYiikURT6TCqL7e0="; + + subPackages = [ "." ]; + + buildInputs = with pkgs; [ libusb1 ]; + nativeBuildInputs = with pkgs; [ pkg-config ]; + + meta = with lib; { + description = "Flash your ZSA Keyboard the EZ way."; + homepage = "https://github.com/zsa/wally-cli"; + license = licenses.mit; + maintainers = [ johnrichardrinehart ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} \ No newline at end of file diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..1d945d2 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1620759905, + "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1620808985, + "narHash": "sha256-cf/+g1RVawT0rcKmfh2nf/lgnSrj9YZS+1PkCFmoeJQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "327368f98c6a927a84aed3c2f2fd1a7f6983e855", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-20.09", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..11f4e7f --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/release-20.09"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + + outputs = inputs: + let + inherit (inputs.flake-utils.lib) eachDefaultSystem flattenTree mkApp; + in + eachDefaultSystem (system: + let + pkgs = inputs.nixpkgs.legacyPackages.${system}; + lib = inputs.nixpkgs.lib; + in + rec { + defaultPackage = (import ./default.nix) { + inherit pkgs lib system; + }; + } + ); +} -- cgit v1.2.3 From 993bcc052b630802d021dd9a54dd099eb5cd46e0 Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Wed, 12 May 2021 15:49:26 +0300 Subject: feat: add defaultApp (for `nix run`) --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 11f4e7f..f9974a6 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,8 @@ defaultPackage = (import ./default.nix) { inherit pkgs lib system; }; + + defaultApp = defaultPackage; } ); } -- cgit v1.2.3 From 85f455f2457822948ff1631664c81b0964874a24 Mon Sep 17 00:00:00 2001 From: John Rinehart Date: Wed, 12 May 2021 16:08:08 +0300 Subject: chore: nixpkgs-fmt --- default.nix | 6 +++--- flake.nix | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/default.nix b/default.nix index 3cf4137..a76bcc2 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? (import {}), lib ? (import ), system ? builtins.currentSystem }: +{ pkgs ? (import { }), lib ? (import ), system ? builtins.currentSystem }: assert lib.versionAtLeast pkgs.go.version "1.14"; @@ -11,7 +11,7 @@ pkgs.buildGoModule rec { vendorSha256 = "HffgkuKmaOjTYi+jQ6vBlC50JqqbYiikURT6TCqL7e0="; subPackages = [ "." ]; - + buildInputs = with pkgs; [ libusb1 ]; nativeBuildInputs = with pkgs; [ pkg-config ]; @@ -22,4 +22,4 @@ pkgs.buildGoModule rec { maintainers = [ johnrichardrinehart ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/flake.nix b/flake.nix index f9974a6..d68e155 100644 --- a/flake.nix +++ b/flake.nix @@ -1,25 +1,25 @@ { - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-20.09"; - flake-utils.url = "github:numtide/flake-utils"; - }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/release-20.09"; + flake-utils.url = "github:numtide/flake-utils"; + }; - outputs = inputs: - let - inherit (inputs.flake-utils.lib) eachDefaultSystem flattenTree mkApp; - in - eachDefaultSystem (system: + outputs = inputs: + let + inherit (inputs.flake-utils.lib) eachDefaultSystem flattenTree mkApp; + in + eachDefaultSystem (system: let - pkgs = inputs.nixpkgs.legacyPackages.${system}; - lib = inputs.nixpkgs.lib; - in + pkgs = inputs.nixpkgs.legacyPackages.${system}; + lib = inputs.nixpkgs.lib; + in rec { defaultPackage = (import ./default.nix) { - inherit pkgs lib system; - }; + inherit pkgs lib system; + }; - defaultApp = defaultPackage; + defaultApp = defaultPackage; } ); } -- cgit v1.2.3