From f00d657e858b2301d9421dc01ca43de6917a135b Mon Sep 17 00:00:00 2001 From: fedx-sudo Date: Fri, 29 Apr 2022 16:35:48 +0000 Subject: [PATCH 1/5] Add Nix Flake support --- flake.lock | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 34 ++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..029f5e252 --- /dev/null +++ b/flake.lock @@ -0,0 +1,92 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1651248272, + "narHash": "sha256-rMqS47Q53lZQDDwrFgLnWI5E+GaalVt4uJfIciv140U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8758d58df0798db2b29484739ca7303220a739d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1651248272, + "narHash": "sha256-rMqS47Q53lZQDDwrFgLnWI5E+GaalVt4uJfIciv140U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8758d58df0798db2b29484739ca7303220a739d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1651165059, + "narHash": "sha256-/psJg8NsEa00bVVsXiRUM8yL/qfu05zPZ+jJzm7hRTo=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "ece2a41612347a4fe537d8c0a25fe5d8254835bd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "poetry2nix": "poetry2nix" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..03eb2782c --- /dev/null +++ b/flake.nix @@ -0,0 +1,34 @@ +{ + description = "Application packaged using poetry2nix"; + + inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs"; + inputs.poetry2nix.url = "github:nix-community/poetry2nix"; + + outputs = { self, nixpkgs, flake-utils, poetry2nix }: + { + # Nixpkgs overlay providing the application + overlay = nixpkgs.lib.composeManyExtensions [ + poetry2nix.overlay + (final: prev: { + # The application + myapp = prev.poetry2nix.mkPoetryApplication { + projectDir = ./.; + }; + }) + ]; + } // (flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlay ]; + }; + in + { + apps = { + myapp = pkgs.myapp; + }; + + defaultApp = pkgs.myapp; + })); +} From 0eac31d60b9d58b07dd9cb54b25b5a62287340b4 Mon Sep 17 00:00:00 2001 From: fedx-sudo Date: Fri, 29 Apr 2022 16:36:28 +0000 Subject: [PATCH 2/5] Add Nix Shell support --- shell.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 shell.nix diff --git a/shell.nix b/shell.nix new file mode 100644 index 000000000..a6be9c044 --- /dev/null +++ b/shell.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {} }: +let + myAppEnv = pkgs.poetry2nix.mkPoetryEnv { + projectDir = ./.; + editablePackageSources = { + my-app = ./src; + }; + }; +in myAppEnv.env From 5d7cb6dc14f97af6b3a35a759b68e77997dbd7d8 Mon Sep 17 00:00:00 2001 From: fedx-sudo Date: Fri, 29 Apr 2022 16:47:43 +0000 Subject: [PATCH 3/5] Update flake.nix --- flake.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 03eb2782c..47b9e7ddb 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ poetry2nix.overlay (final: prev: { # The application - myapp = prev.poetry2nix.mkPoetryApplication { + CME = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; }; }) @@ -26,9 +26,11 @@ in { apps = { - myapp = pkgs.myapp; + CME = pkgs.CME; }; - defaultApp = pkgs.myapp; + defaultApp = pkgs.CME; + + packages = { ... }; })); } From a7283695857efcc8e5971b0193b3b2e54fb54cb0 Mon Sep 17 00:00:00 2001 From: fedx-sudo Date: Fri, 29 Apr 2022 16:52:46 +0000 Subject: [PATCH 4/5] Update flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 47b9e7ddb..edfe9c903 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,6 @@ defaultApp = pkgs.CME; - packages = { ... }; + packages = { CME = pkgs.CME; }; })); } From da5c79a89933bd6104f6d0e9ca5c59c711e272f4 Mon Sep 17 00:00:00 2001 From: fedx-sudo Date: Fri, 29 Apr 2022 16:57:49 +0000 Subject: [PATCH 5/5] Finish updating Nix support --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index edfe9c903..2ee098326 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ poetry2nix.overlay (final: prev: { # The application - CME = prev.poetry2nix.mkPoetryApplication { + CrackMapExec = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; }; }) @@ -26,11 +26,11 @@ in { apps = { - CME = pkgs.CME; + CrackMapExec = pkgs.CrackMapExec; }; - defaultApp = pkgs.CME; + defaultApp = pkgs.CrackMapExec; - packages = { CME = pkgs.CME; }; + packages = { CrackMapExec = pkgs.CrackMapExec; }; })); }