Commit 9b1797c2 authored by Millian Poquet's avatar Millian Poquet

[*] datamovepkgs -> kapack

parent 9fbdf63c
let
pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/18.03.tar.gz") {};
dmpkgs = import
( fetchTarball "https://gitlab.inria.fr/vreis/datamove-nix/repository/master/archive.tar.gz")
kapack = import
( fetchTarball "https://github.com/oar-team/kapack/archive/master.tar.gz")
{ inherit pkgs; };
in
with dmpkgs;
with kapack;
with pkgs;
(batsim_dev.override {}).overrideAttrs (attrs: rec {
......
......@@ -3,4 +3,4 @@
set -eu
# Build up-to-date batsim_dev package, push it on binary cache
nix-build ${DATAMOVEPKGS:-~/datamovepkgs} -A batsim_dev | cachix push batsim
nix-build ${KAPACK:-~/kapack} -A batsim_dev | cachix push batsim
......@@ -14,7 +14,7 @@ nix-shell shell.nix
If it does not work (for old batsim versions) you can do:
```sh
nix-shell /path/to/datamovepkgs -A batsim_dev
nix-shell /path/to/kapack -A batsim_dev
```
This command will open a new Bash shell with all the environment variable set
......
......@@ -24,8 +24,8 @@ source a file to access to the Nix commands:
Then, get our Nix repository that contains the batsim package:
```sh
git clone https://gitlab.inria.fr/vreis/datamove-nix.git datamovepkgs
nix-env --file ./datamovepkgs --install batsim
git clone https://github.com/oar-team/kapack.git kapack
nix-env --file ./kapack --install batsim
```
Batsim is now available directly:
......@@ -36,7 +36,7 @@ batsim --help
You can also install Batsched, the scheduler used for the tests and the
examples, with the same mechanism:
```sh
nix-env --file ./datamovepkgs -iA batsched
nix-env --file ./kapack -iA batsched
```
## Run batsim directly with docker (Deprecated)
......@@ -69,11 +69,11 @@ Then you can run your own scheduler to make the simulation begins.
We use the [Nix package manager](https://nixos.org/nix/) to build a minimal
docker image for batsim.
Get the Nix repository that contains the batsim package [here](https://gitlab.inria.fr/vreis/datamove-nix):
Get the Nix repository that contains the batsim package [here](https://github.com/oar-team/kapack/):
```sh
git clone https://gitlab.inria.fr/vreis/datamove-nix.git datamovepkgs
cd datamovepkgs
git clone https://github.com/oar-team/kapack.git kapack
cd kapack
# For stable version
nix-build . -A batsimDocker
......
......@@ -31,7 +31,7 @@ RUN cachix use batsim
# Batsim #
##########
# Retrieve datamove nix packages
# Retrieve kapack packages
ENV DATAMOVEPKGS=/datamovepkgs
ENV KAPACK=/kapack
RUN git clone https://github.com/oar-team/kapack.git ${KAPACK}
......
let
pkgs = import
( fetchTarball "https://github.com/NixOS/nixpkgs/archive/17.09.tar.gz") {};
dmpkgs = import
#~/Projects/datamove-nix
( fetchTarball "https://gitlab.inria.fr/vreis/datamove-nix/repository/master/archive.tar.gz")
kapack = import
#~/Projects/kapack
( fetchTarball "https://github.com/oar-team/kapack/archive/master.tar.gz")
{ inherit pkgs; };
in
# To use the batsim_dev package build environment
#
#dmpkgs.batsim_dev
#kapack.batsim_dev
# To use local simgrid or a simgrid fork use the folowing instead
with dmpkgs;
with kapack;
with pkgs;
let
simgrid_local = simgrid_dev.overrideAttrs (attrs: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment