From 7a4a0dafeaf5f1c7dd553b942d11e48e948ee306 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Mon, 7 Oct 2024 22:01:08 -0500 Subject: [PATCH 1/2] Add Garnix support --- hosts/darwin/spotlights-macbook-air/configuration.nix | 10 ++++++++-- hosts/linux/cyclone/configuration.nix | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hosts/darwin/spotlights-macbook-air/configuration.nix b/hosts/darwin/spotlights-macbook-air/configuration.nix index 92be879..56e7dd6 100644 --- a/hosts/darwin/spotlights-macbook-air/configuration.nix +++ b/hosts/darwin/spotlights-macbook-air/configuration.nix @@ -40,8 +40,14 @@ nix = { # Keep the latest version of Nix. package = pkgs.nix; - # Necessary for using flakes on this system. - settings.experimental-features = "nix-command flakes"; + settings = { + # Necessary for using flakes on this system. + experimental-features = "nix-command flakes"; + + # Include Garnix + extra-substituters = [ "https://cache.garnix.io" ]; + extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; + }; }; # Create /etc/zshrc that loads the nix-darwin environment. diff --git a/hosts/linux/cyclone/configuration.nix b/hosts/linux/cyclone/configuration.nix index 7be0f2d..22cc7d5 100644 --- a/hosts/linux/cyclone/configuration.nix +++ b/hosts/linux/cyclone/configuration.nix @@ -27,6 +27,10 @@ experimental-features = [ "flakes" "nix-command" ]; trusted-users = [ "spotlight" ]; builders-use-substitutes = true; + + # Include Garnix + extra-substituters = [ "https://cache.garnix.io" ]; + extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; # Select internationalisation properties. From ae3c2f5a761f7967a51d55fb1001a8cb3b38871c Mon Sep 17 00:00:00 2001 From: Spotlight Date: Mon, 7 Oct 2024 22:05:22 -0500 Subject: [PATCH 2/2] ipsw: v3.1.548 -> v3.1.549 --- pkgs/ipsw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/ipsw.nix b/pkgs/ipsw.nix index 0c7a844..7eb6086 100644 --- a/pkgs/ipsw.nix +++ b/pkgs/ipsw.nix @@ -4,16 +4,16 @@ # `buildGoModule` currently uses Go 1.22. buildGo123Module rec { pname = "ipsw"; - version = "3.1.548"; + version = "3.1.549"; src = fetchFromGitHub { owner = "blacktop"; repo = "ipsw"; rev = "v${version}"; - hash = "sha256-tVtWWt65PpuYosDfwTnoqN4IhzyE9YcuN3kWWQ363h4="; + hash = "sha256-BgFVY9vpNtGocv4QHnsDZVm/DHmvpgBNaK2gQRG0Lto="; }; - vendorHash = "sha256-MyPoEjypgjgQlMlAXglA9J0r61+mVGAOqZjJx3Sr6AQ="; + vendorHash = "sha256-qh1gCIl7hOdbpOZJ6rlRSTakq0mjLPBlnF/j3V9qR1A="; buildInputs = with pkgs; [ unicorn