From 22992e2e825b2a5c8c379dd93ae5799408df9c7d Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Tue, 5 Mar 2024 09:17:56 +0800 Subject: [PATCH] update nixpkgs and use upstream qemu --- flake.lock | 6 +++--- flake.nix | 14 +------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 87b10ad..10878e7 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706107048, - "narHash": "sha256-SqcJ9KxQVY+eLojoqYuJhWa4+D9utUzEuFJzOcUS8iY=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6fd7935607b68a96949b51ff08f12109e99ffd1f", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4536f73..77654ab 100644 --- a/flake.nix +++ b/flake.nix @@ -251,18 +251,6 @@ hardeningDisable = [ "fortify" ]; }; - # Overriding qemu since the current linux kernel package upstream is breaking - qemu = pkgs.qemu.overrideAttrs (oldAttrs: rec { - version = "8.2.1"; - src = pkgs.fetchurl { - url = "https://download.qemu.org/qemu-${version}.tar.xz"; - hash = "sha256-hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4="; - }; - # This patch was already removed upstream. Need to manually remove here to avoid errors. - # https://github.com/NixOS/nixpkgs/commit/d422836d725cf3aa70204036b4634dbc6fc3f678?diff=unified&w=0 - patches = builtins.filter (x: (x.name or "") != "9d5b42beb6978dc6219d5dc029c9d453c6b8d503.diff") oldAttrs.patches; - }); - board-package-set = { board }: let fsbl = pkgs.stdenv.mkDerivation { name = "${board}-fsbl"; @@ -427,7 +415,7 @@ not-os-qemu = let qemuScript = '' #!/bin/bash - export PATH=${qemu}/bin:$PATH + export PATH=${pkgs.qemu}/bin:$PATH IMGDIR=$(mktemp -d /tmp/not-os-qemu-XXXXXX) BASE=$(realpath $(dirname $0)) qemu-img create -F raw -f qcow2 -b $BASE/sd-image.img $IMGDIR/sd-overlay.qcow2 512M