diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-21 18:01:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 18:01:41 +0000 |
| commit | 7a1e77336a5d67f6c0ad93f36705d8343aef59cd (patch) | |
| tree | 44e0e383084222277ad9994a456f77570b063e27 /pkgs/top-level | |
| parent | 3087a2d2e96ab840a907dc62b84366e50a9a5ab6 (diff) | |
| parent | 41adc8c8ded99eec7834826445ec96deff2b1908 (diff) | |
| download | nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar.gz nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar.bz2 nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar.lz nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar.xz nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.tar.zst nixpkgs-7a1e77336a5d67f6c0ad93f36705d8343aef59cd.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 123bfde72e8..28f193c141f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1155,6 +1155,8 @@ in argyllcms = callPackage ../tools/graphics/argyllcms {}; + arj = callPackage ../tools/archivers/arj { }; + arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) @@ -14351,6 +14353,8 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; + toil = callPackage ../applications/science/misc/toil { }; + travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -25908,6 +25912,8 @@ in nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; + nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-menu = callPackage ../applications/misc/nwg-menu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c..320115f6ad2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -199,6 +199,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + addict = callPackage ../development/python-modules/addict { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; adext = callPackage ../development/python-modules/adext { }; @@ -2297,6 +2299,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + enlighten = callPackage ../development/python-modules/enlighten { }; + enocean = callPackage ../development/python-modules/enocean { }; enrich = callPackage ../development/python-modules/enrich { }; @@ -5544,6 +5548,8 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + prefixed = callPackage ../development/python-modules/prefixed { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; @@ -7542,6 +7548,8 @@ in { requests-file = callPackage ../development/python-modules/requests-file { }; + requests-futures = callPackage ../development/python-modules/requests-futures { }; + requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; |