diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ac1bf3949ff05253da7d3ef5dc4e20e05e85e57..156b0d1ec8b0b1e095774dcc88db53c0e0e0d86e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ update: build: stage: build script: - - /tmp/guix-jupyter-guix/bin/guix build -l environment.scm + - /tmp/guix-jupyter-guix/bin/guix build -f guix.scm diff --git a/Makefile.am b/Makefile.am index 83f4d57b98131202f13d62d3d5471cbd57008865..36bfadc09dde620b86735b4a089f23abb4f71ae8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Guix-kernel -- Guix kernel for Jupyter # Copyright (C) 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> -# Copyright (C) 2019, 2021 Inria +# Copyright (C) 2019, 2021, 2024 Inria # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,7 +51,8 @@ TESTS = $(SCM_TESTS) EXTRA_DIST += \ $(TESTS) \ - $(top_srcdir)/build-aux/test-driver.scm + guix.scm \ + build-aux/test-driver.scm AM_TESTS_ENVIRONMENT = GUILE_AUTO_COMPILE=0 diff --git a/README.org b/README.org index 4afe95575fea868bcc6c7c67822d5d24fd4512ca..fc6dae6ad7e10a210923c1650be7f8c09586ff05 100644 --- a/README.org +++ b/README.org @@ -160,28 +160,37 @@ $ git clone https://gitlab.inria.fr/guix-hpc/guix-kernel $ cd guix-kernel # Build package -$ guix build -f environment.scm +$ guix build -f guix.scm #+END_SRC You can install it with: #+BEGIN_SRC shell -$ guix package -f environment.scm +$ guix package -f guix.scm #+END_SRC To start Jupyter in an environment that contains Guix-Jupyter, run: #+BEGIN_SRC shell - guix environment --ad-hoc jupyter -l environment.scm guile-git guile \ + guix shell jupyter -Df guix.scm guile-git guile \ -- jupyter notebook #+END_SRC ** Contributing *** Development environment + +Obtain a development by running: + #+BEGIN_SRC sh - guix environment -l environment.scm + guix shell --pure #+END_SRC +Or, to get an development environment in an isolated container (nicer!), run: + +#+begin_src sh + guix shell -CPWN +#+end_src + *** Using the kernel prior to installation You can try out the Guix-Jupyter kernel before it’s installed, for diff --git a/environment.scm b/guix.scm similarity index 98% rename from environment.scm rename to guix.scm index fcacf7bb738e0ea24554be4caca8e516d75a480d..bf3e17f26bf4747c895366910f0298efb125af5b 100644 --- a/environment.scm +++ b/guix.scm @@ -1,7 +1,7 @@ ;;; Run the following command to enter a development environment for -;;; guix-kernel: +;;; Guix-Jupyter: ;;; -;;; $ guix environment -l environment.scm +;;; guix shell --pure (use-modules ((guix licenses) #:prefix license:) (guix packages)