From fbc53c710d7050237d1b8f4729e3e81a2a96619e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 15 Jun 2023 01:04:54 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-2305': 'github:NixOS/nixpkgs/5f6396e85487aa59c801da5f7c87ac20098b2fa8' (2023-06-11) → 'github:NixOS/nixpkgs/75eb7c2d47fdc01a0d477e9a89eac7ed366fe898' (2023-06-14) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/3d318cb303f285d2964d4137619cb21ddd56cfd5' (2023-06-11) → 'github:NixOS/nixpkgs/ba1a6ec548000d4a50719d14e6f73f63016674d5' (2023-06-14) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c747617..9b03afc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixos-2305": { "locked": { - "lastModified": 1686526929, - "narHash": "sha256-ybQ4GDx/AViKJfeu2PUWvxxlGcmVHVY15zay849i6dg=", + "lastModified": 1686780367, + "narHash": "sha256-hEn8ebT32APeDSoT80VUGktqQ4zqI4gCFLzbIZdSuoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f6396e85487aa59c801da5f7c87ac20098b2fa8", + "rev": "75eb7c2d47fdc01a0d477e9a89eac7ed366fe898", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1686496983, - "narHash": "sha256-DX7PZwzBVHQpwG4vK5zUa61/RFk2BQb3uTxJQg2wiM0=", + "lastModified": 1686718773, + "narHash": "sha256-x+4xs6+jWhFaYwt6REH7e91rm5vt2GCPEfmRdNcHyi4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d318cb303f285d2964d4137619cb21ddd56cfd5", + "rev": "ba1a6ec548000d4a50719d14e6f73f63016674d5", "type": "github" }, "original": { From c92fa3d2f7f42058173247f548b1834c018996b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Jun 2023 08:53:37 +0200 Subject: [PATCH 2/3] ping to nixpkgs fork to incorperate aarch64 fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit flake.lock: Update Flake lock file updates: • Updated input 'nixos-2305': 'github:NixOS/nixpkgs/75eb7c2d47fdc01a0d477e9a89eac7ed366fe898' (2023-06-14) → 'github:Mic92/nixpkgs/60e994e7ada7ce39b775d92cbb70a611c59f45d1' (2023-06-15) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/ba1a6ec548000d4a50719d14e6f73f63016674d5' (2023-06-14) → 'github:Mic92/nixpkgs/d21b935395b8880dd4e80dfac4104553cb795d03' (2023-06-15) --- flake.lock | 24 ++++++++++++------------ flake.nix | 8 ++++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 9b03afc..80e6c88 100644 --- a/flake.lock +++ b/flake.lock @@ -2,32 +2,32 @@ "nodes": { "nixos-2305": { "locked": { - "lastModified": 1686780367, - "narHash": "sha256-hEn8ebT32APeDSoT80VUGktqQ4zqI4gCFLzbIZdSuoo=", - "owner": "NixOS", + "lastModified": 1686811632, + "narHash": "sha256-FaetM88sRKHj/G5YWmF7+YgKcQa13tFR37Fw74lMs4E=", + "owner": "Mic92", "repo": "nixpkgs", - "rev": "75eb7c2d47fdc01a0d477e9a89eac7ed366fe898", + "rev": "60e994e7ada7ce39b775d92cbb70a611c59f45d1", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-23.05", + "owner": "Mic92", + "ref": "fix-aarch64-zfs-backport", "repo": "nixpkgs", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1686718773, - "narHash": "sha256-x+4xs6+jWhFaYwt6REH7e91rm5vt2GCPEfmRdNcHyi4=", - "owner": "NixOS", + "lastModified": 1686811343, + "narHash": "sha256-1bKuFKozTa2efVLPrqI+ktSiN+4hAd1gJXGIcx8Cq6A=", + "owner": "Mic92", "repo": "nixpkgs", - "rev": "ba1a6ec548000d4a50719d14e6f73f63016674d5", + "rev": "d21b935395b8880dd4e80dfac4104553cb795d03", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", + "owner": "Mic92", + "ref": "fix-aarch64-zfs", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f002dc2..77aab25 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,12 @@ { description = "NixOS images"; - inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; + # 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"; nixConfig.extra-substituters = [ "https://cache.garnix.io" From b713d907785e9df9b2dbb7ae70ae94d447268353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 Jun 2023 10:20:54 +0200 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-2305': 'github:Mic92/nixpkgs/60e994e7ada7ce39b775d92cbb70a611c59f45d1' (2023-06-15) → 'github:Mic92/nixpkgs/15384bf882f524e3a08ed7cb86c811de5b75ba5a' (2023-06-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 80e6c88..d5e3b70 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixos-2305": { "locked": { - "lastModified": 1686811632, - "narHash": "sha256-FaetM88sRKHj/G5YWmF7+YgKcQa13tFR37Fw74lMs4E=", + "lastModified": 1686817182, + "narHash": "sha256-UbgN7GZ/OOUfhZlY2L5cH7RbwUHI6/7m6rTPPNP3Cmc=", "owner": "Mic92", "repo": "nixpkgs", - "rev": "60e994e7ada7ce39b775d92cbb70a611c59f45d1", + "rev": "15384bf882f524e3a08ed7cb86c811de5b75ba5a", "type": "github" }, "original": {