diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-11 09:19:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-11 09:19:26 +0200 |
| commit | d20d734bcf40c4b36880e91d1142094ce7978af5 (patch) | |
| tree | 94319ee9bf1c1fa81e70aef7b2c06e63f71a7161 /pkgs/top-level/all-packages.nix | |
| parent | 303adc76971983c0c2891d62a83065bdd79595b4 (diff) | |
| parent | 3a768184f4823175f8f46a10b811242efaf41e40 (diff) | |
| download | nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar.gz nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar.bz2 nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar.lz nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar.xz nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.tar.zst nixlib-d20d734bcf40c4b36880e91d1142094ce7978af5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c495e078a530..14591f195d52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5679,6 +5679,8 @@ in stdenv = clangStdenv; }; + oq = callPackage ../development/tools/oq { }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; oppai-ng = callPackage ../tools/misc/oppai-ng { }; @@ -22133,7 +22135,7 @@ in tendermint = callPackage ../tools/networking/tendermint { }; - termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; |