mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-27 06:18:06 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[nix devenv] Devenv cleanup

Browse Source 
This commit does the following:
* Removes Rust development tools from the devenv since all Rust code has been removed
* Removes the deprecated `id` parameter from the `devenv.yml` config, as well as making its formatting actually correct.
* Updates the lockfile of the Nix flake so that all latest versions of tools that are needed are installed.
This commit is contained in:
Pyrox 2023-10-26 02:01:25 -04:00 committed by Laura Hausmann
parent c49780bcee
commit e8fea317fa
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
3 changed files with 25 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/devenv.yml
View File

@ -28,8 +28,6 @@ redis:
# user: # user:
# pass: # pass:
id: 'aid'
reservedUsernames: reservedUsernames:
- root - root
- admin - admin

63
flake.lock
View File

@ -8,11 +8,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1690391043, "lastModified": 1698243190,
"narHash": "sha256-8x5DkOaejES6C2JYX2A3riebbJHGFHBmJ+LwxXUIIVw=", "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "05240861ef3ae1bbe65b1acc88e2fad7dd24a84b", "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -21,27 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1690352427,
"narHash": "sha256-xCH8mt9eSikYb2P1ePYK6ygk/CExDdl7skgVv4RCWf8=",
"owner": "nix-community",
"repo": "fenix",
"rev": "5980b17ea7de165699f76be5f1a20a7306fc6970",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -63,11 +42,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1688466019, "lastModified": 1696343447,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +154,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1688049487, "lastModified": 1696019113,
"narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +203,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1690327932, "lastModified": 1698266953,
"narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=", "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac", "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,28 +248,10 @@
"root": { "root": {
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv",
"fenix": "fenix",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1690216158,
"narHash": "sha256-TUF0YoWweQj0hNHWykC1vtBQVUncARlLLPmQP9hUeME=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "b64e5b3919b24bc784f36248e6e1f921ee7bb71b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

7
flake.nix
View File

@ -7,9 +7,6 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
# Devenv for better devShells(https://devenv.sh) # Devenv for better devShells(https://devenv.sh)
devenv.url = "github:cachix/devenv"; devenv.url = "github:cachix/devenv";
# Fenix for rust development
fenix.url = "github:nix-community/fenix";
fenix.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
@ -32,7 +29,6 @@
# Add additional packages to our environment # Add additional packages to our environment
packages = [ packages = [
pkgs.yarn-berry pkgs.yarn-berry
pkgs.python3 pkgs.python3
]; ];
# No need to warn on a new version, we'll update as needed. # No need to warn on a new version, we'll update as needed.
@ -42,9 +38,6 @@
# Enable javascript for NPM and Yarn # Enable javascript for NPM and Yarn
languages.javascript.enable = true; languages.javascript.enable = true;
languages.javascript.package = pkgs.nodejs_18; languages.javascript.package = pkgs.nodejs_18;
# Enable stable Rust for the backend
languages.rust.enable = true;
languages.rust.channel = "stable";
processes = { processes = {
dev-server.exec = "yarn run dev"; dev-server.exec = "yarn run dev";
}; };