Skip to content

Commit

Permalink
fix: Fix Cython version (#8)
Browse files Browse the repository at this point in the history
* fix: cython 0.x is now in nixpkgs as cython_0

Breaking change in nixpkgs caused wrong version of Cython to be
referenced by Loom and Distributions packages.

* chore: Add Loom to CI build steps
  • Loading branch information
srounce authored May 2, 2024
1 parent 097741c commit 0e0d496
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
-L \
-o ./imgGensqlQuery \
'.#ociImgGensqlQuery'
- run: |
nix build \
-L \
-o ./loom \
'.#loom'
- name: Login to Docker Hub
# only run this when running on main, because
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkgs/distributions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ python3Packages.buildPythonPackage {
propagatedBuildInputs = with python3Packages; [
protobuf3_20
protobuf
cython
cython_0
numpy
parsable
scipy
Expand Down
4 changes: 2 additions & 2 deletions pkgs/loom/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, setuptools
, wheel
, cpplint
, cython
, cython_0
, goftests
, imageio
, matplotlib
Expand Down Expand Up @@ -127,7 +127,7 @@ buildPythonPackage {
loom-cpp
contextlib2
cpplint
cython
cython_0
distributions
distributions.distributions-shared
goftests
Expand Down

0 comments on commit 0e0d496

Please sign in to comment.