Change around environment management so we can install ssh too

The new image does not come with it
This commit is contained in:
Jean-Paul Calderone 2022-01-27 14:31:56 -05:00
parent 83a172210c
commit 5edd96ce6b
2 changed files with 16 additions and 9 deletions

View File

@ -453,14 +453,22 @@ jobs:
NIXPKGS: "nixpkgs-21.05" NIXPKGS: "nixpkgs-21.05"
steps: steps:
- "run":
name: "Install Basic Dependencies"
command: |
nix-env \
-f .circleci/env.nix \
--argstr pkgsVersion "$NIXPKGS" \
--install \
-A ssh python3
- "checkout" - "checkout"
- "run": - "run":
# The Nix package doesn't know how to do this part, unfortunately. # The Nix package doesn't know how to do this part, unfortunately.
name: "Generate version" name: "Generate version"
command: | command: |
nix-shell .circleci/python.nix \ python setup.py update_version
--argstr pkgsVersion "$NIXPKGS" \
--run 'python setup.py update_version'
- "run": - "run":
name: "Build and Test" name: "Build and Test"

View File

@ -5,10 +5,9 @@ in
{ pkgsVersion { pkgsVersion
, pkgs ? import sources.${pkgsVersion} { } , pkgs ? import sources.${pkgsVersion} { }
}: }:
pkgs.mkShell { {
buildInputs = [ ssh = pkgs.openssh;
(pkgs.python3.withPackages (ps: [ python = pkgs.python3.withPackages (ps: [
ps.setuptools ps.setuptools
])) ]);
];
} }