Skip to content
Snippets Groups Projects
Commit 9c9f80d5 authored by Maël Madon's avatar Maël Madon
Browse files

progress on install etc.

parent d1062d8a
Branches
No related tags found
No related merge requests found
out
*__pycache__*
\ No newline at end of file
...@@ -14,8 +14,8 @@ We can start a small expe! ...@@ -14,8 +14,8 @@ We can start a small expe!
On one shell: On one shell:
``` ```
ns -A example-shell ns -A dev
pybatsim rejector pybatsim newSched
``` ```
On the other shell: On the other shell:
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
, python3 ? pkgs.python311 , python3 ? pkgs.python311
, python3Packages ? pkgs.python311Packages , python3Packages ? pkgs.python311Packages
# , pybatsim-core ? kapack.pybatsim-core # , pybatsim-core ? kapack.pybatsim-core
, poetry ? pkgs.poetry
}: }:
let let
...@@ -27,9 +26,17 @@ let ...@@ -27,9 +26,17 @@ let
# small shell to dev and test schedulers # small shell to dev and test schedulers
dev = pkgs.mkShell rec { dev = pkgs.mkShell rec {
buildInputs = [ packages = [
# pkgs.stdenv.cc.cc.lib # kapack.pybatsim-core
poetry pkgs.stdenv.cc.cc.lib
# python3Packages.poetry
python3
(pkgs.poetry.override { python3 = python3; })
# (python3.withPackages
# (ps: with ps; with python3Packages; [
# poetry-core
# ])
# )
]; ];
shellHook = '' shellHook = ''
cd sched cd sched
...@@ -38,7 +45,7 @@ let ...@@ -38,7 +45,7 @@ let
poetry shell poetry shell
''; '';
# LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib"; LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib";
}; };
expe = pkgs.mkShell rec { expe = pkgs.mkShell rec {
...@@ -71,17 +78,11 @@ let ...@@ -71,17 +78,11 @@ let
test = pkgs.mkShell rec { test = pkgs.mkShell rec {
buildInputs = [ buildInputs = [
(python3.withPackages pkgs.stdenv.cc.cc.lib
(ps: with ps; with python3Packages; [ python3Packages.poetry-core
matplotlib])
)
]; ];
# QT_PLUGIN_PATH = with nixpkgs.libsForQt5.qt5; "${qtbase}/${qtbase.qtPluginPrefix}";
# QT_QPA_PLATFORM_PLUGIN_PATH= with nixpkgs.libsForQt5.qt5; "${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms"; LD_LIBRARY_PATH="${pkgs.stdenv.cc.cc.lib}/lib";
# shellHook = ''
# QT_QPA_PLATFORM_PLUGIN_PATH="${qt6.qtbase.bin}/lib/qt-${qt6.qtbase.version}/plugins/platforms";
# '';
# nativeBuildInputs = [ nixpkgs.qt6.wrapQtAppsHook ];
}; };
# lib = pkgs.lib; # lib = pkgs.lib;
# pybatsim-example = python3Packages.buildPythonPackage rec { # pybatsim-example = python3Packages.buildPythonPackage rec {
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment