diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf84488..38c5208 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - nixos-23.05 - nixos-unstable os: - - nscloud-ubuntu-22.04-arm64-4x16 + #- nscloud-ubuntu-22.04-arm64-4x16 - ubuntu-latest runs-on: ${{ matrix.os }} steps: diff --git a/flake.lock b/flake.lock index ce35ca5..14f519c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,32 +2,32 @@ "nodes": { "nixos-2305": { "locked": { - "lastModified": 1686817182, - "narHash": "sha256-UbgN7GZ/OOUfhZlY2L5cH7RbwUHI6/7m6rTPPNP3Cmc=", - "owner": "Mic92", + "lastModified": 1691155011, + "narHash": "sha256-O15tC0ysw+fcacEbOzrDrkVNIR+SgtArSGvpgsEqpvA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "15384bf882f524e3a08ed7cb86c811de5b75ba5a", + "rev": "9652a97d9738d3e65cf33c0bc24429e495a7868f", "type": "github" }, "original": { - "owner": "Mic92", - "ref": "fix-aarch64-zfs-backport", + "owner": "NixOS", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1686906453, - "narHash": "sha256-KfOEs99bjNH+chlUcFqHAQo29tJE+J5EPoZr2kGU2f8=", + "lastModified": 1691180400, + "narHash": "sha256-3XvIucYLBKM9xML1QH4fGSB9HFQ3me36ejJo9gTyuDE=", "owner": "Mic92", "repo": "nixpkgs", - "rev": "d4cab20b3a76fef4b9a487c37107df6351ebce33", + "rev": "52a39dea62074a5d47001e86646f71dff78ffcad", "type": "github" }, "original": { "owner": "Mic92", - "ref": "fix-aarch64-zfs", + "ref": "netboot-fix", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 77aab25..2dd1588 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,9 @@ { description = "NixOS images"; - # see https://github.com/NixOS/nixpkgs/pull/237873 - #inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - inputs.nixos-unstable.url = "github:Mic92/nixpkgs/fix-aarch64-zfs"; - # see https://github.com/NixOS/nixpkgs/pull/237875 - #inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; - inputs.nixos-2305.url = "github:Mic92/nixpkgs/fix-aarch64-zfs-backport"; + # https://github.com/nix-community/nixos-images/pull/123 + inputs.nixos-unstable.url = "github:Mic92/nixpkgs/netboot-fix"; + inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; nixConfig.extra-substituters = [ "https://cache.garnix.io"