diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-26 00:05:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 00:05:43 +0000 |
| commit | 527dacdda61779b75ea6340b133ae2034d17449a (patch) | |
| tree | aa824e4cd0e6be72e9c6d3fcd470cc3b09d823aa /pkgs/top-level | |
| parent | 0dfed52fcf6184c25eefc0ee18330d631e6c7af5 (diff) | |
| parent | 8dee9de4781564940cfa8145c7a0f409041ef646 (diff) | |
| download | nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.gz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.bz2 nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.lz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.xz nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.tar.zst nixpkgs-527dacdda61779b75ea6340b133ae2034d17449a.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2a7e3c7af6..8a0ac74a862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1153,6 +1153,8 @@ in arduino-mk = callPackage ../development/arduino/arduino-mk {}; + apio = python3Packages.callPackage ../development/tools/misc/apio { }; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; argtable = callPackage ../development/libraries/argtable { }; @@ -3902,6 +3904,8 @@ in c14 = callPackage ../applications/networking/c14 { }; + corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; + certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -8276,9 +8280,7 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); qarte = libsForQt5.callPackage ../applications/video/qarte { }; @@ -9551,6 +9553,8 @@ in twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; + twurl = callPackage ../tools/misc/twurl { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -19595,6 +19599,8 @@ in hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; + ic-keysmith = callPackage ../tools/security/ic-keysmith { }; + icecream = callPackage ../servers/icecream { }; icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; @@ -25556,6 +25562,8 @@ in mark = callPackage ../tools/text/mark { }; + markets = callPackage ../applications/misc/markets { }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -26726,6 +26734,8 @@ in tag = "-daemon-qt5"; }; + quill-qr = callPackage ../tools/security/quill-qr { }; + quirc = callPackage ../tools/graphics/quirc {}; quilter = callPackage ../applications/editors/quilter { }; @@ -27336,7 +27346,9 @@ in taskopen = callPackage ../applications/misc/taskopen { }; - tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + inherit (xorg) libpthreadstubs libXdmcp; + }; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; |