diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-18 01:16:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-18 01:16:03 +0000 |
commit | b7f20dcd026426f900d81b76391d402049b96ca8 (patch) | |
tree | 3dde395aac1b900f15ac668e5fd779837d4f943c /pkgs/top-level | |
parent | 4bdb892722454a6d97ad2b72d5ddb5cbe2f2e420 (diff) | |
parent | 3fc28a93b0091a7ec1b6f6e5110a6cfa92d6dd0a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
3 files changed, 39 insertions, 7 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 15d6e2ed927d..22dd825b1fe8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -139,6 +139,7 @@ mapAliases ({ draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 dwarf_fortress = dwarf-fortress; # added 2016-01-23 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0aafcfbf3de..6cb8685d7738 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,6 +697,8 @@ in aide = callPackage ../tools/security/aide { }; + aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; + aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; @@ -3891,6 +3893,8 @@ in eventstat = callPackage ../os-specific/linux/eventstat { }; + evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; + evtest = callPackage ../applications/misc/evtest { }; evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; @@ -5590,6 +5594,8 @@ in matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; + matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; @@ -5796,6 +5802,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libiscsi = callPackage ../development/libraries/libiscsi { }; + libisds = callPackage ../development/libraries/libisds { }; libite = callPackage ../development/libraries/libite { }; @@ -10633,6 +10641,7 @@ in cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { @@ -15784,7 +15793,11 @@ in }; openal = openalSoft; - openbabel = callPackage ../development/libraries/openbabel { }; + openbabel = openbabel3; + + openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; + + openbabel3 = callPackages ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; @@ -17481,10 +17494,6 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -17528,6 +17537,8 @@ in grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); + grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; + grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -19147,7 +19158,7 @@ in linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile stdenv allowImportFromDerivation; + inherit version src configfile lib stdenv allowImportFromDerivation; })); # This serves as a test for linuxPackages_custom @@ -19178,7 +19189,7 @@ in kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit stdenv; + inherit lib stdenv; inherit (kernel) version; }; kernelPatches = kernel.kernelPatches ++ [ @@ -26770,6 +26781,8 @@ in stardust = callPackage ../games/stardust {}; + starspace = callPackage ../applications/science/machine-learning/starspace { }; + stockfish = callPackage ../games/stockfish { }; steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { @@ -27070,6 +27083,7 @@ in mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; @@ -27135,6 +27149,7 @@ in ### SCIENCE/CHEMISTY avogadro = callPackage ../applications/science/chemistry/avogadro { + openbabel = openbabel2; eigen = eigen2; }; @@ -27881,6 +27896,8 @@ in qucs = callPackage ../applications/science/electronics/qucs { }; + qucs-s = callPackage ../applications/science/electronics/qucs-s { }; + xcircuit = callPackage ../applications/science/electronics/xcircuit { }; xoscope = callPackage ../applications/science/electronics/xoscope { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 195fee99a907..2076ae2ec54a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -174,6 +174,8 @@ in { addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + adext = callPackage ../development/python-modules/adext { }; + adguardhome = callPackage ../development/python-modules/adguardhome { }; advantage-air = callPackage ../development/python-modules/advantage-air { }; @@ -194,6 +196,8 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; + agent-py = callPackage ../development/python-modules/agent-py { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -1915,6 +1919,8 @@ in { dopy = callPackage ../development/python-modules/dopy { }; + dotty-dict = callPackage ../development/python-modules/dotty-dict { }; + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; dparse = callPackage ../development/python-modules/dparse { }; @@ -4466,6 +4472,10 @@ in { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { + openbabel = (callPackage ../development/libraries/openbabel { python = self.python; }); + }; + opencv3 = toPythonModule (pkgs.opencv3.override { enablePython = true; pythonPackages = self; @@ -5139,6 +5149,8 @@ in { pybindgen = callPackage ../development/python-modules/pybindgen { }; + pyblackbird = callPackage ../development/python-modules/pyblackbird { }; + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; pyblock = callPackage ../development/python-modules/pyblock { }; @@ -6726,6 +6738,8 @@ in { roman = callPackage ../development/python-modules/roman { }; + roombapy = callPackage ../development/python-modules/roombapy { }; + rope = callPackage ../development/python-modules/rope { }; ROPGadget = callPackage ../development/python-modules/ROPGadget { }; |