From f8c4141aefa0ece8491079a15a70e86fae367656 Mon Sep 17 00:00:00 2001 From: occheung Date: Fri, 7 Aug 2020 13:15:11 +0800 Subject: [PATCH] nix: rm migen --- shell.nix | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/shell.nix b/shell.nix index 9bc447b..aed53eb 100644 --- a/shell.nix +++ b/shell.nix @@ -3,26 +3,6 @@ let pkgs = import {overlays = [mozillaOverlay];}; in with pkgs; let - # TODO: Dump migen when nmigen fully succeed - migen = python3Packages.buildPythonPackage rec { - name = "migen"; - - src = fetchFromGitHub { - owner = "m-labs"; - repo = "migen"; - rev = "12e7ba6a4c19ee65ff9e042747220972aecc05ac"; - sha256 = "0z76jfcvm7k6iqkmpdck3mw06hlg0kqvbpr047rgyvaw5im98wj5"; - }; - - propagatedBuildInputs = with python3Packages; [ colorama ]; - - meta = with stdenv.lib; { - description = "A Python toolbox for building complex digital hardware"; - homepage = "https://m-labs.hk/migen"; - license = licenses.bsd2; - platforms = platforms.unix; - }; - }; nmigen = callPackage ./nix/nmigen.nix {}; nmigen-boards = callPackage ./nix/nmigen-boards.nix { inherit nmigen; }; openocd = callPackage ./nix/openocd.nix {}; @@ -64,12 +44,6 @@ let echo "Compiled fpga_config.py to top.bin" ''; - # No longer uses generated rust array to store bitstream - -# readyBitstream = writeShellScriptBin "ready-bitstream" '' -# python3 nmigen/loader.py -# ''; - flashFPGAConfig = writeShellScriptBin "flash-fpga-config" '' set-gdb-config-file "fpga_config" && cargo run --example fpga_config ''; @@ -96,7 +70,7 @@ in stdenv.mkDerivation { name = "nix-shell"; buildInputs = with rustPlatform.rust; [ - (pkgs.python3.withPackages(ps: [migen nmigen nmigen-boards])) + (pkgs.python3.withPackages(ps: [nmigen nmigen-boards])) pkgs.python3Packages.pandas pkgs.yosys pkgs.nextpnr