Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9e29d266afb1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03fb6086b759
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 24, 2021

  1. python3Packages.fortiosapi: init at 1.0.5

    @fabaff
    fabaff committed Jan 24, 2021
    Copy the full SHA
    4f27216 View commit details

  2. home-assistant: update component-packages

    @fabaff
    fabaff committed Jan 24, 2021
    Copy the full SHA
    5667390 View commit details

Commits on Jan 25, 2021

  1. Merge pull request #110712 from fabaff/fortiosapi

    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03fb608 View commit details
Showing with 43 additions and 1 deletion.
  1. +40 −0 pkgs/development/python-modules/fortiosapi/default.nix
  2. +1 −1 pkgs/servers/home-assistant/component-packages.nix
  3. +2 −0 pkgs/top-level/python-packages.nix
40 changes: 40 additions & 0 deletions pkgs/development/python-modules/fortiosapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, oyaml
, packaging
, paramiko
, pexpect
, requests
}:

buildPythonPackage rec {
pname = "fortiosapi";
version = "1.0.5";

src = fetchFromGitHub {
owner = "fortinet-solutions-cse";
repo = pname;
rev = "v${version}";
sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k";
};

propagatedBuildInputs = [
pexpect
requests
paramiko
packaging
oyaml
];

# Tests require a local VM
doCheck = false;
pythonImportsCheck = [ "fortiosapi" ];

meta = with lib; {
description = "Python module to work with Fortigate/Fortios devices";
homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/component-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@
"folder_watcher" = ps: with ps; [ watchdog ];
"foobot" = ps: with ps; [ ]; # missing inputs: foobot_async
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
"fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi
"fortios" = ps: with ps; [ fortiosapi ];
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
"foursquare" = ps: with ps; [ aiohttp-cors ];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2390,6 +2390,8 @@ in {

forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };

fortiosapi = callPackage ../development/python-modules/fortiosapi { };

FormEncode = callPackage ../development/python-modules/FormEncode { };

foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; };