summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhongheng Liu <z.liu@outlook.com.gr>2025-01-17 08:20:39 +0200
committerZhongheng Liu <z.liu@outlook.com.gr>2025-01-17 08:20:39 +0200
commit6b08f164481d626c6c9d1b066cd132376b4d627e (patch)
tree41a3c9553b938e0d3fab45972e839d1401d9fce6
parent8b68f77786394b8f2021373e7ac1e4a563b9f14d (diff)
downloadrpn-parse-rs-6b08f164481d626c6c9d1b066cd132376b4d627e.tar.gz
rpn-parse-rs-6b08f164481d626c6c9d1b066cd132376b4d627e.tar.bz2
rpn-parse-rs-6b08f164481d626c6c9d1b066cd132376b4d627e.zip
chore(env): update developer environment
-rw-r--r--.gitignore6
-rw-r--r--devenv.lock45
-rw-r--r--devenv.nix12
-rw-r--r--devenv.yaml17
4 files changed, 20 insertions, 60 deletions
diff --git a/.gitignore b/.gitignore
index b972a7f..f2d2c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,5 @@ devenv.local.nix
# pre-commit
.pre-commit-config.yaml
-
-# Added by cargo
-
-/target
+# Generated files
+/target/
diff --git a/devenv.lock b/devenv.lock
index 7dca477..4983385 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
"devenv": {
"locked": {
"dir": "src/modules",
- "lastModified": 1736426010,
+ "lastModified": 1737028622,
"owner": "cachix",
"repo": "devenv",
- "rev": "1c384bc4be3ee571511fbbc6fdc94fe47d60f6cf",
+ "rev": "4e5b00134bf03f16af6b25b80abb38c598cfe239",
"type": "github"
},
"original": {
@@ -16,26 +16,6 @@
"type": "github"
}
},
- "fenix": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ],
- "rust-analyzer-src": "rust-analyzer-src"
- },
- "locked": {
- "lastModified": 1736836313,
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "056c9393c821a4df356df6ce7f14c722dc8717ec",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "fenix",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -95,10 +75,10 @@
]
},
"locked": {
- "lastModified": 1735882644,
+ "lastModified": 1737043064,
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+ "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
"type": "github"
},
"original": {
@@ -110,26 +90,9 @@
"root": {
"inputs": {
"devenv": "devenv",
- "fenix": "fenix",
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks"
}
- },
- "rust-analyzer-src": {
- "flake": false,
- "locked": {
- "lastModified": 1736883839,
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "40710f27486e244eca2d48b830ea2ecb8474d15a",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/devenv.nix b/devenv.nix
index 1f35835..cc5a348 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -5,7 +5,7 @@
env.GREET = "devenv";
# https://devenv.sh/packages/
- packages = with pkgs; [ git ];
+ packages = [ pkgs.git ];
# https://devenv.sh/languages/
# languages.rust.enable = true;
@@ -17,9 +17,6 @@
# services.postgres.enable = true;
# https://devenv.sh/scripts/
- scripts.hello.exec = ''
- echo hello from $GREET
- '';
enterShell = ''
hello
@@ -31,18 +28,13 @@
# "myproj:setup".exec = "mytool build";
# "devenv:enterShell".after = [ "myproj:setup" ];
# };
-
+ languages.rust.enable = true;
# https://devenv.sh/tests/
enterTest = ''
echo "Running tests"
git --version | grep --color=auto "${pkgs.git.version}"
'';
- languages.rust = {
- enable = true;
- channel = "stable";
- #targets = [ "x86_64-pc-windows-gnu" ];
- };
# https://devenv.sh/pre-commit-hooks/
# pre-commit.hooks.shellcheck.enable = true;
diff --git a/devenv.yaml b/devenv.yaml
index 2bbabf4..116a2ad 100644
--- a/devenv.yaml
+++ b/devenv.yaml
@@ -1,8 +1,15 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
inputs:
nixpkgs:
url: github:cachix/devenv-nixpkgs/rolling
- fenix:
- url: github:nix-community/fenix
- inputs:
- nixpkgs:
- follows: nixpkgs
+
+# If you're using non-OSS software, you can set allowUnfree to true.
+# allowUnfree: true
+
+# If you're willing to use a package that's vulnerable
+# permittedInsecurePackages:
+# - "openssl-1.1.1w"
+
+# If you have more than one devenv you can merge them
+#imports:
+# - ./backend