diff options
| author | Theofilos Augoustis <theofilos.augoustis@gmail.com> | 2025-06-11 11:32:01 +0200 |
|---|---|---|
| committer | Theofilos Augoustis <theofilos.augoustis@gmail.com> | 2025-06-11 11:32:01 +0200 |
| commit | 3bb43f17b305430acfe78b5818674b46e6839bec (patch) | |
| tree | ed2a5d274db084a891b11106b4111b195b8ac65d | |
| parent | c05c4baf76e408258bf951ddcdc8bee90868b511 (diff) | |
| download | focaccia-3bb43f17b305430acfe78b5818674b46e6839bec.tar.gz focaccia-3bb43f17b305430acfe78b5818674b46e6839bec.zip | |
Add flake support for known-buggy QEMU version
| -rw-r--r-- | flake.lock | 17 | ||||
| -rw-r--r-- | flake.nix | 25 |
2 files changed, 36 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock index 5497fb5..0343a0a 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,22 @@ "type": "github" } }, + "nixpkgs-qemu-60": { + "locked": { + "lastModified": 1632168163, + "narHash": "sha256-iS3pBopSl0a2jAXuK/o0L+S86B9v9rnErsJHkNSdZRs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f8f124009497b3f9908f395d2533a990feee1de8", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f8f124009497b3f9908f395d2533a990feee1de8", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -84,6 +100,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", + "nixpkgs-qemu-60": "nixpkgs-qemu-60", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "uv2nix": "uv2nix" diff --git a/flake.nix b/flake.nix index 2153c79..ffcd2d4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-qemu-60.url = "github:nixos/nixpkgs/f8f124009497b3f9908f395d2533a990feee1de8"; + flake-utils.url = "github:numtide/flake-utils"; pyproject-nix = { @@ -25,7 +27,7 @@ }; }; - outputs = { + outputs = inputs@{ self, uv2nix, nixpkgs, @@ -36,6 +38,8 @@ }: flake-utils.lib.eachDefaultSystem (system: let + qemu-60 = inputs.nixpkgs-qemu-60.qemu; + # Refine nixpkgs used in flake to system arch pkgs = import nixpkgs { inherit system; @@ -94,11 +98,20 @@ }; # Developer shell that includes Focaccia and QEMU - devShells.default = pkgs.mkShell { - packages = [ - pythonEnv - pkgs.qemu - ]; + devShells = { + default = pkgs.mkShell { + packages = [ + pythonEnv + pkgs.qemu-user + ]; + }; + + qemu-60 = pkgs.mkShell { + packages = [ + pythonEnv + qemu-60 + ]; + }; }; }); } |