From a6a9faa53d0b0cde5a32fb654ebdada051830ef1 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 19 Sep 2024 13:32:17 +0200 Subject: [PATCH 1/2] WIP: Fix shell.nix --- shell.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 611230b33..6a10f28e0 100644 --- a/shell.nix +++ b/shell.nix @@ -23,6 +23,7 @@ pkgs.mkShell { unstable.python312Packages.fastecdsa unstable.python312Packages.greenlet + unstable.python312Packages.libnacl ]; shellHook = '' @@ -61,14 +62,14 @@ pkgs.mkShell { # Create a virtual environment in the current directory if it doesn't exist if [ ! -d "venv" ]; then - python3 -m virtualenv venv + python3.12 -m virtualenv venv fi # Install the required Python packages - ./venv/bin/pip install -e .\[testing\] + ./venv/bin/pip install -e .\[test\] # PyO3 requires a nightly or dev version of Rust. - rustup default nightly + # rustup default nightly # If config.yml does not exist, create it with the port specified in this shell. [ -e config.yml ] || echo -e "postgres:\n port: $PG_PORT" > config.yml From 9ad76e7b9327d951042d44beacd242825e1120bd Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Tue, 11 Feb 2025 17:06:36 +0100 Subject: [PATCH 2/2] WIP... --- shell.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/shell.nix b/shell.nix index 6a10f28e0..5bc0853ce 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ { pkgs ? import {} }: let - unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) {}; + unstable = import (fetchTarball "https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz") {}; in pkgs.mkShell { buildInputs = [ @@ -20,7 +20,12 @@ pkgs.mkShell { unstable.python312Packages.virtualenv unstable.python312Packages.pip unstable.python312Packages.setuptools + unstable.python312Packages.ed25519 + unstable.python312Packages.pytest + unstable.python312Packages.pytest-asyncio + unstable.python312Packages.pytz + unstable.python312Packages.alembic unstable.python312Packages.fastecdsa unstable.python312Packages.greenlet unstable.python312Packages.libnacl @@ -62,7 +67,7 @@ pkgs.mkShell { # Create a virtual environment in the current directory if it doesn't exist if [ ! -d "venv" ]; then - python3.12 -m virtualenv venv + python3.12 -m virtualenv --system-site-packages venv fi # Install the required Python packages