From b46f4181766a99eee3f2892548589888025dfd2d Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 15 Oct 2020 16:12:51 +0800
Subject: [PATCH] add artiq-netboot package

---
 artiq-fast/default.nix          |  4 ++--
 artiq-fast/pkgs/python-deps.nix | 12 +++++++++++-
 gluelogic/default.nix           |  2 +-
 stm32/default.nix               |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index dbd21aa..91ec860 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -2,7 +2,7 @@
 with pkgs;
 let
   artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0";
-  pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; misoc-new = artiq6; };
+  pythonDeps = import ./pkgs/python-deps.nix { inherit (pkgs) stdenv fetchgit fetchFromGitHub python3Packages; misoc-new = artiq6; };
 
   boards = [
     { target = "kasli"; variant = "tester"; }
@@ -20,7 +20,7 @@ let
       }) {} boards;
 
   mainPackages = rec {
-    inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
+    inherit (pythonDeps) sipyco asyncserial pythonparser pyqtgraph-qt5 artiq-netboot misoc migen microscope jesd204b migen-axi lit outputcheck;
     binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
     binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
     llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
diff --git a/artiq-fast/pkgs/python-deps.nix b/artiq-fast/pkgs/python-deps.nix
index 4f1a9f5..2136a8a 100644
--- a/artiq-fast/pkgs/python-deps.nix
+++ b/artiq-fast/pkgs/python-deps.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, misoc-new }:
+{ stdenv, fetchgit, fetchFromGitHub, python3Packages, misoc-new }:
 
 rec {
   # User dependencies
@@ -53,6 +53,16 @@ rec {
   };
 
   # Development/firmware dependencies
+  artiq-netboot = python3Packages.buildPythonPackage rec {
+    name = "artiq-netboot";
+
+    src = fetchgit {
+      url = "https://git.m-labs.hk/m-labs/artiq-netboot.git";
+      rev = "04f69eb07df73abe4b89fde2c24084f7664f2104";
+      sha256 = "0ql4fr8m8gpb2yql8aqsdqsssxb8zqd6l65kl1f6s9845zy7shs9";
+    };
+  };
+
   misoc = python3Packages.buildPythonPackage {
     name = "misoc";
     
diff --git a/gluelogic/default.nix b/gluelogic/default.nix
index 1a7ceea..006270b 100644
--- a/gluelogic/default.nix
+++ b/gluelogic/default.nix
@@ -1,6 +1,6 @@
 { pkgs ? import <nixpkgs> {} }:
 let
-  artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; misoc-new = true; };
+  artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchgit fetchFromGitHub python3Packages; misoc-new = true; };
   ise = import ./ise.nix { inherit pkgs; };
   vivado = import ../artiq-fast/vivado.nix { inherit pkgs; };
   buildUrukulCpld = {version, src}: pkgs.stdenv.mkDerivation {
diff --git a/stm32/default.nix b/stm32/default.nix
index 5832717..d6ce761 100644
--- a/stm32/default.nix
+++ b/stm32/default.nix
@@ -37,7 +37,7 @@ let
 
         dontFixup = true;
       };
-  migen = (import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; misoc-new = true; }).migen;
+  migen = (import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchgit fetchFromGitHub python3Packages; misoc-new = true; }).migen;
 in
   {
     stabilizer = buildStm32Firmware {