forked from M-Labs/nix-scripts
Compare commits
173 Commits
Author | SHA1 | Date |
---|---|---|
Astro | f7dd925234 | |
Astro | bc501c96ab | |
Astro | a7ceb26099 | |
Astro | 4294277702 | |
Astro | e42e87d56b | |
Astro | 84fc1375d1 | |
Leon Riesebos | 50fb3cd8e1 | |
Sebastien Bourdeauducq | b8a803a64f | |
Sebastien Bourdeauducq | 4e9339e3a8 | |
Sebastien Bourdeauducq | f2bdeaf401 | |
Sebastien Bourdeauducq | a57b927418 | |
Sebastien Bourdeauducq | 5b2ee17cb9 | |
Sebastien Bourdeauducq | c46534d41b | |
Sebastien Bourdeauducq | 5eea3a8267 | |
Sebastien Bourdeauducq | 9806228a8c | |
Astro | bc1ffe4fbf | |
Sebastien Bourdeauducq | 0c3f5161e1 | |
Astro | 72fb469b0b | |
Sebastien Bourdeauducq | a6ea6e3666 | |
Astro | 64ee51b673 | |
Astro | 33c33d49df | |
Sebastien Bourdeauducq | d1a6c2f5db | |
Sebastien Bourdeauducq | 5c6dc61d4d | |
Sebastien Bourdeauducq | 87c2586250 | |
Sebastien Bourdeauducq | 42107ff1e9 | |
Sebastien Bourdeauducq | 0d706f000f | |
topquark12 | 29b4cb1b09 | |
topquark12 | b83f40008c | |
topquark12 | 6d0dafb722 | |
topquark12 | f1d689ae78 | |
Harry Ho | 487bf219ba | |
Astro | 4666f1aa6a | |
Astro | d149c66d05 | |
Sebastien Bourdeauducq | 3c1a84a07e | |
Astro | 70a0b8f90f | |
Astro | b0e041c716 | |
Harry Ho | 6fe5a903b9 | |
Harry Ho | 726ee7aa82 | |
Harry Ho | 21f5362b6f | |
Harry Ho | 35c2844612 | |
Sebastien Bourdeauducq | d5b5dbeeb2 | |
Sebastien Bourdeauducq | 57aca5d142 | |
David Nadlinger | 87fdb2c5ea | |
Sebastien Bourdeauducq | 58aabaaa0e | |
Sebastien Bourdeauducq | eac7f4bddb | |
Sebastien Bourdeauducq | b810407aa9 | |
Sebastien Bourdeauducq | e39f359122 | |
occheung | 049de83093 | |
Sebastien Bourdeauducq | 221d2fe793 | |
Sebastien Bourdeauducq | 8b59734705 | |
Sebastien Bourdeauducq | 360eb10ada | |
Sebastien Bourdeauducq | 4d99f4884e | |
Sebastien Bourdeauducq | 45f46f8901 | |
Sebastien Bourdeauducq | 7ee9e4f068 | |
Sebastien Bourdeauducq | 8396cfa1cb | |
Sebastien Bourdeauducq | 7a76d08cb0 | |
Astro | ce676be8e4 | |
Sebastien Bourdeauducq | 2984cff156 | |
occheung | 3cd8e64846 | |
occheung | f5145e23ee | |
occheung | 58b49c173e | |
occheung | d4c78c8d1b | |
Astro | cc6e7095f3 | |
Astro | e189ee4c8f | |
Astro | 2f4b063513 | |
Astro | 0cf2def070 | |
Astro | 22a6d5fb2e | |
Astro | 1c103ccb62 | |
Sebastien Bourdeauducq | 42df27a7fd | |
Drew Risinger | 2577aa52c0 | |
Sebastien Bourdeauducq | a45b6fc771 | |
Sebastien Bourdeauducq | 228a73fc55 | |
occheung | e97e8be246 | |
Sebastien Bourdeauducq | 2814292f05 | |
Robert Jördens | cefb3ce2f2 | |
Robert Jördens | 2f2ed2b68e | |
Robert Jördens | 718230f12a | |
Drew Risinger | ca28925120 | |
Drew Risinger | beb99234fe | |
Sebastien Bourdeauducq | f072c46ee3 | |
occheung | abf17296c8 | |
occheung | 755f36ecdf | |
Sebastien Bourdeauducq | 0c3cb62cde | |
occheung | d1f7e5d25f | |
occheung | 73d7fe2502 | |
Sebastien Bourdeauducq | eb48b4a6b8 | |
Sebastien Bourdeauducq | 093b1b7224 | |
Sebastien Bourdeauducq | faedd3e1ea | |
Sebastien Bourdeauducq | 56382d6301 | |
Robert Jördens | 6721a8ea17 | |
SingularitySurfer | 08241d9ab0 | |
Sebastien Bourdeauducq | 7259a0b3aa | |
SingularitySurfer | b17a99ac3b | |
SingularitySurfer | 3d26cd62cf | |
SingularitySurfer | 8771512787 | |
Sebastien Bourdeauducq | d688ed1a56 | |
Sebastien Bourdeauducq | ea292df252 | |
Astro | 00352b9942 | |
SingularitySurfer | cf4ca3e4f2 | |
Astro | eab83a6a3f | |
occheung | 262ef72eb7 | |
Astro | 12fbe64616 | |
Robert Jördens | 6acf5b3f93 | |
Astro | 5695977531 | |
Astro | 2e62831998 | |
Astro | fd25af0733 | |
Astro | 843da12452 | |
Drew Risinger | 267b497ac4 | |
Sebastien Bourdeauducq | ff54c815d5 | |
Sebastien Bourdeauducq | eb398dcc53 | |
Robert Jördens | 88cd472f90 | |
Robert Jördens | 6eac1b5f3f | |
Robert Jördens | c31b0144d3 | |
Robert Jördens | 34c5ff76b9 | |
Astro | 571cfbd8a6 | |
Sebastien Bourdeauducq | 0db0ffb128 | |
Sebastien Bourdeauducq | 083e389b41 | |
Sebastien Bourdeauducq | 777b9dbecd | |
Sebastien Bourdeauducq | 0a11450df3 | |
Sebastien Bourdeauducq | 30629929a8 | |
Sebastien Bourdeauducq | d53eed3880 | |
Astro | df36762bfe | |
occheung | 8477bc2919 | |
Sebastien Bourdeauducq | 01dbcb5886 | |
Sebastien Bourdeauducq | f2c9e226ac | |
Sebastien Bourdeauducq | b46f418176 | |
Harry Ho | 6ee5fa70ec | |
Sebastien Bourdeauducq | 24510c81d6 | |
occheung | 17e6cbf6b1 | |
Sebastien Bourdeauducq | 59844c28d9 | |
Sebastien Bourdeauducq | 4172f745e3 | |
Sebastien Bourdeauducq | ee9983728e | |
Sebastien Bourdeauducq | b50d1a0f7e | |
Sebastien Bourdeauducq | a9108d5fa3 | |
Sebastien Bourdeauducq | 0064906c6f | |
Sebastien Bourdeauducq | 9754f45904 | |
Sebastien Bourdeauducq | 59ad8b124a | |
Sebastien Bourdeauducq | 1263c7f15f | |
Sebastien Bourdeauducq | 477f9ce197 | |
Sebastien Bourdeauducq | 4dd16d3aa8 | |
Sebastien Bourdeauducq | 497f1970a0 | |
Sebastien Bourdeauducq | bf45666b2b | |
Sebastien Bourdeauducq | 6cbfebf626 | |
Sebastien Bourdeauducq | 9870fce5a6 | |
Sebastien Bourdeauducq | a6f94d37e9 | |
Sebastien Bourdeauducq | 657d3c1b27 | |
Sebastien Bourdeauducq | fe728a7303 | |
Sebastien Bourdeauducq | f392ca6fd6 | |
Sebastien Bourdeauducq | 9a39d707da | |
Sebastien Bourdeauducq | 3e607f7d12 | |
Sebastien Bourdeauducq | f69616307e | |
Astro | 62f7610087 | |
Harry Ho | 68318b05ec | |
Astro | 7c7c0cb58d | |
Sebastien Bourdeauducq | 5ba0896be6 | |
Harry Ho | 7c4eb8e770 | |
Sebastien Bourdeauducq | c64d73649f | |
Sebastien Bourdeauducq | e6fb3088b1 | |
Sebastien Bourdeauducq | e4d6dd253d | |
Sebastien Bourdeauducq | b5d7b1d10a | |
Sebastien Bourdeauducq | 864bddd0b4 | |
Sebastien Bourdeauducq | de7c867866 | |
Sebastien Bourdeauducq | 58c9c6f83c | |
Sebastien Bourdeauducq | 532dd5c861 | |
Sebastien Bourdeauducq | eabcda5013 | |
Sebastien Bourdeauducq | b3715bbfc8 | |
Sebastien Bourdeauducq | 51bd917512 | |
Sebastien Bourdeauducq | b7a1f42a06 | |
Sebastien Bourdeauducq | 53838bd55f | |
Sebastien Bourdeauducq | 354f653a13 | |
Sebastien Bourdeauducq | 33b66b1a65 | |
Sebastien Bourdeauducq | 1b324970e5 | |
Sebastien Bourdeauducq | 44ffc90e3a |
|
@ -0,0 +1,97 @@
|
||||||
|
# Install Vivado in /opt and add to /etc/nixos/configuration.nix:
|
||||||
|
# nix.sandboxPaths = ["/opt"];
|
||||||
|
|
||||||
|
{ pkgs ? import <nixpkgs> {}
|
||||||
|
, artiq-fast
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
artiqSrc = import (artiq-fast + "/pkgs/artiq-src.nix") { fetchgit = pkgs.fetchgit; };
|
||||||
|
artiqpkgs = import artiq-fast { inherit pkgs; };
|
||||||
|
pythonEnv = pkgs.python3.withPackages (ps: with ps; [
|
||||||
|
jinja2 jsonschema numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
|
||||||
|
]);
|
||||||
|
fetchcargo = import (artiq-fast + "/fetchcargo.nix") {
|
||||||
|
inherit (pkgs) stdenv lib cacert git;
|
||||||
|
inherit (artiqpkgs) cargo cargo-vendor;
|
||||||
|
};
|
||||||
|
cargoDeps = fetchcargo rec {
|
||||||
|
name = "artiq-firmware-cargo-deps";
|
||||||
|
src = "${artiqSrc}/artiq/firmware";
|
||||||
|
sha256 = import (artiqSrc + "/artiq/firmware/cargosha256.nix");
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoVendored = pkgs.stdenv.mkDerivation {
|
||||||
|
name = "artiq-firmware-cargo-vendored";
|
||||||
|
src = cargoDeps;
|
||||||
|
phases = [ "unpackPhase" "installPhase" ];
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
mkdir -p $out/registry
|
||||||
|
cat << EOF > $out/config
|
||||||
|
[source.crates-io]
|
||||||
|
registry = "https://github.com/rust-lang/crates.io-index"
|
||||||
|
replace-with = "vendored-sources"
|
||||||
|
|
||||||
|
[source."https://github.com/m-labs/libfringe"]
|
||||||
|
git = "https://github.com/m-labs/libfringe"
|
||||||
|
rev = "b8a6d8f"
|
||||||
|
replace-with = "vendored-sources"
|
||||||
|
|
||||||
|
[source.vendored-sources]
|
||||||
|
directory = "$out/registry"
|
||||||
|
EOF
|
||||||
|
cp -R * $out/registry
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{ target
|
||||||
|
, variant
|
||||||
|
, src ? null
|
||||||
|
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
|
||||||
|
, extraInstallCommands ? ""
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
name = "artiq-board-${target}-${variant}-${artiqpkgs.artiq.version}-xxx";
|
||||||
|
installPath = "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
|
||||||
|
in
|
||||||
|
# Board packages are Python modules so that they get added to the ARTIQ Python
|
||||||
|
# environment, and artiq_flash finds them.
|
||||||
|
pkgs.stdenv.mkDerivation {
|
||||||
|
name = "artiq-board-${target}-${variant}-${artiqpkgs.artiq.version}";
|
||||||
|
inherit src;
|
||||||
|
phases = [ "buildPhase" "installPhase" ];
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkgs.gnumake pkgs.which pythonEnv
|
||||||
|
artiqpkgs.cargo
|
||||||
|
artiqpkgs.rustc
|
||||||
|
artiqpkgs.binutils-or1k
|
||||||
|
artiqpkgs.llvm-or1k
|
||||||
|
];
|
||||||
|
buildInputs = [ pythonEnv ];
|
||||||
|
buildPhase =
|
||||||
|
''
|
||||||
|
export CARGO_HOME=${cargoVendored}
|
||||||
|
export TARGET_AR=or1k-linux-ar
|
||||||
|
${buildCommand} --no-compile-gateware --gateware-identifier-str=unprogrammed
|
||||||
|
'';
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
mkdir -p $out
|
||||||
|
cp -ar artiq_${target}/${variant}/gateware $out
|
||||||
|
|
||||||
|
TARGET_DIR=$out/${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}
|
||||||
|
mkdir -p $TARGET_DIR
|
||||||
|
if [ -e artiq_${target}/${variant}/software/bootloader/bootloader.bin ]
|
||||||
|
then cp artiq_${target}/${variant}/software/bootloader/bootloader.bin $TARGET_DIR
|
||||||
|
fi
|
||||||
|
if [ -e artiq_${target}/${variant}/software/runtime ]
|
||||||
|
then cp artiq_${target}/${variant}/software/runtime/runtime.{elf,fbi} $TARGET_DIR
|
||||||
|
else cp artiq_${target}/${variant}/software/satman/satman.{elf,fbi} $TARGET_DIR
|
||||||
|
fi
|
||||||
|
${extraInstallCommands}
|
||||||
|
'';
|
||||||
|
# don't mangle ELF files as they are not for NixOS
|
||||||
|
dontFixup = true;
|
||||||
|
}
|
|
@ -0,0 +1,54 @@
|
||||||
|
{ pkgs ? import <artiq-fast/pkgs/nixpkgs.nix> { inherit (import <nixpkgs> {}) fetchgit; } {}
|
||||||
|
, artiq-fast ? <artiq-fast>
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
sinaraSystemsSrc = <sinaraSystemsSrc>;
|
||||||
|
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
|
||||||
|
''
|
||||||
|
mkdir $out
|
||||||
|
cp ${./artiq-board.nix} $out/artiq-board.nix
|
||||||
|
cp ${../artiq-full/artiq-targets.nix} $out/artiq-targets.nix
|
||||||
|
cp -a ${artiq-fast} $out/fast
|
||||||
|
|
||||||
|
REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
|
||||||
|
echo -n $REV > $out/sinara-rev.txt
|
||||||
|
SINARA_SRC_CLEAN=`mktemp -d`
|
||||||
|
cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
|
||||||
|
chmod -R 755 $SINARA_SRC_CLEAN/.git
|
||||||
|
chmod 755 $SINARA_SRC_CLEAN
|
||||||
|
rm -rf $SINARA_SRC_CLEAN/.git
|
||||||
|
HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
|
||||||
|
echo -n $HASH > $out/sinara-hash.txt
|
||||||
|
|
||||||
|
cat > $out/default.nix << EOF
|
||||||
|
{ pkgs ? import ./fast/pkgs/nixpkgs.git { inherit (import <nixpkgs> {}) fetchgit; }
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
sinaraSystemsSrc = pkgs.fetchgit {
|
||||||
|
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
||||||
|
rev = "$REV";
|
||||||
|
sha256 = "$HASH";
|
||||||
|
};
|
||||||
|
artiq-fast = import ./fast { inherit pkgs; };
|
||||||
|
artiq-board = import ./artiq-board.nix {
|
||||||
|
inherit pkgs;
|
||||||
|
artiq-fast = ./fast;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
builtins.mapAttrs (_: conf: pkgs.lib.hydraJob (artiq-board conf)) (
|
||||||
|
import ./artiq-targets.nix {
|
||||||
|
inherit pkgs sinaraSystemsSrc;
|
||||||
|
artiqVersion = artiq-fast.artiq.version;
|
||||||
|
}
|
||||||
|
)
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
artiq-board-generated = import generatedNix {
|
||||||
|
inherit pkgs;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
artiq-board-generated // {
|
||||||
|
generated-nix = pkgs.lib.hydraJob generatedNix;
|
||||||
|
}
|
|
@ -30,6 +30,22 @@ let
|
||||||
EOF
|
EOF
|
||||||
echo "{ stdenv, git, fetchgit }: \"$MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`$SUFFIX\"" > $out/pkgs/artiq-version.nix
|
echo "{ stdenv, git, fetchgit }: \"$MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`$SUFFIX\"" > $out/pkgs/artiq-version.nix
|
||||||
echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix
|
echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix
|
||||||
|
|
||||||
|
REV=`git --git-dir ${<nixpkgs>}/.git rev-parse HEAD`
|
||||||
|
NIXPKGS_CLEAN=`mktemp -d`
|
||||||
|
cp -a ${<nixpkgs>}/. $NIXPKGS_CLEAN
|
||||||
|
chmod -R 755 $NIXPKGS_CLEAN/.git
|
||||||
|
chmod 755 $NIXPKGS_CLEAN
|
||||||
|
rm -rf $NIXPKGS_CLEAN/.git
|
||||||
|
HASH=`nix-hash --type sha256 --base32 $NIXPKGS_CLEAN`
|
||||||
|
cat > $out/pkgs/nixpkgs.nix << EOF
|
||||||
|
{ fetchgit }:
|
||||||
|
import (fetchgit {
|
||||||
|
url = "https://github.com/nixos/nixpkgs.git";
|
||||||
|
rev = "$REV";
|
||||||
|
sha256 = "$HASH";
|
||||||
|
})
|
||||||
|
EOF
|
||||||
'';
|
'';
|
||||||
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
|
artiqpkgs = import "${generatedNix}/default.nix" { inherit pkgs; };
|
||||||
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
|
artiqVersion = import "${generatedNix}/pkgs/artiq-version.nix" (with pkgs; { inherit stdenv fetchgit git; });
|
||||||
|
@ -84,7 +100,7 @@ in
|
||||||
-i $HOME/.ssh/id_rsa \
|
-i $HOME/.ssh/id_rsa \
|
||||||
-o UserKnownHostsFile=$HOME/.ssh/known_hosts \
|
-o UserKnownHostsFile=$HOME/.ssh/known_hosts \
|
||||||
sb@rpi-1 \
|
sb@rpi-1 \
|
||||||
'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \
|
'mkdir -p /tmp/board_lock && flock /tmp/board_lock/kc705-1 -c "echo Ok; cat"' \
|
||||||
| (
|
| (
|
||||||
# End remote flock via FIFO
|
# End remote flock via FIFO
|
||||||
atexit_unlock() {
|
atexit_unlock() {
|
||||||
|
|
|
@ -9,7 +9,7 @@ let
|
||||||
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
artiqSrc = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
||||||
artiqpkgs = import ./default.nix { inherit pkgs; };
|
artiqpkgs = import ./default.nix { inherit pkgs; };
|
||||||
fetchcargo = import ./fetchcargo.nix {
|
fetchcargo = import ./fetchcargo.nix {
|
||||||
inherit (pkgs) stdenv cacert git;
|
inherit (pkgs) stdenv lib cacert git;
|
||||||
inherit (artiqpkgs) cargo cargo-vendor;
|
inherit (artiqpkgs) cargo cargo-vendor;
|
||||||
};
|
};
|
||||||
cargoDeps = fetchcargo rec {
|
cargoDeps = fetchcargo rec {
|
||||||
|
@ -47,7 +47,8 @@ in
|
||||||
, variant
|
, variant
|
||||||
, src ? null
|
, src ? null
|
||||||
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
|
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
|
||||||
, extraInstallCommands ? ""}:
|
, extraInstallCommands ? ""
|
||||||
|
, ... }:
|
||||||
|
|
||||||
# Board packages are Python modules so that they get added to the ARTIQ Python
|
# Board packages are Python modules so that they get added to the ARTIQ Python
|
||||||
# environment, and artiq_flash finds them.
|
# environment, and artiq_flash finds them.
|
||||||
|
@ -56,15 +57,15 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
|
||||||
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
|
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
|
||||||
inherit src;
|
inherit src;
|
||||||
phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
|
phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
|
||||||
buildInputs = [
|
nativeBuildInputs = [
|
||||||
vivado
|
vivado
|
||||||
pkgs.gnumake
|
pkgs.gnumake
|
||||||
(pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ]))
|
|
||||||
artiqpkgs.cargo
|
artiqpkgs.cargo
|
||||||
artiqpkgs.rustc
|
artiqpkgs.rustc
|
||||||
artiqpkgs.binutils-or1k
|
artiqpkgs.binutils-or1k
|
||||||
artiqpkgs.llvm-or1k
|
artiqpkgs.llvm-or1k
|
||||||
];
|
];
|
||||||
|
buildInputs = [ (pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ])) ];
|
||||||
buildPhase =
|
buildPhase =
|
||||||
''
|
''
|
||||||
export CARGO_HOME=${cargoVendored}
|
export CARGO_HOME=${cargoVendored}
|
||||||
|
@ -96,4 +97,6 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
|
||||||
fi
|
fi
|
||||||
${extraInstallCommands}
|
${extraInstallCommands}
|
||||||
'';
|
'';
|
||||||
|
# don't mangle ELF files as they are not for NixOS
|
||||||
|
dontFixup = true;
|
||||||
})
|
})
|
||||||
|
|
|
@ -36,6 +36,8 @@ let
|
||||||
build:
|
build:
|
||||||
- cmake
|
- cmake
|
||||||
- llvm-or1k
|
- llvm-or1k
|
||||||
|
run:
|
||||||
|
- python<3.8
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat > bld.bat << EOF
|
cat > bld.bat << EOF
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
[
|
|
||||||
"llvmlite-artiq"
|
|
||||||
"binutils-or1k-linux"
|
|
||||||
"pythonparser"
|
|
||||||
"scipy"
|
|
||||||
"numpy"
|
|
||||||
"prettytable"
|
|
||||||
"h5py"
|
|
||||||
"python-dateutil"
|
|
||||||
"pyqt"
|
|
||||||
"quamash"
|
|
||||||
"pyqtgraph"
|
|
||||||
"pygit2"
|
|
||||||
"python-levenshtein"
|
|
||||||
"sipyco"
|
|
||||||
]
|
|
|
@ -6,7 +6,22 @@ let
|
||||||
name = "artiq";
|
name = "artiq";
|
||||||
inherit version;
|
inherit version;
|
||||||
src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
|
||||||
dependencies = import ./artiq-deps.nix;
|
dependencies = [
|
||||||
|
"llvmlite-artiq"
|
||||||
|
"binutils-or1k-linux"
|
||||||
|
"pythonparser"
|
||||||
|
"scipy"
|
||||||
|
"numpy"
|
||||||
|
"prettytable"
|
||||||
|
"h5py"
|
||||||
|
"python-dateutil"
|
||||||
|
"pyqt"
|
||||||
|
(if (pkgs.lib.strings.versionAtLeast version "6.0") then "qasync" else "quamash")
|
||||||
|
"pyqtgraph"
|
||||||
|
"pygit2"
|
||||||
|
"python-levenshtein"
|
||||||
|
"sipyco"
|
||||||
|
];
|
||||||
extraYaml =
|
extraYaml =
|
||||||
''
|
''
|
||||||
about:
|
about:
|
||||||
|
|
|
@ -2,12 +2,22 @@
|
||||||
# recipe must be a string pointing to a path within the source.
|
# recipe must be a string pointing to a path within the source.
|
||||||
|
|
||||||
{ pkgs }:
|
{ pkgs }:
|
||||||
{ name, src, recipe ? "fake-conda"}:
|
{ name ? null
|
||||||
|
, src
|
||||||
|
, pname ? null
|
||||||
|
, version ? null
|
||||||
|
, recipe ? "fake-conda"
|
||||||
|
}:
|
||||||
|
|
||||||
|
# Check that either name is specified or both pname & version are specified.
|
||||||
|
assert (name == null) -> pname != null && version != null;
|
||||||
|
assert (name != null) -> pname == null && version == null;
|
||||||
let
|
let
|
||||||
condaBuilderEnv = import ./builder-env.nix { inherit pkgs; };
|
condaBuilderEnv = import ./builder-env.nix { inherit pkgs; };
|
||||||
|
realName = if (name != null) then name else "${pname}-${version}";
|
||||||
in pkgs.stdenv.mkDerivation {
|
in pkgs.stdenv.mkDerivation {
|
||||||
inherit name src;
|
name = realName;
|
||||||
|
inherit src;
|
||||||
buildCommand =
|
buildCommand =
|
||||||
''
|
''
|
||||||
HOME=`pwd`
|
HOME=`pwd`
|
||||||
|
|
|
@ -25,7 +25,7 @@ let
|
||||||
# that they are not there if they have been installed from files.
|
# that they are not there if they have been installed from files.
|
||||||
requirements:
|
requirements:
|
||||||
run:
|
run:
|
||||||
- python
|
- python<3.8
|
||||||
- ncurses [linux]
|
- ncurses [linux]
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
{ pkgs ? import ./pkgs/nixpkgs.nix { inherit (import <nixpkgs> {}) fetchgit; } {}}:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
artiq6 = pkgs.lib.strings.versionAtLeast mainPackages.artiq.version "6.0";
|
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) lib fetchgit fetchFromGitHub python3Packages; misoc-new = artiq6; };
|
||||||
|
|
||||||
boards = [
|
boards = [
|
||||||
{ target = "kasli"; variant = "tester"; }
|
{ target = "kasli"; variant = "tester"; }
|
||||||
|
@ -20,12 +20,12 @@ let
|
||||||
}) {} boards;
|
}) {} boards;
|
||||||
|
|
||||||
mainPackages = rec {
|
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 qasync;
|
||||||
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
||||||
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
||||||
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
||||||
rustc = callPackage ./pkgs/rust/rustc-with-crates.nix
|
rustc = callPackage ./pkgs/rust/rustc-with-crates.nix
|
||||||
((stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
((lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
||||||
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
||||||
}) //
|
}) //
|
||||||
{ inherit llvm-or1k; });
|
{ inherit llvm-or1k; });
|
||||||
|
@ -40,7 +40,8 @@ let
|
||||||
|
|
||||||
condaNoarch = {
|
condaNoarch = {
|
||||||
conda-pythonparser = import ./conda/build.nix { inherit pkgs; } {
|
conda-pythonparser = import ./conda/build.nix { inherit pkgs; } {
|
||||||
name = "conda-pythonparser";
|
pname = "conda-pythonparser";
|
||||||
|
inherit (pythonDeps.pythonparser) version;
|
||||||
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
||||||
name = "pythonparser";
|
name = "pythonparser";
|
||||||
inherit (pythonDeps.pythonparser) version src;
|
inherit (pythonDeps.pythonparser) version src;
|
||||||
|
@ -49,7 +50,8 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
conda-sipyco = import ./conda/build.nix { inherit pkgs; } {
|
conda-sipyco = import ./conda/build.nix { inherit pkgs; } {
|
||||||
name = "conda-sipyco";
|
pname = "conda-sipyco";
|
||||||
|
inherit (pythonDeps.sipyco) version;
|
||||||
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
||||||
name = "sipyco";
|
name = "sipyco";
|
||||||
inherit (pythonDeps.sipyco) version src;
|
inherit (pythonDeps.sipyco) version src;
|
||||||
|
@ -57,11 +59,20 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
conda-quamash = import ./conda/build.nix { inherit pkgs; } {
|
conda-quamash = import ./conda/build.nix { inherit pkgs; } {
|
||||||
name = "conda-quamash";
|
pname = "conda-quamash";
|
||||||
|
inherit (pkgs.python3Packages.quamash) version;
|
||||||
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
||||||
name = "quamash";
|
name = "quamash";
|
||||||
inherit (pkgs.python3Packages.quamash) version src;
|
inherit (pkgs.python3Packages.quamash) version src;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
conda-qasync = import ./conda/build.nix { inherit pkgs; } {
|
||||||
|
pname = "conda-qasync";
|
||||||
|
inherit (pythonDeps.qasync) version;
|
||||||
|
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
||||||
|
name = "qasync";
|
||||||
|
inherit (pythonDeps.qasync) version src;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
|
conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
@ -69,7 +80,8 @@ let
|
||||||
};
|
};
|
||||||
conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
|
conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
|
||||||
conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {
|
conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {
|
||||||
name = "conda-asyncserial";
|
pname = "conda-asyncserial";
|
||||||
|
inherit (pythonDeps.asyncserial) version;
|
||||||
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
src = import ./conda/fake-source.nix { inherit pkgs; } {
|
||||||
name = "asyncserial";
|
name = "asyncserial";
|
||||||
inherit (pythonDeps.asyncserial) version src;
|
inherit (pythonDeps.asyncserial) version src;
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{ stdenv, cacert, git, cargo, cargo-vendor }:
|
{ stdenv, lib, cacert, git, cargo, cargo-vendor }:
|
||||||
{ name, src, sha256 }:
|
{ name, src, sha256 }:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "${name}-vendor";
|
name = "${name}-vendor";
|
||||||
|
strictDeps = true;
|
||||||
nativeBuildInputs = [ cacert git cargo cargo-vendor ];
|
nativeBuildInputs = [ cacert git cargo cargo-vendor ];
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
|
@ -30,6 +31,6 @@ stdenv.mkDerivation {
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = sha256;
|
outputHash = sha256;
|
||||||
|
|
||||||
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
|
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
|
{ stdenv, lib, pythonDeps, fetchgit, git, python3Packages, qt5, binutils-or1k, binutils-arm, llvm-or1k, llvmlite-artiq, libartiq-support, lit, outputcheck }:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
name = "artiq-${version}";
|
pname = "artiq";
|
||||||
version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
|
version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
|
|
||||||
|
@ -11,7 +11,8 @@ python3Packages.buildPythonPackage rec {
|
||||||
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ]
|
propagatedBuildInputs = [ binutils-or1k llvm-or1k llvmlite-artiq ]
|
||||||
++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
|
++ (lib.lists.optionals (lib.strings.versionAtLeast version "6.0") [ binutils-arm ])
|
||||||
++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
|
++ (with pythonDeps; [ sipyco pyqtgraph-qt5 pythonparser ])
|
||||||
++ (with python3Packages; [ pygit2 numpy dateutil quamash scipy prettytable pyserial python-Levenshtein h5py pyqt5 ]);
|
++ (with python3Packages; [ pygit2 numpy dateutil scipy prettytable pyserial python-Levenshtein h5py pyqt5 ])
|
||||||
|
++ [(if (lib.strings.versionAtLeast version "6.0") then pythonDeps.qasync else python3Packages.quamash)];
|
||||||
|
|
||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
@ -20,6 +21,10 @@ python3Packages.buildPythonPackage rec {
|
||||||
wrapQtApp "$out/bin/artiq_session"
|
wrapQtApp "$out/bin/artiq_session"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses.
|
||||||
|
# Allows subprocesses using python to find all packages you have installed
|
||||||
|
makeWrapperArgs = [ ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' '' ];
|
||||||
|
|
||||||
checkInputs = [ binutils-or1k outputcheck ];
|
checkInputs = [ binutils-or1k outputcheck ];
|
||||||
checkPhase =
|
checkPhase =
|
||||||
''
|
''
|
||||||
|
@ -31,7 +36,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A leading-edge control system for quantum information experiments";
|
description = "A leading-edge control system for quantum information experiments";
|
||||||
homepage = https://m-labs/artiq;
|
homepage = https://m-labs/artiq;
|
||||||
license = licenses.lgpl3;
|
license = licenses.lgpl3;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, buildPackages
|
{ stdenv, lib, buildPackages
|
||||||
, fetchurl, zlib
|
, fetchurl, zlib
|
||||||
, platform, target
|
, platform, target
|
||||||
}:
|
}:
|
||||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
`gprof', `nm', `strip', etc.
|
`gprof', `nm', `strip', etc.
|
||||||
'';
|
'';
|
||||||
homepage = http://www.gnu.org/software/binutils/;
|
homepage = http://www.gnu.org/software/binutils/;
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
license = lib.licenses.gpl3Plus;
|
||||||
/* Give binutils a lower priority than gcc-wrapper to prevent a
|
/* Give binutils a lower priority than gcc-wrapper to prevent a
|
||||||
collision due to the ld/as wrappers/symlinks in the latter. */
|
collision due to the ld/as wrappers/symlinks in the latter. */
|
||||||
priority = "10";
|
priority = "10";
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, fetchgit, git, rustc }:
|
{ stdenv, fetchgit, git, rustc }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libartiq-support-${version}";
|
pname = "libartiq-support";
|
||||||
version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
|
version = import ./artiq-version.nix { inherit stdenv fetchgit git; };
|
||||||
|
|
||||||
src = import ./artiq-src.nix { inherit fetchgit; };
|
src = import ./artiq-src.nix { inherit fetchgit; };
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv
|
{ stdenv, lib
|
||||||
, fetchFromGitHub, runCommand
|
, fetchFromGitHub, runCommand
|
||||||
, perl, groff, cmake, libxml2, python, libffi, valgrind
|
, perl, groff, cmake, libxml2, python, libffi, valgrind
|
||||||
}:
|
}:
|
||||||
|
@ -25,12 +25,12 @@ let
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "llvm-or1k";
|
pname = "llvm-or1k";
|
||||||
|
version = "6.0.0";
|
||||||
passthru.llvm-src = llvm-src;
|
passthru.llvm-src = llvm-src;
|
||||||
src = llvm-clang-src;
|
src = llvm-clang-src;
|
||||||
version = "6.0.0";
|
|
||||||
|
|
||||||
buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
|
buildInputs = [ perl groff cmake libxml2 python libffi ] ++ lib.optional stdenv.isLinux valgrind;
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
NIX_BUILD_CORES=4
|
NIX_BUILD_CORES=4
|
||||||
|
@ -59,8 +59,8 @@ in
|
||||||
meta = {
|
meta = {
|
||||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||||
homepage = http://llvm.org/;
|
homepage = http://llvm.org/;
|
||||||
license = stdenv.lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = with stdenv.lib.maintainers; [ sb0 ];
|
maintainers = with lib.maintainers; [ sb0 ];
|
||||||
platforms = stdenv.lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, fetchFromGitHub, llvm-or1k, makeWrapper, python3, ncurses, zlib, python3Packages }:
|
{ stdenv, lib, fetchFromGitHub, llvm-or1k, makeWrapper, python3, ncurses, zlib, python3Packages }:
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
name = "llvmlite-artiq";
|
pname = "llvmlite-artiq";
|
||||||
version = "0.23.0.dev";
|
version = "0.23.0.dev";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "158f9d3a898dbf055ca513d69505df288c681fea";
|
rev = "158f9d3a898dbf055ca513d69505df288c681fea";
|
||||||
|
@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
|
|
||||||
preBuild = "export LLVM_CONFIG=${llvm-or1k}/bin/llvm-config";
|
preBuild = "export LLVM_CONFIG=${llvm-or1k}/bin/llvm-config";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A lightweight LLVM python binding for writing JIT compilers";
|
description = "A lightweight LLVM python binding for writing JIT compilers";
|
||||||
homepage = "http://llvmlite.pydata.org/";
|
homepage = "http://llvmlite.pydata.org/";
|
||||||
maintainers = with maintainers; [ sb0 ];
|
maintainers = with maintainers; [ sb0 ];
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ fetchgit }:
|
||||||
|
import (fetchgit {
|
||||||
|
url = "https://github.com/nixos/nixpkgs.git";
|
||||||
|
rev = "1c7f02b0b9f115ccbc122ce39ae99debc1af857a";
|
||||||
|
sha256 = "14sichs3hyg4ybcacvzglw97lg747y1ls5lsazv0n5yxv5w06l3d";
|
||||||
|
})
|
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, fetchFromGitHub, autoreconfHook, libftdi, libusb1, pkgconfig, hidapi }:
|
{ stdenv, lib, fetchFromGitHub, autoreconfHook, libftdi, libusb1, pkgconfig, hidapi }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "openocd-mlabs-${version}";
|
pname = "openocd-mlabs";
|
||||||
version = "0.10.0";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||||
cp ${bscan_spi_bitstreams}/*.bit "$out/share/bscan-spi-bitstreams"
|
cp ${bscan_spi_bitstreams}/*.bit "$out/share/bscan-spi-bitstreams"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
|
description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
OpenOCD provides on-chip programming and debugging support with a layered
|
OpenOCD provides on-chip programming and debugging support with a layered
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
{ stdenv, fetchFromGitHub, python3Packages, misoc-new }:
|
{ lib, fetchgit, fetchFromGitHub, python3Packages, misoc-new }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
# User dependencies
|
# User dependencies
|
||||||
sipyco = python3Packages.buildPythonPackage rec {
|
sipyco = python3Packages.buildPythonPackage rec {
|
||||||
name = "sipyco";
|
pname = "sipyco";
|
||||||
version = "1.1";
|
version = "1.2";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "sipyco";
|
repo = "sipyco";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "09vyrzfhnbp65ybd7w2g96gvvnhzafpn72syls2kbg2paqjjf9gs";
|
sha256 = "02x2s66x9bbzj82d823vjg2i73w7iqwvkrjbbyrsav6ccj7f90sj";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = with python3Packages; [ numpy ];
|
propagatedBuildInputs = with python3Packages; [ numpy ];
|
||||||
};
|
};
|
||||||
|
|
||||||
asyncserial = python3Packages.buildPythonPackage rec {
|
asyncserial = python3Packages.buildPythonPackage rec {
|
||||||
name = "asyncserial";
|
pname = "asyncserial";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
|
@ -27,7 +27,7 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonparser = python3Packages.buildPythonPackage rec {
|
pythonparser = python3Packages.buildPythonPackage rec {
|
||||||
name = "pythonparser";
|
pname = "pythonparser";
|
||||||
version = "1.3";
|
version = "1.3";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
|
@ -40,28 +40,60 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
|
pyqtgraph-qt5 = python3Packages.buildPythonPackage rec {
|
||||||
name = "pyqtgraph_qt5-${version}";
|
pname = "pyqtgraph_qt5";
|
||||||
version = "0.10.0";
|
version = "0.11.0";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "pyqtgraph" ];
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pyqtgraph";
|
owner = "pyqtgraph";
|
||||||
repo = "pyqtgraph";
|
repo = "pyqtgraph";
|
||||||
rev = "1426e334e1d20542400d77c72c132b04c6d17ddb";
|
rev = "pyqtgraph-${version}";
|
||||||
sha256 = "1079haxyr316jf0wpirxdj0ry6j8mr16cqr0dyyrd5cnxwl7zssh";
|
sha256 = "03fvpkqdn80ni51msvyivmghw41qk4vplwdqndkvzzzlppimdjbn";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = with python3Packages; [ scipy numpy pyqt5 pyopengl ];
|
propagatedBuildInputs = with python3Packages; [ scipy numpy pyqt5 pyopengl ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
qasync = python3Packages.buildPythonPackage rec {
|
||||||
|
pname = "qasync";
|
||||||
|
version = "0.10.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "CabbageDevelopment";
|
||||||
|
repo = "qasync";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1zga8s6dr7gk6awmxkh4pf25gbg8n6dv1j4b0by7y0fhi949qakq";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ python3Packages.pyqt5 ];
|
||||||
|
|
||||||
|
checkInputs = [ python3Packages.pytest ];
|
||||||
|
checkPhase = ''
|
||||||
|
pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
# Development/firmware dependencies
|
# Development/firmware dependencies
|
||||||
|
artiq-netboot = python3Packages.buildPythonPackage rec {
|
||||||
|
pname = "artiq-netboot";
|
||||||
|
version = "unstable-2020-10-15";
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "https://git.m-labs.hk/m-labs/artiq-netboot.git";
|
||||||
|
rev = "04f69eb07df73abe4b89fde2c24084f7664f2104";
|
||||||
|
sha256 = "0ql4fr8m8gpb2yql8aqsdqsssxb8zqd6l65kl1f6s9845zy7shs9";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
misoc = python3Packages.buildPythonPackage {
|
misoc = python3Packages.buildPythonPackage {
|
||||||
name = "misoc";
|
pname = "misoc";
|
||||||
|
version = if misoc-new then "unstable-2021-02-15" else "unstable-2020-05-29";
|
||||||
|
|
||||||
src = if misoc-new
|
src = if misoc-new
|
||||||
then (fetchFromGitHub {
|
then (fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "misoc";
|
repo = "misoc";
|
||||||
rev = "9cad449a283d3b7a6e496afa523547df06e75829";
|
rev = "d84551418042cea0891ea743442e20684b51e77a";
|
||||||
sha256 = "1fw3qfhaa435iv5qnvhhfwj29skhkj6yagr6ila9va9nb2zvklf5";
|
sha256 = "1id5qjr9dl4r3vi6jdn7dfpnr2wb08nrm3nfscn18clbbdxybyjn";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
})
|
})
|
||||||
else (fetchFromGitHub {
|
else (fetchFromGitHub {
|
||||||
|
@ -74,10 +106,10 @@ rec {
|
||||||
|
|
||||||
# TODO: fix misoc bitrot and re-enable tests
|
# TODO: fix misoc bitrot and re-enable tests
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ pyserial jinja2 numpy asyncserial migen ];
|
propagatedBuildInputs = with python3Packages; [ pyserial jinja2 numpy asyncserial migen ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A high performance and small footprint system-on-chip based on Migen";
|
description = "A high performance and small footprint system-on-chip based on Migen";
|
||||||
homepage = "https://m-labs.hk/migen";
|
homepage = "https://m-labs.hk/migen";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
@ -86,18 +118,19 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
migen = python3Packages.buildPythonPackage rec {
|
migen = python3Packages.buildPythonPackage rec {
|
||||||
name = "migen";
|
pname = "migen";
|
||||||
|
version = "unstable-2021-02-08";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "migen";
|
repo = "migen";
|
||||||
rev = "12e7ba6a4c19ee65ff9e042747220972aecc05ac";
|
rev = "7014bdccc11270764186e6a4441fb58238c612aa";
|
||||||
sha256 = "0z76jfcvm7k6iqkmpdck3mw06hlg0kqvbpr047rgyvaw5im98wj5";
|
sha256 = "12mhmcdf0jqv33ald9x9zb1qi26sw4ywdfgg5saqvmx0pmbmvynk";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ colorama ];
|
propagatedBuildInputs = with python3Packages; [ colorama ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A Python toolbox for building complex digital hardware";
|
description = "A Python toolbox for building complex digital hardware";
|
||||||
homepage = "https://m-labs.hk/migen";
|
homepage = "https://m-labs.hk/migen";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
@ -106,7 +139,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
microscope = python3Packages.buildPythonPackage rec {
|
microscope = python3Packages.buildPythonPackage rec {
|
||||||
name = "microscope";
|
pname = "microscope";
|
||||||
|
version = "unstable-2019-05-17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
|
@ -117,7 +151,7 @@ rec {
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ pyserial prettytable msgpack migen ];
|
propagatedBuildInputs = with python3Packages; [ pyserial prettytable msgpack migen ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Finding the bacteria in rotting FPGA designs";
|
description = "Finding the bacteria in rotting FPGA designs";
|
||||||
homepage = "https://m-labs.hk/migen";
|
homepage = "https://m-labs.hk/migen";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
@ -126,18 +160,19 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
jesd204b = python3Packages.buildPythonPackage rec {
|
jesd204b = python3Packages.buildPythonPackage rec {
|
||||||
name = "jesd204b";
|
pname = "jesd204b";
|
||||||
|
version = "unstable-2020-12-18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "jesd204b";
|
repo = "jesd204b";
|
||||||
rev = "ac877ac5975411a438415f824e182338ed773529";
|
rev = "23bd08f5ee95eb42502f9fbe1c2a45e8c083eab9";
|
||||||
sha256 = "1lkb7cyj87bq4y0hp6379jq4q4lm2ijldccpyhawiizcfkawxa10";
|
sha256 = "0x2mh5fv4q0b1f8pjc2kcyjqbfgiyp1hlvbfgk8dbsraj50i566h";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ migen misoc ];
|
propagatedBuildInputs = with python3Packages; [ migen misoc ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "JESD204B core for Migen/MiSoC";
|
description = "JESD204B core for Migen/MiSoC";
|
||||||
homepage = "https://m-labs.hk/migen";
|
homepage = "https://m-labs.hk/migen";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
@ -154,7 +189,7 @@ rec {
|
||||||
sha256 = "0j15i54p7nri6hkzn1wal9pxri4pgql01wgjccig6ar0v5jjbvsy";
|
sha256 = "0j15i54p7nri6hkzn1wal9pxri4pgql01wgjccig6ar0v5jjbvsy";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Super-fast and clean conversions to numbers";
|
description = "Super-fast and clean conversions to numbers";
|
||||||
homepage = "https://github.com/SethMMorton/fastnumbers";
|
homepage = "https://github.com/SethMMorton/fastnumbers";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
@ -163,7 +198,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
ramda = python3Packages.buildPythonPackage {
|
ramda = python3Packages.buildPythonPackage {
|
||||||
name = "ramda";
|
pname = "ramda";
|
||||||
|
version = "unstable-2019-02-01";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "peteut";
|
owner = "peteut";
|
||||||
|
@ -182,7 +218,7 @@ rec {
|
||||||
export PBR_VERSION=0.0.1
|
export PBR_VERSION=0.0.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Ramda, ported to Python";
|
description = "Ramda, ported to Python";
|
||||||
homepage = "https://github.com/peteut/ramda.py";
|
homepage = "https://github.com/peteut/ramda.py";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
@ -191,13 +227,14 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
migen-axi = python3Packages.buildPythonPackage {
|
migen-axi = python3Packages.buildPythonPackage {
|
||||||
name = "migen-axi";
|
pname = "migen-axi";
|
||||||
|
version = "unstable-2021-01-22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "peteut";
|
owner = "peteut";
|
||||||
repo = "migen-axi";
|
repo = "migen-axi";
|
||||||
rev = "623f368702c1380afff51f67cc744427b871f967";
|
rev = "9439ee900358598cecc682db327aa30e506172b5";
|
||||||
sha256 = "0nca8piril1lwwffdxi3x32drgq4mgj88r23mxwzdfa28ws506il";
|
sha256 = "1z5s8ifq7fbpqi6sx2i87rmz63kbgh9ck94fs2qf21ixhxi46nm3";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python3Packages.pbr ];
|
nativeBuildInputs = [ python3Packages.pbr ];
|
||||||
|
@ -222,7 +259,7 @@ rec {
|
||||||
export PBR_VERSION=0.0.1
|
export PBR_VERSION=0.0.1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "AXI support for Migen/MiSoC";
|
description = "AXI support for Migen/MiSoC";
|
||||||
homepage = "https://github.com/peteut/migen-axi";
|
homepage = "https://github.com/peteut/migen-axi";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
@ -243,7 +280,7 @@ rec {
|
||||||
# Non-standard test suite. Needs custom checkPhase.
|
# Non-standard test suite. Needs custom checkPhase.
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "Portable tool for executing LLVM and Clang style test suites";
|
description = "Portable tool for executing LLVM and Clang style test suites";
|
||||||
homepage = http://llvm.org/docs/CommandGuide/lit.html;
|
homepage = http://llvm.org/docs/CommandGuide/lit.html;
|
||||||
license = licenses.ncsa;
|
license = licenses.ncsa;
|
||||||
|
@ -262,7 +299,7 @@ rec {
|
||||||
};
|
};
|
||||||
prePatch = "echo ${version} > RELEASE-VERSION";
|
prePatch = "echo ${version} > RELEASE-VERSION";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
description = "A tool for checking tool output inspired by LLVM's FileCheck";
|
description = "A tool for checking tool output inspired by LLVM's FileCheck";
|
||||||
homepage = "https://github.com/stp/OutputCheck";
|
homepage = "https://github.com/stp/OutputCheck";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin
|
{ stdenv, lib, makeWrapper, bash, buildRustPackage, curl, darwin
|
||||||
, version
|
, version
|
||||||
, src
|
, src
|
||||||
, platform
|
, platform
|
||||||
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (stdenv.lib) optionalString;
|
inherit (lib) optionalString;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
|
||||||
bootstrapping = versionType == "bootstrap";
|
bootstrapping = versionType == "bootstrap";
|
||||||
|
@ -26,14 +26,14 @@ rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = http://www.rust-lang.org/;
|
homepage = http://www.rust-lang.org/;
|
||||||
description = "A safe, concurrent, practical language";
|
description = "A safe, concurrent, practical language";
|
||||||
maintainers = with maintainers; [ sb0 ];
|
maintainers = with maintainers; [ sb0 ];
|
||||||
license = [ licenses.mit licenses.asl20 ];
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
|
buildInputs = [ bash ] ++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
@ -60,7 +60,7 @@ rec {
|
||||||
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
|
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc"
|
||||||
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
|
||||||
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
|
||||||
install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libcurl.4.dylib '${lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
|
||||||
for f in $out/lib/lib*.dylib; do
|
for f in $out/lib/lib*.dylib; do
|
||||||
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
|
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f"
|
||||||
done
|
done
|
||||||
|
@ -80,14 +80,14 @@ rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = http://www.rust-lang.org/;
|
homepage = http://www.rust-lang.org/;
|
||||||
description = "A safe, concurrent, practical language";
|
description = "A safe, concurrent, practical language";
|
||||||
maintainers = with maintainers; [ sb0 ];
|
maintainers = with maintainers; [ sb0 ];
|
||||||
license = [ licenses.mit licenses.asl20 ];
|
license = [ licenses.mit licenses.asl20 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
|
buildInputs = [ makeWrapper bash ] ++ lib.optional stdenv.isDarwin Security;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
@ -107,7 +107,7 @@ rec {
|
||||||
${optionalString (stdenv.isDarwin && bootstrapping) ''
|
${optionalString (stdenv.isDarwin && bootstrapping) ''
|
||||||
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo"
|
||||||
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo"
|
||||||
install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
|
install_name_tool -change /usr/lib/libcurl.4.dylib '${lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo"
|
||||||
''}
|
''}
|
||||||
|
|
||||||
wrapProgram "$out/bin/cargo" \
|
wrapProgram "$out/bin/cargo" \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
|
{ stdenv, lib, file, curl, pkgconfig, python, openssl, cmake, zlib
|
||||||
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
|
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
|
||||||
, fetchurl
|
, fetchurl
|
||||||
}:
|
}:
|
||||||
|
@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
# Note: we can't build cargo 1.28.0 because rustc tightened the borrow checker rules and broke
|
# Note: we can't build cargo 1.28.0 because rustc tightened the borrow checker rules and broke
|
||||||
# backward compatibility, which affects old cargo versions.
|
# backward compatibility, which affects old cargo versions.
|
||||||
# There are also issues with asm/llvm_asm with recent rustc and cargo versions prior to 1.39.
|
# There are also issues with asm/llvm_asm with recent rustc and cargo versions prior to 1.39.
|
||||||
name = "cargo-${version}";
|
pname = "cargo";
|
||||||
version = "1.39.0";
|
version = "1.39.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz";
|
url = "https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz";
|
||||||
|
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
# Disable check phase as there are failures (4 tests fail)
|
# Disable check phase as there are failures (4 tests fail)
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = https://crates.io;
|
homepage = https://crates.io;
|
||||||
description = "Downloads your Rust project's dependencies and builds your project";
|
description = "Downloads your Rust project's dependencies and builds your project";
|
||||||
maintainers = with maintainers; [ wizeman retrry ];
|
maintainers = with maintainers; [ wizeman retrry ];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, targetPackages
|
{ stdenv, lib, targetPackages
|
||||||
, fetchurl, file, python2, tzdata, ps
|
, fetchurl, file, python2, tzdata, ps
|
||||||
, llvm-or1k, ncurses, zlib, darwin, rustPlatform, git, cmake, curl
|
, llvm-or1k, ncurses, zlib, darwin, rustPlatform, git, cmake, curl
|
||||||
, which, libffi, gdb
|
, which, libffi, gdb
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (stdenv.lib) optional optionalString;
|
inherit (lib) optional optionalString;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
|
|
||||||
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
|
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
|
||||||
|
@ -26,7 +26,7 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "rustc-${version}";
|
pname = "rustc";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
inherit src;
|
inherit src;
|
||||||
|
@ -171,7 +171,7 @@ stdenv.mkDerivation {
|
||||||
# https://github.com/rust-lang/rust/issues/30181
|
# https://github.com/rust-lang/rust/issues/30181
|
||||||
# enableParallelBuilding = false;
|
# enableParallelBuilding = false;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with lib; {
|
||||||
homepage = https://www.rust-lang.org/;
|
homepage = https://www.rust-lang.org/;
|
||||||
description = "A safe, concurrent, practical language";
|
description = "A safe, concurrent, practical language";
|
||||||
maintainers = with maintainers; [ sb0 ];
|
maintainers = with maintainers; [ sb0 ];
|
||||||
|
|
|
@ -8,7 +8,7 @@ in
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
vivado
|
vivado
|
||||||
pkgs.gnumake
|
pkgs.gnumake
|
||||||
(pkgs.python3.withPackages(ps: (with ps; [ jinja2 numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ])))
|
(pkgs.python3.withPackages(ps: (with ps; [ jinja2 jsonschema numpy paramiko ]) ++ (with artiqpkgs; [ migen microscope misoc jesd204b migen-axi artiq ])))
|
||||||
artiqpkgs.cargo
|
artiqpkgs.cargo
|
||||||
artiqpkgs.rustc
|
artiqpkgs.rustc
|
||||||
artiqpkgs.binutils-or1k
|
artiqpkgs.binutils-or1k
|
||||||
|
|
|
@ -15,6 +15,7 @@ let
|
||||||
name = "conda-deps";
|
name = "conda-deps";
|
||||||
script = let
|
script = let
|
||||||
artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0";
|
artiq6 = pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "6.0";
|
||||||
|
qt-asyncio-package = if artiq6 then artiqpkgs.conda-qasync else artiqpkgs.conda-quamash;
|
||||||
conda-deps-noarch = import (if artiq6 then ./conda_noarch_packages.nix else ./conda_noarch_packages-legacy.nix) { inherit pkgs; };
|
conda-deps-noarch = import (if artiq6 then ./conda_noarch_packages.nix else ./conda_noarch_packages-legacy.nix) { inherit pkgs; };
|
||||||
conda-deps-win-64 = import (if artiq6 then ./conda_win-64_packages.nix else ./conda_win-64_packages-legacy.nix) { inherit pkgs; };
|
conda-deps-win-64 = import (if artiq6 then ./conda_win-64_packages.nix else ./conda_win-64_packages-legacy.nix) { inherit pkgs; };
|
||||||
conda-packages-put = pkgs.lib.strings.concatStringsSep "\n"
|
conda-packages-put = pkgs.lib.strings.concatStringsSep "\n"
|
||||||
|
@ -32,7 +33,7 @@ let
|
||||||
|
|
||||||
win-put ${artiqpkgs.conda-pythonparser}/noarch/*.tar.bz2 'fake-channel/noarch'
|
win-put ${artiqpkgs.conda-pythonparser}/noarch/*.tar.bz2 'fake-channel/noarch'
|
||||||
win-put ${artiqpkgs.conda-sipyco}/noarch/*.tar.bz2 'fake-channel/noarch'
|
win-put ${artiqpkgs.conda-sipyco}/noarch/*.tar.bz2 'fake-channel/noarch'
|
||||||
win-put ${artiqpkgs.conda-quamash}/noarch/*.tar.bz2 'fake-channel/noarch'
|
win-put ${qt-asyncio-package}/noarch/*.tar.bz2 'fake-channel/noarch'
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
342
artiq-full.nix
342
artiq-full.nix
|
@ -1,118 +1,128 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
{ a6p ? <a6p>
|
||||||
|
, artiq-fast ? (
|
||||||
|
if a6p
|
||||||
|
then <artiq-board-generated/fast>
|
||||||
|
else <artiq-fast>
|
||||||
|
)
|
||||||
|
, pkgs ? import (artiq-fast + "/pkgs/nixpkgs.nix") { inherit (import <nixpkgs> {}) fetchgit; } {}
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
sinaraSystemsSrc = <sinaraSystemsSrc>;
|
sinaraSystemsRev = builtins.readFile <artiq-board-generated/sinara-rev.txt>;
|
||||||
|
sinaraSystemsHash = builtins.readFile <artiq-board-generated/sinara-hash.txt>;
|
||||||
|
sinaraSystemsSrc =
|
||||||
|
if a6p
|
||||||
|
then pkgs.fetchgit {
|
||||||
|
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
||||||
|
rev = sinaraSystemsRev;
|
||||||
|
sha256 = sinaraSystemsHash;
|
||||||
|
}
|
||||||
|
else <sinaraSystemsSrc>;
|
||||||
|
artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") {
|
||||||
|
inherit (pkgs) stdenv git fetchgit;
|
||||||
|
};
|
||||||
|
targets = import ./artiq-full/artiq-targets.nix {
|
||||||
|
inherit pkgs artiqVersion sinaraSystemsSrc;
|
||||||
|
};
|
||||||
|
kasliVariants = map ({ variant, ... }: variant) (
|
||||||
|
builtins.filter ({ target, ... }: target == "kasli") (
|
||||||
|
builtins.attrValues targets
|
||||||
|
)
|
||||||
|
);
|
||||||
|
standaloneVariants = map ({ variant, ... }: variant) (
|
||||||
|
builtins.filter ({ target, standalone ? false, ... }: target == "kasli" && standalone) (
|
||||||
|
builtins.attrValues targets
|
||||||
|
)
|
||||||
|
);
|
||||||
|
serializedTargets = pkgs.lib.generators.toPretty {} (
|
||||||
|
map (conf:
|
||||||
|
if conf ? buildCommand
|
||||||
|
then conf // {
|
||||||
|
buildCommand = builtins.replaceStrings ["$"] ["\\\\\\$"] conf.buildCommand;
|
||||||
|
}
|
||||||
|
else conf
|
||||||
|
) (builtins.attrValues targets)
|
||||||
|
);
|
||||||
|
|
||||||
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
|
generatedNix = pkgs.runCommand "generated-nix" { buildInputs = [ pkgs.nix pkgs.git ]; }
|
||||||
''
|
''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
|
|
||||||
cp -a ${<artiq-fast>} $out/fast
|
${if a6p
|
||||||
cp ${./artiq-full/conda-artiq-board.nix} $out/conda-artiq-board.nix
|
then ''
|
||||||
cp ${./artiq-full/extras.nix} $out/extras.nix
|
cp -a ${<artiq-board-generated>} $out/board-generated
|
||||||
|
ln -s board-generated/fast $out/fast
|
||||||
|
''
|
||||||
|
else "cp -a ${<artiq-fast>} $out/fast"}
|
||||||
|
cp ${./artiq-full}/artiq-board-vivado.nix $out
|
||||||
|
cp ${./artiq-full}/generate-identifier.py $out
|
||||||
|
cp ${./artiq-full}/conda-artiq-board.nix $out
|
||||||
|
cp ${./artiq-full}/extras.nix $out
|
||||||
|
cp ${./artiq-full}/*.patch $out
|
||||||
|
|
||||||
REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
|
${if a6p
|
||||||
SINARA_SRC_CLEAN=`mktemp -d`
|
then ''
|
||||||
cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
|
REV=${sinaraSystemsRev}
|
||||||
chmod -R 755 $SINARA_SRC_CLEAN/.git
|
HASH=${sinaraSystemsHash}
|
||||||
chmod 755 $SINARA_SRC_CLEAN
|
''
|
||||||
rm -rf $SINARA_SRC_CLEAN/.git
|
else ''
|
||||||
HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
|
REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
|
||||||
|
SINARA_SRC_CLEAN=`mktemp -d`
|
||||||
|
cp -a ${sinaraSystemsSrc}/. $SINARA_SRC_CLEAN
|
||||||
|
chmod -R 755 $SINARA_SRC_CLEAN/.git
|
||||||
|
chmod 755 $SINARA_SRC_CLEAN
|
||||||
|
rm -rf $SINARA_SRC_CLEAN/.git
|
||||||
|
HASH=`nix-hash --type sha256 --base32 $SINARA_SRC_CLEAN`
|
||||||
|
''}
|
||||||
cat > $out/default.nix << EOF
|
cat > $out/default.nix << EOF
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
{ pkgs ? import ./fast/pkgs/nixpkgs.nix { inherit (import <nixpkgs> {}) fetchgit; } {} }:
|
||||||
|
|
||||||
let
|
let
|
||||||
artiq-fast = import ./fast { inherit pkgs; };
|
artiq-fast = import ${if a6p then "./board-generated" else "."}/fast { inherit pkgs; };
|
||||||
|
ddbDeps = [
|
||||||
|
artiq-fast.artiq
|
||||||
|
(pkgs.python3.withPackages (ps: [ ps.jsonschema ]))
|
||||||
|
];
|
||||||
|
|
||||||
target = "kasli";
|
kasliVariants = [${builtins.concatStringsSep " " (
|
||||||
variants = [
|
builtins.map (variant: "\"${variant}\"") kasliVariants
|
||||||
"afmaster"
|
)}];
|
||||||
"afsatellite"
|
standaloneVariants = [${builtins.concatStringsSep " " (
|
||||||
"berkeley3"
|
builtins.map (variant: "\"${variant}\"") standaloneVariants
|
||||||
"csu"
|
)}];
|
||||||
"duke3"
|
|
||||||
"femto1"
|
|
||||||
"femto2"
|
|
||||||
"femto3"
|
|
||||||
"freiburg1"
|
|
||||||
"griffith"
|
|
||||||
"hub"
|
|
||||||
"hw"
|
|
||||||
"indiana"
|
|
||||||
"innsbruck2"
|
|
||||||
"ist"
|
|
||||||
"liaf"
|
|
||||||
"luh2"
|
|
||||||
"luh3"
|
|
||||||
"mikes"
|
|
||||||
"mit"
|
|
||||||
"mitll3"
|
|
||||||
"mitll4master"
|
|
||||||
"mitll4satellite"
|
|
||||||
"mpik"
|
|
||||||
"mpq"
|
|
||||||
"nict"
|
|
||||||
"nist"
|
|
||||||
"no"
|
|
||||||
"npl1"
|
|
||||||
"npl2"
|
|
||||||
"oklahoma"
|
|
||||||
"olomouc"
|
|
||||||
"opticlock"
|
|
||||||
"oregon"
|
|
||||||
"osaka"
|
|
||||||
"ptb"
|
|
||||||
"ptb2"
|
|
||||||
"ptb3"
|
|
||||||
"ptb4"
|
|
||||||
"ptb5"
|
|
||||||
"ptb6"
|
|
||||||
"ptbal"
|
|
||||||
"ptbin"
|
|
||||||
"purpleberry"
|
|
||||||
"qe"
|
|
||||||
"qleds"
|
|
||||||
"rice"
|
|
||||||
"saymamaster"
|
|
||||||
"siegen"
|
|
||||||
"sydney"
|
|
||||||
"uaarhus"
|
|
||||||
"ubirmingham"
|
|
||||||
"ugranada"
|
|
||||||
"unlv"
|
|
||||||
"ustc2"
|
|
||||||
"vlbaimaster"
|
|
||||||
"vlbaisatellite"
|
|
||||||
"wipm"
|
|
||||||
"wipm5master"
|
|
||||||
"wipm5satellite"
|
|
||||||
] ++ (pkgs.lib.lists.optionals (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") [
|
|
||||||
"bonn1master"
|
|
||||||
"bonn1satellite"
|
|
||||||
"hw2master"
|
|
||||||
"hw2satellite"
|
|
||||||
"luh"
|
|
||||||
"purduemaster"
|
|
||||||
"purduesatellite"
|
|
||||||
"uamsterdam"
|
|
||||||
]);
|
|
||||||
|
|
||||||
vivado = import ./fast/vivado.nix { inherit pkgs; };
|
vivado = import ${if a6p then "./board-generated" else "."}/fast/vivado.nix {
|
||||||
artiq-board = import ./fast/artiq-board.nix { inherit pkgs vivado; };
|
inherit pkgs;
|
||||||
|
};
|
||||||
|
artiq-board =
|
||||||
|
${if a6p
|
||||||
|
then ''
|
||||||
|
import ./artiq-board-vivado.nix {
|
||||||
|
inherit pkgs vivado;
|
||||||
|
version = artiq-fast.artiq.version;
|
||||||
|
board-generated = import ./board-generated {
|
||||||
|
inherit pkgs;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
''
|
||||||
|
else ''
|
||||||
|
import ./fast/artiq-board.nix {
|
||||||
|
inherit pkgs vivado;
|
||||||
|
}
|
||||||
|
''};
|
||||||
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
|
conda-artiq-board = import ./conda-artiq-board.nix { inherit pkgs; };
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
url = "https://git.m-labs.hk/M-Labs/sinara-systems.git";
|
||||||
rev = "$REV";
|
rev = "$REV";
|
||||||
sha256 = "$HASH";
|
sha256 = "$HASH";
|
||||||
};
|
};
|
||||||
generic-kasli = pkgs.lib.lists.foldr (variant: start:
|
artiq-targets = pkgs.lib.lists.foldr (conf: start:
|
||||||
let
|
let
|
||||||
json = builtins.toPath (src + "/\''${variant}.json");
|
inherit (conf) target variant;
|
||||||
boardBinaries = artiq-board {
|
json = src + "/\''${variant}.json";
|
||||||
inherit target variant;
|
boardBinaries = artiq-board (conf // {
|
||||||
src = json;
|
src = json;
|
||||||
buildCommand = "python -m artiq.gateware.targets.kasli_generic \$src";
|
});
|
||||||
};
|
|
||||||
in
|
in
|
||||||
start // {
|
start // {
|
||||||
"artiq-board-\''${target}-\''${variant}" = boardBinaries;
|
"artiq-board-\''${target}-\''${variant}" = boardBinaries;
|
||||||
|
@ -120,10 +130,13 @@ let
|
||||||
boardBinaries = boardBinaries;
|
boardBinaries = boardBinaries;
|
||||||
inherit target variant;
|
inherit target variant;
|
||||||
};
|
};
|
||||||
} // (pkgs.lib.optionalAttrs ((builtins.fromJSON (builtins.readFile json)).base == "standalone") {
|
} // (pkgs.lib.optionalAttrs (
|
||||||
|
target == "kasli" &&
|
||||||
|
builtins.elem variant standaloneVariants
|
||||||
|
) {
|
||||||
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
|
"device-db-\''${target}-\''${variant}" = pkgs.stdenv.mkDerivation {
|
||||||
name = "device-db-\''${target}-\''${variant}";
|
name = "device-db-\''${target}-\''${variant}";
|
||||||
buildInputs = [ artiq-fast.artiq ];
|
buildInputs = ddbDeps;
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
buildPhase = "
|
buildPhase = "
|
||||||
mkdir \$out
|
mkdir \$out
|
||||||
|
@ -132,62 +145,64 @@ let
|
||||||
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
||||||
";
|
";
|
||||||
};
|
};
|
||||||
})) {} variants;
|
})
|
||||||
|
) {} ${serializedTargets};
|
||||||
drtio-systems = {
|
drtio-systems = {
|
||||||
af = {
|
${pkgs.lib.optionalString a6p ''
|
||||||
master = "afmaster";
|
berkeley3 = {
|
||||||
satellites = {
|
master = "berkeley3master";
|
||||||
"1" = "afsatellite";
|
satellites = {
|
||||||
|
"1" = "berkeley3satellite";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
bonn1 = {
|
||||||
mitll4 = {
|
master = "bonn1master";
|
||||||
master = "mitll4master";
|
satellites = {
|
||||||
satellites = {
|
"1" = "bonn1satellite";
|
||||||
"1" = "mitll4satellite";
|
};
|
||||||
};
|
};
|
||||||
};
|
hw2 = {
|
||||||
vlbai = {
|
master = "hw2master";
|
||||||
master = "vlbaimaster";
|
satellites = {
|
||||||
satellites = {
|
"1" = "hw2satellite";
|
||||||
"1" = "vlbaisatellite";
|
};
|
||||||
};
|
};
|
||||||
};
|
ptb3 = {
|
||||||
wipm5 = {
|
master = "ptb3master";
|
||||||
master = "wipm5master";
|
satellites = {
|
||||||
satellites = {
|
"1" = "ptb3satellite";
|
||||||
"1" = "wipm5satellite";
|
};
|
||||||
};
|
};
|
||||||
};
|
purdue = {
|
||||||
} // (pkgs.lib.optionalAttrs (pkgs.lib.strings.versionAtLeast artiq-fast.artiq.version "6.0") {
|
master = "purduemaster";
|
||||||
bonn1 = {
|
satellites = {
|
||||||
master = "bonn1master";
|
"1" = "purduesatellite";
|
||||||
satellites = {
|
};
|
||||||
"1" = "bonn1satellite";
|
|
||||||
};
|
};
|
||||||
};
|
stfc = {
|
||||||
hw2 = {
|
master = "stfcmaster";
|
||||||
master = "hw2master";
|
satellites = {
|
||||||
satellites = {
|
"1" = "stfcsatellite";
|
||||||
"1" = "hw2satellite";
|
};
|
||||||
};
|
};
|
||||||
};
|
wipm7 = {
|
||||||
purdue = {
|
master = "wipm7master";
|
||||||
master = "purduemaster";
|
satellites = {
|
||||||
satellites = {
|
"1" = "wipm7satellite";
|
||||||
"1" = "purduesatellite";
|
};
|
||||||
};
|
};
|
||||||
};
|
''}
|
||||||
});
|
};
|
||||||
drtio-ddbs = pkgs.lib.attrsets.mapAttrs'
|
drtio-ddbs = pkgs.lib.attrsets.mapAttrs'
|
||||||
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
|
(system: crates: pkgs.lib.attrsets.nameValuePair ("device-db-" + system)
|
||||||
(pkgs.stdenv.mkDerivation {
|
(pkgs.stdenv.mkDerivation {
|
||||||
name = "device-db-\''${system}";
|
name = "device-db-\''${system}";
|
||||||
buildInputs = [ artiq-fast.artiq ];
|
buildInputs = ddbDeps;
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
buildPhase = "
|
buildPhase = "
|
||||||
mkdir \$out
|
mkdir \$out
|
||||||
artiq_ddb_template \
|
artiq_ddb_template \
|
||||||
\''${pkgs.lib.strings.concatStringsSep " " (pkgs.lib.attrsets.mapAttrsToList (dest: desc: "-s " + dest + " " + src + "/" + desc + ".json") crates.satellites) } \
|
\''${pkgs.lib.strings.concatStringsSep " " (pkgs.lib.attrsets.mapAttrsToList (dest: desc: "-s " + dest + " " + (src + "/\''${desc}.json")) crates.satellites) } \
|
||||||
\''${src}/\''${crates.master}.json -o \$out/device_db.py
|
\''${src}/\''${crates.master}.json -o \$out/device_db.py
|
||||||
mkdir \$out/nix-support
|
mkdir \$out/nix-support
|
||||||
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
echo file device_db_template \$out/device_db.py >> \$out/nix-support/hydra-build-products
|
||||||
|
@ -195,42 +210,7 @@ let
|
||||||
})) drtio-systems;
|
})) drtio-systems;
|
||||||
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
|
extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) sipyco asyncserial artiq; };
|
||||||
in
|
in
|
||||||
artiq-fast // generic-kasli // drtio-ddbs // extras // rec {
|
artiq-fast // artiq-targets // drtio-ddbs // extras // rec {
|
||||||
artiq-board-sayma-rtm = artiq-board {
|
|
||||||
target = "sayma";
|
|
||||||
variant = "rtm";
|
|
||||||
buildCommand = "python -m artiq.gateware.targets.sayma_rtm";
|
|
||||||
};
|
|
||||||
artiq-board-sayma-satellite = artiq-board {
|
|
||||||
target = "sayma";
|
|
||||||
variant = "satellite";
|
|
||||||
buildCommand = "python -m artiq.gateware.targets.sayma_amc";
|
|
||||||
};
|
|
||||||
artiq-board-metlino-master = artiq-board {
|
|
||||||
target = "metlino";
|
|
||||||
variant = "master";
|
|
||||||
buildCommand = "python -m artiq.gateware.targets.metlino";
|
|
||||||
};
|
|
||||||
artiq-board-kc705-nist_qc2 = artiq-board {
|
|
||||||
target = "kc705";
|
|
||||||
variant = "nist_qc2";
|
|
||||||
};
|
|
||||||
|
|
||||||
conda-artiq-board-sayma-rtm = conda-artiq-board {
|
|
||||||
target = "sayma";
|
|
||||||
variant = "rtm";
|
|
||||||
boardBinaries = artiq-board-sayma-rtm;
|
|
||||||
};
|
|
||||||
conda-artiq-board-sayma-satellite = conda-artiq-board {
|
|
||||||
target = "sayma";
|
|
||||||
variant = "satellite";
|
|
||||||
boardBinaries = artiq-board-sayma-satellite;
|
|
||||||
};
|
|
||||||
conda-artiq-board-metlino-master = conda-artiq-board {
|
|
||||||
target = "metlino";
|
|
||||||
variant = "master";
|
|
||||||
boardBinaries = artiq-board-metlino-master;
|
|
||||||
};
|
|
||||||
conda-artiq-board-kasli-tester = conda-artiq-board {
|
conda-artiq-board-kasli-tester = conda-artiq-board {
|
||||||
target = "kasli";
|
target = "kasli";
|
||||||
variant = "tester";
|
variant = "tester";
|
||||||
|
@ -241,28 +221,22 @@ let
|
||||||
variant = "nist_clock";
|
variant = "nist_clock";
|
||||||
boardBinaries = artiq-fast.artiq-board-kc705-nist_clock;
|
boardBinaries = artiq-fast.artiq-board-kc705-nist_clock;
|
||||||
};
|
};
|
||||||
conda-artiq-board-kc705-nist_qc2 = conda-artiq-board {
|
|
||||||
target = "kc705";
|
|
||||||
variant = "nist_qc2";
|
|
||||||
boardBinaries = artiq-board-kc705-nist_qc2;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
pythonDeps = import ./artiq-full/python-deps.nix { inherit pkgs; };
|
pythonDeps = import ./artiq-full/python-deps.nix { inherit pkgs; };
|
||||||
sipycoManualPackages = import ./artiq-full/sipyco-manual.nix {
|
sipycoManualPackages = import ./artiq-full/sipyco-manual.nix {
|
||||||
inherit (pkgs) stdenv lib python3Packages texlive texinfo;
|
inherit (pkgs) stdenv lib python3Packages texlive texinfo;
|
||||||
inherit (import <artiq-fast> { inherit pkgs; }) sipyco;
|
inherit (import artiq-fast { inherit pkgs; }) sipyco;
|
||||||
};
|
};
|
||||||
artiqManualPackages = import ./artiq-full/artiq-manual.nix {
|
artiqManualPackages = import ./artiq-full/artiq-manual.nix {
|
||||||
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
|
inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
|
||||||
inherit (pythonDeps) sphinxcontrib-wavedrom;
|
inherit (pythonDeps) sphinxcontrib-wavedrom;
|
||||||
|
inherit artiq-fast;
|
||||||
};
|
};
|
||||||
jobs = (import generatedNix { inherit pkgs; }) // sipycoManualPackages // artiqManualPackages // {
|
artiq-full = import generatedNix { inherit pkgs; };
|
||||||
# This is in the example in the ARTIQ manual - precompile it to speed up
|
exampleUserEnv = import ./artiq-full/example-user-env.nix { inherit pkgs artiq-full; };
|
||||||
# installation for users.
|
jobs = artiq-full // sipycoManualPackages // artiqManualPackages // exampleUserEnv;
|
||||||
matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // {
|
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // {
|
||||||
artiq-full = pkgs.releaseTools.channel {
|
artiq-full = pkgs.releaseTools.channel {
|
||||||
|
@ -270,5 +244,5 @@ in
|
||||||
src = generatedNix;
|
src = generatedNix;
|
||||||
constituents = [];
|
constituents = [];
|
||||||
};
|
};
|
||||||
conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
|
conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs artiq-fast; } { inherit jobs; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,125 @@
|
||||||
|
# Install Vivado in /opt and add to /etc/nixos/configuration.nix:
|
||||||
|
# nix.sandboxPaths = ["/opt"];
|
||||||
|
|
||||||
|
{ pkgs
|
||||||
|
, vivado ? import ./fast/vivado.nix { inherit pkgs; }
|
||||||
|
, board-generated
|
||||||
|
, version
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
# Funnelling the source code through a Nix string allows dropping
|
||||||
|
# all dependencies via `unsafeDiscardStringContext`.
|
||||||
|
discardContextFromPath = { name, src }:
|
||||||
|
let
|
||||||
|
packed = pkgs.stdenv.mkDerivation {
|
||||||
|
name = "${name}.nar.base64";
|
||||||
|
buildInputs = [ pkgs.nix ];
|
||||||
|
phases = [ "installPhase" ];
|
||||||
|
installPhase = "nix-store --dump ${src} | base64 -w0 > $out";
|
||||||
|
};
|
||||||
|
unpacked = archive:
|
||||||
|
pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
name = builtins.unsafeDiscardStringContext name;
|
||||||
|
|
||||||
|
phases = [ "installPhase" ];
|
||||||
|
buildInputs = [ pkgs.nix ];
|
||||||
|
installPhase = "base64 -d < ${archive} | nix-store --restore $out";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
unpacked (
|
||||||
|
builtins.toFile "${builtins.unsafeDiscardStringContext name}.nar.base64" (
|
||||||
|
builtins.unsafeDiscardStringContext (
|
||||||
|
builtins.readFile packed
|
||||||
|
))) ;
|
||||||
|
in
|
||||||
|
{ target
|
||||||
|
, variant
|
||||||
|
, extraInstallCommands ? ""
|
||||||
|
, ... }:
|
||||||
|
let
|
||||||
|
name = "artiq-board-${target}-${variant}-${version}";
|
||||||
|
installPath = builtins.unsafeDiscardStringContext "${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}";
|
||||||
|
|
||||||
|
generated = board-generated."artiq-board-${target}-${variant}";
|
||||||
|
|
||||||
|
identifierStr = "${version};${variant}";
|
||||||
|
identifiers = import (
|
||||||
|
pkgs.runCommandLocal "${name}-identifiers.nix" {
|
||||||
|
buildInputs = [ pkgs.python3 ];
|
||||||
|
} ''python ${./generate-identifier.py} "${identifierStr}" > $out''
|
||||||
|
);
|
||||||
|
|
||||||
|
# Depends on just Vivado and the generated Bitstream source
|
||||||
|
vivadoCheckpoint = pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
name = builtins.unsafeDiscardStringContext "${name}-vivado-checkpoint";
|
||||||
|
|
||||||
|
src = discardContextFromPath {
|
||||||
|
name = "${name}-gateware";
|
||||||
|
src = "${generated}/gateware";
|
||||||
|
};
|
||||||
|
buildInputs = [ vivado pkgs.nix ];
|
||||||
|
buildPhase = ''
|
||||||
|
vivado -mode batch -source top_route.tcl
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out
|
||||||
|
|
||||||
|
chmod a+r top_route.dcp
|
||||||
|
cp top_route.dcp $out
|
||||||
|
cp top_bitstream.tcl $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
vivadoOutput = pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
name = builtins.unsafeDiscardStringContext "${name}-vivado-output";
|
||||||
|
src = vivadoCheckpoint;
|
||||||
|
buildInputs = [ vivado ];
|
||||||
|
buildPhase =
|
||||||
|
''
|
||||||
|
cat >top.tcl <<EOF
|
||||||
|
open_checkpoint top_route.dcp
|
||||||
|
'' +
|
||||||
|
(pkgs.lib.concatMapStrings ({ cell, init }:
|
||||||
|
''
|
||||||
|
set_property INIT ${init} [get_cell ${cell}]
|
||||||
|
''
|
||||||
|
) identifiers) +
|
||||||
|
''
|
||||||
|
source "top_bitstream.tcl"
|
||||||
|
EOF
|
||||||
|
vivado -mode batch -source top.tcl
|
||||||
|
'';
|
||||||
|
installPhase = ''
|
||||||
|
TARGET_DIR=$out/${installPath}
|
||||||
|
mkdir -p $TARGET_DIR
|
||||||
|
chmod a+r top.bit
|
||||||
|
cp top.bit $TARGET_DIR/
|
||||||
|
'';
|
||||||
|
|
||||||
|
# temporarily disabled because there is currently always at least one Kasli bitstream
|
||||||
|
# that fails timing and blocks the conda channel.
|
||||||
|
doCheck = false;
|
||||||
|
checkPhase = ''
|
||||||
|
# Search for PCREs in the Vivado output to check for errors
|
||||||
|
check_log() {
|
||||||
|
set +e
|
||||||
|
grep -Pe "$1" vivado.log
|
||||||
|
FOUND=$?
|
||||||
|
set -e
|
||||||
|
if [ $FOUND != 1 ]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
check_log "\d+ constraint not met\."
|
||||||
|
check_log "Timing constraints are not met\."
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
pkgs.python3Packages.toPythonModule (
|
||||||
|
pkgs.buildEnv rec {
|
||||||
|
inherit name;
|
||||||
|
paths = [ generated vivadoOutput ];
|
||||||
|
pathsToLink = [ "/${installPath}" ];
|
||||||
|
})
|
|
@ -1,7 +1,7 @@
|
||||||
{ stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom }:
|
{ stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom, artiq-fast }:
|
||||||
|
|
||||||
let
|
let
|
||||||
artiqVersion = import <artiq-fast/pkgs/artiq-version.nix> { inherit stdenv fetchgit git; };
|
artiqVersion = import (artiq-fast + "/pkgs/artiq-version.nix") { inherit stdenv fetchgit git; };
|
||||||
|
|
||||||
isLatexPdfTarget = target: builtins.match "latexpdf.*" target != null;
|
isLatexPdfTarget = target: builtins.match "latexpdf.*" target != null;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ let
|
||||||
name = "artiq-manual-${target}-${version}";
|
name = "artiq-manual-${target}-${version}";
|
||||||
version = artiqVersion;
|
version = artiqVersion;
|
||||||
|
|
||||||
src = import <artiq-fast/pkgs/artiq-src.nix> { inherit fetchgit; };
|
src = import (artiq-fast + "/pkgs/artiq-src.nix") { inherit fetchgit; };
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
python3Packages.sphinx python3Packages.sphinx_rtd_theme
|
python3Packages.sphinx python3Packages.sphinx_rtd_theme
|
||||||
python3Packages.sphinx-argparse sphinxcontrib-wavedrom
|
python3Packages.sphinx-argparse sphinxcontrib-wavedrom
|
||||||
|
@ -26,7 +26,7 @@ let
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
export VERSIONEER_OVERRIDE=${artiqVersion}
|
export VERSIONEER_OVERRIDE=${artiqVersion}
|
||||||
export SOURCE_DATE_EPOCH=${import <artiq-fast/pkgs/artiq-timestamp.nix> { inherit stdenv fetchgit git; }}
|
export SOURCE_DATE_EPOCH=${import (artiq-fast + "/pkgs/artiq-timestamp.nix") { inherit stdenv fetchgit git; }}
|
||||||
cd doc/manual
|
cd doc/manual
|
||||||
'';
|
'';
|
||||||
makeFlags = [ target ];
|
makeFlags = [ target ];
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
{ pkgs
|
||||||
|
, artiqVersion
|
||||||
|
, sinaraSystemsSrc
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
jsons =
|
||||||
|
map (jsonFile: builtins.fromJSON (
|
||||||
|
builtins.readFile (sinaraSystemsSrc + "/${jsonFile}")
|
||||||
|
)) (
|
||||||
|
builtins.attrNames (
|
||||||
|
pkgs.lib.filterAttrs (name: type:
|
||||||
|
type != "directory" &&
|
||||||
|
builtins.match ".+\\.json" name != null
|
||||||
|
) (builtins.readDir sinaraSystemsSrc)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
kasli = builtins.listToAttrs (
|
||||||
|
builtins.map ({ variant, base, ... }: {
|
||||||
|
name = "artiq-board-kasli-${variant}";
|
||||||
|
value = {
|
||||||
|
target = "kasli";
|
||||||
|
inherit variant;
|
||||||
|
src = sinaraSystemsSrc + "/${variant}.json";
|
||||||
|
buildCommand = "python -m artiq.gateware.targets.kasli_generic $src";
|
||||||
|
standalone = base == "standalone";
|
||||||
|
};
|
||||||
|
}) (
|
||||||
|
builtins.filter (json:
|
||||||
|
pkgs.lib.strings.versionAtLeast artiqVersion (
|
||||||
|
if json ? min_artiq_version
|
||||||
|
then json.min_artiq_version
|
||||||
|
else "0"
|
||||||
|
)
|
||||||
|
) jsons
|
||||||
|
)
|
||||||
|
);
|
||||||
|
in
|
||||||
|
kasli // {
|
||||||
|
artiq-board-sayma-rtm = {
|
||||||
|
target = "sayma";
|
||||||
|
variant = "rtm";
|
||||||
|
buildCommand = "python -m artiq.gateware.targets.sayma_rtm";
|
||||||
|
};
|
||||||
|
artiq-board-sayma-satellite = {
|
||||||
|
target = "sayma";
|
||||||
|
variant = "satellite";
|
||||||
|
buildCommand = "python -m artiq.gateware.targets.sayma_amc";
|
||||||
|
};
|
||||||
|
artiq-board-metlino-master = {
|
||||||
|
target = "metlino";
|
||||||
|
variant = "master";
|
||||||
|
buildCommand = "python -m artiq.gateware.targets.metlino";
|
||||||
|
};
|
||||||
|
artiq-board-kc705-nist_qc2 = {
|
||||||
|
target = "kc705";
|
||||||
|
variant = "nist_qc2";
|
||||||
|
};
|
||||||
|
} // (pkgs.lib.optionalAttrs (pkgs.lib.strings.versionAtLeast artiqVersion "6.0") {
|
||||||
|
artiq-board-sayma-satellite-st = {
|
||||||
|
target = "sayma";
|
||||||
|
variant = "satellite";
|
||||||
|
buildCommand = "python -m artiq.gateware.targets.sayma_amc --jdcg-type syncdds";
|
||||||
|
};
|
||||||
|
})
|
|
@ -1,8 +1,8 @@
|
||||||
{ pkgs }:
|
{ pkgs, artiq-fast }:
|
||||||
{ jobs }:
|
{ jobs }:
|
||||||
|
|
||||||
let
|
let
|
||||||
condaBuilderEnv = import <artiq-fast/conda/builder-env.nix> { inherit pkgs; };
|
condaBuilderEnv = import (artiq-fast + "/conda/builder-env.nix") { inherit pkgs; };
|
||||||
in
|
in
|
||||||
pkgs.runCommand "conda-channel" { }
|
pkgs.runCommand "conda-channel" { }
|
||||||
''
|
''
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
{ pkgs, artiq-full }:
|
||||||
|
let
|
||||||
|
matplotlib-qt = (pkgs.python3Packages.matplotlib.override { enableQt = true; });
|
||||||
|
in
|
||||||
|
{
|
||||||
|
artiq-example-user-env = pkgs.runCommand "artiq-example-user-env" {
|
||||||
|
buildInputs = [
|
||||||
|
(pkgs.python3.withPackages(ps: [
|
||||||
|
artiq-full.artiq
|
||||||
|
artiq-full.artiq-comtools
|
||||||
|
artiq-full.wand
|
||||||
|
artiq-full.flake8-artiq
|
||||||
|
artiq-full.lda
|
||||||
|
artiq-full.korad_ka3005p
|
||||||
|
artiq-full.novatech409b
|
||||||
|
artiq-full.thorlabs_tcube
|
||||||
|
artiq-full.artiq-board-kc705-nist_clock
|
||||||
|
artiq-full.artiq-board-kasli-oregon
|
||||||
|
ps.paramiko
|
||||||
|
ps.pandas
|
||||||
|
ps.numpy
|
||||||
|
ps.scipy
|
||||||
|
ps.numba
|
||||||
|
ps.bokeh
|
||||||
|
matplotlib-qt
|
||||||
|
# cirq is broken and doesn't build (as of 20.09.3281.06b11191834)
|
||||||
|
#(ps.cirq.override { matplotlib = matplotlib-qt; })
|
||||||
|
# qiskit does not work with matplotlib-qt
|
||||||
|
#ps.qiskit
|
||||||
|
]))
|
||||||
|
|
||||||
|
artiq-full.openocd
|
||||||
|
pkgs.gtkwave
|
||||||
|
#pkgs.spyder # broken on 20.03
|
||||||
|
pkgs.R
|
||||||
|
];
|
||||||
|
} "touch $out";
|
||||||
|
}
|
|
@ -3,13 +3,20 @@ let
|
||||||
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
||||||
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
||||||
dualPackage = (
|
dualPackage = (
|
||||||
{ name, version, src, pythonOptions ? {}, condaOptions ? {}}:
|
{ name, version, src, pythonOptions ? {}, condaOptions ? {}, withManual ? true}:
|
||||||
{
|
{
|
||||||
"${name}" = pkgs.python3Packages.buildPythonPackage ({
|
"${name}" = pkgs.python3Packages.buildPythonPackage ({
|
||||||
inherit version;
|
inherit version;
|
||||||
name = "${name}-${version}";
|
name = "${name}-${version}";
|
||||||
inherit src;
|
inherit src;
|
||||||
} // pythonOptions);
|
} // pythonOptions);
|
||||||
|
"conda-${name}" = condaBuild {
|
||||||
|
name = "conda-${name}";
|
||||||
|
src = condaFakeSource ({
|
||||||
|
inherit name version src;
|
||||||
|
} // condaOptions);
|
||||||
|
};
|
||||||
|
} // (pkgs.lib.optionalAttrs withManual {
|
||||||
"${name}-manual-html" = pkgs.stdenv.mkDerivation {
|
"${name}-manual-html" = pkgs.stdenv.mkDerivation {
|
||||||
name = "${name}-manual-html-${version}";
|
name = "${name}-manual-html-${version}";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
|
@ -31,13 +38,7 @@ let
|
||||||
echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
|
echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"conda-${name}" = condaBuild {
|
})
|
||||||
name = "conda-${name}";
|
|
||||||
src = condaFakeSource ({
|
|
||||||
inherit name version src;
|
|
||||||
} // condaOptions);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
);
|
||||||
# https://github.com/m-labs/artiq/issues/23
|
# https://github.com/m-labs/artiq/issues/23
|
||||||
hidapi = pkgs.hidapi.overrideAttrs (oa: {
|
hidapi = pkgs.hidapi.overrideAttrs (oa: {
|
||||||
|
@ -55,8 +56,8 @@ in
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "korad_ka3005p";
|
repo = "korad_ka3005p";
|
||||||
rev = "a0cfaa5792a211e166d224314c4d0be4881b9b8d";
|
rev = "a1898409cb188b388ed1cf84e76ca69e9c8a74eb";
|
||||||
sha256 = "1bxzyjyvdhsbm9hj7ypf0vgkd1lvc340bb6lx3wchvh30n7bv9gv";
|
sha256 = "0h20qss70nssqiagc2fx75mravq1pji7rizhag3nq8xrcz2w20nc";
|
||||||
};
|
};
|
||||||
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
||||||
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
||||||
|
@ -66,8 +67,8 @@ in
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "novatech409b";
|
repo = "novatech409b";
|
||||||
rev = "8740b3e7b254e03395135e6bc128bbaca70d4fbb";
|
rev = "3bd559753972f07d881df66b7c6819afc5436053";
|
||||||
sha256 = "0mwm434y83y8jb30fpz69z6z3b6sxbc8dv3nw0hq4wc7iginx89d";
|
sha256 = "1g9qv6fn5h7d393mb1v7w8sg6fimqg34blqdj22qnayb4agw1wyg";
|
||||||
};
|
};
|
||||||
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
||||||
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
||||||
|
@ -77,8 +78,8 @@ in
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "lda";
|
repo = "lda";
|
||||||
rev = "6138a94a1116c8f7b40b8bd8bb161f847065aab6";
|
rev = "e6bf828b6dfd7fbf59b61b691712736c98c95970";
|
||||||
sha256 = "1009k9pq8wx5zxrljkxr1g95g8q979i7mq3csksdkd3d0v2jvqif";
|
sha256 = "1w4ykzsl3386bz4ggpd6i60b6a3k7rnc6qjw59xm3hk0vs3w2vyn";
|
||||||
};
|
};
|
||||||
pythonOptions = {
|
pythonOptions = {
|
||||||
propagatedBuildInputs = [ sipyco ];
|
propagatedBuildInputs = [ sipyco ];
|
||||||
|
@ -95,8 +96,8 @@ in
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "m-labs";
|
owner = "m-labs";
|
||||||
repo = "thorlabs_tcube";
|
repo = "thorlabs_tcube";
|
||||||
rev = "8b85292d76a69ae72ba8da32b894c87c794574ba";
|
rev = "0cb0c15fc7e660a150e193245f5338d48f8b97db";
|
||||||
sha256 = "09cy9nhydcwdib21wb0qg1cinvibfbszwgphrmf2ajw5kqpr1d6a";
|
sha256 = "1n4zmjcj2kpd97217y602pq6x8s80w39fgyi6qjmal92aicqdg07";
|
||||||
};
|
};
|
||||||
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
pythonOptions = { propagatedBuildInputs = [ sipyco asyncserial ]; };
|
||||||
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
condaOptions = { dependencies = [ "sipyco" "asyncserial" ]; };
|
||||||
|
@ -194,6 +195,9 @@ in
|
||||||
sha256 = "165j12k9nnrkf2pv0idcv6xhnp1hnsllna4rps2dssnqgjfaw1ss";
|
sha256 = "165j12k9nnrkf2pv0idcv6xhnp1hnsllna4rps2dssnqgjfaw1ss";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp ];
|
propagatedBuildInputs = [ sipyco pkgs.python3Packages.numpy pkgs.python3Packages.aiohttp ];
|
||||||
|
# Modifies PATH to pass the wrapped python environment (i.e. python3.withPackages(...) to subprocesses.
|
||||||
|
# Allows subprocesses using python to find all packages you have installed
|
||||||
|
makeWrapperArgs = [ ''--run 'if [ ! -z "$NIX_PYTHONPREFIX" ]; then export PATH=$NIX_PYTHONPREFIX/bin:$PATH;fi' '' ];
|
||||||
};
|
};
|
||||||
conda-artiq-comtools = condaBuild {
|
conda-artiq-comtools = condaBuild {
|
||||||
name = "conda-artiq-comtools";
|
name = "conda-artiq-comtools";
|
||||||
|
@ -203,4 +207,42 @@ in
|
||||||
dependencies = [ "sipyco" "numpy" "aiohttp >=3" ];
|
dependencies = [ "sipyco" "numpy" "aiohttp >=3" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
} // {
|
||||||
|
wand = pkgs.python3Packages.buildPythonApplication rec {
|
||||||
|
name = "wand";
|
||||||
|
version = "0.4.dev";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "OxfordIonTrapGroup";
|
||||||
|
repo = "wand";
|
||||||
|
rev = "0bf1cfef4aa37e5761c20ac8702abec125b45e23";
|
||||||
|
sha256 = "0jfw6w6id7qkx2f6rklrmp13b2hsnvii1qbls60ampx399lcb43g";
|
||||||
|
};
|
||||||
|
patches = [ ./wand-fix-config-dir.patch ];
|
||||||
|
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
postFixup = ''
|
||||||
|
wrapQtApp "$out/bin/wand_gui"
|
||||||
|
'';
|
||||||
|
propagatedBuildInputs = with pkgs.python3Packages; [ artiq quamash numpy scipy influxdb setuptools ];
|
||||||
|
};
|
||||||
|
} // (dualPackage {
|
||||||
|
name = "flake8-artiq";
|
||||||
|
version = "0.1.0";
|
||||||
|
withManual = false;
|
||||||
|
src = pkgs.fetchgit {
|
||||||
|
url = "https://gitlab.com/duke-artiq/flake8-artiq.git";
|
||||||
|
rev = "3d011bdadc41bb5d4b7e536fbfdb3744d9d9a6de";
|
||||||
|
sha256 = "1i6vk2j97fr1fnm6lzi5n33l6ldvcyfjgfxgr59pcpbz6xhbbgp2";
|
||||||
|
};
|
||||||
|
pythonOptions = {
|
||||||
|
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
|
||||||
|
checkInputs = [ pkgs.python3Packages.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ];
|
||||||
|
checkPhase =
|
||||||
|
''
|
||||||
|
pytest
|
||||||
|
mypy
|
||||||
|
flake8
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
condaOptions = { dependencies = [ "flake8" ]; };
|
||||||
|
})
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
#
|
||||||
|
# Encodes data like ARTIQ build_soc.py ReprogrammableIdentifier
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
if len(sys.argv) != 2:
|
||||||
|
raise ValueError('argument missing')
|
||||||
|
|
||||||
|
identifier_str = sys.argv[1]
|
||||||
|
contents = list(identifier_str.encode())
|
||||||
|
l = len(contents)
|
||||||
|
if l > 255:
|
||||||
|
raise ValueError("Identifier string must be 255 characters or less")
|
||||||
|
contents.insert(0, l)
|
||||||
|
|
||||||
|
f = sys.stdout
|
||||||
|
f.write("[\n");
|
||||||
|
for i in range(7):
|
||||||
|
init = sum(1 << j if c & (1 << i) else 0 for j, c in enumerate(contents))
|
||||||
|
f.write(
|
||||||
|
' {{ cell = "identifier_str{}"; init = "256\'h{:X}"; }}\n'.format(i, init)
|
||||||
|
)
|
||||||
|
f.write("]\n");
|
|
@ -3,18 +3,18 @@
|
||||||
rec {
|
rec {
|
||||||
wavedrom = pkgs.python3Packages.buildPythonPackage rec {
|
wavedrom = pkgs.python3Packages.buildPythonPackage rec {
|
||||||
pname = "wavedrom";
|
pname = "wavedrom";
|
||||||
version = "0.1";
|
version = "2.0.3.post2";
|
||||||
|
|
||||||
src = pkgs.python3Packages.fetchPypi {
|
src = pkgs.python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "006w683zlmmwcw5xz1n5dwg34ims5jg3gl2700ql4wr0myjz6710";
|
sha256 = "13a4086417nv836s2wbj3f4r31gwapbyw5smgl00jsqizwsk96r3";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgs.python3Packages.setuptools_scm ];
|
buildInputs = [ pkgs.python3Packages.setuptools_scm ];
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [ svgwrite attrdict ];
|
propagatedBuildInputs = with pkgs.python3Packages; [ svgwrite attrdict ];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with pkgs.stdenv.lib; {
|
meta = with pkgs.lib; {
|
||||||
description = "WaveDrom compatible Python module and command line";
|
description = "WaveDrom compatible Python module and command line";
|
||||||
homepage = "https://pypi.org/project/wavedrom/";
|
homepage = "https://pypi.org/project/wavedrom/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
@ -23,18 +23,18 @@ rec {
|
||||||
|
|
||||||
sphinxcontrib-wavedrom = pkgs.python3Packages.buildPythonPackage rec {
|
sphinxcontrib-wavedrom = pkgs.python3Packages.buildPythonPackage rec {
|
||||||
pname = "sphinxcontrib-wavedrom";
|
pname = "sphinxcontrib-wavedrom";
|
||||||
version = "2.0.0";
|
version = "2.1.1";
|
||||||
|
|
||||||
src = pkgs.python3Packages.fetchPypi {
|
src = pkgs.python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0nk36zqq5ipxqx9izz2iazb3iraasanv3nm05bjr21gw42zgkz22";
|
sha256 = "09xq4csdcil2x8mm38yd5k6lfbkazicvm278xnzwbfc9vghkqqs2";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgs.python3Packages.setuptools_scm ];
|
buildInputs = [ pkgs.python3Packages.setuptools_scm ];
|
||||||
propagatedBuildInputs = [ wavedrom ] ++ (with pkgs.python3Packages; [ sphinx xcffib cairosvg ]);
|
propagatedBuildInputs = [ wavedrom ] ++ (with pkgs.python3Packages; [ sphinx xcffib cairosvg ]);
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = with pkgs.stdenv.lib; {
|
meta = with pkgs.lib; {
|
||||||
description = "A Sphinx extension that allows including WaveDrom diagrams";
|
description = "A Sphinx extension that allows including WaveDrom diagrams";
|
||||||
homepage = "https://pypi.org/project/sphinxcontrib-wavedrom/";
|
homepage = "https://pypi.org/project/sphinxcontrib-wavedrom/";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
diff --git a/wand/tools.py b/wand/tools.py
|
||||||
|
index a51dabd..4d5a9d1 100644
|
||||||
|
--- a/wand/tools.py
|
||||||
|
+++ b/wand/tools.py
|
||||||
|
@@ -6,6 +6,7 @@ import shutil
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from sipyco import pyon
|
||||||
|
+from artiq.appdirs import user_config_dir
|
||||||
|
import wand
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
@@ -26,10 +27,15 @@ class LockException(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
+def get_user_config_dir():
|
||||||
|
+ dir = user_config_dir("wand", "oitg", "1")
|
||||||
|
+ os.makedirs(dir, exist_ok=True)
|
||||||
|
+ return dir
|
||||||
|
+
|
||||||
|
+
|
||||||
|
def get_config_path(args, name_suffix=""):
|
||||||
|
config_file = "{}{}_config.pyon".format(args.name, name_suffix)
|
||||||
|
- wand_dir = os.path.dirname(wand.__file__)
|
||||||
|
- config_path = os.path.join(wand_dir, config_file)
|
||||||
|
+ config_path = os.path.join(get_user_config_dir(), config_file)
|
||||||
|
|
||||||
|
if args.backup_dir == "":
|
||||||
|
backup_path = ""
|
|
@ -1,14 +1,15 @@
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
let
|
let
|
||||||
artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchFromGitHub python3Packages; misoc-new = false; };
|
artiqpkgs = import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchgit fetchFromGitHub python3Packages; misoc-new = true; };
|
||||||
ise = import ./ise.nix { inherit pkgs; };
|
ise = import ./ise.nix { inherit pkgs; };
|
||||||
|
vivado = import ../artiq-fast/vivado.nix { inherit pkgs; };
|
||||||
buildUrukulCpld = {version, src}: pkgs.stdenv.mkDerivation {
|
buildUrukulCpld = {version, src}: pkgs.stdenv.mkDerivation {
|
||||||
name = "urukul-cpld-${version}";
|
pname = "urukul-cpld";
|
||||||
inherit src;
|
inherit src version;
|
||||||
buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
|
buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
|
||||||
phases = ["buildPhase" "installPhase"];
|
phases = ["buildPhase" "installPhase"];
|
||||||
buildPhase = "python $src/urukul_impl.py";
|
buildPhase = "python $src/urukul_impl.py";
|
||||||
installPhase =
|
installPhase =
|
||||||
''
|
''
|
||||||
mkdir -p $out $out/nix-support
|
mkdir -p $out $out/nix-support
|
||||||
cp build/urukul.jed $out
|
cp build/urukul.jed $out
|
||||||
|
@ -16,12 +17,12 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
buildMirnyCpld = {version, src}: pkgs.stdenv.mkDerivation {
|
buildMirnyCpld = {version, src}: pkgs.stdenv.mkDerivation {
|
||||||
name = "mirny-cpld-${version}";
|
pname = "mirny-cpld";
|
||||||
inherit src;
|
inherit src version;
|
||||||
buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
|
buildInputs = [(pkgs.python3.withPackages(ps: [artiqpkgs.migen]))] ++ (builtins.attrValues ise);
|
||||||
phases = ["buildPhase" "installPhase"];
|
phases = ["buildPhase" "installPhase"];
|
||||||
buildPhase = "python $src/mirny_impl.py";
|
buildPhase = "python $src/mirny_impl.py";
|
||||||
installPhase =
|
installPhase =
|
||||||
''
|
''
|
||||||
mkdir -p $out $out/nix-support
|
mkdir -p $out $out/nix-support
|
||||||
cp build/mirny.jed $out
|
cp build/mirny.jed $out
|
||||||
|
@ -78,4 +79,27 @@ in
|
||||||
echo file binary-dist $out/fastino.bin >> $out/nix-support/hydra-build-products
|
echo file binary-dist $out/fastino.bin >> $out/nix-support/hydra-build-products
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
phaser-fpga = pkgs.stdenv.mkDerivation {
|
||||||
|
name = "phaser-fpga";
|
||||||
|
src = <phaserSrc>;
|
||||||
|
patchPhase = ''
|
||||||
|
substituteInPlace phaser.py \
|
||||||
|
--replace "source ../load.tcl" \
|
||||||
|
""
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ (pkgs.python3.withPackages(ps: [ artiqpkgs.migen artiqpkgs.misoc ])) ] ++ [ vivado ];
|
||||||
|
buildPhase = "python phaser.py";
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
mkdir -p $out $out/nix-support
|
||||||
|
cp build/phaser.bit $out
|
||||||
|
echo file binary-dist $out/phaser.bit >> $out/nix-support/hydra-build-products
|
||||||
|
'';
|
||||||
|
dontFixup = true;
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
checkInputs = [ pkgs.python3Packages.pytest ];
|
||||||
|
checkPhase = "pytest";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
197
hydra/artiq.json
197
hydra/artiq.json
|
@ -1,16 +1,187 @@
|
||||||
{
|
{
|
||||||
"enabled": 1,
|
"fast-beta": {
|
||||||
"hidden": true,
|
"enabled": 1,
|
||||||
"description": "js",
|
"hidden": false,
|
||||||
"nixexprinput": "nixScripts",
|
"description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
|
||||||
"nixexprpath": "hydra/artiq.nix",
|
"nixexprinput": "nixScripts",
|
||||||
"checkinterval": 300,
|
"nixexprpath": "artiq-fast.nix",
|
||||||
"schedulingshares": 10,
|
"checkinterval": 300,
|
||||||
"enableemail": false,
|
"schedulingshares": 10,
|
||||||
"emailoverride": "",
|
"enableemail": false,
|
||||||
"keepnr": 10,
|
"emailoverride": "",
|
||||||
"inputs": {
|
"keepnr": 1,
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
"inputs": {
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"board-generated-beta": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Generated code for ARTIQ boards (beta version)",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-board-generated",
|
||||||
|
"checkinterval": 14400,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
||||||
|
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"full-beta": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Full set of ARTIQ packages (beta version)",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-full.nix",
|
||||||
|
"checkinterval": 86400,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"a6p": { "type": "boolean", "value": "true" },
|
||||||
|
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-beta:generated-nix", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"fast": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Core ARTIQ packages to build fast for CI purposes",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-fast.nix",
|
||||||
|
"checkinterval": 300,
|
||||||
|
"schedulingshares": 10,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"board-generated": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Generated code for ARTIQ boards",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-board-generated",
|
||||||
|
"checkinterval": 14400,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
||||||
|
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"full": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Full set of ARTIQ packages",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-full.nix",
|
||||||
|
"checkinterval": 86400,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"a6p": { "type": "boolean", "value": "true" },
|
||||||
|
"artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"fast-legacy": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Core ARTIQ packages to build fast for CI purposes (legacy version)",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-fast.nix",
|
||||||
|
"checkinterval": 300,
|
||||||
|
"schedulingshares": 10,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"full-legacy": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Full set of ARTIQ packages (legacy version)",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "artiq-full.nix",
|
||||||
|
"checkinterval": 86400,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
||||||
|
"a6p": { "type": "boolean", "value": "false" },
|
||||||
|
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"gluelogic": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "Glue logic gateware for Sinara devices",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "gluelogic.nix",
|
||||||
|
"checkinterval": 172800,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"urukulSrc": { "type": "git", "value": "git://github.com/quartiq/urukul", "emailresponsible": false },
|
||||||
|
"mirnySrc": { "type": "git", "value": "git://github.com/quartiq/mirny", "emailresponsible": false },
|
||||||
|
"fastinoSrc": { "type": "git", "value": "git://github.com/quartiq/fastino", "emailresponsible": false },
|
||||||
|
"phaserSrc": { "type": "git", "value": "git://github.com/quartiq/phaser", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
"zynq": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "ARTIQ on Zynq",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "zynq.nix",
|
||||||
|
"checkinterval": 300,
|
||||||
|
"schedulingshares": 1,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 1,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/astro/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false },
|
||||||
|
"zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false },
|
||||||
|
"artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
119
hydra/artiq.nix
119
hydra/artiq.nix
|
@ -1,119 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
|
||||||
{
|
|
||||||
jobsets = pkgs.runCommand "spec.json" {}
|
|
||||||
''
|
|
||||||
cat > $out << EOF
|
|
||||||
{
|
|
||||||
"fast-beta": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "artiq-fast.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"full-beta": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Full set of ARTIQ packages (beta version)",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "artiq-full.nix",
|
|
||||||
"checkinterval": 86400,
|
|
||||||
"schedulingshares": 1,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
|
||||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"fast": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Core ARTIQ packages to build fast for CI purposes",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "artiq-fast.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"full": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Full set of ARTIQ packages",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "artiq-full.nix",
|
|
||||||
"checkinterval": 86400,
|
|
||||||
"schedulingshares": 1,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems.git master 1", "emailresponsible": false },
|
|
||||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gluelogic": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "Glue logic gateware for Sinara devices",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "gluelogic.nix",
|
|
||||||
"checkinterval": 172800,
|
|
||||||
"schedulingshares": 1,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"urukulSrc": { "type": "git", "value": "git://github.com/quartiq/urukul", "emailresponsible": false },
|
|
||||||
"mirnySrc": { "type": "git", "value": "git://github.com/quartiq/mirny", "emailresponsible": false },
|
|
||||||
"fastinoSrc": { "type": "git", "value": "git://github.com/quartiq/fastino", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"zynq": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "ARTIQ on Zynq",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "zynq.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 1,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla", "emailresponsible": false },
|
|
||||||
"artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false },
|
|
||||||
"zynq-rs": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/zynq-rs.git", "emailresponsible": false },
|
|
||||||
"artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -1,16 +0,0 @@
|
||||||
{
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": true,
|
|
||||||
"description": "js",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "hydra/fpga.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
|
||||||
{
|
|
||||||
jobsets = pkgs.runCommand "spec.json" {}
|
|
||||||
''
|
|
||||||
cat > $out << EOF
|
|
||||||
{
|
|
||||||
"heavyx": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "HeavyX SoC toolkit experiment",
|
|
||||||
"nixexprinput": "heavyx",
|
|
||||||
"nixexprpath": "release.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false },
|
|
||||||
"heavyx": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/HeavyX.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
{
|
||||||
|
"mcu": {
|
||||||
|
"enabled": 1,
|
||||||
|
"hidden": false,
|
||||||
|
"description": "MCU firmware",
|
||||||
|
"nixexprinput": "nixScripts",
|
||||||
|
"nixexprpath": "mcu.nix",
|
||||||
|
"checkinterval": 300,
|
||||||
|
"schedulingshares": 10,
|
||||||
|
"enableemail": false,
|
||||||
|
"emailoverride": "",
|
||||||
|
"keepnr": 10,
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.09", "emailresponsible": false },
|
||||||
|
"mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"stabilizerSrc": { "type": "git", "value": "git://github.com/quartiq/stabilizer.git", "emailresponsible": false },
|
||||||
|
"thermostatSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/thermostat.git", "emailresponsible": false },
|
||||||
|
"humpbackDdsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/humpback-dds.git", "emailresponsible": false },
|
||||||
|
"saymaMmcSrc": { "type": "git", "value": "git://github.com/sinara-hw/openMMC sayma-devel", "emailresponsible": false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,16 +0,0 @@
|
||||||
{
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": true,
|
|
||||||
"description": "js",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "hydra/stm32.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
|
||||||
{
|
|
||||||
jobsets = pkgs.runCommand "spec.json" {}
|
|
||||||
''
|
|
||||||
cat > $out << EOF
|
|
||||||
{
|
|
||||||
"stm32": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "STM32 firmware",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "stm32.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"stabilizerSrc": { "type": "git", "value": "git://github.com/quartiq/stabilizer.git", "emailresponsible": false },
|
|
||||||
"thermostatSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/thermostat.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -1,16 +1,19 @@
|
||||||
{
|
{
|
||||||
"enabled": 1,
|
"web": {
|
||||||
"hidden": true,
|
"enabled": 1,
|
||||||
"description": "js",
|
"hidden": false,
|
||||||
"nixexprinput": "nixScripts",
|
"description": "M-Labs website",
|
||||||
"nixexprpath": "hydra/web.nix",
|
"nixexprinput": "nixScripts",
|
||||||
"checkinterval": 300,
|
"nixexprpath": "web.nix",
|
||||||
"schedulingshares": 10,
|
"checkinterval": 300,
|
||||||
"enableemail": false,
|
"schedulingshares": 10,
|
||||||
"emailoverride": "",
|
"enableemail": false,
|
||||||
"keepnr": 10,
|
"emailoverride": "",
|
||||||
"inputs": {
|
"keepnr": 10,
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
"inputs": {
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }
|
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs nixos-20.03", "emailresponsible": false },
|
||||||
|
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
||||||
|
"webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> {}}:
|
|
||||||
{
|
|
||||||
jobsets = pkgs.runCommand "spec.json" {}
|
|
||||||
''
|
|
||||||
cat > $out << EOF
|
|
||||||
{
|
|
||||||
"web": {
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "M-Labs website",
|
|
||||||
"nixexprinput": "nixScripts",
|
|
||||||
"nixexprpath": "web.nix",
|
|
||||||
"checkinterval": 300,
|
|
||||||
"schedulingshares": 10,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 10,
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-20.03", "emailresponsible": false },
|
|
||||||
"nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
|
|
||||||
"webSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/web2019.git", "emailresponsible": false }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
|
||||||
|
let
|
||||||
|
jobs = import ./mcu/default.nix {
|
||||||
|
mozillaOverlay = import <mozillaOverlay>;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,105 @@
|
||||||
|
{ # Use master branch of the overlay by default
|
||||||
|
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
|
||||||
|
rustManifest ? ./channel-rust-nightly.toml
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
|
||||||
|
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
|
||||||
|
inherit rustManifest;
|
||||||
|
});
|
||||||
|
buildStm32Firmware = { name, src, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", ... } @ args:
|
||||||
|
let
|
||||||
|
# If binaryName is specified as an arg of buildStm32Firmware,
|
||||||
|
# then the .nix containing the cargoSha256 must be named "cargosha256-${binaryName}.nix";
|
||||||
|
# otherwise, the .nix must be named "cargosha256.nix".
|
||||||
|
cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''
|
||||||
|
cp "${src}/cargosha256${
|
||||||
|
if (args ? binaryName) then "-" + args.binaryName else ""
|
||||||
|
}.nix" $out
|
||||||
|
'';
|
||||||
|
# If binaryName is specified as an arg of buildStm32Firmware,
|
||||||
|
# then use it as the filename of the ELF generated from `cargo build`;
|
||||||
|
# otherwise, use the `name` arg (i.e. the Rust package name) as the ELF filename.
|
||||||
|
binaryName = if (args ? binaryName) then args.binaryName else name;
|
||||||
|
in
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
inherit name;
|
||||||
|
version = "0.0.0";
|
||||||
|
|
||||||
|
inherit src;
|
||||||
|
cargoSha256 = (import cargoSha256Drv);
|
||||||
|
|
||||||
|
inherit patchPhase;
|
||||||
|
nativeBuildInputs = [ pkgs.llvm ] ++ extraNativeBuildInputs;
|
||||||
|
buildPhase = ''
|
||||||
|
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
|
||||||
|
cargo build --release
|
||||||
|
'';
|
||||||
|
|
||||||
|
inherit checkPhase;
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out $out/nix-support
|
||||||
|
cp target/thumbv7em-none-eabihf/release/${binaryName} $out/${name}.elf
|
||||||
|
echo file binary-dist $out/${name}.elf >> $out/nix-support/hydra-build-products
|
||||||
|
llvm-objcopy -O binary target/thumbv7em-none-eabihf/release/${binaryName} $out/${name}.bin
|
||||||
|
echo file binary-dist $out/${name}.bin >> $out/nix-support/hydra-build-products
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontFixup = true;
|
||||||
|
};
|
||||||
|
migen = (import ../artiq-fast/pkgs/python-deps.nix { inherit (pkgs) stdenv fetchgit fetchFromGitHub python3Packages; misoc-new = true; }).migen;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
stabilizer-dual-iir = buildStm32Firmware {
|
||||||
|
name = "stabilizer-dual-iir";
|
||||||
|
binaryName = "dual-iir";
|
||||||
|
src = <stabilizerSrc>;
|
||||||
|
patchPhase = ''
|
||||||
|
substituteInPlace src/hardware/configuration.rs \
|
||||||
|
--replace "IpAddress::v4(10, 34, 16, 103)" \
|
||||||
|
"IpAddress::v4(192, 168, 1, 76)" \
|
||||||
|
--replace "Ipv4Address::new(10, 34, 16, 1)" \
|
||||||
|
"Ipv4Address::new(192, 168, 1, 1)"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
thermostat = buildStm32Firmware {
|
||||||
|
name = "thermostat";
|
||||||
|
src = <thermostatSrc>;
|
||||||
|
checkPhase = ''
|
||||||
|
cargo test --target=${pkgs.rust.toRustTarget pkgs.stdenv.targetPlatform}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
humpback-dds = buildStm32Firmware {
|
||||||
|
name = "humpback-dds";
|
||||||
|
src = <humpbackDdsSrc>;
|
||||||
|
extraNativeBuildInputs = [
|
||||||
|
(pkgs.python3.withPackages(ps: [ migen ]))
|
||||||
|
pkgs.yosys
|
||||||
|
pkgs.nextpnr
|
||||||
|
pkgs.icestorm
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# openMMC build system breaks if host compiler is not available, so do not use stdenvNoCC here
|
||||||
|
sayma-mmc = pkgs.stdenv.mkDerivation {
|
||||||
|
name = "sayma-mmc";
|
||||||
|
src = <saymaMmcSrc>;
|
||||||
|
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
|
||||||
|
nativeBuildInputs = [ pkgs.cmake pkgs.gcc-arm-embedded ];
|
||||||
|
buildPhase =
|
||||||
|
''
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake .. -DBOARD=sayma -DBOARD_RTM=sayma -DVERSION= -DTARGET_CONTROLLER=LPC1776 -DCMAKE_BUILD_TYPE=Debug
|
||||||
|
make
|
||||||
|
'';
|
||||||
|
installPhase =
|
||||||
|
''
|
||||||
|
mkdir $out
|
||||||
|
cp out/* $out
|
||||||
|
mkdir -p $out $out/nix-support
|
||||||
|
echo file binary-dist $out/openMMC.axf >> $out/nix-support/hydra-build-products
|
||||||
|
echo file binary-dist $out/openMMC.bin >> $out/nix-support/hydra-build-products
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,9 +0,0 @@
|
||||||
{ pkgs ? import <nixpkgs> {}, rustManifest ? ./stm32/channel-rust-nightly.toml }:
|
|
||||||
|
|
||||||
let
|
|
||||||
jobs = import ./stm32/default.nix {
|
|
||||||
inherit rustManifest;
|
|
||||||
mozillaOverlay = import <mozillaOverlay>;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs
|
|
|
@ -1,50 +0,0 @@
|
||||||
{ # Use master branch of the overlay by default
|
|
||||||
mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
|
|
||||||
rustManifest ? builtins.fetchurl "https://static.rust-lang.org/dist/channel-rust-nightly.toml"
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
|
|
||||||
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
|
|
||||||
inherit rustManifest;
|
|
||||||
});
|
|
||||||
buildStm32Firmware = { name, src, patchPhase ? "" }:
|
|
||||||
let
|
|
||||||
cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''cp "${src}/cargosha256.nix" $out'';
|
|
||||||
in
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
inherit name;
|
|
||||||
version = "0.0.0";
|
|
||||||
|
|
||||||
inherit src;
|
|
||||||
cargoSha256 = (import cargoSha256Drv);
|
|
||||||
|
|
||||||
inherit patchPhase;
|
|
||||||
buildPhase = ''
|
|
||||||
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
|
|
||||||
cargo build --release
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out $out/nix-support
|
|
||||||
cp target/thumbv7em-none-eabihf/release/${name} $out/${name}.elf
|
|
||||||
echo file binary-dist $out/${name}.elf >> $out/nix-support/hydra-build-products
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
stabilizer = buildStm32Firmware {
|
|
||||||
name = "stabilizer";
|
|
||||||
src = <stabilizerSrc>;
|
|
||||||
patchPhase = ''
|
|
||||||
substituteInPlace src/main.rs \
|
|
||||||
--replace "let local_addr = net::wire::IpAddress::v4(10, 0, 16, 99);" \
|
|
||||||
"let local_addr = net::wire::IpAddress::v4(192, 168, 1, 76);"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
thermostat = buildStm32Firmware {
|
|
||||||
name = "thermostat";
|
|
||||||
src = <thermostatSrc>;
|
|
||||||
};
|
|
||||||
}
|
|
29
zynq.nix
29
zynq.nix
|
@ -1,24 +1,11 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
zynq-rs = import <zynq-rs> { mozillaOverlay = import <mozillaOverlay>; };
|
zynq-rs-latest = import <zynq-rs>;
|
||||||
artiq-zynq = import <artiq-zynq> { mozillaOverlay = import <mozillaOverlay>; };
|
artiq-zynq = import <artiq-zynq>;
|
||||||
artiq-fast = import <artiq-fast> { inherit pkgs; };
|
artiq-fast = import <artiq-fast> { inherit pkgs; };
|
||||||
addBuildProducts = drv: drv.overrideAttrs (oldAttrs: {
|
|
||||||
installPhase = ''
|
|
||||||
${oldAttrs.installPhase}
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
for f in $out/*.elf ; do
|
|
||||||
echo file binary-dist $f >> $out/nix-support/hydra-build-products
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
in
|
in
|
||||||
(
|
(
|
||||||
builtins.mapAttrs (name: drv:
|
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) zynq-rs-latest
|
||||||
pkgs.lib.hydraJob (
|
|
||||||
addBuildProducts drv
|
|
||||||
)
|
|
||||||
) zynq-rs.zc706
|
|
||||||
) // (
|
) // (
|
||||||
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
|
builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq
|
||||||
) // {
|
) // {
|
||||||
|
@ -41,18 +28,19 @@ in
|
||||||
__networked = true;
|
__networked = true;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgs.netcat pkgs.openssh pkgs.rsync artiq-fast.artiq
|
pkgs.netcat pkgs.openssh pkgs.rsync artiq-fast.artiq artiq-fast.artiq-netboot
|
||||||
];
|
];
|
||||||
phases = [ "buildPhase" ];
|
phases = [ "buildPhase" ];
|
||||||
|
|
||||||
buildPhase =
|
buildPhase =
|
||||||
''
|
''
|
||||||
echo Power cycling board...
|
echo Power cycling board...
|
||||||
(echo b; sleep 5; echo B) | nc -N 192.168.1.31 3131
|
(echo b; sleep 5; echo B; sleep 5) | nc -N -w6 192.168.1.31 3131
|
||||||
sleep 5
|
|
||||||
echo Power cycle done.
|
echo Power cycle done.
|
||||||
|
|
||||||
export USER=hydra
|
export USER=hydra
|
||||||
|
export OPENOCD_ZYNQ=${artiq-zynq.zynq-rs}/openocd
|
||||||
|
export SZL=${(import artiq-zynq.zynq-rs).zc706-szl}/szl.elf
|
||||||
pushd ${<artiq-zynq>}
|
pushd ${<artiq-zynq>}
|
||||||
bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa" -d ${artiq-zynq.zc706-nist_qc2-jtag}
|
bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa" -d ${artiq-zynq.zc706-nist_qc2-jtag}
|
||||||
popd
|
popd
|
||||||
|
@ -69,6 +57,9 @@ in
|
||||||
touch $out
|
touch $out
|
||||||
|
|
||||||
echo Completed
|
echo Completed
|
||||||
|
|
||||||
|
(echo b; sleep 5) | nc -N -w6 192.168.1.31 3131
|
||||||
|
echo Board powered off
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue