From 23532168b12704521684897f75b6d6cbc2a32022 Mon Sep 17 00:00:00 2001 From: clerie Date: Fri, 17 Oct 2025 14:32:29 +0200 Subject: [PATCH] Migrate to arduino-sketch-builder-nix --- flake.lock | 23 +++++++++++------------ flake.nix | 10 +++++----- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 4762e70..d7e95bc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,19 +1,18 @@ { "nodes": { - "arduino-nix": { + "arduino-sketch-builder-nix": { "locked": { - "lastModified": 1760702729, - "narHash": "sha256-wNtHhM2YyR+01mqNDCQjUscNOxkIbPbC8zsfpzFAeTg=", - "owner": "clerie", - "repo": "arduino-nix", - "rev": "2fe354b7eb0083ee76c8578446057eaffcbb2784", - "type": "github" + "lastModified": 1760703962, + "narHash": "sha256-QDFGRAtW57ooL6aefBamciR9yAD+vBvVkv6koT9Bf0g=", + "ref": "refs/heads/main", + "rev": "b53c9c75cf4c33438a112a8a63449b1e7aa1685a", + "revCount": 24, + "type": "git", + "url": "https://git.clerie.de/clerie/arduino-sketch-builder-nix.git" }, "original": { - "owner": "clerie", - "ref": "clerie/arduino-env", - "repo": "arduino-nix", - "type": "github" + "type": "git", + "url": "https://git.clerie.de/clerie/arduino-sketch-builder-nix.git" } }, "nixpkgs": { @@ -34,7 +33,7 @@ }, "root": { "inputs": { - "arduino-nix": "arduino-nix", + "arduino-sketch-builder-nix": "arduino-sketch-builder-nix", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 4e5eccf..eee16cb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,17 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - arduino-nix.url = "github:clerie/arduino-nix/clerie/arduino-env"; + arduino-sketch-builder-nix.url = "git+https://git.clerie.de/clerie/arduino-sketch-builder-nix.git"; }; - outputs = { self, nixpkgs, arduino-nix, ... }: { + outputs = { self, nixpkgs, arduino-sketch-builder-nix, ... }: { packages.x86_64-linux = let pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ - (arduino-nix.overlay) - (arduino-nix.mkArduinoPackageOverlay ./package_index.json) - (arduino-nix.mkArduinoPackageOverlay (pkgs.fetchurl { + (arduino-sketch-builder-nix.overlay) + (arduino-sketch-builder-nix.mkArduinoPackageOverlay ./package_index.json) + (arduino-sketch-builder-nix.mkArduinoPackageOverlay (pkgs.fetchurl { url = "https://raw.githubusercontent.com/espressif/arduino-esp32/8bae7e23376c6087a55e46456049ae6d73b72e16/package_esp32_index.json"; hash = "sha256-0kvZeRDtE/JKJes86omyN4cf4HWfX68P7xPfE+BvTC8="; }))