M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

shells (artiq-fast): change artiqpkgs, vivado to arguments #76

Closed
drewrisinger wants to merge 1 commits from drewrisinger/nix-scripts:feature/shell-artiqpkgs-args into master
pull from: drewrisinger/nix-scripts:feature/shell-artiqpkgs-args
merge into: M-Labs:master
Conversation 2 Commits 1 Files Changed 2 +25 -27
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq-fast/shell-dev.nix
View File

@ -1,11 +1,10 @@
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}
, artiqpkgs ? import ./default.nix { inherit pkgs; }
, vivado ? import ./vivado.nix { inherit pkgs; }
}:
let assert pkgs.lib.asserts.assertMsg (!pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0") "For ARTIQ 7+, use 'nix develop' on the flake instead.";
artiqpkgs = import ./default.nix { inherit pkgs; }; pkgs.mkShell {
vivado = import ./vivado.nix { inherit pkgs; };
in
assert pkgs.lib.asserts.assertMsg (!pkgs.lib.strings.versionAtLeast artiqpkgs.artiq.version "7.0") "For ARTIQ 7+, use 'nix develop' on the flake instead.";
pkgs.mkShell {
buildInputs = [ buildInputs = [
vivado vivado
pkgs.gnumake pkgs.gnumake
@ -18,4 +17,4 @@ in
artiqpkgs.openocd artiqpkgs.openocd
]; ];
TARGET_AR="or1k-linux-ar"; TARGET_AR="or1k-linux-ar";
} }

11
artiq-fast/shell.nix
View File

@ -1,8 +1,7 @@
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}
, artiqpkgs ? import ./default.nix { inherit pkgs; }
}:
let pkgs.mkShell {
artiqpkgs = import ./default.nix { inherit pkgs; };
in
pkgs.mkShell {
buildInputs = [ (pkgs.python3.withPackages(ps: [artiqpkgs.artiq])) ]; buildInputs = [ (pkgs.python3.withPackages(ps: [artiqpkgs.artiq])) ];
} }