emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #123 from nix-community/ci

Browse source 
nixos-images: return to nixpkgs upstream
This commit is contained in:
Jörg Thalheim 2023-08-04 21:26:11 +01:00 committed by GitHub
commit d694dd7829
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -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
View file

@ -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"
} }

9
flake.nix
View file

@ -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"