From 1ebdf95ea02c998fe5321f1ed92994969d99d7a1 Mon Sep 17 00:00:00 2001
From: Frede Braendstrup <frederikbraendstrup@gmail.com>
Date: Fri, 6 Dec 2024 14:24:45 +0100
Subject: [PATCH 1/2] envs/yocto: add extraPythonPkgs

---
 envs/yocto/shell.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/envs/yocto/shell.nix b/envs/yocto/shell.nix
index c0aab5e..8a292b6 100644
--- a/envs/yocto/shell.nix
+++ b/envs/yocto/shell.nix
@@ -1,5 +1,6 @@
 { pkgs ? import <nixpkgs> { }
 , extraPkgs ? [ ]
+, extraPythonPkgs ? [ ]
 }:
 
 let
@@ -43,7 +44,7 @@ let
       (ncurses'.override { unicodeSupport = false; })
       patch
       perl
-      (python3.withPackages (ps: [ ps.setuptools ps.pyaml ]))
+      (python3.withPackages (ps: [ ps.setuptools ps.pyaml ] ++ extraPythonPkgs))
       rpcsvc-proto
       unzip
       util-linux

From 5618d47c783db0dbe2deff9b989338f57732fe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 6 Dec 2024 19:18:38 +0100
Subject: [PATCH 2/2] phoronix: drop gcc7

---
 envs/phoronix-test-suite/shell.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/envs/phoronix-test-suite/shell.nix b/envs/phoronix-test-suite/shell.nix
index 8b97e9e..9beface 100644
--- a/envs/phoronix-test-suite/shell.nix
+++ b/envs/phoronix-test-suite/shell.nix
@@ -10,7 +10,6 @@ pkgs.stdenv.mkDerivation {
     popt
     libaio
     perl
-    gcc7
     pcre
     glibc.out
     glibc.static