diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:30:16 +0200 |
commit | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (patch) | |
tree | 11455dc939663bdda36790451315de1cc364614b /pkgs/top-level | |
parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
parent | a2bd8da766c7a7ea456afd099b86920dd902cec4 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 32 |
3 files changed, 55 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c560fa67271b0..2dceba2763b1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -169,6 +169,10 @@ in demoit = callPackage ../servers/demoit { }; + deviceTree = callPackage ../os-specific/linux/device-tree {}; + + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -560,6 +564,8 @@ in antora = callPackage ../development/tools/documentation/antora {}; + apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -760,6 +766,8 @@ in crumbs = callPackage ../applications/misc/crumbs { }; + crc32c = callPackage ../development/libraries/crc32c { }; + cue = callPackage ../development/tools/cue { }; deskew = callPackage ../applications/graphics/deskew { }; @@ -3453,6 +3461,8 @@ in google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; @@ -6146,6 +6156,8 @@ in srcml = callPackage ../applications/version-management/srcml { }; + sourcehut = callPackage ../applications/version-management/sourcehut { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshfs = sshfs-fuse; # added 2017-08-14 @@ -6380,6 +6392,8 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; @@ -9919,6 +9933,8 @@ in spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; }; + spooles = callPackage ../development/libraries/science/math/spooles {}; + sqlcheck = callPackage ../development/tools/database/sqlcheck { }; sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; @@ -10764,6 +10780,8 @@ in ghp-import = callPackage ../development/tools/ghp-import { }; + ghcid = haskellPackages.ghcid.bin; + icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { @@ -17388,6 +17406,8 @@ in calcurse = callPackage ../applications/misc/calcurse { }; + calculix = callPackage ../applications/science/math/calculix {}; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { @@ -23930,7 +23950,7 @@ in in nixosTesting.makeTest calledTest; - nixosOptionsDoc = attrs: + nixosOptionsDoc = attrs: (import ../../nixos/lib/make-options-doc/default.nix) ({ inherit pkgs lib; } // attrs); @@ -24221,6 +24241,8 @@ in jx = callPackage ../applications/networking/cluster/jx {}; + prow = callPackage ../applications/networking/cluster/prow {}; + inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_11 terraform_0_11-full diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b5ec6ed335b2f..f42b9fd2e33cc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -450,6 +450,8 @@ let mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + mmap = callPackage ../development/ocaml-modules/mmap { }; + mparser = callPackage ../development/ocaml-modules/mparser { }; mstruct = callPackage ../development/ocaml-modules/mstruct { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eada8bf669eca..454e497ad1dc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + cnvkit = callPackage ../development/python-modules/cnvkit { }; + cozy = callPackage ../development/python-modules/cozy { }; codespell = callPackage ../development/python-modules/codespell { }; @@ -519,6 +521,8 @@ in { emcee = callPackage ../development/python-modules/emcee { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; + email_validator = callPackage ../development/python-modules/email-validator { }; ewmh = callPackage ../development/python-modules/ewmh { }; @@ -879,6 +883,8 @@ in { pyfakefs = callPackage ../development/python-modules/pyfakefs {}; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + pyfttt = callPackage ../development/python-modules/pyfttt { }; pyftdi = callPackage ../development/python-modules/pyftdi { }; @@ -1014,6 +1020,8 @@ in { pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; @@ -1271,6 +1279,8 @@ in { aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; @@ -1342,8 +1352,12 @@ in { astor = callPackage ../development/python-modules/astor {}; + asyncpg = callPackage ../development/python-modules/asyncpg { }; + asyncssh = callPackage ../development/python-modules/asyncssh { }; + atpublic = callPackage ../development/python-modules/atpublic { }; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -2426,6 +2440,8 @@ in { jsmin = callPackage ../development/python-modules/jsmin { }; + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpickle = callPackage ../development/python-modules/jsonpickle { }; @@ -2806,6 +2822,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-csp = callPackage ../development/python-modules/django-csp { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django_environ = callPackage ../development/python-modules/django_environ { }; @@ -2977,6 +2995,8 @@ in { flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; + flake8-polyfill = callPackage ../development/python-modules/flake8-polyfill { }; + flaky = callPackage ../development/python-modules/flaky { }; flask = callPackage ../development/python-modules/flask { }; @@ -4071,6 +4091,8 @@ in { pep8 = callPackage ../development/python-modules/pep8 { }; + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pep257 = callPackage ../development/python-modules/pep257 { }; percol = callPackage ../development/python-modules/percol { }; @@ -4092,6 +4114,12 @@ in { pgspecial = callPackage ../development/python-modules/pgspecial { }; + pgpy = callPackage ../development/python-modules/pgpy { + cryptography = self.cryptography.override { + openssl = pkgs.openssl_1_1; + }; + }; + pickleshare = callPackage ../development/python-modules/pickleshare { }; piep = callPackage ../development/python-modules/piep { }; @@ -4838,6 +4866,8 @@ in { sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; @@ -4981,8 +5011,6 @@ in { wordfreq = callPackage ../development/python-modules/wordfreq { }; - wikipedia = callPackage ../development/python-modules/wikipedia { }; - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; |