From ec52a1003ddb0ed67547b2ea460b3914065ea76d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 2 Jan 2019 16:34:11 +0800 Subject: [PATCH] nix: add jesd204b --- nix/artiq-dev.nix | 2 +- nix/default.nix | 2 +- nix/pkgs/python3Packages.nix | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/nix/artiq-dev.nix b/nix/artiq-dev.nix index ad6ada554..38ef2dc9c 100644 --- a/nix/artiq-dev.nix +++ b/nix/artiq-dev.nix @@ -16,7 +16,7 @@ in xorg.libXext xorg.libXtst xorg.libXi - (python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.artiq ])) + (python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ])) ] ++ (with artiqpkgs; [ rustc diff --git a/nix/default.nix b/nix/default.nix index 66c626540..90063b48d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -9,7 +9,7 @@ let llvm-src = callPackage ./fetch-llvm-clang.nix {}; in rec { inherit (rust) cargo rustc; - inherit (callPackage ./pkgs/python3Packages.nix {}) migen microscope misoc; + inherit (callPackage ./pkgs/python3Packages.nix {}) migen microscope misoc jesd204b; binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {}; llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; }; llvmlite = callPackage ./pkgs/llvmlite.nix { inherit llvm-or1k; }; diff --git a/nix/pkgs/python3Packages.nix b/nix/pkgs/python3Packages.nix index b34b0a9a1..f69f38887 100644 --- a/nix/pkgs/python3Packages.nix +++ b/nix/pkgs/python3Packages.nix @@ -94,4 +94,25 @@ rec { platforms = platforms.unix; }; }; + jesd204b = python3Packages.buildPythonPackage rec { + version = "git-02cffc"; + pname = "jesd204b"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "jesd204b"; + rev = "03d3280690727b12b6522cbd294138e66dd157c9"; + sha256 = "1hpx4y8ynhsmwsq4ry748q6bkh8jvv2hy8b7hifxjmlh174y8rb0"; + }; + + propagatedBuildInputs = with python3Packages; [ migen misoc ]; + + meta = with stdenv.lib; { + description = "JESD204B core for Migen/MiSoC"; + homepage = "https://m-labs.hk/migen"; + license = licenses.bsd2; + platforms = platforms.unix; + }; + }; }