From 389d4976b23ec7cb9e9f650c330102c6cfbcb7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Carneck=C3=BD?= Date: Sun, 19 Apr 2026 17:26:31 +0200 Subject: [PATCH] Remove rust-overlay (#47) --- flake.lock | 23 +---------------------- flake.nix | 24 ++++++------------------ 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 05c6a7d..264c8d4 100644 --- a/flake.lock +++ b/flake.lock @@ -37,28 +37,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776350315, - "narHash": "sha256-ijD4bgb5Iyap9F3MX73vLAZF/SYu+q7Gd7Ux4cbfCWw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "62e3b8aedabc240e5b0cc9fae003bc9edfebbc9b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index 5d42dee..6be841d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,34 +1,20 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { nixpkgs, flake-utils, - rust-overlay, ... }: flake-utils.lib.eachDefaultSystem ( system: let - overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { - inherit system overlays; - }; - rustToolchain = pkgs.rust-bin.stable.latest.default; - - rustPlatform = pkgs.makeRustPlatform { - cargo = rustToolchain; - rustc = rustToolchain; + inherit system; }; fontsConf = pkgs.makeFontsConf { @@ -45,7 +31,7 @@ ]; }; - webshotPackage = rustPlatform.buildRustPackage { + webshotPackage = pkgs.rustPlatform.buildRustPackage { pname = "webshot"; version = "0.1.0"; @@ -102,7 +88,8 @@ devShells.default = pkgs.mkShell { nativeBuildInputs = [ - rustToolchain + pkgs.rustc + pkgs.cargo pkgs.google-cloud-sdk pkgs.skopeo ]; @@ -110,7 +97,8 @@ devShells.workflow = pkgs.mkShell { nativeBuildInputs = [ - rustToolchain + pkgs.rustc + pkgs.cargo ]; }; } -- 2.51.2