From 693e301ccfe5c095885a6fd1c0df01f89d837ee1 Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Tue, 2 Jul 2024 14:26:07 +0800 Subject: [PATCH] fix pkgs.writeReferencesToFile deprecation and pin linux version --- not-os-patches/pr-28.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/not-os-patches/pr-28.patch b/not-os-patches/pr-28.patch index 541dd69..9fdbf46 100644 --- a/not-os-patches/pr-28.patch +++ b/not-os-patches/pr-28.patch @@ -1,5 +1,5 @@ diff --git a/base.nix b/base.nix -index 7eaee32..3a2a0a9 100644 +index 7eaee32..3ade454 100644 --- a/base.nix +++ b/base.nix @@ -27,6 +27,11 @@ with lib; @@ -14,9 +14,12 @@ index 7eaee32..3a2a0a9 100644 not-os.simpleStaticIp = mkOption { type = types.bool; default = false; -@@ -86,15 +91,25 @@ with lib; +@@ -84,17 +89,27 @@ with lib; + }; + environment.etc = { "nix/nix.conf".source = pkgs.runCommand "nix.conf" {} '' - extraPaths=$(for i in $(cat ${pkgs.writeReferencesToFile pkgs.runtimeShell}); do if test -d $i; then echo $i; fi; done) +- extraPaths=$(for i in $(cat ${pkgs.writeReferencesToFile pkgs.runtimeShell}); do if test -d $i; then echo $i; fi; done) ++ extraPaths=$(for i in $(cat ${pkgs.writeClosure [ pkgs.bash ]}); do if test -d $i; then echo $i; fi; done) cat > $out << EOF - build-use-sandbox = true + auto-optimise-store = true @@ -151,7 +154,7 @@ index c61f9d6..fbdf0fd 100644 }; } diff --git a/zynq_image.nix b/zynq_image.nix -index 3fa23ab..9d1621e 100644 +index 3fa23ab..d5c5eda 100644 --- a/zynq_image.nix +++ b/zynq_image.nix @@ -1,66 +1,89 @@ @@ -163,7 +166,7 @@ index 3fa23ab..9d1621e 100644 - # dont use overlays for the qemu, it causes a lot of wasted time on recompiles - x86pkgs = import pkgs.path { system = "x86_64-linux"; }; - customKernel = pkgs.linux.override { -+ customKernel = (pkgs.linux.override { ++ customKernel = (pkgs.linux_6_6.override { extraConfig = '' OVERLAY_FS y + MEDIA_SUPPORT n