Skip to content

Commit

Permalink
fix: use nixpkgs-compatible versions of numpy etc
Browse files Browse the repository at this point in the history
The GitHub (rather than PyPi) pinned source can be
removed once this PR is merged:

probsys/sppl#128
  • Loading branch information
ships committed May 3, 2024
1 parent 85a5938 commit a29a170
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
8 changes: 8 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@
packages = [] ++ toolkit;
};

devShells.sppl = pkgs.mkShell {
packages
= [sppl]
++ sppl.checkInputs
++ toolkit
;
};

inherit packages;
};

Expand Down
14 changes: 9 additions & 5 deletions pkgs/sppl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@
nixpkgs-sppl = import (pkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs";
rev = "35a74aa665a681b60d68e3d3400fcaa11690ee50";
sha256 = "sha256-6qjgWliwYtFsEUl4/SjlUaUF9hSSfVoaRZzN6MCgslg=";
rev = "994df04c3c700fe9edb1b69b82ba3c627e5e04ff";
sha256 = "sha256-60hLkFqLRI+5XEeacXaVPHdl6m/P8rN2L4luLGxklqs=";
}) {inherit system;};
pypkgs = nixpkgs-sppl.python39Packages;

sppl = pypkgs.buildPythonPackage rec { # not in nixpkgs
pname = "sppl";
version = "2.0.4";

src = pypkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-QAp77L8RpN86V4O8F1zNA8O/szm9hNa4wWFT13av6BE=";
# Use a version of sppl that has Nixpkgs-compatible versions of some packages
src = pkgs.fetchFromGitHub {
owner = "ships";
repo = "sppl";
rev = "6999c253e6d88c9c7949ad763dfc07419d48e7ca";
sha256 = "sha256-hFIR073wDRXyt8EqFkLZNDdGUjPTyWYOfDg5eGTjvz0=";
};

propagatedBuildInputs = with pypkgs; [
Expand All @@ -41,6 +44,7 @@
pipInstallFlags = [ "--no-deps" ];

passthru.runtimePython = nixpkgs-sppl.python39.withPackages (p: [ sppl ]);
passthru.checkInputs = checkInputs;
};

in sppl

0 comments on commit a29a170

Please sign in to comment.