diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-03 18:14:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 18:14:40 +0000 |
| commit | 1aeec1f039ecfb360c0ee931af15458452dd3871 (patch) | |
| tree | 8846aaf219de5c884b8e80610609a3752c746d42 /pkgs/top-level | |
| parent | 5b73e3087ae63d404f94a76781b281e73a33922b (diff) | |
| parent | 555641c50462d5ab87afe9ceab7df9d8c7755a37 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 857b3fd11b53..f6543872561c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2041,6 +2041,8 @@ in dyncall = callPackage ../development/libraries/dyncall { }; + dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earlyoom = callPackage ../os-specific/linux/earlyoom { }; EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; @@ -3544,6 +3546,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + pax = callPackage ../tools/archivers/pax { }; + rage = callPackage ../tools/security/rage { }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; @@ -12233,6 +12237,8 @@ in yq-go = callPackage ../development/tools/yq-go { }; + ytt = callPackage ../development/tools/ytt {}; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -28132,6 +28138,8 @@ in prow = callPackage ../applications/networking/cluster/prow { }; + tagref = callPackage ../tools/misc/tagref { }; + tellico = libsForQt5.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -28141,6 +28149,7 @@ in terraform_0_11-full terraform_0_12 terraform_0_13 + terraform_0_14 terraform_plugins_test ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9dbd35097767..8e68f3b97939 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1452,6 +1452,8 @@ in { daemonize = callPackage ../development/python-modules/daemonize { }; + daemonocle = callPackage ../development/python-modules/daemonocle { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; @@ -4858,6 +4860,8 @@ in { pxml = callPackage ../development/python-modules/pxml { }; + py-air-control = callPackage ../development/python-modules/py-air-control { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); |