From 7f5d1222ce58982b0b508b6c72a1dd9f3afc8c14 Mon Sep 17 00:00:00 2001 From: glassesneo Date: Mon, 1 Jul 2024 21:25:41 +0900 Subject: [PATCH] :cake: Change the nimble package installation process from devbox to nimble --- .envrc | 2 ++ .gitignore | 3 +-- devbox.json | 3 +-- devbox.lock | 48 ------------------------------------------------ nim.cfg | 1 + oolib.nimble | 11 ++++++----- 6 files changed, 11 insertions(+), 57 deletions(-) create mode 100644 nim.cfg diff --git a/.envrc b/.envrc index 84fc8e5..a4cb46a 100644 --- a/.envrc +++ b/.envrc @@ -3,5 +3,7 @@ eval "$(devbox generate direnv --print-envrc)" +export PATH=nimbledeps/bin:$PATH + # check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ # for more details diff --git a/.gitignore b/.gitignore index 3264bfb..921a88f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ nimcache testresults* tests/* !*.nim -.direnv -/direnv +nimbledeps/* diff --git a/devbox.json b/devbox.json index 04e3cd0..caf99cd 100644 --- a/devbox.json +++ b/devbox.json @@ -2,8 +2,7 @@ "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.11.0/.schema/devbox.schema.json", "packages": [ "nim@2.0.4", - "nimble@0.14.2", - "nimlangserver@latest" + "nimble@0.14.2" ], "shell": { "init_hook": [ diff --git a/devbox.lock b/devbox.lock index 1b104ea..3347391 100644 --- a/devbox.lock +++ b/devbox.lock @@ -96,54 +96,6 @@ "store_path": "/nix/store/q5i99p78fhyb2dyw1virds9jjd2f4qh6-nimble-0.14.2" } } - }, - "nimlangserver@latest": { - "last_modified": "2024-06-12T20:55:33Z", - "resolved": "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40#nimlangserver", - "source": "devbox-search", - "version": "1.2.0", - "systems": { - "aarch64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/w6rrpdk2x5cb8vvv5mmj6kaq8cdvcz89-nimlangserver-1.2.0", - "default": true - } - ], - "store_path": "/nix/store/w6rrpdk2x5cb8vvv5mmj6kaq8cdvcz89-nimlangserver-1.2.0" - }, - "aarch64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/gwxlq3r583i6f9chki7jqlsvh6djida8-nimlangserver-1.2.0", - "default": true - } - ], - "store_path": "/nix/store/gwxlq3r583i6f9chki7jqlsvh6djida8-nimlangserver-1.2.0" - }, - "x86_64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/l7qa4rjla6qkpv2qx2z2hv71scl7qpf8-nimlangserver-1.2.0", - "default": true - } - ], - "store_path": "/nix/store/l7qa4rjla6qkpv2qx2z2hv71scl7qpf8-nimlangserver-1.2.0" - }, - "x86_64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/fxm9j420kwi4nfmk86v16kg69djzcyqg-nimlangserver-1.2.0", - "default": true - } - ], - "store_path": "/nix/store/fxm9j420kwi4nfmk86v16kg69djzcyqg-nimlangserver-1.2.0" - } - } } } } diff --git a/nim.cfg b/nim.cfg new file mode 100644 index 0000000..2e0f3e3 --- /dev/null +++ b/nim.cfg @@ -0,0 +1 @@ +nimblePath = "nimbledeps/pkgs" diff --git a/oolib.nimble b/oolib.nimble index f595df5..2fab021 100644 --- a/oolib.nimble +++ b/oolib.nimble @@ -1,15 +1,16 @@ # Package -version = "0.7.1" -author = "Glasses-Neo" -description = "A nimble package for object-oriented programming" -license = "WTFPL" -srcDir = "src" +version = "0.7.1" +author = "Glasses-Neo" +description = "A nimble package for object-oriented programming" +license = "WTFPL" +srcDir = "src" # Dependencies requires "nim >= 2.0.0" +requires "nimlangserver#head" task tests, "Run all tests": exec "testament p 'tests/**.nim'"