From 8338398c22bf468a8284361295c87315acca2ad7 Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Thu, 26 Feb 2026 20:03:49 +0100 Subject: [PATCH] updated flake --- flake.lock | 75 +++++++++++++++++++++++++++++++++++++++--------------- flake.nix | 17 ++++++++----- 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 5bbb065..ea62999 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "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, @@ -34,10 +16,45 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay", + "utils": "utils" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772075164, + "narHash": "sha256-93XcvAt+6p7aAq1ERlxD2T17zLGoYGo64KJYasGcpgc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "07601339b15fa6810541c0e7dc2f3664d92a7ad0", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { @@ -54,6 +71,24 @@ "repo": "default", "type": "github" } + }, + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d15b5b1..9df2a85 100644 --- a/flake.nix +++ b/flake.nix @@ -3,18 +3,21 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + utils.url = "github:numtide/flake-utils"; + rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system : + outputs = { self, nixpkgs, utils, rust-overlay }: + utils.lib.eachDefaultSystem (system : let - pkgs = import nixpkgs { inherit system; }; + overlays = [(import rust-overlay)]; + pkgs = import nixpkgs { inherit system overlays; }; in { - devShells.default = pkgs.mkShell { + devShells.default = with pkgs; mkShell { packages = [ - pkgs.rustup pkgs.cargo pkgs.rustc-unwrapped - pkgs.rust-analyzer-unwrapped + openssl + pkg-config + rust-bin.stable.latest.default ]; }; }