Merge pull request #123 from nix-community/ci
nixos-images: return to nixpkgs upstream
This commit is contained in:
commit
d694dd7829
3 changed files with 14 additions and 17 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -14,7 +14,7 @@ jobs:
|
||||||
- nixos-23.05
|
- nixos-23.05
|
||||||
- nixos-unstable
|
- nixos-unstable
|
||||||
os:
|
os:
|
||||||
- nscloud-ubuntu-22.04-arm64-4x16
|
#- nscloud-ubuntu-22.04-arm64-4x16
|
||||||
- ubuntu-latest
|
- ubuntu-latest
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
|
|
20
flake.lock
20
flake.lock
|
@ -2,32 +2,32 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixos-2305": {
|
"nixos-2305": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686817182,
|
"lastModified": 1691155011,
|
||||||
"narHash": "sha256-UbgN7GZ/OOUfhZlY2L5cH7RbwUHI6/7m6rTPPNP3Cmc=",
|
"narHash": "sha256-O15tC0ysw+fcacEbOzrDrkVNIR+SgtArSGvpgsEqpvA=",
|
||||||
"owner": "Mic92",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "15384bf882f524e3a08ed7cb86c811de5b75ba5a",
|
"rev": "9652a97d9738d3e65cf33c0bc24429e495a7868f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "Mic92",
|
"owner": "NixOS",
|
||||||
"ref": "fix-aarch64-zfs-backport",
|
"ref": "release-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686906453,
|
"lastModified": 1691180400,
|
||||||
"narHash": "sha256-KfOEs99bjNH+chlUcFqHAQo29tJE+J5EPoZr2kGU2f8=",
|
"narHash": "sha256-3XvIucYLBKM9xML1QH4fGSB9HFQ3me36ejJo9gTyuDE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d4cab20b3a76fef4b9a487c37107df6351ebce33",
|
"rev": "52a39dea62074a5d47001e86646f71dff78ffcad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"ref": "fix-aarch64-zfs",
|
"ref": "netboot-fix",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
{
|
{
|
||||||
description = "NixOS images";
|
description = "NixOS images";
|
||||||
|
|
||||||
# see https://github.com/NixOS/nixpkgs/pull/237873
|
# https://github.com/nix-community/nixos-images/pull/123
|
||||||
#inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
inputs.nixos-unstable.url = "github:Mic92/nixpkgs/netboot-fix";
|
||||||
inputs.nixos-unstable.url = "github:Mic92/nixpkgs/fix-aarch64-zfs";
|
inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05";
|
||||||
# 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";
|
|
||||||
|
|
||||||
nixConfig.extra-substituters = [
|
nixConfig.extra-substituters = [
|
||||||
"https://cache.garnix.io"
|
"https://cache.garnix.io"
|
||||||
|
|
Loading…
Reference in a new issue