treewide: full update in some time

3 files changed, 54 insertions, 54 deletions

diff --git a/devShells/apo.nix b/devShells/apo.nix
index 07ed91b..39b890a 100644
--- a/devShells/apo.nix
+++ b/devShells/apo.nix
@@ -1,6 +1,6 @@
 pkgs: c: let
   riscvPkgs = import pkgs.path {
-    localSystem = pkgs.buildPlatform.system;
+    localSystem = pkgs.stdenv.buildPlatform.system;
     crossSystem = {
       config = "riscv32-none-elf";
       libc = "newlib";
diff --git a/devShells/c.nix b/devShells/c.nix
index b7c2519..7c8c353 100644
--- a/devShells/c.nix
+++ b/devShells/c.nix
@@ -1,61 +1,60 @@
-pkgs:
+pkgs: extra:
 pkgs.mkShell {
-  packages = with pkgs; [
-    clang-tools
-    ctags
-    gcc
-    gdb
-    pkg-config
+  packages = with pkgs;
+    [
+      clang-tools
+      ctags
+      pkg-config
 
-    autoconf
-    automake
-    libtool
+      autoconf
+      automake
+      libtool
 
-    gnumake
-    bear
-    meson
-    ninja
-    cmake
+      gnumake
+      bear
+      meson
+      ninja
+      cmake
 
-    valgrind
-    lcov
-    massif-visualizer
-    cppcheck
-    flawfinder
+      valgrind
+      lcov
+      cppcheck
+      flawfinder
 
-    check
-    curl
-    ncurses
-    flex
-    bison
-    gperf
-    gobject-introspection
-    gtk3
-    gtk4
+      check
+      curl
+      ncurses
+      flex
+      bison
+      gperf
+      gobject-introspection
+      gtk3
+      gtk4
 
-    # Various libraries
-    openssl.dev
-    zlib.dev
-    curl.dev
-    libconfig
-    czmq
-    libevent.dev
+      # Various libraries
+      openssl.dev
+      zlib.dev
+      curl.dev
+      libconfig
+      czmq
+      libevent.dev
 
-    # LVGL
-    SDL2
-    libffi.dev
+      # LVGL
+      SDL2
+      libffi.dev
 
-    # Qt
-    qt6.qttools
-    qt6.qtbase
-    qt6.qttranslations
-    qt6.qtserialport
-    qt6.qtwebsockets
-    qt6.qtcharts
-    qt6.qtsvg
-    qt6.qtnetworkauth
-    qt6.qtwayland
-    qt6.wrapQtAppsHook
-  ];
+      # Qt
+      qt6.qttools
+      qt6.qtbase
+      qt6.qttranslations
+      qt6.qtserialport
+      qt6.qtwebsockets
+      qt6.qtcharts
+      qt6.qtsvg
+      qt6.qtnetworkauth
+      qt6.qtwayland
+      qt6.wrapQtAppsHook
+    ]
+    ++ extra;
   meta.platforms = pkgs.lib.platforms.linux;
 }
diff --git a/devShells/default.nix b/devShells/default.nix
index e6a80ad..462a791 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -1,6 +1,7 @@
 pkgs: rec {
-  c = import ./c.nix pkgs;
+  c = import ./c.nix pkgs [pkgs.gcc pkgs.gdb];
+  #clang = import ./c.nix pkgs [pkgs.clang];
   #musl = import ./c.nix pkgs.pkgsMusl;
   #llvm = import ./c.nix pkgs.pkgsLLVM;
-  apo = import ./apo.nix pkgs c;
+  #apo = import ./apo.nix pkgs c;
 }