strawberries/wiki-maker
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remvoved flake-utils which was not really useful

Browse Source
This commit is contained in:
eiiko6
2026-03-04 17:26:10 +01:00
parent e9855ec6a1
commit ba6705d798
2 changed files with 49 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
flake.lock generated
View File

@@ -12,31 +12,13 @@
"url": "https://raw.githubusercontent.com/catppuccin/bat/refs/heads/main/themes/Catppuccin%20Macchiato.tmTheme" "url": "https://raw.githubusercontent.com/catppuccin/bat/refs/heads/main/themes/Catppuccin%20Macchiato.tmTheme"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771848320, "lastModified": 1772542754,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993", "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -65,7 +47,6 @@
"root": { "root": {
"inputs": { "inputs": {
"code-theme": "code-theme", "code-theme": "code-theme",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
} }
@@ -75,11 +56,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1772075164, "lastModified": 1772593411,
"narHash": "sha256-93XcvAt+6p7aAq1ERlxD2T17zLGoYGo64KJYasGcpgc=", "narHash": "sha256-47WOnCSyOL6AghZiMIJaTLWM359DHe3be9R1cNCdGUE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "07601339b15fa6810541c0e7dc2f3664d92a7ad0", "rev": "a741b36b77440f5db15fcf2ab6d7d592d2f9ee8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,21 +68,6 @@
"repo": "rust-overlay", "repo": "rust-overlay",
"type": "github" "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", "root": "root",

90
flake.nix
View File

@@ -3,7 +3,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
code-theme = { code-theme = {
@@ -15,59 +14,56 @@
outputs = outputs =
{ {
nixpkgs, nixpkgs,
flake-utils,
rust-overlay, rust-overlay,
code-theme, code-theme,
... ...
}: }:
flake-utils.lib.eachDefaultSystem ( let
system: system = "x86_64-linux";
let overlays = [ rust-overlay.overlays.default ];
overlays = [ rust-overlay.overlays.default ]; pkgs = import nixpkgs {
pkgs = import nixpkgs { inherit system overlays;
inherit system overlays; };
}; rust = pkgs.rust-bin.stable.latest.default;
rust = pkgs.rust-bin.stable.latest.default; openssl = pkgs.openssl;
openssl = pkgs.openssl; in
in {
{ packages.${system}.default = pkgs.rustPlatform.buildRustPackage {
packages.default = pkgs.rustPlatform.buildRustPackage { pname = "wiki-maker";
pname = "wiki-maker"; version = "0.1.0";
version = "0.1.0";
src = ./.; src = ./.;
THEME_PATH = "${code-theme}"; THEME_PATH = "${code-theme}";
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
};
nativeBuildInputs = [
rust
pkgs.pkg-config
];
buildInputs = [
openssl
];
OPENSSL_LIB_DIR = "${openssl.out}/lib";
OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
}; };
devShells.default = pkgs.mkShell { nativeBuildInputs = [
packages = [ rust
rust pkgs.pkg-config
pkgs.cargo ];
pkgs.rust-analyzer
pkgs.pkg-config buildInputs = [
openssl openssl
]; ];
OPENSSL_DIR = openssl.dev;
PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; OPENSSL_LIB_DIR = "${openssl.out}/lib";
}; OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
} PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
); };
devShells.default = pkgs.mkShell {
packages = [
rust
pkgs.cargo
pkgs.rust-analyzer
pkgs.pkg-config
openssl
];
OPENSSL_DIR = openssl.dev;
PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
};
};
} }