From 3794b707ebec4f91bd3f9922572bb154a8ac910a Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 2 Jun 2024 11:13:51 -0600
Subject: nix/shells: refactor out of flake

---
 flake.nix | 97 +++++----------------------------------------------------------
 1 file changed, 7 insertions(+), 90 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 157f220..30c7b0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,12 @@
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
+
+        overlays = [
+          (self: super: {
+            inherit cross rv32Pkgs;
+          })
+        ];
       };
 
       crossSystem = "arm-linux";
@@ -130,95 +136,6 @@
         ];
       };
 
-      devShells."${system}" = with pkgs; {
-        default = mkShell {
-          buildInputs = [
-            ncurses
-            openssl
-            SDL2
-            zlib
-          ];
-
-          nativeBuildInputs = [
-            binutils
-            gcc
-            cross.stdenv.cc.cc
-            cross.stdenv.cc.bintools
-            gcc-arm-embedded
-            gdb
-            gnumake
-            gtkwave
-            kermit
-            meson
-            ninja
-            lcov
-            (openocd.overrideAttrs (prev: {
-              pname = "openocd-vexriscv";
-              version = "0.11.0-master";
-
-              buildInputs = prev.buildInputs ++ [ pkgs.libyaml ];
-              nativeBuildInputs = [ pkgs.autoreconfHook ] ++ prev.nativeBuildInputs;
-
-              src = pkgs.fetchFromGitHub {
-                repo = "openocd_riscv";
-                owner = "SpinalHDL";
-
-                rev = "058dfa50d625893bee9fecf8d604141911fac125";
-                hash = "sha256-bv8hUlZXEexUy8tzrnibNYRNb2oLRfh1xCpmalPwdqc=";
-              };
-            }))
-            pkg-config
-            (python3.withPackages (py: with py; [
-              cocotb
-              cocotb-bus
-              find-libpython # Para cocotb
-              matplotlib
-              numpy
-              pillow
-              pytest # Para cocotb
-              (py.callPackage ./nix/cocotb-coverage.nix { })
-              (py.callPackage ./nix/peakrdl/peakrdl.nix { })
-              (py.callPackage ./nix/peakrdl/peakrdl-regblock.nix { })
-              (py.callPackage ./nix/pyuvm.nix { })
-            ]))
-            rv32Pkgs.stdenv.cc.cc
-            rv32Pkgs.stdenv.cc.bintools
-            (quartus-prime-lite.override { supportedDevices = [ "Cyclone V" ]; })
-            verilator
-          ];
-
-          shellHook = ''
-            export CROSS_COMPILE=arm-unknown-linux-gnueabi-
-            export MAKEFLAGS="AR=gcc-ar"
-
-            # <https://discourse.nixos.org/t/fonts-in-nix-installed-packages-on-a-non-nixos-system/5871/7>
-            export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-            export FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"
-          '';
-        };
-
-        kbuild = mkShell {
-          buildInputs = [
-            ncurses
-          ];
-
-          nativeBuildInputs = [
-            bc
-            bison
-            flex
-            gcc
-            cross.stdenv.cc.cc
-            cross.stdenv.cc.bintools
-            gnumake
-            openssl # Splash de u-boot
-            ubootTools
-          ];
-
-          shellHook = ''
-            export CROSS_COMPILE=arm-unknown-linux-gnueabi-
-            export MAKEFLAGS="ARCH=arm O=build/taller LOADADDR=0x8000"
-          '';
-        };
-      };
+      devShells."${system}" = import ./nix/shells.nix { inherit pkgs; };
     };
 }
-- 
cgit v1.2.3