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

View File

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

View File

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

View File

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

View File

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