commit 2d03d542c7c0ffbf359b9cb199bdcb9bc038f099 · pyrox.dev/nixpkgs

+37 -35

nixos/lib/test-driver/test-driver.py

···

       4
       4
        
       from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable

     

       5
       5
        
       from xml.sax.saxutils import XMLGenerator

     

       6
       6
        
       from colorama import Style

     

       7
       7
       +
       from pathlib import Path

     

       7
       8
        
       import queue

     

       8
       9
        
       import io

     

       9
       10
        
       import threading

     
···

       11
       12
        
       import base64

     

       12
       13
        
       import codecs

     

       13
       14
        
       import os

     

       14
       14
       -
       import pathlib

     

       15
       15
        
       import ptpython.repl

     

       16
       16
        
       import pty

     

       17
       17
        
       import re

     
···

       239
       239
        
       

     

       240
       240
        
           def cmd(

     

       241
       241
        
               self,

     

       242
       242
       -
               monitor_socket_path: pathlib.Path,

     

       243
       243
       -
               shell_socket_path: pathlib.Path,

     

       242
       242
       +
               monitor_socket_path: Path,

     

       243
       243
       +
               shell_socket_path: Path,

     

       244
       244
        
               allow_reboot: bool = False,  # TODO: unused, legacy?

     

       245
       245
        
           ) -> str:

     

       246
       246
        
               display_opts = ""

     
···

       272
       272
        
       

     

       273
       273
        
           @staticmethod

     

       274
       274
        
           def build_environment(

     

       275
       275
       -
               state_dir: pathlib.Path,

     

       276
       276
       -
               shared_dir: pathlib.Path,

     

       275
       275
       +
               state_dir: Path,

     

       276
       276
       +
               shared_dir: Path,

     

       277
       277
        
           ) -> dict:

     

       278
       278
        
               # We make a copy to not update the current environment

     

       279
       279
        
               env = dict(os.environ)

     
