From c2cfbcf3db9bc99f5f08e03c51c1d30780046ffb Mon Sep 17 00:00:00 2001 From: Samuel Ludwig Date: Sun, 24 Oct 2021 20:40:10 -0400 Subject: [PATCH 1/4] Initial attempt at flakifying node2nix --- .gitignore | 1 + flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 23 +++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.gitignore b/.gitignore index 2ccbe46..f32cf7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /node_modules/ +result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..40600c2 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1634782485, + "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "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/flake.nix b/flake.nix new file mode 100644 index 0000000..73e03b9 --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + description = "A very basic flake"; + + 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}; + inherit (import ./default.nix { inherit pkgs; }) + sources package shell nodeDependencies; + node2nix = package; + app = flake-utils.lib.mkApp { drv = package; }; + in { + packages.node2nix = node2nix; + defaultPackage = node2nix; + apps.node2nix = app; + defaultApp = app; + nodeDependencies = nodeDependencies; + nodeShell = shell; + }); +} From 94ce7d3a3bb612db6c4e631cd0f6f8f986a4a436 Mon Sep 17 00:00:00 2001 From: Samuel Ludwig Date: Mon, 25 Oct 2021 07:45:20 -0400 Subject: [PATCH 2/4] Add exePath to app-definition --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 73e03b9..fda8cc5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,10 @@ inherit (import ./default.nix { inherit pkgs; }) sources package shell nodeDependencies; node2nix = package; - app = flake-utils.lib.mkApp { drv = package; }; + app = flake-utils.lib.mkApp { + drv = package; + exePath = "/bin/node2nix"; + }; in { packages.node2nix = node2nix; defaultPackage = node2nix; From 29c96b5064381232518404122af09e22b619dabc Mon Sep 17 00:00:00 2001 From: Samuel Ludwig Date: Tue, 26 Oct 2021 07:55:09 -0400 Subject: [PATCH 3/4] Re-add overlays --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index fda8cc5..c234be2 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ drv = package; exePath = "/bin/node2nix"; }; + overlays = final: prev: { node2nix = node2nix; }; in { packages.node2nix = node2nix; defaultPackage = node2nix; @@ -22,5 +23,6 @@ defaultApp = app; nodeDependencies = nodeDependencies; nodeShell = shell; + inherit overlays; }); } From b250e5d1bfa0f260f8b055dbeefbcf0ab5199261 Mon Sep 17 00:00:00 2001 From: Samuel Ludwig Date: Wed, 27 Oct 2021 07:23:48 -0400 Subject: [PATCH 4/4] Update flake description --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c234be2..9f301c3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A very basic flake"; + description = "Generate Nix expressions to build NPM packages"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils";