diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 15:56:00 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 15:56:00 -0400 |
| commit | bdf750499ec4754ac0db17fdc84f03a90e155666 (patch) | |
| tree | d9bf1c127131f358fa11a05ecff60d91fca26be8 /pkgs/top-level | |
| parent | cebda2ffd0a1216f26585746b14f06467af69cfd (diff) | |
| parent | 4ad049fba0f2507cfc3c6effbbf002eea1a48637 (diff) | |
| download | nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar.gz nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar.bz2 nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar.lz nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar.xz nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.tar.zst nixlib-bdf750499ec4754ac0db17fdc84f03a90e155666.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9cd5c4452b1..348b92f25d50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1339,7 +1339,7 @@ with pkgs; kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = callPackage ../servers/web-apps/klaus { }; + klaus = with pythonPackages; toPythonApplication klaus; lcdproc = callPackage ../servers/monitoring/lcdproc { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f0a0f45b12d..7d17e16f1c69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6929,6 +6929,8 @@ in { kiwisolver = callPackage ../development/python-modules/kiwisolver { }; + klaus = callPackage ../development/python-modules/klaus {}; + klein = callPackage ../development/python-modules/klein { }; koji = callPackage ../development/python-modules/koji { }; @@ -18202,6 +18204,11 @@ EOF gast = callPackage ../development/python-modules/gast { }; + IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { }; + + qiskit = callPackage ../development/python-modules/qiskit { }; + + qasm2image = callPackage ../development/python-modules/qasm2image { }; }); in fix' (extends overrides packages) |