From 7994c294af58fdb7c49445a1fb09f5f0a87db44f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 8 Feb 2019 23:14:32 +0800 Subject: [PATCH] nix: set up hydra to provide conda package --- nix/{disciplined-conda.nix => conda-build.nix} | 5 ++++- nix/release.nix | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) rename nix/{disciplined-conda.nix => conda-build.nix} (92%) create mode 100644 nix/release.nix diff --git a/nix/disciplined-conda.nix b/nix/conda-build.nix similarity index 92% rename from nix/disciplined-conda.nix rename to nix/conda-build.nix index dbf731714..c333b9e04 100644 --- a/nix/disciplined-conda.nix +++ b/nix/conda-build.nix @@ -1,4 +1,4 @@ -# nix-build -E "with import {}; callPackage ./disciplined-conda.nix {}" +# nix-build -E "with import {}; callPackage ./conda-build.nix {}" { stdenv , fetchurl @@ -61,5 +61,8 @@ in stdenv.mkDerivation { EOF mkdir $out ${condaBuilderEnv}/bin/conda-builder-env -c "PYTHON=python conda build --clobber-file clobber.yaml --no-anaconda-upload --no-test --output-folder $out $src/conda/artiq" + + mkdir -p $out/nix-support + echo file conda $out/noarch/*.tar.bz2 >> $out/nix-support/hydra-build-products ''; } diff --git a/nix/release.nix b/nix/release.nix new file mode 100644 index 000000000..7c65a6454 --- /dev/null +++ b/nix/release.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {}}: +with pkgs; +let + artiqPkgs = import ./default.nix {}; + jobs = rec { + conda-artiq = callPackage ./conda-build.nix {}; + } // artiqPkgs; +in + jobs