From e6e46111f50c035ae1183b358aae034610bbc700 Mon Sep 17 00:00:00 2001 From: Pedro Manse Date: Mon, 17 Mar 2025 14:39:33 -0300 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BF=EF=B8=8F(nix)=20Added=20nix-shell?= =?UTF-8?q?=20file=20with=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added `docker`, `docker-compose` and `gnumake` as dependencies for a dev environment for nix users While `docker` and `docker-compose` are not needed in shell.nix if the user has docker enabled, if docker daemon is not enabled system-wide, these programs will warn the user, insted of saying they are not installed. --- CHANGELOG.md | 1 + shell.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 shell.nix diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a82e569a..6f471e794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to ## Added +- ♿️(nix) Added nix environment declaration #751 - ✨(frontend) add pinning on doc detail #711 - 🚩(frontend) feature flag analytic on copy as html #649 - ✨(frontend) Custom block divider with export #698 diff --git a/shell.nix b/shell.nix new file mode 100644 index 000000000..48863e6e3 --- /dev/null +++ b/shell.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {} }: +pkgs.mkShellNoCC { + nativeBuildInputs = with pkgs.buildPackages; [ + docker + docker-compose + gnumake + ]; +} + From 60b04b59712b3148988d97faf9bd2d90d24a49f9 Mon Sep 17 00:00:00 2001 From: Pedro Manse Date: Tue, 18 Mar 2025 09:08:14 -0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A8(nix)=20made=20shell.nix=20impo?= =?UTF-8?q?rt=20default.nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- default.nix | 13 +++++++++++++ shell.nix | 10 +--------- 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 000000000..1f9184645 --- /dev/null +++ b/default.nix @@ -0,0 +1,13 @@ +{ + pkgs ? import { }, +}: +{ + devShell = pkgs.mkShellNoCC { + name = "numerique-docs"; + packages = with pkgs; [ + docker + docker-compose + gnumake + ]; + }; +} diff --git a/shell.nix b/shell.nix index 48863e6e3..d6d21cf18 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1 @@ -{ pkgs ? import {} }: -pkgs.mkShellNoCC { - nativeBuildInputs = with pkgs.buildPackages; [ - docker - docker-compose - gnumake - ]; -} - +(import ./. { }).devShell