From ba6705d798f863ca3ef96aaa038090ba2ecdb191 Mon Sep 17 00:00:00 2001 From: eiiko6 Date: Wed, 4 Mar 2026 17:26:10 +0100 Subject: [PATCH] remvoved flake-utils which was not really useful --- flake.lock | 46 ++++------------------------ flake.nix | 90 ++++++++++++++++++++++++++---------------------------- 2 files changed, 49 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 2a1ad86..1550b79 100644 --- a/flake.lock +++ b/flake.lock @@ -12,31 +12,13 @@ "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": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -65,7 +47,6 @@ "root": { "inputs": { "code-theme": "code-theme", - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } @@ -75,11 +56,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772075164, - "narHash": "sha256-93XcvAt+6p7aAq1ERlxD2T17zLGoYGo64KJYasGcpgc=", + "lastModified": 1772593411, + "narHash": "sha256-47WOnCSyOL6AghZiMIJaTLWM359DHe3be9R1cNCdGUE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "07601339b15fa6810541c0e7dc2f3664d92a7ad0", + "rev": "a741b36b77440f5db15fcf2ab6d7d592d2f9ee8f", "type": "github" }, "original": { @@ -87,21 +68,6 @@ "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", diff --git a/flake.nix b/flake.nix index f9e8b4d..3548835 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; rust-overlay.url = "github:oxalica/rust-overlay"; code-theme = { @@ -15,59 +14,56 @@ outputs = { nixpkgs, - flake-utils, rust-overlay, code-theme, ... }: - flake-utils.lib.eachDefaultSystem ( - system: - let - overlays = [ rust-overlay.overlays.default ]; - pkgs = import nixpkgs { - inherit system overlays; - }; - rust = pkgs.rust-bin.stable.latest.default; - openssl = pkgs.openssl; - in - { - packages.default = pkgs.rustPlatform.buildRustPackage { - pname = "wiki-maker"; - version = "0.1.0"; + let + system = "x86_64-linux"; + overlays = [ rust-overlay.overlays.default ]; + pkgs = import nixpkgs { + inherit system overlays; + }; + rust = pkgs.rust-bin.stable.latest.default; + openssl = pkgs.openssl; + in + { + packages.${system}.default = pkgs.rustPlatform.buildRustPackage { + pname = "wiki-maker"; + version = "0.1.0"; - src = ./.; + src = ./.; - THEME_PATH = "${code-theme}"; + THEME_PATH = "${code-theme}"; - cargoLock = { - 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"; + cargoLock = { + lockFile = ./Cargo.lock; }; - 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"; - }; - } - ); + 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 { + packages = [ + rust + pkgs.cargo + pkgs.rust-analyzer + pkgs.pkg-config + openssl + ]; + OPENSSL_DIR = openssl.dev; + PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; + }; + }; }