diff --git a/default.nix b/default.nix deleted file mode 100644 index 3f96341..0000000 --- a/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs ? ( - let - inherit (builtins) fetchTree fromJSON readFile; - inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix; - in - import (fetchTree nixpkgs.locked) { - overlays = [ - (import "${fetchTree gomod2nix.locked}/overlay.nix") - ]; - } - ) -, buildGoApplication ? pkgs.buildGoApplication -}: - - buildGoApplication { - pname = "awl-ntfy"; - version = "0.1"; - pwd = ./.; - src = ./.; - modules = ./gomod2nix.toml; - } diff --git a/devshell.nix b/devshell.nix new file mode 100644 index 0000000..ef720cb --- /dev/null +++ b/devshell.nix @@ -0,0 +1,8 @@ +{ pkgs }: + +pkgs.mkShell { + packages = [ + pkgs.mkGoEnv { pwd = ./.; } + pkgs.gomod2nix + ]; +} diff --git a/flake.nix b/flake.nix index d09d65e..16cb1c6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,31 +1,23 @@ { - description = "A basic gomod2nix flake"; + description = "Send notification for your local awl trash collection to your phone"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; - inputs.gomod2nix = { - url = "github:nix-community/gomod2nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; + gomod2nix = { + url = "github:nix-community/gomod2nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + + blueprint = { + url = "github:numtide/blueprint"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, flake-utils, gomod2nix }: - (flake-utils.lib.eachDefaultSystem - (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - callPackage = pkgs.callPackage; - in - { - packages.default = callPackage ./. { - inherit (gomod2nix.legacyPackages.${system}) buildGoApplication; - }; - devShells.default = callPackage ./shell.nix { - inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix; - }; - }) - ); + outputs = inputs: inputs.blueprint inputs; } diff --git a/package.nix b/package.nix new file mode 100644 index 0000000..d798923 --- /dev/null +++ b/package.nix @@ -0,0 +1,9 @@ +{ pkgs }: + +pkgs.buildGoApplication { + pname = "awl-ntfy"; + version = "0.1"; + pwd = ./.; + src = ./.; + modules = ./gomod2nix.toml; +} diff --git a/result b/result new file mode 120000 index 0000000..8ac3b08 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/zd7pa71h9lihln596dzpdg081kcn9g90-awl-ntfy-0.1 \ No newline at end of file diff --git a/shell.nix b/shell.nix deleted file mode 100644 index d4f21a8..0000000 --- a/shell.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs ? ( - let - inherit (builtins) fetchTree fromJSON readFile; - inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix; - in - import (fetchTree nixpkgs.locked) { - overlays = [ - (import "${fetchTree gomod2nix.locked}/overlay.nix") - ]; - } - ) -, mkGoEnv ? pkgs.mkGoEnv -, gomod2nix ? pkgs.gomod2nix -}: - -let - goEnv = mkGoEnv { pwd = ./.; }; -in -pkgs.mkShell { - packages = [ - goEnv - gomod2nix - ]; -}