M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

nix: cleanup

This commit is contained in:
Sebastien Bourdeauducq 2019-02-09 10:24:22 +08:00
parent 2de1eaa521
commit f0f50bf1dc
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/artiq-dev.nix
View File

@ -1,7 +1,6 @@
{runScript ? "bash", extraProfile ? ""}: { pkgs ? import <nixpkgs> {}}:
let let
pkgs = import <nixpkgs> {};
artiqpkgs = import ./default.nix { inherit pkgs; }; artiqpkgs = import ./default.nix { inherit pkgs; };
in in
pkgs.buildFHSUserEnv { pkgs.buildFHSUserEnv {
@ -30,8 +29,7 @@ in
openocd openocd
]) ])
); );
runScript = runScript;
profile = '' profile = ''
export TARGET_AR=${artiqpkgs.binutils-or1k}/bin/or1k-linux-ar export TARGET_AR=${artiqpkgs.binutils-or1k}/bin/or1k-linux-ar
'' + extraProfile; '';
} }

10
nix/conda-build.nix
View File

@ -1,12 +1,6 @@
# nix-build -E "with import <nixpkgs> {}; callPackage ./conda-build.nix {}" { pkgs ? import <nixpkgs> {}}:
{ stdenv with pkgs;
, fetchurl
, runCommand
, buildFHSUserEnv
, libselinux
, xorg
}:
let let
condaDeps = [ stdenv.cc xorg.libSM xorg.libICE xorg.libXrender libselinux ]; condaDeps = [ stdenv.cc xorg.libSM xorg.libICE xorg.libXrender libselinux ];

5
nix/release.nix
View File

@ -1,9 +1,8 @@
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}}:
with pkgs;
let let
artiqPkgs = import ./default.nix {}; artiqPkgs = import ./default.nix { inherit pkgs; };
jobs = rec { jobs = rec {
conda-artiq = callPackage ./conda-build.nix {}; conda-artiq = import ./conda-build.nix { inherit pkgs; };
} // artiqPkgs; } // artiqPkgs;
in in
jobs jobs

4
nix/shell-dev.nix
View File

@ -1,4 +1,6 @@
{ pkgs ? import <nixpkgs> {}}:
let let
artiq-dev = import ./artiq-dev.nix {}; artiq-dev = import ./artiq-dev.nix { inherit pkgs; };
in in
artiq-dev.env artiq-dev.env