Justin Frank / neurocube_consumer

Authored by Justin Frank 2021-06-26 11:14:36 -0700

Exists in master

Showing 3 changed files with 17 additions and 18 deletions Side-by-side Diff

...	...	@@ -53,11 +53,11 @@
53	53	},
54	54	"nixpkgs_2": {
55	55	"locked": {
56		- "lastModified": 1624634316,
57		- "narHash": "sha256-MUEJzeZZr+nP1V9D19PS9mKVJUJBgnweHFGuFN6hvAQ=",
	56	+ "lastModified": 1624727938,
	57	+ "narHash": "sha256-K0fYTmUVZTlB8UKBDL0JOmGlYuTWeEaOcpPJUe9NL0U=",
58	58	"owner": "NixOS",
59	59	"repo": "nixpkgs",
60		- "rev": "61e983dbac933aa26cf913aef47aa92a5c40143c",
	60	+ "rev": "c74057781fee9d29a28172402c6edeb68dd2d885",
61	61	"type": "github"
62	62	},
63	63	"original": {

...	...	@@ -18,23 +18,15 @@
18	18
19	19	# Explicit settings per package
20	20	};
21		- requirements = ''
22		- pandas
23		- watchdog
24		- debugpy
25		- pytest
26		- sphinx
27		- sphinx_rtd_theme
28		- '';
29		-
	21	+ pyEnv = mach-nix-utils.mkPython{
	22	+ requirements = builtins.readFile ./requirements.txt;
	23	+ providers = mach-provider;
	24	+ };
30	25	in
31	26	{
32		- devShell."${system}" = (mach-nix-utils.mkPythonShell {
33		- inherit requirements;
34		- providers = mach-provider;
35		- }) // (pkgs.mkShell {
36		- nativeBuildInputs = [pkgs.google-drive-ocamlfuse];
37		- });
	27	+ devShell."${system}" = pkgs.mkShell{
	28	+ buildInputs = [pkgs.google-drive-ocamlfuse pyEnv];
	29	+ };
38	30	};
39	31	}