From 76a625a03e9750ecbcd2e048a5ca8592ca276995 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Wed, 20 Nov 2024 20:03:32 +0100 Subject: [PATCH] ci: update flake inputs --- examples/gamecube/flake.lock | 36 +++++++++++++++++++++++++++--------- examples/nds/flake.lock | 36 +++++++++++++++++++++++++++--------- examples/switch/flake.lock | 36 +++++++++++++++++++++++++++--------- flake.lock | 30 ++++++++++++++++++++++++------ update.sh | 7 +++++-- 5 files changed, 110 insertions(+), 35 deletions(-) diff --git a/examples/gamecube/flake.lock b/examples/gamecube/flake.lock index f7b2cce..dd7022b 100755 --- a/examples/gamecube/flake.lock +++ b/examples/gamecube/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732054644, - "narHash": "sha256-WfYXkVaJzqnuP3S7AF3O+Ee6Mrwf3bvrMAW8sZ3YTPQ=", + "lastModified": 1732128791, + "narHash": "sha256-9K5GxhNQ+9BDqW8SSfb2uPVkhazUrYgQQlmgszTTlRY=", "owner": "bandithedoge", "repo": "devkitNix", - "rev": "d500ad9908eb9046c6b269c11b63d131856c2ac4", + "rev": "cbb2e8f8753ec2321af8bc97cd90953db944de65", "type": "github" }, "original": { @@ -35,12 +35,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -67,11 +70,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1671877799, - "narHash": "sha256-jjC0NtPOT4huSwyichdrKHVCjuGr1al7Wu6PcHo5XZs=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8351f271f85dae1ee28269028acde661e60394dd", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -87,6 +90,21 @@ "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" } + }, + "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/examples/nds/flake.lock b/examples/nds/flake.lock index f7b2cce..dd7022b 100755 --- a/examples/nds/flake.lock +++ b/examples/nds/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732054644, - "narHash": "sha256-WfYXkVaJzqnuP3S7AF3O+Ee6Mrwf3bvrMAW8sZ3YTPQ=", + "lastModified": 1732128791, + "narHash": "sha256-9K5GxhNQ+9BDqW8SSfb2uPVkhazUrYgQQlmgszTTlRY=", "owner": "bandithedoge", "repo": "devkitNix", - "rev": "d500ad9908eb9046c6b269c11b63d131856c2ac4", + "rev": "cbb2e8f8753ec2321af8bc97cd90953db944de65", "type": "github" }, "original": { @@ -35,12 +35,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -67,11 +70,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1671877799, - "narHash": "sha256-jjC0NtPOT4huSwyichdrKHVCjuGr1al7Wu6PcHo5XZs=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8351f271f85dae1ee28269028acde661e60394dd", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -87,6 +90,21 @@ "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" } + }, + "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/examples/switch/flake.lock b/examples/switch/flake.lock index f7b2cce..dd7022b 100755 --- a/examples/switch/flake.lock +++ b/examples/switch/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732054644, - "narHash": "sha256-WfYXkVaJzqnuP3S7AF3O+Ee6Mrwf3bvrMAW8sZ3YTPQ=", + "lastModified": 1732128791, + "narHash": "sha256-9K5GxhNQ+9BDqW8SSfb2uPVkhazUrYgQQlmgszTTlRY=", "owner": "bandithedoge", "repo": "devkitNix", - "rev": "d500ad9908eb9046c6b269c11b63d131856c2ac4", + "rev": "cbb2e8f8753ec2321af8bc97cd90953db944de65", "type": "github" }, "original": { @@ -35,12 +35,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -67,11 +70,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1671877799, - "narHash": "sha256-jjC0NtPOT4huSwyichdrKHVCjuGr1al7Wu6PcHo5XZs=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8351f271f85dae1ee28269028acde661e60394dd", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -87,6 +90,21 @@ "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" } + }, + "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.lock b/flake.lock index 445a6ac..aaddd6a 100755 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1671877799, - "narHash": "sha256-jjC0NtPOT4huSwyichdrKHVCjuGr1al7Wu6PcHo5XZs=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8351f271f85dae1ee28269028acde661e60394dd", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "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/update.sh b/update.sh index 0864eb0..749ff04 100755 --- a/update.sh +++ b/update.sh @@ -1,11 +1,14 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch-docker +#!nix-shell -i bash -p nix-prefetch-docker fd # shellcheck shell=bash function fetch() { - nix-prefetch-docker --image-name "devkitpro/$1" --json --quiet > "sources/$1.json" + echo "fetching $1..." + nix-prefetch-docker --image-name "devkitpro/$1" --json --quiet >"sources/$1.json" } +fd flake.nix -x nix flake update --flake "{//}" + mkdir -p sources fetch devkitarm