···

       288
       288
        
       

     

       289
       289
        
           def run(

     

       290
       290
        
               self,

     

       291
       291
       -
               state_dir: pathlib.Path,

     

       292
       292
       -
               shared_dir: pathlib.Path,

     

       293
       293
       -
               monitor_socket_path: pathlib.Path,

     

       294
       294
       -
               shell_socket_path: pathlib.Path,

     

       291
       291
       +
               state_dir: Path,

     

       292
       292
       +
               shared_dir: Path,

     

       293
       293
       +
               monitor_socket_path: Path,

     

       294
       294
       +
               shell_socket_path: Path,

     

       295
       295
        
           ) -> subprocess.Popen:

     

       296
       296
        
               return subprocess.Popen(

     

       297
       297
        
                   self.cmd(monitor_socket_path, shell_socket_path),

     
···

       334
       334
        
               self,

     

       335
       335
        
               netBackendArgs: Optional[str] = None,

     

       336
       336
        
               netFrontendArgs: Optional[str] = None,

     

       337
       337
       -
               hda: Optional[Tuple[pathlib.Path, str]] = None,

     

       337
       337
       +
               hda: Optional[Tuple[Path, str]] = None,

     

       338
       338
        
               cdrom: Optional[str] = None,

     

       339
       339
        
               usb: Optional[str] = None,

     

       340
       340
        
               bios: Optional[str] = None,

     
···

       394
       394
        
           the machine lifecycle with the help of a start script / command."""

     

       395
       395
        
       

     

       396
       396
        
           name: str

     

       397
       397
       -
           tmp_dir: pathlib.Path

     

       398
       398
       -
           shared_dir: pathlib.Path

     

       399
       399
       -
           state_dir: pathlib.Path

     

       400
       400
       -
           monitor_path: pathlib.Path

     

       401
       401
       -
           shell_path: pathlib.Path

     

       397
       397
       +
           tmp_dir: Path

     

       398
       398
       +
           shared_dir: Path

     

       399
       399
       +
           state_dir: Path

     

       400
       400
       +
           monitor_path: Path

     

       401
       401
       +
           shell_path: Path

     

       402
       402
        
       

     

       403
       403
        
           start_command: StartCommand

     

       404
       404
        
           keep_vm_state: bool

     
···

       421
       421
        
       

     

       422
       422
        
           def __init__(

     

       423
       423
        
               self,

     

       424
       424
       -
               tmp_dir: pathlib.Path,

     

       424
       424
       +
               tmp_dir: Path,

     

       425
       425
        
               start_command: StartCommand,

     

       426
       426
        
               name: str = "machine",

     

       427
       427
        
               keep_vm_state: bool = False,

     
···

       463
       463
        
               hda = None

     

       464
       464
        
               if args.get("hda"):

     

       465
       465
        
                   hda_arg: str = args.get("hda", "")

     

       466
       466
       -
                   hda_arg_path: pathlib.Path = pathlib.Path(hda_arg)

     

       466
       466
       +
                   hda_arg_path: Path = Path(hda_arg)

     

       467
       467
        
                   hda = (hda_arg_path, args.get("hdaInterface", ""))

     

       468
       468
        
               return LegacyStartCommand(

     

       469
       469
        
                   netBackendArgs=args.get("netBackendArgs"),

     
···

       814
       814
        
               """Copy a file from the host into the guest via the `shared_dir` shared

     

       815
       815
        
               among all the VMs (using a temporary directory).

     

       816
       816
        
               """

     

       817
       817
       -
               host_src = pathlib.Path(source)

     

       818
       818
       -
               vm_target = pathlib.Path(target)

     

       817
       817
       +
               host_src = Path(source)

     

       818
       818
       +
               vm_target = Path(target)

     

       819
       819
        
               with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:

     

       820
       820
       -
                   shared_temp = pathlib.Path(shared_td)

     

       820
       820
       +
                   shared_temp = Path(shared_td)

     

       821
       821
        
                   host_intermediate = shared_temp / host_src.name

     

       822
       822
       -
                   vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name

     

       822
       822
       +
                   vm_shared_temp = Path("/tmp/shared") / shared_temp.name

     

       823
       823
        
                   vm_intermediate = vm_shared_temp / host_src.name

     

       824
       824
        
       

     

       825
       825
        
                   self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))

     
···

       836
       836
        
               all the VMs (using a temporary directory).

     

       837
       837
        
               """

     

       838
       838
        
               # Compute the source, target, and intermediate shared file names

     

       839
       839
       -
               out_dir = pathlib.Path(os.environ.get("out", os.getcwd()))

     

       840
       840
       -
               vm_src = pathlib.Path(source)

     

       839
       839
       +
               out_dir = Path(os.environ.get("out", os.getcwd()))

     

       840
       840
       +
               vm_src = Path(source)

     

       841
       841
        
               with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:

     

       842
       842
       -
                   shared_temp = pathlib.Path(shared_td)

     

       843
       843
       -
                   vm_shared_temp = pathlib.Path("/tmp/shared") / shared_temp.name

     

       842
       842
       +
                   shared_temp = Path(shared_td)

     

       843
       843
       +
                   vm_shared_temp = Path("/tmp/shared") / shared_temp.name

     

       844
       844
        
                   vm_intermediate = vm_shared_temp / vm_src.name

     

       845
       845
        
                   intermediate = shared_temp / vm_src.name

     

       846
       846
        
                   # Copy the file to the shared directory inside VM

     
···

       911
       911
        
       

     

       912
       912
        
               self.log("starting vm")

     

       913
       913
        
       

     

       914
       914
       -
               def clear(path: pathlib.Path) -> pathlib.Path:

     

       914
       914
       +
               def clear(path: Path) -> Path:

     

       915
       915
        
                   if path.exists():

     

       916
       916
        
                       path.unlink()

     

       917
       917
        
                   return path

     

       918
       918
        
       

     

       919
       919
       -
               def create_socket(path: pathlib.Path) -> socket.socket:

     

       919
       919
       +
               def create_socket(path: Path) -> socket.socket:

     

       920
       920
        
                   s = socket.socket(family=socket.AF_UNIX, type=socket.SOCK_STREAM)

     

       921
       921
        
                   s.bind(str(path))

     

       922
       922
        
                   s.listen(1)

     
···

       1061
       1061
        
           """

     

       1062
       1062
        
       

     

       1063
       1063
        
           nr: int

     

       1064
       1064
       -
           socket_dir: pathlib.Path

     

       1064
       1064
       +
           socket_dir: Path

     

       1065
       1065
        
       

     

       1066
       1066
        
           process: subprocess.Popen

     

       1067
       1067
        
           pid: int

     
···

       1070
       1070
        
           def __repr__(self) -> str:

     

       1071
       1071
        
               return f"<Vlan Nr. {self.nr}>"

     

       1072
       1072
        
       

     

       1073
       1073
       -
           def __init__(self, nr: int, tmp_dir: pathlib.Path):

     

       1073
       1073
       +
           def __init__(self, nr: int, tmp_dir: Path):

     

       1074
       1074
        
               self.nr = nr

     

       1075
       1075
        
               self.socket_dir = tmp_dir / f"vde{self.nr}.ctl"

     

       1076
       1076
        
       

     
···

       1123
       1123
        
           ):

     

       1124
       1124
        
               self.tests = tests

     

       1125
       1125
        
       

     

       1126
       1126
       -
               tmp_dir = pathlib.Path(os.environ.get("TMPDIR", tempfile.gettempdir()))

     

       1126
       1126
       +
               tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir()))

     

       1127
       1127
        
               tmp_dir.mkdir(mode=0o700, exist_ok=True)

     

       1128
       1128
        
       

     

       1129
       1129
        
               with rootlog.nested("start all VLans"):

     
···

       1183
       1183
        
                   serial_stdout_on=self.serial_stdout_on,

     

       1184
       1184
        
                   Machine=Machine,  # for typing

     

       1185
       1185
        
               )

     

       1186
       1186
       -
               machine_symbols = {

     

       1187
       1187
       -
                   m.name: self.machines[idx] for idx, m in enumerate(self.machines)

     

       1188
       1188
       -
               }

     

       1186
       1186
       +
               machine_symbols = {m.name: m for m in self.machines}

     

       1187
       1187
       +
               # If there's exactly one machine, make it available under the name

     

       1188
       1188
       +
               # "machine", even if it's not called that.

     

       1189
       1189
       +
               if len(self.machines) == 1:

     

       1190
       1190
       +
                   (machine_symbols["machine"],) = self.machines

     

       1189
       1191
        
               vlan_symbols = {

     

       1190
       1192
        
                   f"vlan{v.nr}": self.vlans[idx] for idx, v in enumerate(self.vlans)

     

       1191
       1193
        
               }

     
···

       1230
       1232
        
                   "Using legacy create_machine(), please instantiate the"

     

       1231
       1233
        
                   "Machine class directly, instead"

     

       1232
       1234
        
               )

     

       1233
       1233
       -
               tmp_dir = pathlib.Path(os.environ.get("TMPDIR", tempfile.gettempdir()))

     

       1235
       1235
       +
               tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir()))

     

       1234
       1236
        
               tmp_dir.mkdir(mode=0o700, exist_ok=True)

     

       1235
       1237
        
       

     

       1236
       1238
        
               if args.get("startCommand"):

     
···

       1316
       1318
        
               action=EnvDefault,

     

       1317
       1319
        
               envvar="testScript",

     

       1318
       1320
        
               help="the test script to run",

     

       1319
       1319
       -
               type=pathlib.Path,

     

       1321
       1321
       +
               type=Path,

     

       1320
       1322
        
           )

     

       1321
       1323
        
       

     

       1322
       1324
        
           args = arg_parser.parse_args()

+3 -1

nixos/lib/testing-python.nix

···

       134
       134
        
             vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);

     

       135
       135
        
             vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);

     

       136
       136
        
       

     

       137
       137
       -
             nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes);

     

       137
       137
       +
             nodeHostNames = let

     

       138
       138
       +
               nodesList = map (c: c.config.system.name) (lib.attrValues nodes);

     

       139
       139
       +
             in nodesList ++ lib.optional (lib.length nodesList == 1) "machine";

     

       138
       140
        
       

     

       139
       141
        
             # TODO: This is an implementation error and needs fixing

     

       140
       142
        
             # the testing famework cannot legitimately restrict hostnames further

+1 -1

nixos/tests/all-tests.nix

···

       489
       489
        
         victoriametrics = handleTest ./victoriametrics.nix {};

     

       490
       490
        
         vikunja = handleTest ./vikunja.nix {};

     

       491
       491
        
         virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};

     

       492
       492
       -
         vscodium = handleTest ./vscodium.nix {};

     

       492
       492
       +
         vscodium = discoverTests (import ./vscodium.nix);

     

       493
       493
        
         wasabibackend = handleTest ./wasabibackend.nix {};

     

       494
       494
        
         wiki-js = handleTest ./wiki-js.nix {};

     

       495
       495
        
         wireguard = handleTest ./wireguard {};

+14

nixos/tests/common/wayland-cage.nix

···

       1
       1
       +
       { ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [ ./user-account.nix ];

     

       5
       5
       +
         services.cage = {

     

       6
       6
       +
           enable = true;

     

       7
       7
       +
           user = "alice";

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         virtualisation = {

     

       11
       11
       +
           memorySize = 1024;

     

       12
       12
       +
           qemu.options = [ "-vga virtio" ];

     

       13
       13
       +
         };

     

       14
       14
       +
       }

+57 -35

nixos/tests/vscodium.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ...} :

     

       1
       1
       +
       let

     

       2
       2
       +
         tests = {

     

       3
       3
       +
           wayland = { pkgs, ... }: {

     

       4
       4
       +
             imports = [ ./common/wayland-cage.nix ];

     

       5
       5
       +
       

     

       6
       6
       +
             services.cage.program = ''

     

       7
       7
       +
               ${pkgs.vscodium}/bin/codium \

     

       8
       8
       +
                 --enable-features=UseOzonePlatform \

     

       9
       9
       +
                 --ozone-platform=wayland

     

       10
       10
       +
             '';

     

       11
       11
       +
       

     

       12
       12
       +
             fonts.fonts = with pkgs; [ dejavu_fonts ];

     

       13
       13
       +
           };

     

       14
       14
       +
           xorg = { pkgs, ... }: {

     

       15
       15
       +
             imports = [ ./common/user-account.nix ./common/x11.nix ];

     

       2
       16
        
       

     

       3
       3
       -
       {

     

       4
       4
       -
         name = "vscodium";

     

       5
       5
       -
         meta = with pkgs.lib.maintainers; {

     

       6
       6
       -
           maintainers = [ turion ];

     

       17
       17
       +
             virtualisation.memorySize = 2047;

     

       18
       18
       +
             services.xserver.enable = true;

     

       19
       19
       +
             services.xserver.displayManager.sessionCommands = ''

     

       20
       20
       +
               ${pkgs.vscodium}/bin/codium

     

       21
       21
       +
             '';

     

       22
       22
       +
             test-support.displayManager.auto.user = "alice";

     

       23
       23
       +
           };

     

       7
       24
        
         };

     

       8
       25
        
       

     

       9
       9
       -
         machine = { ... }:

     

       26
       26
       +
         mkTest = name: machine:

     

       27
       27
       +
           import ./make-test-python.nix ({ pkgs, ... }: {

     

       28
       28
       +
             inherit name;

     

       10
       29
        
       

     

       11
       11
       -
         {

     

       12
       12
       -
           imports = [

     

       13
       13
       -
             ./common/user-account.nix

     

       14
       14
       -
             ./common/x11.nix

     

       15
       15
       -
           ];

     

       30
       30
       +
             nodes = { "${name}" = machine; };

     

       16
       31
        
       

     

       17
       17
       -
           virtualisation.memorySize = 2047;

     

       18
       18
       -
           services.xserver.enable = true;

     

       19
       19
       -
           test-support.displayManager.auto.user = "alice";

     

       20
       20
       -
           environment.systemPackages = with pkgs; [

     

       21
       21
       -
             vscodium

     

       22
       22
       -
           ];

     

       23
       23
       -
         };

     

       32
       32
       +
             meta = with pkgs.lib.maintainers; {

     

       33
       33
       +
               maintainers = [ synthetica turion ];

     

       34
       34
       +
             };

     

       35
       35
       +
             enableOCR = true;

     

       36
       36
       +
             testScript = ''

     

       37
       37
       +
               start_all()

     

       24
       38
        
       

     

       25
       25
       -
         enableOCR = true;

     

       39
       39
       +
               machine.wait_for_unit('graphical.target')

     

       40
       40
       +
               machine.wait_until_succeeds('pgrep -x codium')

     

       26
       41
        
       

     

       27
       27
       -
         testScript = { nodes, ... }: ''

     

       28
       28
       -
           # Start up X

     

       29
       29
       -
           start_all()

     

       30
       30
       -
           machine.wait_for_x()

     

       42
       42
       +
               # Wait until vscodium is visible. "File" is in the menu bar.

     

       43
       43
       +
               machine.wait_for_text('File')

     

       44
       44
       +
               machine.screenshot('start_screen')

     

       31
       45
        
       

     

       32
       32
       -
           # Start VSCodium with a file that doesn't exist yet

     

       33
       33
       -
           machine.fail("ls /home/alice/foo.txt")

     

       34
       34
       -
           machine.succeed("su - alice -c 'codium foo.txt' >&2 &")

     

       46
       46
       +
               test_string = 'testfile'

     

       35
       47
        
       

     

       36
       36
       -
           # Wait for the window to appear

     

       37
       37
       -
           machine.wait_for_text("VSCodium")

     

       48
       48
       +
               # Create a new file

     

       49
       49
       +
               machine.send_key('ctrl-n')

     

       50
       50
       +
               machine.wait_for_text('Untitled')

     

       51
       51
       +
               machine.screenshot('empty_editor')

     

       38
       52
        
       

     

       39
       39
       -
           # Save file

     

       40
       40
       -
           machine.send_key("ctrl-s")

     

       53
       53
       +
               # Type a string

     

       54
       54
       +
               machine.send_chars(test_string)

     

       55
       55
       +
               machine.wait_for_text(test_string)

     

       56
       56
       +
               machine.screenshot('editor')

     

       57
       57
       +
       

     

       58
       58
       +
               # Save the file

     

       59
       59
       +
               machine.send_key('ctrl-s')

     

       60
       60
       +
               machine.wait_for_text('Save')

     

       61
       61
       +
               machine.screenshot('save_window')

     

       62
       62
       +
               machine.send_key('ret')

     

       41
       63
        
       

     

       42
       42
       -
           # Wait until the file has been saved

     

       43
       43
       -
           machine.wait_for_file("/home/alice/foo.txt")

     

       64
       64
       +
               # (the default filename is the first line of the file)

     

       65
       65
       +
               machine.wait_for_file(f'/home/alice/{test_string}')

     

       66
       66
       +
             '';

     

       67
       67
       +
           });

     

       44
       68
        
       

     

       45
       45
       -
           machine.screenshot("VSCodium")

     

       46
       46
       -
         '';

     

       47
       47
       -
       })

     

       69
       69
       +
       in builtins.mapAttrs (k: v: mkTest k v { }) tests

+2 -1

pkgs/development/libraries/grpc/default.nix

···

       81
       81
        
           export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH

     

       82
       82
        
         '';

     

       83
       83
        
       

     

       84
       84
       -
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";

     

       84
       84
       +
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"

     

       85
       85
       +
           + lib.optionalString stdenv.isAarch64 "-Wno-error=format-security";

     

       85
       86
        
       

     

       86
       87
        
         enableParallelBuilds = true;

     

       87
       88

+2 -2

pkgs/development/libraries/libfprint-tod/default.nix

···

       6
       6
        
       # for the curious, "tod" means "Touch OEM Drivers" meaning it can load

     

       7
       7
        
       # external .so's.

     

       8
       8
        
       libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let

     

       9
       9
       -
         version = "1.94.1+tod1";

     

       9
       9
       +
         version = "1.90.7+git20210222+tod1";

     

       10
       10
        
       in  {

     

       11
       11
        
         pname = "libfprint-tod";

     

       12
       12
        
         inherit version;

     
···

       16
       16
        
           owner = "3v1n0";

     

       17
       17
        
           repo = "libfprint";

     

       18
       18
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-IVeTQlZjea4xgbG/N7OTHAj6RT4WutfvQhV8qFEvkKo=";

     

       19
       19
       +
           sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         mesonFlags = mesonFlags ++ [

+1

pkgs/development/mobile/androidenv/ndk-bundle/default.nix

···

       10
       10
        
       deployAndroidPackage {

     

       11
       11
        
         inherit package os;

     

       12
       12
        
         nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

     

       13
       13
       +
         autoPatchelfIgnoreMissingDeps = true;

     

       13
       14
        
         buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ];

     

       14
       15
        
         patchInstructions = lib.optionalString (os == "linux") (''

     

       15
       16
        
           patchShebangs .

+40

pkgs/development/python-modules/aiohwenergy/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , aiohttp

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "aiohwenergy";

     

       11
       11
       +
         version = "0.4.0";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "DCSBL";

     

       18
       18
       +
           repo = pname;

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           sha256 = "Rs7kD+jN/z0j4KmkitquB+cm2UcYG87YHczZR0A4axI=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           aiohttp

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         # Project has no tests

     

       28
       28
       +
         doCheck = false;

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [

     

       31
       31
       +
           "aiohwenergy"

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "Python library to interact with the HomeWizard Energy devices API";

     

       36
       36
       +
           homepage = "https://github.com/DCSBL/aiohwenergy";

     

       37
       37
       +
           license = licenses.asl20;

     

       38
       38
       +
           maintainers = with maintainers; [ fab ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+15 -5

pkgs/development/python-modules/apache-airflow/default.nix

···

       58
       58
        
       , termcolor

     

       59
       59
        
       , unicodecsv

     

       60
       60
        
       , werkzeug

     

       61
       61
       -
       , pytest

     

       61
       61
       +
       , pytestCheckHook

     

       62
       62
        
       , freezegun

     

       63
       63
        
       , mkYarnPackage

     

       64
       64
        
       }:

     
···

       171
       171
        
       

     

       172
       172
        
         checkInputs = [

     

       173
       173
        
           freezegun

     

       174
       174
       -
           pytest

     

       174
       174
       +
           pytestCheckHook

     

       175
       175
        
         ];

     

       176
       176
        
       

     

       177
       177
        
         INSTALL_PROVIDERS_FROM_SOURCES = "true";

     
···

       199
       199
        
       

     

       200
       200
        
           substituteInPlace tests/core/test_core.py \

     

       201
       201
        
             --replace "/bin/bash" "${stdenv.shell}"

     

       202
       202
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       203
       203
       +
           # Fix failing test on Hydra

     

       204
       204
       +
           substituteInPlace airflow/utils/db.py \

     

       205
       205
       +
             --replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"

     

       202
       206
        
         '';

     

       203
       207
        
       

     

       204
       208
        
         # allow for gunicorn processes to have access to python packages

     

       205
       209
        
         makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ];

     

       206
       210
        
       

     

       207
       207
       -
         checkPhase = ''

     

       211
       211
       +
         preCheck = ''

     

       208
       212
        
          export HOME=$(mktemp -d)

     

       209
       213
        
          export AIRFLOW_HOME=$HOME

     

       210
       214
        
          export AIRFLOW__CORE__UNIT_TEST_MODE=True

     
···

       214
       218
        
          airflow version

     

       215
       219
        
          airflow db init

     

       216
       220
        
          airflow db reset -y

     

       217
       217
       -
       

     

       218
       218
       -
          pytest tests/core/test_core.py

     

       219
       221
        
         '';

     

       222
       222
       +
       

     

       223
       223
       +
         pytestFlagsArray = [

     

       224
       224
       +
           "tests/core/test_core.py"

     

       225
       225
       +
         ];

     

       226
       226
       +
       

     

       227
       227
       +
         disabledTests = lib.optionals stdenv.isDarwin [

     

       228
       228
       +
           "bash_operator_kill"  # psutil.AccessDenied

     

       229
       229
       +
         ];

     

       220
       230
        
       

     

       221
       231
        
         postInstall = ''

     

       222
       232
        
           cp -rv ${airflow-frontend}/static/dist $out/lib/${python.libPrefix}/site-packages/airflow/www/static

+6 -3

pkgs/development/python-modules/elementpath/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
       -
         version = "2.3.2";

     

       9
       8
        
         pname = "elementpath";

     

       9
       9
       +
         version = "2.4.0";

     

       10
       10
       +
         format = "setuptools";

     

       10
       11
        
       

     

       11
       12
        
         disabled = pythonOlder "3.6";

     

       12
       13
        
       

     
···

       14
       15
        
           owner = "sissaschool";

     

       15
       16
        
           repo = "elementpath";

     

       16
       17
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "01h68v077xbcnqn9v52i8d6s6i7ds3zycn3ddn11hc074m4gg3af";

     

       18
       18
       +
           sha256 = "1f3w5zyvrkl4gab81i5z9b41ybs54b37znj5r7hrcf25x8hrqgvv";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         # avoid circular dependency with xmlschema which directly depends on this

     

       21
       22
        
         doCheck = false;

     

       22
       23
        
       

     

       23
       23
       -
         pythonImportsCheck = [ "elementpath" ];

     

       24
       24
       +
         pythonImportsCheck = [

     

       25
       25
       +
           "elementpath"

     

       26
       26
       +
         ];

     

       24
       27
        
       

     

       25
       28
        
         meta = with lib; {

     

       26
       29
        
           description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";

+2 -2

pkgs/development/python-modules/faraday-plugins/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "faraday-plugins";

     

       19
       19
       -
         version = "1.5.6";

     

       19
       19
       +
         version = "1.5.7";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "infobyte";

     

       24
       24
        
           repo = "faraday_plugins";

     

       25
       25
        
           rev = "v${version}";

     

       26
       26
       -
           sha256 = "sha256-RTHhCSOqtdPsgZgeziAYm+9NoR72Jfm+42fyyKqjFpA=";

     

       26
       26
       +
           sha256 = "sha256-EW9p5r7RwWohNGwbITtDrEd1FYLtOwWXhVWFgPCG+Po=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+5 -3

pkgs/development/python-modules/identify/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       +
       , editdistance-s

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , pytestCheckHook

     

       5
       5
       -
       , editdistance-s

     

       6
       6
        
       , pythonOlder

     

       7
       7
       +
       , ukkonen

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       buildPythonPackage rec {

     

       10
       11
        
         pname = "identify";

     

       11
       11
       -
         version = "2.3.7";

     

       12
       12
       +
         version = "2.4.0";

     

       12
       13
        
         format = "setuptools";

     

       13
       14
        
       

     

       14
       15
        
         disabled = pythonOlder "3.7";

     
···

       17
       18
        
           owner = "pre-commit";

     

       18
       19
        
           repo = pname;

     

       19
       20
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "sha256-L71Zi0SWFh7K4BRwF57prdrIdxLp8Igs0k/gc6k1+Mo=";

     

       21
       21
       +
           sha256 = "sha256-0J3P3RawafVAfOUhK9qSz5K8y0goMqTjMh5PL60sqME=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         checkInputs = [

     

       24
       25
        
           editdistance-s

     

       25
       26
        
           pytestCheckHook

     

       27
       27
       +
           ukkonen

     

       26
       28
        
         ];

     

       27
       29
        
       

     

       28
       30
        
         pythonImportsCheck = [

+36

pkgs/development/python-modules/luxtronik/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , poetry-core

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "luxtronik";

     

       11
       11
       +
         version = "0.3.9";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "Bouni";

     

       18
       18
       +
           repo = "python-luxtronik";

     

       19
       19
       +
           rev = version;

     

       20
       20
       +
           sha256 = "mScdTQ82tV5fyy1S0YDDOz1UC4VB0OmSXD5gHp53WsE=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         # Project has no tests

     

       24
       24
       +
         doCheck = false;

     

       25
       25
       +
       

     

       26
       26
       +
         pythonImportsCheck = [

     

       27
       27
       +
           "luxtronik"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       31
       31
       +
           description = "Python library to interact with Luxtronik heatpump controllers";

     

       32
       32
       +
           homepage = "https://github.com/Bouni/python-luxtronik";

     

       33
       33
       +
           license = licenses.mit;

     

       34
       34
       +
           maintainers = with maintainers; [ fab ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+4 -2

pkgs/development/python-modules/millheater/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "millheater";

     

       12
       12
       -
         version = "0.8.1";

     

       12
       12
       +
         version = "0.9.0";

     

       13
       13
       +
         format = "setuptools";

     

       14
       14
       +
       

     

       13
       15
        
         disabled = pythonOlder "3.6";

     

       14
       16
        
       

     

       15
       17
        
         src = fetchFromGitHub {

     

       16
       18
        
           owner = "Danielhiversen";

     

       17
       19
        
           repo = "pymill";

     

       18
       20
        
           rev = version;

     

       19
       19
       -
           sha256 = "0269lhb6y4c13n6krsl2b66ldvzkd26jlax7bbnkvag2iv7g6hzj";

     

       21
       21
       +
           sha256 = "sha256-ocPp9tRghlOb0vZrpELDkwOq8ue+JBCRf2uB0Q7CPF8=";

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       24
        
         propagatedBuildInputs = [

+6 -3

pkgs/development/python-modules/pyatmo/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "pyatmo";

     

       19
       19
       -
         version = "6.1.0";

     

       19
       19
       +
         version = "6.2.0";

     

       20
       20
       +
         format = "setuptools";

     

       20
       21
        
       

     

       21
       22
        
         disabled = pythonOlder "3.8";

     

       22
       23
        
       

     
···

       24
       25
        
           owner = "jabesq";

     

       25
       26
        
           repo = "pyatmo";

     

       26
       27
        
           rev = "v${version}";

     

       27
       27
       -
           sha256 = "sha256-Iscnv3hfYa8QFiXMUN334Muo0oGqnnK11RPNxQJggG0=";

     

       28
       28
       +
           sha256 = "sha256-VBc2avJiIFQW1LYXQEvIZ/wZKMFJsCF9DDrxwL8dDnk=";

     

       28
       29
        
         };

     

       29
       30
        
       

     

       30
       31
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     
···

       54
       55
        
             --replace "requests~=2.24" "requests"

     

       55
       56
        
         '';

     

       56
       57
        
       

     

       57
       57
       -
         pythonImportsCheck = [ "pyatmo" ];

     

       58
       58
       +
         pythonImportsCheck = [

     

       59
       59
       +
           "pyatmo"

     

       60
       60
       +
         ];

     

       58
       61
        
       

     

       59
       62
        
         meta = with lib; {

     

       60
       63
        
           description = "Simple API to access Netatmo weather station data";

+43

pkgs/development/python-modules/pyebus/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , anytree

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , poetry-core

     

       7
       7
       +
       , pythonOlder

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "pyebus";

     

       12
       12
       +
         version = "1.2.4";

     

       13
       13
       +
         format = "pyproject";

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.7";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchPypi {

     

       18
       18
       +
           inherit pname version;

     

       19
       19
       +
           sha256 = "i+p40s9SXey1lfXWW+PiXsA1kUF4o6Rk7QLmQ2ljN6g=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           poetry-core

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           anytree

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         # https://github.com/c0fec0de/pyebus/issues/3

     

       31
       31
       +
         doCheck = false;

     

       32
       32
       +
       

     

       33
       33
       +
         pythonImportsCheck = [

     

       34
       34
       +
           "pyebus"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         meta = with lib; {

     

       38
       38
       +
           description = "Pythonic Interface to EBUS Daemon (ebusd)";

     

       39
       39
       +
           homepage = "https://github.com/c0fec0de/pyebus";

     

       40
       40
       +
           license = licenses.mit;

     

       41
       41
       +
           maintainers = with maintainers; [ fab ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+13 -5

pkgs/development/python-modules/pyupgrade/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pyupgrade";

     

       11
       11
       -
         version = "2.29.0";

     

       11
       11
       +
         version = "2.29.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       12
       14
        
         disabled = pythonOlder "3.6";

     

       13
       15
        
       

     

       14
       16
        
         src = fetchFromGitHub {

     

       15
       17
        
           owner = "asottile";

     

       16
       18
        
           repo = pname;

     

       17
       19
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-Hq58DJe8ZLZSJdhqSxfTaZPnWae2aQFCe7lH+6Y6ABg=";

     

       20
       20
       +
           sha256 = "sha256-fN0+4/EeoMD2c16OgepjDWuUhowMxzM7nB3mkL3iDjc=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         checkInputs = [ pytestCheckHook ];

     

       23
       23
       +
         checkInputs = [

     

       24
       24
       +
           pytestCheckHook

     

       25
       25
       +
         ];

     

       22
       26
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ tokenize-rt ];

     

       27
       27
       +
         propagatedBuildInputs = [

     

       28
       28
       +
           tokenize-rt

     

       29
       29
       +
         ];

     

       24
       30
        
       

     

       25
       25
       -
         pythonImportsCheck = [ "pyupgrade" ];

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "pyupgrade"

     

       33
       33
       +
         ];

     

       26
       34
        
       

     

       27
       35
        
         meta = with lib; {

     

       28
       36
        
           description = "Tool to automatically upgrade syntax for newer versions of the language";

+60

pkgs/development/python-modules/related/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , attrs

     

       3
       3
       +
       , buildPythonPackage

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , future

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       , python-dateutil

     

       8
       8
       +
       , pythonOlder

     

       9
       9
       +
       , pyyaml

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "related";

     

       14
       14
       +
         version = "0.7.2";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.7";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchPypi {

     

       20
       20
       +
           inherit pname version;

     

       21
       21
       +
           sha256 = "w0XmNWh1xF08qitH22lQgTRNqO6qyYrYd2dc6x3Fop0=";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         propagatedBuildInputs = [

     

       25
       25
       +
           attrs

     

       26
       26
       +
           future

     

       27
       27
       +
           python-dateutil

     

       28
       28
       +
           pyyaml

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         checkInputs = [

     

       32
       32
       +
           pytestCheckHook

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         postPatch = ''

     

       36
       36
       +
           # Remove outdated setup.cfg

     

       37
       37
       +
           rm setup.cfg

     

       38
       38
       +
           substituteInPlace setup.py \

     

       39
       39
       +
             --replace "'pytest-runner'," ""

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         disabledTests = [

     

       43
       43
       +
           # Source tarball doesn't contains all needed files

     

       44
       44
       +
           "test_compose_from_yml"

     

       45
       45
       +
           "test_yaml_roundtrip_with_empty_values"

     

       46
       46
       +
           "test_compose_from_yml"

     

       47
       47
       +
           "test_store_data_from_json"

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         pythonImportsCheck = [

     

       51
       51
       +
           "related"

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with lib; {

     

       55
       55
       +
           description = "Nested Object Models in Python";

     

       56
       56
       +
           homepage = "https://github.com/genomoncology/related";

     

       57
       57
       +
           license = licenses.mit;

     

       58
       58
       +
           maintainers = with maintainers; [ fab ];

     

       59
       59
       +
         };

     

       60
       60
       +
       }

+19 -7

pkgs/development/python-modules/roombapy/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "roombapy";

     

       14
       14
       -
         version = "1.6.3";

     

       14
       14
       +
         version = "1.6.4";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
       +
       

     

       16
       17
        
         disabled = pythonOlder "3.7";

     

       17
       18
        
       

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = "pschmitt";

     

       20
       21
        
           repo = "roombapy";

     

       21
       22
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-GkDfIC2jx4Mpguk/Wu45pZw0czhabJwTz58WYSLCOV8=";

     

       23
       23
       +
           sha256 = "sha256-EN+em+lULAUplXlhcU409ZVPk9BfMmD2oNwO0ETuqoA=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       25
       -
         nativeBuildInputs = [ poetry-core ];

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           poetry-core

     

       28
       28
       +
         ];

     

       26
       29
        
       

     

       27
       27
       -
         propagatedBuildInputs = [ paho-mqtt ];

     

       30
       30
       +
         propagatedBuildInputs = [

     

       31
       31
       +
           paho-mqtt

     

       32
       32
       +
         ];

     

       28
       33
        
       

     

       29
       34
        
         checkInputs = [

     

       30
       35
        
           amqtt

     
···

       37
       42
        
           "tests/test_discovery.py"

     

       38
       43
        
         ];

     

       39
       44
        
       

     

       40
       40
       -
         pythonImportsCheck = [ "roombapy" ];

     

       45
       45
       +
         disabledTests = [

     

       46
       46
       +
           # Test want to connect to a local MQTT broker

     

       47
       47
       +
           "test_roomba_connect"

     

       48
       48
       +
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         pythonImportsCheck = [

     

       51
       51
       +
           "roombapy"

     

       52
       52
       +
         ];

     

       41
       53
        
       

     

       42
       54
        
         meta = with lib; {

     

       43
       43
       -
           homepage = "https://github.com/pschmitt/roombapy";

     

       44
       55
        
           description = "Python program and library to control Wi-Fi enabled iRobot Roombas";

     

       56
       56
       +
           homepage = "https://github.com/pschmitt/roombapy";

     

       57
       57
       +
           license = licenses.mit;

     

       45
       58
        
           maintainers = with maintainers; [ justinas ];

     

       46
       46
       -
           license = licenses.mit;

     

       47
       59
        
         };

     

       48
       60
        
       }

+2 -2

pkgs/development/python-modules/tweepy/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "tweepy";

     

       15
       15
       -
         version = "4.3.0";

     

       15
       15
       +
         version = "4.4.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     
···

       21
       21
        
           owner = pname;

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = "v${version}";

     

       24
       24
       -
           sha256 = "sha256-lS/98DRpJH1UGGNzwqVVUJOeul+BX+I3e+ysmC0oL3I=";

     

       24
       24
       +
           sha256 = "sha256-GUo8uvShyIOWWcO5T1JvV7DMC1W70YILx/hvHIGQg0o=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+41

pkgs/development/python-modules/ukkonen/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cffi

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "ukkonen";

     

       11
       11
       +
         version = "1.0.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.6";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "asottile";

     

       18
       18
       +
           repo = pname;

     

       19
       19
       +
           rev = "v${version}";

     

       20
       20
       +
           sha256 = "jG6VP/P5sadrdrmneH36/ExSld9blyMAAG963QS9+p0=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           cffi

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "ukkonen"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with lib; {

     

       36
       36
       +
           description = "Python implementation of bounded Levenshtein distance (Ukkonen)";

     

       37
       37
       +
           homepage = "https://github.com/asottile/ukkonen";

     

       38
       38
       +
           license = licenses.mit;

     

       39
       39
       +
           maintainers = with maintainers; [ fab ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+37

pkgs/development/python-modules/uonet-request-signer-hebe/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , pyopenssl

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "uonet-request-signer-hebe";

     

       10
       10
       +
         version = "0.1.1";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       13
       13
       +
         disabled = pythonOlder "3.6";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "fidopnpAt5CXPsLbx+V8wrJCQQ/WIO6AqxpsYLDv8qM=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           pyopenssl

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         # Source is not tagged

     

       25
       25
       +
         doCheck = false;

     

       26
       26
       +
       

     

       27
       27
       +
         pythonImportsCheck = [

     

       28
       28
       +
           "uonet_request_signer_hebe"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with lib; {

     

       32
       32
       +
           description = "UONET+ (hebe) request signer for Python";

     

       33
       33
       +
           homepage = "https://github.com/wulkanowy/uonet-request-signer";

     

       34
       34
       +
           license = licenses.mit;

     

       35
       35
       +
           maintainers = with maintainers; [ fab ];

     

       36
       36
       +
         };

     

       37
       37
       +
       }

+57

pkgs/development/python-modules/vulcan-api/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , aenum

     

       3
       3
       +
       , aiodns

     

       4
       4
       +
       , aiohttp

     

       5
       5
       +
       , buildPythonPackage

     

       6
       6
       +
       , cchardet

     

       7
       7
       +
       , fetchFromGitHub

     

       8
       8
       +
       , pyopenssl

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       , pytz

     

       11
       11
       +
       , related

     

       12
       12
       +
       , requests

     

       13
       13
       +
       , uonet-request-signer-hebe

     

       14
       14
       +
       , yarl

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       buildPythonPackage rec {

     

       18
       18
       +
         pname = "vulcan-api";

     

       19
       19
       +
         version = "2.0.3";

     

       20
       20
       +
         format = "setuptools";

     

       21
       21
       +
       

     

       22
       22
       +
         disabled = pythonOlder "3.6";

     

       23
       23
       +
       

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "kapi2289";

     

       26
       26
       +
           repo = pname;

     

       27
       27
       +
           rev = "v${version}";

     

       28
       28
       +
           sha256 = "YLt9yufOBlWRyo+le7HcaFD/s7V5WpvhMUrHJqyC3pY=";

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         propagatedBuildInputs = [

     

       32
       32
       +
           aenum

     

       33
       33
       +
           aiodns

     

       34
       34
       +
           aiohttp

     

       35
       35
       +
           cchardet

     

       36
       36
       +
           pyopenssl

     

       37
       37
       +
           pytz

     

       38
       38
       +
           related

     

       39
       39
       +
           requests

     

       40
       40
       +
           uonet-request-signer-hebe

     

       41
       41
       +
           yarl

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         # Project has no tests

     

       45
       45
       +
         doCheck = false;

     

       46
       46
       +
       

     

       47
       47
       +
         pythonImportsCheck = [

     

       48
       48
       +
           "vulcan"

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         meta = with lib; {

     

       52
       52
       +
           description = "Python library for UONET+ e-register API";

     

       53
       53
       +
           homepage = "https://vulcan-api.readthedocs.io/";

     

       54
       54
       +
           license = licenses.mit;

     

       55
       55
       +
           maintainers = with maintainers; [ fab ];

     

       56
       56
       +
         };

     

       57
       57
       +
       }

+2 -2

pkgs/development/python-modules/xmlschema/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
       -
         version = "1.8.1";

     

       11
       11
       +
         version = "1.8.2";

     

       12
       12
        
         pname = "xmlschema";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.6";

     
···

       17
       17
        
           owner = "sissaschool";

     

       18
       18
        
           repo = "xmlschema";

     

       19
       19
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "0vs4d9bnms4krxvplzf2p69g673pdw31z8p5alzj3pqnaw83rg1z";

     

       20
       20
       +
           sha256 = "sha256-d7f19T17aAwdtNDjCrsXXY39u0aRgQo4vFPnxFNs2PQ=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/tools/analysis/checkov/default.nix

···

       56
       56
        
       

     

       57
       57
        
       buildPythonApplication rec {

     

       58
       58
        
         pname = "checkov";

     

       59
       59
       -
         version = "2.0.587";

     

       59
       59
       +
         version = "2.0.591";

     

       60
       60
        
       

     

       61
       61
        
         src = fetchFromGitHub {

     

       62
       62
        
           owner = "bridgecrewio";

     

       63
       63
        
           repo = pname;

     

       64
       64
        
           rev = version;

     

       65
       65
       -
           sha256 = "sha256-uLH3g3UeWdIZsMsUwCYpTehgxDKGraPBlENdTz+QYLI=";

     

       65
       65
       +
           sha256 = "sha256-p8pEw3vH3W62MmlZsSqWoUKf7QjEQhlV5bSjYr1Wwm0=";

     

       66
       66
        
         };

     

       67
       67
        
       

     

       68
       68
        
         nativeBuildInputs = with py.pkgs; [

+10 -5

pkgs/tools/admin/trivy/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       buildGoModule rec {

     

       4
       7
        
         pname = "trivy";

     

       5
       5
       -
         version = "0.20.2";

     

       8
       8
       +
         version = "0.21.0";

     

       6
       9
        
       

     

       7
       10
        
         src = fetchFromGitHub {

     

       8
       11
        
           owner = "aquasecurity";

     

       9
       12
        
           repo = pname;

     

       10
       13
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-ittOVWsM+1IaILCLCJNOeLxRbRHiiMN4qgLTS9gxV0w=";

     

       14
       14
       +
           sha256 = "sha256-weLzW1pyv9q9VKvFxno+f/L29wlpvxlVUZJUwx6Gn2A=";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-HrDj09gUJtkZhQ3nYfoj0K8+T62ib0CWAhhcuvg8cyc=";

     

       17
       17
       +
         vendorSha256 = "sha256-1kQ2m8gFBHKznbjNPtYN0BVrRbxyCs2H1f7+XZqgVvc=";

     

       15
       18
        
       

     

       16
       19
        
         excludedPackages = "misc";

     

       17
       20
        
       

     

       18
       21
        
         ldflags = [

     

       19
       19
       -
           "-s" "-w" "-X main.version=v${version}"

     

       22
       22
       +
           "-s"

     

       23
       23
       +
           "-w"

     

       24
       24
       +
           "-X main.version=v${version}"

     

       20
       25
        
         ];

     

       21
       26
        
       

     

       22
       27
        
         doInstallCheck = true;

+5

pkgs/tools/filesystems/nilfs-utils/default.nix

···

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ libuuid libselinux ];

     

       17
       17
        
       

     

       18
       18
       +
         # According to upstream, libmount should be detected automatically but the

     

       19
       19
       +
         # build system fails to do this. This is likely a bug with their build system

     

       20
       20
       +
         # hence it is explicitly enabled here.

     

       21
       21
       +
         configureFlags = [ "--with-libmount" ];

     

       22
       22
       +
       

     

       18
       23
        
         installFlags = [

     

       19
       24
        
           "sysconfdir=${placeholder "out"}/etc"

     

       20
       25
        
           "root_sbindir=${placeholder "out"}/sbin"

+5

pkgs/tools/security/masscan/default.nix

···

       17
       17
        
           sha256 = "sha256-mnGC/moQANloR5ODwRjzJzBa55OEZ9QU+9WpAHxQE/g=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       21
       21
       +
           # Fix broken install command

     

       22
       22
       +
           substituteInPlace Makefile --replace "-pm755" "-pDm755"

     

       23
       23
       +
         '';

     

       24
       24
       +
       

     

       20
       25
        
         nativeBuildInputs = [ makeWrapper installShellFiles ];

     

       21
       26
        
       

     

       22
       27
        
         makeFlags = [

+14

pkgs/top-level/python-packages.nix

···

       315
       315
        
       

     

       316
       316
        
         aiohue = callPackage ../development/python-modules/aiohue { };

     

       317
       317
        
       

     

       318
       318
       +
         aiohwenergy = callPackage ../development/python-modules/aiohwenergy { };

     

       319
       319
       +
       

     

       318
       320
        
         aioimaplib = callPackage ../development/python-modules/aioimaplib { };

     

       319
       321
        
       

     

       320
       322
        
         aioinflux = callPackage ../development/python-modules/aioinflux { };

     
···

       4539
       4541
        
       

     

       4540
       4542
        
         luftdaten = callPackage ../development/python-modules/luftdaten { };

     

       4541
       4543
        
       

     

       4544
       4544
       +
         luxtronik = callPackage ../development/python-modules/luxtronik { };

     

       4545
       4545
       +
       

     

       4542
       4546
        
         lupa = callPackage ../development/python-modules/lupa { };

     

       4543
       4547
        
       

     

       4544
       4548
        
         lupupy = callPackage ../development/python-modules/lupupy { };

     
···

       6372
       6376
        
       

     

       6373
       6377
        
         pydyf = callPackage ../development/python-modules/pydyf { };

     

       6374
       6378
        
       

     

       6379
       6379
       +
         pyebus = callPackage ../development/python-modules/pyebus { };

     

       6380
       6380
       +
       

     

       6375
       6381
        
         pyechonest = callPackage ../development/python-modules/pyechonest { };

     

       6376
       6382
        
       

     

       6377
       6383
        
         pyeclib = callPackage ../development/python-modules/pyeclib { };

     
···

       8092
       8098
        
       

     

       8093
       8099
        
         reikna = callPackage ../development/python-modules/reikna { };

     

       8094
       8100
        
       

     

       8101
       8101
       +
         related = callPackage ../development/python-modules/related { };

     

       8102
       8102
       +
       

     

       8095
       8103
        
         relatorio = callPackage ../development/python-modules/relatorio { };

     

       8096
       8104
        
       

     

       8097
       8105
        
         remarshal = callPackage ../development/python-modules/remarshal { };

     
···

       9584
       9592
        
       

     

       9585
       9593
        
         ujson = callPackage ../development/python-modules/ujson { };

     

       9586
       9594
        
       

     

       9595
       9595
       +
         ukkonen = callPackage ../development/python-modules/ukkonen { };

     

       9596
       9596
       +
       

     

       9587
       9597
        
         ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };

     

       9588
       9598
        
       

     

       9589
       9599
        
         umalqurra = callPackage ../development/python-modules/umalqurra { };

     
···

       9637
       9647
        
         untangle = callPackage ../development/python-modules/untangle { };

     

       9638
       9648
        
       

     

       9639
       9649
        
         untokenize = callPackage ../development/python-modules/untokenize { };

     

       9650
       9650
       +
       

     

       9651
       9651
       +
         uonet-request-signer-hebe = callPackage ../development/python-modules/uonet-request-signer-hebe { };

     

       9640
       9652
        
       

     

       9641
       9653
        
         upass = callPackage ../development/python-modules/upass { };

     

       9642
       9654
        
       

     
···

       9808
       9820
        
           pythonInterpreter = python;

     

       9809
       9821
        
           enablePython = true;

     

       9810
       9822
        
         });

     

       9823
       9823
       +
       

     

       9824
       9824
       +
         vulcan-api = callPackage ../development/python-modules/vulcan-api { };

     

       9811
       9825
        
       

     

       9812
       9826
        
         vultr = callPackage ../development/python-modules/vultr { };

     

       9813
       9827