M-Labs/nix-servo
3
1
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update nixpkgs and use upstream qemu #44

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:kernel-nixpkgs into master 2024-03-05 10:20:48 +08:00
Conversation 0 Commits 1 Files Changed 2 +4 -16
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 22992e2e82 - Show all commits

6
flake.lock generated
View File

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706107048, "lastModified": 1709237383,
"narHash": "sha256-SqcJ9KxQVY+eLojoqYuJhWa4+D9utUzEuFJzOcUS8iY=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6fd7935607b68a96949b51ff08f12109e99ffd1f", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@ -251,18 +251,6 @@
hardeningDisable = [ "fortify" ]; 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 board-package-set = { board }: let
fsbl = pkgs.stdenv.mkDerivation { fsbl = pkgs.stdenv.mkDerivation {
name = "${board}-fsbl"; name = "${board}-fsbl";
@ -427,7 +415,7 @@
not-os-qemu = let not-os-qemu = let
qemuScript = '' qemuScript = ''
#!/bin/bash #!/bin/bash
export PATH=${qemu}/bin:$PATH export PATH=${pkgs.qemu}/bin:$PATH
IMGDIR=$(mktemp -d /tmp/not-os-qemu-XXXXXX) IMGDIR=$(mktemp -d /tmp/not-os-qemu-XXXXXX)
BASE=$(realpath $(dirname $0)) BASE=$(realpath $(dirname $0))
qemu-img create -F raw -f qcow2 -b $BASE/sd-image.img $IMGDIR/sd-overlay.qcow2 512M qemu-img create -F raw -f qcow2 -b $BASE/sd-image.img $IMGDIR/sd-overlay.qcow2 512M