From afccbcfd5ef50d5df50da740d8fd982bcbb42a84 Mon Sep 17 00:00:00 2001 From: Michel Bade Date: Tue, 23 Jul 2024 09:22:56 +0200 Subject: [PATCH] NTR - Updated devenv --- .envrc | 3 + .gitignore | 4 + devenv.lock | 122 ++++++++++++++++++++++++++ devenv.nix | 12 +++ packages/admin-sdk/.envrc | 4 - packages/admin-sdk/.gitignore | 4 - packages/admin-sdk/devenv.lock | 156 --------------------------------- packages/admin-sdk/devenv.nix | 6 -- 8 files changed, 141 insertions(+), 170 deletions(-) create mode 100644 .envrc create mode 100644 devenv.lock create mode 100644 devenv.nix delete mode 100644 packages/admin-sdk/.envrc delete mode 100644 packages/admin-sdk/devenv.lock delete mode 100644 packages/admin-sdk/devenv.nix diff --git a/.envrc b/.envrc new file mode 100644 index 000000000..12873272a --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +source_url "https://raw.githubusercontent.com/cachix/devenv/6450828d038d743e97e2e7ff567ce5fa9f17a224/direnvrc" "sha256-d+8cBpDfDBj41inrADaJt+bDWhOktwslgoP5YiGJ1v0=" + +use devenv diff --git a/.gitignore b/.gitignore index 5db54e335..cf3bf06b5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ node_modules/ chrome/ .idea/ .DS_Store +# Devenv +.direnv +.devenv* +devenv.local.nix diff --git a/devenv.lock b/devenv.lock new file mode 100644 index 000000000..6b6966d88 --- /dev/null +++ b/devenv.lock @@ -0,0 +1,122 @@ +{ + "nodes": { + "devenv": { + "locked": { + "dir": "src/modules", + "lastModified": 1721650703, + "owner": "cachix", + "repo": "devenv", + "rev": "6450828d038d743e97e2e7ff567ce5fa9f17a224", + "treeHash": "d040331ff202cb5093982a49bf1cfb4ca93a3347", + "type": "github" + }, + "original": { + "dir": "src/modules", + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "treeHash": "ca14199cabdfe1a06a7b1654c76ed49100a689f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1716977621, + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "treeHash": "6d9f1f7ca0faf1bc2eeb397c78a49623260d3412", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1721548954, + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "treeHash": "f5e8284d2eef1362c0217c01c3406c5cd5bb77b6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1721042469, + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "treeHash": "91f40b7a3b9f6886bd77482cba5b5cd890415a2e", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/devenv.nix b/devenv.nix new file mode 100644 index 000000000..a032e11b3 --- /dev/null +++ b/devenv.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, ... }: + +{ + packages = with pkgs; [ + nodePackages.pnpm + ]; + + languages.javascript = { + enable = lib.mkDefault true; + package = lib.mkDefault pkgs.nodejs-18_x; + }; +} diff --git a/packages/admin-sdk/.envrc b/packages/admin-sdk/.envrc deleted file mode 100644 index 5dae8de00..000000000 --- a/packages/admin-sdk/.envrc +++ /dev/null @@ -1,4 +0,0 @@ -watch_file devenv.nix -watch_file devenv.yaml -watch_file devenv.lock -eval "$(devenv print-dev-env)" \ No newline at end of file diff --git a/packages/admin-sdk/.gitignore b/packages/admin-sdk/.gitignore index 272f6ed26..cb4b09533 100644 --- a/packages/admin-sdk/.gitignore +++ b/packages/admin-sdk/.gitignore @@ -16,7 +16,3 @@ playwright-report/ testpageDist dependency-graph.png .vscode -# Devenv -.devenv* -devenv.local.nix - diff --git a/packages/admin-sdk/devenv.lock b/packages/admin-sdk/devenv.lock deleted file mode 100644 index 021070eb6..000000000 --- a/packages/admin-sdk/devenv.lock +++ /dev/null @@ -1,156 +0,0 @@ -{ - "nodes": { - "devenv": { - "locked": { - "dir": "src/modules", - "lastModified": 1685013540, - "narHash": "sha256-UM9tPy9fyfXs+knxwk/rCIaNfVC7ggwzbLcY8lkOr+E=", - "owner": "cachix", - "repo": "devenv", - "rev": "5ff14a8f2828a2e607a65e2b16650a8cf950515b", - "type": "github" - }, - "original": { - "dir": "src/modules", - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1684973047, - "narHash": "sha256-ZLnSr35L6C49pCZS9fZCCqkIKNAeQzykov2QfosNG9w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "21eb6c6ba74dcbe3ea5926ee46287300fb066630", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1684842236, - "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "61e567d6497bc9556f391faebe5e410e6623217f", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "devenv": "devenv", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/packages/admin-sdk/devenv.nix b/packages/admin-sdk/devenv.nix deleted file mode 100644 index c090978cc..000000000 --- a/packages/admin-sdk/devenv.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, lib, ... }: - -{ - languages.javascript.enable = lib.mkDefault true; - languages.javascript.package = lib.mkDefault pkgs.nodejs-18_x; -}