Nickiel/Ewwtilities
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated template form project

Browse source
This commit is contained in:
Nickiel12 2023-11-06 20:40:25 -08:00
parent c58269b749
commit d51b9fefa4
7 changed files with 116 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.vscode/settings.json vendored
View file

@ -1,5 +0,0 @@
{
"rust-analyzer.linkedProjects": [
"./helloworld/Cargo.toml",
]
}

2
Cargo.lock generated
View file

@ -3,5 +3,5 @@
version = 3
[[package]]
name = "helloworld"
name = "ewwtilities"
version = "0.1.0"

2
Cargo.toml
View file

@ -1,3 +1,3 @@
[workspace]
members = ["helloworld"]
members = ["ewwtilities"]
resolver = "2"

2
helloworld/Cargo.toml → ewwtilities/Cargo.toml
View file

@ -1,5 +1,5 @@
[package]
name = "helloworld"
name = "ewwtilities"
version = "0.1.0"
edition = "2021"

0
helloworld/src/main.rs → ewwtilities/src/main.rs
View file

96
flake.lock Normal file
View file

@ -0,0 +1,96 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1681358109,
"narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1699323235,
"narHash": "sha256-ZFRItRv0dDSzsfpqSjj9qWM/SA1kRrOk6R04qhBZuxM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8a9d6f544c08ee898c7f3761cc9587be7565db5e",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"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
}

34
flake.nix
View file

@ -1,6 +1,6 @@
/*
TODO
1. Find and replace "helloworld" with your package name for **ALL FILES IN REPOSITORY**
1. Find and replace "ewwtilities" with your package name for **ALL FILES IN REPOSITORY**
2. Add a flake description that describes the workspace on line 27
3. Add a package description on line 70
4. (optional) uncomment `nativeBuildInputs` and `buildInputs` on lines 43 and 44 if you need openssl
@ -13,8 +13,8 @@ TODO
Some utility commands:
- `nix flake update --commit-lock-file`
- `nix flake lock update-input <input>`
- `nix build .#helloworld` or `nix build .`
- `nix run .#helloworld` or `nix run .`
- `nix build .#ewwtilities` or `nix build .`
- `nix run .#ewwtilities` or `nix run .`
*/
{
@ -53,14 +53,14 @@ Some utility commands:
cargo-edit
bacon
];
inputsFrom = with self.packages.${system}; [ helloworld ];
inputsFrom = with self.packages.${system}; [ ewwtilities ];
};
packages.${system} = {
default = self.packages.${system}.helloworld;
helloworld = pkgs.rustPlatform.buildRustPackage (rustSettings // {
pname = "helloworld";
default = self.packages.${system}.ewwtilities;
ewwtilities = pkgs.rustPlatform.buildRustPackage (rustSettings // {
pname = "ewwtilities";
version = "0.1.0";
buildAndTestSubdir = "helloworld";
buildAndTestSubdir = "ewwtilities";
cargoHash = "sha256-+TaGIiKf+Pz2bTABeG8aCZz0/ZTCKl5398+qbas4Nvo=";
meta = meta // {
description = "";
@ -71,14 +71,14 @@ Some utility commands:
nixosModules.default = { config, ... }: let
lib = nixpkgs.lib;
in {
options.services.helloworld = {
enable = lib.mkEnableOption (lib.mdDoc "helloworld service");
options.services.ewwtilities = {
enable = lib.mkEnableOption (lib.mdDoc "ewwtilities service");
package = lib.mkOption {
type = lib.types.package;
default = self.packages.${system}.helloworld;
defaultText = "pkgs.helloworld";
default = self.packages.${system}.ewwtilities;
defaultText = "pkgs.ewwtilities";
description = lib.mdDoc ''
The helloworld package that should be used.
The ewwtilities package that should be used.
'';
};
port = lib.mkOption {
@ -89,16 +89,16 @@ Some utility commands:
'';
};
};
config.systemd.services.helloworld = let
cfg = config.services.helloworld;
pkg = self.packages.${system}.helloworld;
config.systemd.services.ewwtilities = let
cfg = config.services.ewwtilities;
pkg = self.packages.${system}.ewwtilities;
in lib.mkIf cfg.enable {
description = pkg.meta.description;
after = [ "network.target" ];
wantedBy = [ "network.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/helloworld --port ${builtins.toString cfg.port}
${cfg.package}/bin/ewwtilities --port ${builtins.toString cfg.port}
'';
Restart = "always";
DynamicUser = true;