Commit Graph

13 Commits

Author SHA1 Message Date
84fc1375d1 s/stdenv.lib/lib/ 2021-03-11 17:32:26 +01:00
Drew Risinger
2577aa52c0 artiq: pass wrapped python env to subprocesses
Fixes https://github.com/m-labs/artiq-comtools/issues/7.
Basically, python subprocesses can't see all installed python packages
in a python environment because it uses the wrong Python exe (i.e. it
doesn't use the wrapped exe). This patches the PATH in the binary
wrappers (e.g. */bin/artiq_session) to include the correct python path.
2020-12-23 10:55:43 +08:00
ca28925120 treewide: name -> pname where possible
Changes "name = '...-${version}" -> "pname = '...'" syntax everywhere
that is easy.
This matches current best nixpkgs convention.
The nixpkgs standard derivation will convert this to name =
"${pname}-${version}" automatically.
This also has the added benefit of adding the version to the filepath
for several packages that didn't have it before.

The only remaining files are ./artiq-full/extras.nix &
./artiq-fast/pkgs/python-deps.nix.
extras.nix had a
semi-confusing function that I didn't want to mess with.
2020-12-17 14:16:45 +08:00
093b1b7224 artiq-fast: quamash -> qasync on artiq-6+ 2020-12-12 21:58:04 +08:00
1c43932205 cleanup/fix python-deps import 2020-08-01 10:40:00 +08:00
7b27d68841 artiq: apply Qt wrapper to artiq_session 2020-08-01 10:20:15 +08:00
e75d16f55a artiq: fix use of Qt 2020-07-17 11:48:43 +08:00
8c508de922 artiq: add binutils-arm dependency for 6.0+ 2020-06-28 17:29:40 +08:00
68078d38d8 artiq: use nixpkgs levenshtein 2020-06-09 15:52:36 +08:00
f03d0370db artiq: use nixpkgs quamash 2020-06-09 15:47:35 +08:00
5797648204 build artiq-comtools 2019-11-14 15:22:17 +08:00
63625e74b8 artiq: depend on sipyco 2019-11-10 15:54:02 +08:00
dfa5b47d9b rename jobsets to artiq-fast/artiq-full 2019-07-17 19:19:43 +08:00