1
0
Fork 0

move conda files to dedicated folder

This commit is contained in:
Sebastien Bourdeauducq 2020-06-09 14:30:23 +08:00
parent 38eff183a8
commit 5d8ffd44ef
8 changed files with 29 additions and 28 deletions

View File

@ -1,23 +0,0 @@
{ pkgs }:
let
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
fakeCondaSource = import ./conda-fake-source.nix { inherit pkgs; } {
name = "artiq";
inherit version;
src = import ./pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
dependencies = import ./conda-artiq-deps.nix;
extraYaml =
''
about:
home: https://m-labs.hk/artiq
license: LGPL
summary: 'A leading-edge control system for quantum information experiments'
'';
};
conda-artiq = import ./conda-build.nix { inherit pkgs; } {
name = "conda-artiq";
src = fakeCondaSource;
};
in
conda-artiq

View File

@ -0,0 +1,23 @@
{ pkgs }:
let
version = import ../pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
fakeCondaSource = import ./fake-source.nix { inherit pkgs; } {
name = "artiq";
inherit version;
src = import ../pkgs/artiq-src.nix { fetchgit = pkgs.fetchgit; };
dependencies = import ./artiq-deps.nix;
extraYaml =
''
about:
home: https://m-labs.hk/artiq
license: LGPL
summary: 'A leading-edge control system for quantum information experiments'
'';
};
conda-artiq = import ./build.nix { inherit pkgs; } {
name = "conda-artiq";
src = fakeCondaSource;
};
in
conda-artiq

View File

@ -5,7 +5,7 @@
{ name, src, recipe ? "fake-conda"}: { name, src, recipe ? "fake-conda"}:
let let
condaBuilderEnv = import ./conda-builder-env.nix { inherit pkgs; }; condaBuilderEnv = import ./builder-env.nix { inherit pkgs; };
in pkgs.stdenv.mkDerivation { in pkgs.stdenv.mkDerivation {
inherit name src; inherit name src;
buildCommand = buildCommand =

View File

@ -34,14 +34,15 @@ let
artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; }; artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k llvm-or1k llvmlite-artiq libartiq-support lit outputcheck; };
artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; }); artiq-env = (pkgs.python3.withPackages(ps: [ artiq ])).overrideAttrs (oldAttrs: { name = "${pkgs.python3.name}-artiq-env-${artiq.version}"; });
openocd = callPackage ./pkgs/openocd.nix {}; openocd = callPackage ./pkgs/openocd.nix {};
conda-sipyco = import ./conda-build.nix { inherit pkgs; } {
conda-sipyco = import ./conda/build.nix { inherit pkgs; } {
name = "conda-sipyco"; name = "conda-sipyco";
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;
}; };
}; };
conda-artiq = import ./conda-artiq.nix { inherit pkgs; }; conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
}; };
in in
mainPackages // boardPackages mainPackages // boardPackages

View File

@ -29,7 +29,7 @@ let
condaDepSpecs = condaDepSpecs =
builtins.concatStringsSep " " builtins.concatStringsSep " "
(map (s: "\"${s}\"") (map (s: "\"${s}\"")
(import ../conda-artiq-deps.nix)); (import ../conda/artiq-deps.nix));
instructions = instructions =
builtins.toFile "install.txt" builtins.toFile "install.txt"