commit 7ca1d48ff2382e5845ea1779d3eaab277ff12d7c · pyrox.dev/nixpkgs

+12 -1

nixos/lib/testing-python.nix

···

       218
       218
        
                 build-vms = import ./build-vms.nix {

     

       219
       219
        
                   inherit system lib pkgs minimal specialArgs;

     

       220
       220
        
                   extraConfigurations = extraConfigurations ++ [(

     

       221
       221
       +
                     { config, ... }:

     

       221
       222
        
                     {

     

       222
       223
        
                       virtualisation.qemu.package = qemu_pkg;

     

       223
       224
        
       

     
···

       230
       231
        
                       # copied to the image.

     

       231
       232
        
                       virtualisation.additionalPaths =

     

       232
       233
        
                         lib.optional

     

       233
       233
       -
                           (builtins.hasContext testScript')

     

       234
       234
       +
                           # A testScript may evaluate nodes, which has caused

     

       235
       235
       +
                           # infinite recursions. The demand cycle involves:

     

       236
       236
       +
                           #   testScript -->

     

       237
       237
       +
                           #   nodes -->

     

       238
       238
       +
                           #   toplevel -->

     

       239
       239
       +
                           #   additionalPaths -->

     

       240
       240
       +
                           #   hasContext testScript' -->

     

       241
       241
       +
                           #   testScript (ad infinitum)

     

       242
       242
       +
                           # If we don't need to build an image, we can break this

     

       243
       243
       +
                           # cycle by short-circuiting when useNixStoreImage is false.

     

       244
       244
       +
                           (config.virtualisation.useNixStoreImage && builtins.hasContext testScript')

     

       234
       245
        
                           (pkgs.writeStringReferencesToFile testScript');

     

       235
       246
        
       

     

       236
       247
        
                       # Ensure we do not use aliases. Ideally this is only set

nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json nixos/modules/services/desktops/pipewire/media-session/alsa-monitor.conf.json

nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json nixos/modules/services/desktops/pipewire/media-session/bluez-monitor.conf.json

nixos/modules/services/desktops/pipewire/client-rt.conf.json nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json

nixos/modules/services/desktops/pipewire/client.conf.json nixos/modules/services/desktops/pipewire/daemon/client.conf.json

nixos/modules/services/desktops/pipewire/jack.conf.json nixos/modules/services/desktops/pipewire/daemon/jack.conf.json

nixos/modules/services/desktops/pipewire/media-session.conf.json nixos/modules/services/desktops/pipewire/media-session/media-session.conf.json

+10 -10

nixos/modules/services/desktops/pipewire/pipewire-media-session.nix

···

       13
       13
        
         # Use upstream config files passed through spa-json-dump as the base

     

       14
       14
        
         # Patched here as necessary for them to work with this module

     

       15
       15
        
         defaults = {

     

       16
       16
       -
           alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json));

     

       17
       17
       -
           bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json));

     

       18
       18
       -
           media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));

     

       19
       19
       -
           v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));

     

       16
       16
       +
           alsa-monitor = (builtins.fromJSON (builtins.readFile ./media-session/alsa-monitor.conf.json));

     

       17
       17
       +
           bluez-monitor = (builtins.fromJSON (builtins.readFile ./media-session/bluez-monitor.conf.json));

     

       18
       18
       +
           media-session = (builtins.fromJSON (builtins.readFile ./media-session/media-session.conf.json));

     

       19
       19
       +
           v4l2-monitor = (builtins.fromJSON (builtins.readFile ./media-session/v4l2-monitor.conf.json));

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         configs = {

     
···

       43
       43
        
       

     

       44
       44
        
             package = mkOption {

     

       45
       45
        
               type = types.package;

     

       46
       46
       -
               default = pkgs.pipewire.mediaSession;

     

       47
       47
       -
               defaultText = literalExpression "pkgs.pipewire.mediaSession";

     

       46
       46
       +
               default = pkgs.pipewire-media-session;

     

       47
       47
       +
               defaultText = literalExpression "pkgs.pipewire-media-session";

     

       48
       48
        
               description = ''

     

       49
       49
        
                 The pipewire-media-session derivation to use.

     

       50
       50
        
               '';

     
···

       55
       55
        
                 type = json.type;

     

       56
       56
        
                 description = ''

     

       57
       57
        
                   Configuration for the media session core. For details see

     

       58
       58
       -
                   https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf

     

       58
       58
       +
                   https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf

     

       59
       59
        
                 '';

     

       60
       60
        
                 default = {};

     

       61
       61
        
               };

     
···

       64
       64
        
                 type = json.type;

     

       65
       65
        
                 description = ''

     

       66
       66
        
                   Configuration for the alsa monitor. For details see

     

       67
       67
       -
                   https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf

     

       67
       67
       +
                   https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf

     

       68
       68
        
                 '';

     

       69
       69
        
                 default = {};

     

       70
       70
        
               };

     
···

       73
       73
        
                 type = json.type;

     

       74
       74
        
                 description = ''

     

       75
       75
        
                   Configuration for the bluez5 monitor. For details see

     

       76
       76
       -
                   https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf

     

       76
       76
       +
                   https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf

     

       77
       77
        
                 '';

     

       78
       78
        
                 default = {};

     

       79
       79
        
               };

     
···

       82
       82
        
                 type = json.type;

     

       83
       83
        
                 description = ''

     

       84
       84
        
                   Configuration for the V4L2 monitor. For details see

     

       85
       85
       -
                   https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf

     

       85
       85
       +
                   https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf

     

       86
       86
        
                 '';

     

       87
       87
        
                 default = {};

     

       88
       88
        
               };

nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json

nixos/modules/services/desktops/pipewire/pipewire.conf.json nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json

+5 -6

nixos/modules/services/desktops/pipewire/pipewire.nix

···

       22
       22
        
         # Use upstream config files passed through spa-json-dump as the base

     

       23
       23
        
         # Patched here as necessary for them to work with this module

     

       24
       24
        
         defaults = {

     

       25
       25
       -
           client = builtins.fromJSON (builtins.readFile ./client.conf.json);

     

       26
       26
       -
           client-rt = builtins.fromJSON (builtins.readFile ./client-rt.conf.json);

     

       27
       27
       -
           jack = builtins.fromJSON (builtins.readFile ./jack.conf.json);

     

       28
       28
       -
           # Remove session manager invocation from the upstream generated file, it points to the wrong path

     

       29
       29
       -
           pipewire = builtins.fromJSON (builtins.readFile ./pipewire.conf.json);

     

       30
       30
       -
           pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);

     

       25
       25
       +
           client = builtins.fromJSON (builtins.readFile ./daemon/client.conf.json);

     

       26
       26
       +
           client-rt = builtins.fromJSON (builtins.readFile ./daemon/client-rt.conf.json);

     

       27
       27
       +
           jack = builtins.fromJSON (builtins.readFile ./daemon/jack.conf.json);

     

       28
       28
       +
           pipewire = builtins.fromJSON (builtins.readFile ./daemon/pipewire.conf.json);

     

       29
       29
       +
           pipewire-pulse = builtins.fromJSON (builtins.readFile ./daemon/pipewire-pulse.conf.json);

     

       31
       30
        
         };

     

       32
       31
        
       

     

       33
       32
        
         configs = {

nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json nixos/modules/services/desktops/pipewire/media-session/v4l2-monitor.conf.json

+1 -1

nixos/modules/services/web-apps/nextcloud.nix

···

       586
       586
        
           { systemd.timers.nextcloud-cron = {

     

       587
       587
        
               wantedBy = [ "timers.target" ];

     

       588
       588
        
               timerConfig.OnBootSec = "5m";

     

       589
       589
       -
               timerConfig.OnUnitActiveSec = "15m";

     

       589
       589
       +
               timerConfig.OnUnitActiveSec = "5m";

     

       590
       590
        
               timerConfig.Unit = "nextcloud-cron.service";

     

       591
       591
        
             };

     

       592
       592

+50 -23

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

···

       17
       17
        
       import os.path

     

       18
       18
        
       from typing import Tuple, List, Optional

     

       19
       19
        
       

     

       20
       20
       +
       SystemIdentifier = Tuple[Optional[str], int, Optional[str]]

     

       21
       21
       +
       

     

       20
       22
        
       

     

       21
       23
        
       def copy_if_not_exists(source: str, dest: str) -> None:

     

       22
       24
        
           if not os.path.exists(dest):

     

       23
       25
        
               shutil.copyfile(source, dest)

     

       24
       26
        
       

     

       25
       27
        
       

     

       26
       26
       -
       def system_dir(profile: Optional[str], generation: int) -> str:

     

       28
       28
       +
       def generation_dir(profile: Optional[str], generation: int) -> str:

     

       27
       29
        
           if profile:

     

       28
       30
        
               return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation)

     

       29
       31
        
           else:

     

       30
       32
        
               return "/nix/var/nix/profiles/system-%d-link" % (generation)

     

       31
       33
        
       

     

       32
       32
       -
       BOOT_ENTRY = """title NixOS{profile}

     

       34
       34
       +
       def system_dir(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str:

     

       35
       35
       +
           d = generation_dir(profile, generation)

     

       36
       36
       +
           if specialisation:

     

       37
       37
       +
               return os.path.join(d, "specialisation", specialisation)

     

       38
       38
       +
           else:

     

       39
       39
       +
               return d

     

       40
       40
       +
       

     

       41
       41
       +
       BOOT_ENTRY = """title NixOS{profile}{specialisation}

     

       33
       42
        
       version Generation {generation} {description}

     

       34
       43
        
       linux {kernel}

     

       35
       44
        
       initrd {initrd}

     
···

       46
       55
        
       """

     

       47
       56
        
       

     

       48
       57
        
       

     

       49
       49
       -
       def write_loader_conf(profile: Optional[str], generation: int) -> None:

     

       58
       58
       +
       def generation_conf_filename(profile: Optional[str], generation: int, specialisation: Optional[str]) -> str:

     

       59
       59
       +
           pieces = [

     

       60
       60
       +
               "nixos",

     

       61
       61
       +
               profile or None,

     

       62
       62
       +
               "generation",

     

       63
       63
       +
               str(generation),

     

       64
       64
       +
               f"specialisation-{specialisation}" if specialisation else None,

     

       65
       65
       +
           ]

     

       66
       66
       +
           return "-".join(p for p in pieces if p) + ".conf"

     

       67
       67
       +
       

     

       68
       68
       +
       

     

       69
       69
       +
       def write_loader_conf(profile: Optional[str], generation: int, specialisation: Optional[str]) -> None:

     

       50
       70
        
           with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:

     

       51
       71
        
               if "@timeout@" != "":

     

       52
       72
        
                   f.write("timeout @timeout@\n")

     

       53
       53
       -
               if profile:

     

       54
       54
       -
                   f.write("default nixos-%s-generation-%d.conf\n" % (profile, generation))

     

       55
       55
       -
               else:

     

       56
       56
       -
                   f.write("default nixos-generation-%d.conf\n" % (generation))

     

       73
       73
       +
               f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation))

     

       57
       74
        
               if not @editor@:

     

       58
       75
        
                   f.write("editor 0\n");

     

       59
       76
        
               f.write("console-mode @consoleMode@\n");

     

       60
       77
        
           os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")

     

       61
       78
        
       

     

       62
       79
        
       

     

       63
       63
       -
       def profile_path(profile: Optional[str], generation: int, name: str) -> str:

     

       64
       64
       -
           return os.path.realpath("%s/%s" % (system_dir(profile, generation), name))

     

       80
       80
       +
       def profile_path(profile: Optional[str], generation: int, specialisation: Optional[str], name: str) -> str:

     

       81
       81
       +
           return os.path.realpath("%s/%s" % (system_dir(profile, generation, specialisation), name))

     

       65
       82
        
       

     

       66
       83
        
       

     

       67
       67
       -
       def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str:

     

       68
       68
       -
           store_file_path = profile_path(profile, generation, name)

     

       84
       84
       +
       def copy_from_profile(profile: Optional[str], generation: int, specialisation: Optional[str], name: str, dry_run: bool = False) -> str:

     

       85
       85
       +
           store_file_path = profile_path(profile, generation, specialisation, name)

     

       69
       86
        
           suffix = os.path.basename(store_file_path)

     

       70
       87
        
           store_dir = os.path.basename(os.path.dirname(store_file_path))

     

       71
       88
        
           efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)

     
···

       95
       112
        
           return description

     

       96
       113
        
       

     

       97
       114
        
       

     

       98
       98
       -
       def write_entry(profile: Optional[str], generation: int, machine_id: str) -> None:

     

       99
       99
       -
           kernel = copy_from_profile(profile, generation, "kernel")

     

       100
       100
       -
           initrd = copy_from_profile(profile, generation, "initrd")

     

       115
       115
       +
       def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], machine_id: str) -> None:

     

       116
       116
       +
           kernel = copy_from_profile(profile, generation, specialisation, "kernel")

     

       117
       117
       +
           initrd = copy_from_profile(profile, generation, specialisation, "initrd")

     

       101
       118
        
           try:

     

       102
       102
       -
               append_initrd_secrets = profile_path(profile, generation, "append-initrd-secrets")

     

       119
       119
       +
               append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets")

     

       103
       120
        
               subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)])

     

       104
       121
        
           except FileNotFoundError:

     

       105
       122
        
               pass

     

       106
       106
       -
           if profile:

     

       107
       107
       -
               entry_file = "@efiSysMountPoint@/loader/entries/nixos-%s-generation-%d.conf" % (profile, generation)

     

       108
       108
       -
           else:

     

       109
       109
       -
               entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)

     

       110
       110
       -
           generation_dir = os.readlink(system_dir(profile, generation))

     

       123
       123
       +
           entry_file = "@efiSysMountPoint@/loader/entries/%s" % (

     

       124
       124
       +
               generation_conf_filename(profile, generation, specialisation))

     

       125
       125
       +
           generation_dir = os.readlink(system_dir(profile, generation, specialisation))

     

       111
       126
        
           tmp_path = "%s.tmp" % (entry_file)

     

       112
       127
        
           kernel_params = "init=%s/init " % generation_dir

     

       113
       128
        
       

     
···

       115
       130
        
               kernel_params = kernel_params + params_file.read()

     

       116
       131
        
           with open(tmp_path, 'w') as f:

     

       117
       132
        
               f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "",

     

       133
       133
       +
                           specialisation=" (%s)" % specialisation if specialisation else "",

     

       118
       134
        
                           generation=generation,

     

       119
       135
        
                           kernel=kernel,

     

       120
       136
        
                           initrd=initrd,

     
···

       133
       149
        
                   raise

     

       134
       150
        
       

     

       135
       151
        
       

     

       136
       136
       -
       def get_generations(profile: Optional[str] = None) -> List[Tuple[Optional[str], int]]:

     

       152
       152
       +
       def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]:

     

       137
       153
        
           gen_list = subprocess.check_output([

     

       138
       154
        
               "@nix@/bin/nix-env",

     

       139
       155
        
               "--list-generations",

     
···

       145
       161
        
           gen_lines.pop()

     

       146
       162
        
       

     

       147
       163
        
           configurationLimit = @configurationLimit@

     

       148
       148
       -
           return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:]

     

       164
       164
       +
           configurations: List[SystemIdentifier] = [ (profile, int(line.split()[0]), None) for line in gen_lines ]

     

       165
       165
       +
           return configurations[-configurationLimit:]

     

       166
       166
       +
       

     

       167
       167
       +
       

     

       168
       168
       +
       def get_specialisations(profile: Optional[str], generation: int, _: Optional[str]) -> List[SystemIdentifier]:

     

       169
       169
       +
           specialisations_dir = os.path.join(

     

       170
       170
       +
                   system_dir(profile, generation, None), "specialisation")

     

       171
       171
       +
           if not os.path.exists(specialisations_dir):

     

       172
       172
       +
               return []

     

       173
       173
       +
           return [(profile, generation, spec) for spec in os.listdir(specialisations_dir)]

     

       149
       174
        
       

     

       150
       175
        
       

     

       151
       151
       -
       def remove_old_entries(gens: List[Tuple[Optional[str], int]]) -> None:

     

       176
       176
       +
       def remove_old_entries(gens: List[SystemIdentifier]) -> None:

     

       152
       177
        
           rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")

     

       153
       178
        
           rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")

     

       154
       179
        
           known_paths = []

     
···

       243
       268
        
           for gen in gens:

     

       244
       269
        
               try:

     

       245
       270
        
                   write_entry(*gen, machine_id)

     

       271
       271
       +
                   for specialisation in get_specialisations(*gen):

     

       272
       272
       +
                       write_entry(*specialisation, machine_id)

     

       246
       273
        
                   if os.readlink(system_dir(*gen)) == args.default_config:

     

       247
       274
        
                       write_loader_conf(*gen)

     

       248
       275
        
               except OSError as e:

+2 -3

nixos/tests/ghostunnel.nix

···

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

     

       2
       2
       -
       

     

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

     

       3
       2
        
         nodes = {

     

       4
       3
        
           backend = { pkgs, ... }: {

     

       5
       4
        
             services.nginx.enable = true;

     
···

       101
       100
        
         meta.maintainers = with pkgs.lib.maintainers; [

     

       102
       101
        
           roberth

     

       103
       102
        
         ];

     

       104
       104
       -
       }

     

       103
       103
       +
       })

+1 -1

nixos/tests/nixops/default.nix

···

       27
       27
        
               users.users.person.isNormalUser = true;

     

       28
       28
        
               virtualisation.writableStore = true;

     

       29
       29
        
               virtualisation.memorySize = 1024 /*MiB*/;

     

       30
       30
       -
               virtualisation.pathsInNixDB = [

     

       30
       30
       +
               virtualisation.additionalPaths = [

     

       31
       31
        
                 pkgs.hello

     

       32
       32
        
                 pkgs.figlet

     

       33
       33

+23

nixos/tests/systemd-boot.nix

···

       39
       39
        
           '';

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
       +
         # Check that specialisations create corresponding boot entries.

     

       43
       43
       +
         specialisation = makeTest {

     

       44
       44
       +
           name = "systemd-boot-specialisation";

     

       45
       45
       +
           meta.maintainers = with pkgs.stdenv.lib.maintainers; [ lukegb ];

     

       46
       46
       +
       

     

       47
       47
       +
           machine = { pkgs, lib, ... }: {

     

       48
       48
       +
             imports = [ common ];

     

       49
       49
       +
             specialisation.something.configuration = {};

     

       50
       50
       +
           };

     

       51
       51
       +
       

     

       52
       52
       +
           testScript = ''

     

       53
       53
       +
             machine.start()

     

       54
       54
       +
             machine.wait_for_unit("multi-user.target")

     

       55
       55
       +
       

     

       56
       56
       +
             machine.succeed(

     

       57
       57
       +
                 "test -e /boot/loader/entries/nixos-generation-1-specialisation-something.conf"

     

       58
       58
       +
             )

     

       59
       59
       +
             machine.succeed(

     

       60
       60
       +
                 "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf"

     

       61
       61
       +
             )

     

       62
       62
       +
           '';

     

       63
       63
       +
         };

     

       64
       64
       +
       

     

       42
       65
        
         # Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"

     

       43
       66
        
         fallback = makeTest {

     

       44
       67
        
           name = "systemd-boot-fallback";

+2 -2

pkgs/applications/blockchains/btcpayserver/default.nix

···

       3
       3
        
       

     

       4
       4
        
       buildDotnetModule rec {

     

       5
       5
        
         pname = "btcpayserver";

     

       6
       6
       -
         version = "1.2.4";

     

       6
       6
       +
         version = "1.3.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = pname;

     

       10
       10
        
           repo = pname;

     

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

     

       12
       12
       -
           sha256 = "sha256-vjNJ08twsJ036TTFF6srOGshDpP7ZwWCGN0XjrtFT/g=";

     

       12
       12
       +
           sha256 = "sha256-gJvUW/U+O83Q0VDo6a5VkWx2RuofMNs/mPn/hnM2XiE=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         projectFile = "BTCPayServer/BTCPayServer.csproj";

+219 -174

pkgs/applications/blockchains/btcpayserver/deps.nix

···

       31
       31
        
         })

     

       32
       32
        
         (fetchNuGet {

     

       33
       33
        
           name = "BTCPayServer.Lightning.All";

     

       34
       34
       -
           version = "1.2.12";

     

       35
       35
       -
           sha256 = "0sciwh9m7h6ns59bsrzpd6zyxxdkiy33bdsq0phd3r2yxakvw68n";

     

       34
       34
       +
           version = "1.2.13";

     

       35
       35
       +
           sha256 = "16nhahb6bnjwhw3wh044zfkqpb5k40kyhdazs2h6y4phjhm5hq2r";

     

       36
       36
        
         })

     

       37
       37
        
         (fetchNuGet {

     

       38
       38
        
           name = "BTCPayServer.Lightning.Charge";

     

       39
       39
       -
           version = "1.2.7";

     

       40
       40
       -
           sha256 = "02x3p0am5zqp8f4fycdlrp26alicxc5vrlvgxg6d8wsa35q473xc";

     

       39
       39
       +
           version = "1.2.8";

     

       40
       40
       +
           sha256 = "0ldk7kyipgmg0mj1444ins5n014z149j1qa40h12pncr6q1fb0xf";

     

       41
       41
        
         })

     

       42
       42
        
         (fetchNuGet {

     

       43
       43
        
           name = "BTCPayServer.Lightning.CLightning";

     

       44
       44
       -
           version = "1.2.8";

     

       45
       45
       -
           sha256 = "06c6dnp72iwvnjm3pil24fnk4vp2v1f9gg84a381yn1xah9jghky";

     

       44
       44
       +
           version = "1.2.9";

     

       45
       45
       +
           sha256 = "0r855lnh6cyj6hpwhdpdhpp39332v7lmk93ri2q8gs9lsnwdyjr8";

     

       46
       46
        
         })

     

       47
       47
        
         (fetchNuGet {

     

       48
       48
        
           name = "BTCPayServer.Lightning.Common";

     
···

       50
       50
        
           sha256 = "09p2ks1qgy6jnpcfwgdnxvldyyadwnh3mwmq9z89vvzmmgs19xkk";

     

       51
       51
        
         })

     

       52
       52
        
         (fetchNuGet {

     

       53
       53
       +
           name = "BTCPayServer.Lightning.Common";

     

       54
       54
       +
           version = "1.2.7";

     

       55
       55
       +
           sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6";

     

       56
       56
       +
         })

     

       57
       57
       +
         (fetchNuGet {

     

       53
       58
        
           name = "BTCPayServer.Lightning.Eclair";

     

       54
       54
       -
           version = "1.2.6";

     

       55
       55
       -
           sha256 = "0lf55w8v997kqh808545ry5mlwxpzxzlkbz38fl4nfm85yydw0fc";

     

       59
       59
       +
           version = "1.2.7";

     

       60
       60
       +
           sha256 = "1h15gic45wps4nvmxyfmfils9nicbz3xkli705hq69g0mafy0f23";

     

       56
       61
        
         })

     

       57
       62
        
         (fetchNuGet {

     

       58
       63
        
           name = "BTCPayServer.Lightning.LND";

     

       59
       59
       -
           version = "1.2.8";

     

       60
       60
       -
           sha256 = "1g1siy3xwf3rmyl4qrcg42wpww4b2qmfs88x0rxccwxjy5inzkz6";

     

       64
       64
       +
           version = "1.2.9";

     

       65
       65
       +
           sha256 = "1zyr58kwdyb02dfgxza73fqvzcjlf59msllmf06anl9im4pqcjx6";

     

       61
       66
        
         })

     

       62
       67
        
         (fetchNuGet {

     

       63
       68
        
           name = "BTCPayServer.Lightning.Ptarmigan";

     

       64
       64
       -
           version = "1.2.6";

     

       65
       65
       -
           sha256 = "10g785jh92z5x7aqh41ma3d1nw0718bk7ibb58ychhdk1v2wwmh4";

     

       69
       69
       +
           version = "1.2.7";

     

       70
       70
       +
           sha256 = "1mmj8bi32kzgda8v7qdfpm2qlpffv5223c2xnq7351h8ih4bbcvb";

     

       66
       71
        
         })

     

       67
       72
        
         (fetchNuGet {

     

       68
       73
        
           name = "BuildBundlerMinifier";

     
···

       170
       175
        
           sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn";

     

       171
       176
        
         })

     

       172
       177
        
         (fetchNuGet {

     

       178
       178
       +
           name = "LNURL";

     

       179
       179
       +
           version = "0.0.14";

     

       180
       180
       +
           sha256 = "0b2v87k3yi2lyka5zy3sbvxsa7yp04nn72l7dk27cm9i1d9914sq";

     

       181
       181
       +
         })

     

       182
       182
       +
         (fetchNuGet {

     

       173
       183
        
           name = "McMaster.NETCore.Plugins.Mvc";

     

       174
       174
       -
           version = "1.3.1";

     

       175
       175
       -
           sha256 = "1dh58ijwn6q6id0jpzr4hpfl0y4ak43zq4m8rsi5j2qv8vasq1mi";

     

       184
       184
       +
           version = "1.4.0";

     

       185
       185
       +
           sha256 = "07i0p6236hyh1c3cb5v6zkayq5807rd6msc341v2jh6yd5radasy";

     

       176
       186
        
         })

     

       177
       187
        
         (fetchNuGet {

     

       178
       188
        
           name = "McMaster.NETCore.Plugins";

     

       179
       179
       -
           version = "1.3.1";

     

       180
       180
       -
           sha256 = "0jrp7sshnvg7jcb52gfhwmg1jy31k9dxdf4061yggwcgpfskyg7n";

     

       189
       189
       +
           version = "1.4.0";

     

       190
       190
       +
           sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy";

     

       181
       191
        
         })

     

       182
       192
        
         (fetchNuGet {

     

       183
       193
        
           name = "Microsoft.AspNet.SignalR.Client";

     
···

       191
       201
        
         })

     

       192
       202
        
         (fetchNuGet {

     

       193
       203
        
           name = "Microsoft.AspNetCore.Cryptography.Internal";

     

       194
       194
       -
           version = "3.1.4";

     

       195
       195
       -
           sha256 = "0d4djj073bl9kps5jkcpydh92lcp6kpa7njhypjw3myaa987dcsh";

     

       204
       204
       +
           version = "3.1.19";

     

       205
       205
       +
           sha256 = "1b20hksk2qk2jnkwin4g0n9ap3ma7724pd518fh9qcakf7vfpkl1";

     

       196
       206
        
         })

     

       197
       207
        
         (fetchNuGet {

     

       198
       208
        
           name = "Microsoft.AspNetCore.Cryptography.KeyDerivation";

     

       199
       199
       -
           version = "3.1.4";

     

       200
       200
       -
           sha256 = "1rya2775prm8ss0rz6izsqqcz96gcf1rh0bpcvnfy1mwi04rx8bl";

     

       209
       209
       +
           version = "3.1.19";

     

       210
       210
       +
           sha256 = "1ksi2h3904932igh1g27l91fqdsfxg8zr6y82ym8pqb62m0906a4";

     

       201
       211
        
         })

     

       202
       212
        
         (fetchNuGet {

     

       203
       213
        
           name = "Microsoft.AspNetCore.Hosting.Abstractions";

     
···

       221
       231
        
         })

     

       222
       232
        
         (fetchNuGet {

     

       223
       233
        
           name = "Microsoft.AspNetCore.Identity.EntityFrameworkCore";

     

       224
       224
       -
           version = "3.1.4";

     

       225
       225
       -
           sha256 = "0smcpaqm7d95flr0k7i2psrsfvs48lv28kzqgnllv5229hhb670d";

     

       234
       234
       +
           version = "3.1.19";

     

       235
       235
       +
           sha256 = "0sm7cpccpygwgplbkp0j1q5ilkkiw0dx76qwy3xharv4himakrfm";

     

       226
       236
        
         })

     

       227
       237
        
         (fetchNuGet {

     

       228
       238
        
           name = "Microsoft.AspNetCore.JsonPatch";

     

       229
       229
       -
           version = "3.1.1";

     

       230
       230
       -
           sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml";

     

       239
       239
       +
           version = "3.1.19";

     

       240
       240
       +
           sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an";

     

       231
       241
        
         })

     

       232
       242
        
         (fetchNuGet {

     

       233
       243
        
           name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";

     

       234
       234
       -
           version = "3.1.1";

     

       235
       235
       -
           sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig";

     

       244
       244
       +
           version = "3.1.19";

     

       245
       245
       +
           sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs";

     

       236
       246
        
         })

     

       237
       247
        
         (fetchNuGet {

     

       238
       248
        
           name = "Microsoft.AspNetCore.Mvc.Razor.Extensions";

     

       239
       239
       -
           version = "3.1.1";

     

       240
       240
       -
           sha256 = "1iydcr7rfzg3kqky0x70853g6lbzsl9ja9cv8ph6iwpqxnswgdkh";

     

       249
       249
       +
           version = "3.1.19";

     

       250
       250
       +
           sha256 = "1n22q10n9xlhcjxsm1apd0b7j3j97dd5jmpw6nvymwbv2bw88af4";

     

       241
       251
        
         })

     

       242
       252
        
         (fetchNuGet {

     

       243
       253
        
           name = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation";

     

       244
       244
       -
           version = "3.1.1";

     

       245
       245
       -
           sha256 = "1q1bblcj9l2dnz46frygsfq7w4v08l96clgryh78wyws83xjm43y";

     

       254
       254
       +
           version = "3.1.19";

     

       255
       255
       +
           sha256 = "1glmlgrwksv0h8g41wy43wv94ndllq4ihxhdaagig9szvivdh8c1";

     

       246
       256
        
         })

     

       247
       257
        
         (fetchNuGet {

     

       248
       258
        
           name = "Microsoft.AspNetCore.Razor.Language";

     

       249
       249
       -
           version = "3.1.1";

     

       250
       250
       -
           sha256 = "0arqmy04dd0r4wm2fin66gxxwj2kirbgxyf3w7kq6f73lrnazhq0";

     

       259
       259
       +
           version = "3.1.19";

     

       260
       260
       +
           sha256 = "059v85f2qbj403wcnp5mspzvhkbf6d8hsjl26xvfd5s8svnaz4ax";

     

       251
       261
        
         })

     

       252
       262
        
         (fetchNuGet {

     

       253
       263
        
           name = "Microsoft.Bcl.AsyncInterfaces";

     
···

       256
       266
        
         })

     

       257
       267
        
         (fetchNuGet {

     

       258
       268
        
           name = "Microsoft.Bcl.HashCode";

     

       259
       259
       -
           version = "1.1.0";

     

       260
       260
       -
           sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0";

     

       269
       269
       +
           version = "1.1.1";

     

       270
       270
       +
           sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0";

     

       261
       271
        
         })

     

       262
       272
        
         (fetchNuGet {

     

       263
       273
        
           name = "Microsoft.CodeAnalysis.Analyzers";

     
···

       266
       276
        
         })

     

       267
       277
        
         (fetchNuGet {

     

       268
       278
        
           name = "Microsoft.CodeAnalysis.Analyzers";

     

       269
       269
       -
           version = "3.0.0";

     

       270
       270
       -
           sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8";

     

       279
       279
       +
           version = "3.3.2";

     

       280
       280
       +
           sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4";

     

       271
       281
        
         })

     

       272
       282
        
         (fetchNuGet {

     

       273
       283
        
           name = "Microsoft.CodeAnalysis.Common";

     

       274
       274
       -
           version = "3.3.0";

     

       275
       275
       -
           sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2";

     

       284
       284
       +
           version = "3.11.0";

     

       285
       285
       +
           sha256 = "0pwidgg4ifm7cirdy3hf61dyvg6lk4vgb6q7lyb4y0h0b6mvkrcl";

     

       276
       286
        
         })

     

       277
       287
        
         (fetchNuGet {

     

       278
       288
        
           name = "Microsoft.CodeAnalysis.Common";

     

       279
       279
       -
           version = "3.6.0";

     

       280
       280
       -
           sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7";

     

       289
       289
       +
           version = "3.3.0";

     

       290
       290
       +
           sha256 = "1vwhsp3pjgcfnpapkps9a3z9n2ryiv5bbhzycfljngj5grj63rg2";

     

       281
       291
        
         })

     

       282
       292
        
         (fetchNuGet {

     

       283
       293
        
           name = "Microsoft.CodeAnalysis.CSharp";

     

       284
       284
       -
           version = "3.3.0";

     

       285
       285
       -
           sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424";

     

       294
       294
       +
           version = "3.11.0";

     

       295
       295
       +
           sha256 = "1h16b7dsp1mq7d7picyfhkssqr6xiyywi5x1fd4jwclyrvanyl81";

     

       286
       296
        
         })

     

       287
       297
        
         (fetchNuGet {

     

       288
       298
        
           name = "Microsoft.CodeAnalysis.CSharp";

     

       289
       289
       -
           version = "3.6.0";

     

       290
       290
       -
           sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn";

     

       299
       299
       +
           version = "3.3.0";

     

       300
       300
       +
           sha256 = "09nmd5h1r2q0dwp1dfpn4anvs8sfi3rwcgpcv28lrhky8vc51424";

     

       291
       301
        
         })

     

       292
       302
        
         (fetchNuGet {

     

       293
       303
        
           name = "Microsoft.CodeAnalysis.Razor";

     

       294
       294
       -
           version = "3.1.1";

     

       295
       295
       -
           sha256 = "03n5rli6v1kvghha82zar3dvvkbc2vb9g8zp5fjrzhvp4l74ingn";

     

       304
       304
       +
           version = "3.1.19";

     

       305
       305
       +
           sha256 = "18l0gcpl7i0bfnyzhpm7h72ng2h8bh46fr2azk7d3ns507gi3xmp";

     

       296
       306
        
         })

     

       297
       307
        
         (fetchNuGet {

     

       298
       308
        
           name = "Microsoft.CodeCoverage";

     

       299
       299
       -
           version = "16.6.1";

     

       300
       300
       -
           sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl";

     

       309
       309
       +
           version = "16.11.0";

     

       310
       310
       +
           sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv";

     

       301
       311
        
         })

     

       302
       312
        
         (fetchNuGet {

     

       303
       313
        
           name = "Microsoft.CSharp";

     
···

       321
       331
        
         })

     

       322
       332
        
         (fetchNuGet {

     

       323
       333
        
           name = "Microsoft.Data.Sqlite.Core";

     

       324
       324
       -
           version = "3.1.4";

     

       325
       325
       -
           sha256 = "1pahyqjs4l9g1wg9hvxf68kgzzf72ny2i7n7ai97a389p2c86xvh";

     

       334
       334
       +
           version = "3.1.19";

     

       335
       335
       +
           sha256 = "0ns3rrk011gjw4g1kwr625390yj0mcadb3py49750sji72my7l7s";

     

       326
       336
        
         })

     

       327
       337
        
         (fetchNuGet {

     

       328
       338
        
           name = "Microsoft.DotNet.PlatformAbstractions";

     
···

       331
       341
        
         })

     

       332
       342
        
         (fetchNuGet {

     

       333
       343
        
           name = "Microsoft.DotNet.PlatformAbstractions";

     

       334
       334
       -
           version = "3.1.0";

     

       335
       335
       -
           sha256 = "1fg1zggza45pa8zlcf8llqh6v47fqi44azsia68kmsg2q9r1r4mq";

     

       344
       344
       +
           version = "3.1.6";

     

       345
       345
       +
           sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5";

     

       336
       346
        
         })

     

       337
       347
        
         (fetchNuGet {

     

       338
       338
       -
           name = "Microsoft.DotNet.PlatformAbstractions";

     

       339
       339
       -
           version = "3.1.4";

     

       340
       340
       -
           sha256 = "1s5h96zdc3vh1v03gizmqfw5hmksajw10bdrj79pm8brbyzipxia";

     

       348
       348
       +
           name = "Microsoft.EntityFrameworkCore.Abstractions";

     

       349
       349
       +
           version = "3.1.18";

     

       350
       350
       +
           sha256 = "0d00d6wx2mm5bav39bjsikjq0sx6qmp183dbwimfda7wav2bwya8";

     

       341
       351
        
         })

     

       342
       352
        
         (fetchNuGet {

     

       343
       353
        
           name = "Microsoft.EntityFrameworkCore.Abstractions";

     

       344
       344
       -
           version = "3.1.4";

     

       345
       345
       -
           sha256 = "07l7137pzwh0k4m53ji5j6a2zmbbzrl164p18wxcri77ds5is4g7";

     

       354
       354
       +
           version = "3.1.19";

     

       355
       355
       +
           sha256 = "0na2jgxs5k2gxqh99ha4v0blya3pwh2qha49iz0qkw0r3kq0vdvv";

     

       346
       356
        
         })

     

       347
       357
        
         (fetchNuGet {

     

       348
       358
        
           name = "Microsoft.EntityFrameworkCore.Analyzers";

     

       349
       349
       -
           version = "3.1.4";

     

       350
       350
       -
           sha256 = "1zaqn9z7ns6p6jgnffzkgpziqr2wqs68g2sa0c11kaclhlhgvvbv";

     

       359
       359
       +
           version = "3.1.19";

     

       360
       360
       +
           sha256 = "02xjz4c6f71mcmdwihi9klrqm28xk84x19vcqi8cgpw50q7d0rly";

     

       351
       361
        
         })

     

       352
       362
        
         (fetchNuGet {

     

       353
       363
        
           name = "Microsoft.EntityFrameworkCore.Design";

     

       354
       354
       -
           version = "3.1.4";

     

       355
       355
       -
           sha256 = "10mxnbiw23ia4sln86sd3gn84yhmrb6r2kipzid4h1g15paal9gi";

     

       364
       364
       +
           version = "3.1.19";

     

       365
       365
       +
           sha256 = "128md0ijqa1wvpdicf09i7kcb2aq2b07skc6j0vddz2jhcbi0irr";

     

       356
       366
        
         })

     

       357
       367
        
         (fetchNuGet {

     

       358
       368
        
           name = "Microsoft.EntityFrameworkCore.Relational";

     

       359
       359
       -
           version = "3.1.0";

     

       360
       360
       -
           sha256 = "0javqw6c27ppcysigjvcjcw3mk0gg1pv2pmwfpvvryr1pb4a9n55";

     

       369
       369
       +
           version = "3.1.18";

     

       370
       370
       +
           sha256 = "0mlq9gmxrmix68mdh0lv803cx15lzrhs5d9622vj8wwdlngg3xdx";

     

       361
       371
        
         })

     

       362
       372
        
         (fetchNuGet {

     

       363
       373
        
           name = "Microsoft.EntityFrameworkCore.Relational";

     

       364
       364
       -
           version = "3.1.4";

     

       365
       365
       -
           sha256 = "1344rsavawwg69dx8xsl08hcs43lc6h7z4mn461dcx85rirlwd0v";

     

       374
       374
       +
           version = "3.1.19";

     

       375
       375
       +
           sha256 = "13rbnd441r4zb52y99zwida0n0phvvw7hmccjy2kpnk1jfrr8xi1";

     

       366
       376
        
         })

     

       367
       377
        
         (fetchNuGet {

     

       368
       378
        
           name = "Microsoft.EntityFrameworkCore.Sqlite.Core";

     

       369
       369
       -
           version = "3.1.4";

     

       370
       370
       -
           sha256 = "080qz0b52i7v5c1sgnqlh9px9881cfr1x06np66hdgmh0ni5c1lw";

     

       379
       379
       +
           version = "3.1.19";

     

       380
       380
       +
           sha256 = "1w8ja5daglnr3ycfwlyskrnacb66p8yz730k838v6bpmpsdybn71";

     

       371
       381
        
         })

     

       372
       382
        
         (fetchNuGet {

     

       373
       383
        
           name = "Microsoft.EntityFrameworkCore.Sqlite";

     

       374
       374
       -
           version = "3.1.4";

     

       375
       375
       -
           sha256 = "009mcmakw0p7k8xrz920a8qc0rjv361awiz8jia5i5a8p5ihgkbx";

     

       384
       384
       +
           version = "3.1.19";

     

       385
       385
       +
           sha256 = "0iwwa44dr2lg9mh5hmnpnkzbhi5v3vi6xy3xlnqg4hja37ji0xyw";

     

       376
       386
        
         })

     

       377
       387
        
         (fetchNuGet {

     

       378
       388
        
           name = "Microsoft.EntityFrameworkCore";

     

       379
       379
       -
           version = "3.1.4";

     

       380
       380
       -
           sha256 = "11w63yp7fk9qwmnq3lmpf1h30mlbzfx4zpm89vrs0lprj86g0742";

     

       389
       389
       +
           version = "3.1.19";

     

       390
       390
       +
           sha256 = "0gl43zk7ashjx49h35w58cn7dfl1ap3nyq9ws8575jcjhcx3c94h";

     

       381
       391
        
         })

     

       382
       392
        
         (fetchNuGet {

     

       383
       393
        
           name = "Microsoft.Extensions.Caching.Abstractions";

     
···

       386
       396
        
         })

     

       387
       397
        
         (fetchNuGet {

     

       388
       398
        
           name = "Microsoft.Extensions.Caching.Abstractions";

     

       389
       389
       -
           version = "3.1.4";

     

       390
       390
       -
           sha256 = "09f96pvpyzylpdaiw3lsvr7p6rs4i21mmhsxl6pkivg5lpfb79sk";

     

       399
       399
       +
           version = "3.1.19";

     

       400
       400
       +
           sha256 = "1y1is16yl69ja67i9n98r44cr0z8b8f8k31d5ighi9djj4yhz4k2";

     

       391
       401
        
         })

     

       392
       402
        
         (fetchNuGet {

     

       393
       403
        
           name = "Microsoft.Extensions.Caching.Memory";

     

       394
       394
       -
           version = "3.1.4";

     

       395
       395
       -
           sha256 = "0b8ijxjd8lgq8mgnvh3wl4y4wbjj3v5b763y6gslm75fn43iyad8";

     

       404
       404
       +
           version = "3.1.19";

     

       405
       405
       +
           sha256 = "1iysxrmchw5ripyrcfi4nv5a00b9a7agsgvbb7y9fwbfq838v3mp";

     

       396
       406
        
         })

     

       397
       407
        
         (fetchNuGet {

     

       398
       408
        
           name = "Microsoft.Extensions.Configuration.Abstractions";

     
···

       411
       421
        
         })

     

       412
       422
        
         (fetchNuGet {

     

       413
       423
        
           name = "Microsoft.Extensions.Configuration.Abstractions";

     

       414
       414
       -
           version = "3.1.4";

     

       415
       415
       -
           sha256 = "0r33m68y1vgpmqams4sgciizl0w6y97qkp93m0hyn0nlkxqf72l6";

     

       424
       424
       +
           version = "3.1.19";

     

       425
       425
       +
           sha256 = "19s5dpswyad55p191280510sb8cr2b6zyx9zlx79p0lq4zaxwaq6";

     

       416
       426
        
         })

     

       417
       427
        
         (fetchNuGet {

     

       418
       428
        
           name = "Microsoft.Extensions.Configuration.Abstractions";

     
···

       426
       436
        
         })

     

       427
       437
        
         (fetchNuGet {

     

       428
       438
        
           name = "Microsoft.Extensions.Configuration.Binder";

     

       429
       429
       -
           version = "3.1.4";

     

       430
       430
       -
           sha256 = "1bnf213zlrh0m3sbhsv601yx21l5xp254jiy2g4hm7zpm8vsz1hz";

     

       439
       439
       +
           version = "3.1.19";

     

       440
       440
       +
           sha256 = "0dw1qiyc8j7rk13x6wfm1xnc7drnlvk8xv607hja0af2m0y7a3p2";

     

       431
       441
        
         })

     

       432
       442
        
         (fetchNuGet {

     

       433
       443
        
           name = "Microsoft.Extensions.Configuration.Binder";

     
···

       461
       471
        
         })

     

       462
       472
        
         (fetchNuGet {

     

       463
       473
        
           name = "Microsoft.Extensions.Configuration";

     

       464
       464
       -
           version = "3.1.4";

     

       465
       465
       -
           sha256 = "0npc18pjl86d06czb0fy6ln3prfpwfb16p6709xx2jrsl96dp9bp";

     

       474
       474
       +
           version = "3.1.19";

     

       475
       475
       +
           sha256 = "04zadl7q5vcak9d77jm5ivfzhhp2zvz5apywvfzrca4h0q38fs45";

     

       466
       476
        
         })

     

       467
       477
        
         (fetchNuGet {

     

       468
       478
        
           name = "Microsoft.Extensions.Configuration";

     
···

       481
       491
        
         })

     

       482
       492
        
         (fetchNuGet {

     

       483
       493
        
           name = "Microsoft.Extensions.DependencyInjection.Abstractions";

     

       484
       484
       -
           version = "3.1.4";

     

       485
       485
       -
           sha256 = "03ys96pqca93zwxvh0vprzms09i9y0lmq32w98m6klbizq01fc06";

     

       494
       494
       +
           version = "3.1.19";

     

       495
       495
       +
           sha256 = "0claq9nna6p30zbvd25bn1ild9f3x50d5fxfbq9fsp464rq70b2y";

     

       486
       496
        
         })

     

       487
       497
        
         (fetchNuGet {

     

       488
       498
        
           name = "Microsoft.Extensions.DependencyInjection.Abstractions";

     
···

       496
       506
        
         })

     

       497
       507
        
         (fetchNuGet {

     

       498
       508
        
           name = "Microsoft.Extensions.DependencyInjection";

     

       499
       499
       -
           version = "3.1.4";

     

       500
       500
       -
           sha256 = "0rhyjgdpjm56drvrvqd9v1xq1qhyrpwwn2pjsz17g2s462rwliqx";

     

       509
       509
       +
           version = "3.1.19";

     

       510
       510
       +
           sha256 = "0fsvv5jl95kmdxc4c7b15xanlq3fmfls556m8ghbqqikrgkqhz8m";

     

       501
       511
        
         })

     

       502
       512
        
         (fetchNuGet {

     

       503
       513
        
           name = "Microsoft.Extensions.DependencyModel";

     
···

       506
       516
        
         })

     

       507
       517
        
         (fetchNuGet {

     

       508
       518
        
           name = "Microsoft.Extensions.DependencyModel";

     

       509
       509
       -
           version = "3.1.0";

     

       510
       510
       -
           sha256 = "12nrdw3q9wl5zry8gb3sw003a0iyk2gvps2ij813l7lim38wy1mi";

     

       511
       511
       -
         })

     

       512
       512
       -
         (fetchNuGet {

     

       513
       513
       -
           name = "Microsoft.Extensions.DependencyModel";

     

       514
       514
       -
           version = "3.1.1";

     

       515
       515
       -
           sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh";

     

       519
       519
       +
           version = "3.1.6";

     

       520
       520
       +
           sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac";

     

       516
       521
        
         })

     

       517
       522
        
         (fetchNuGet {

     

       518
       523
        
           name = "Microsoft.Extensions.DependencyModel";

     

       519
       519
       -
           version = "3.1.4";

     

       520
       520
       -
           sha256 = "0r0wv4k0ig6mrl6fr184zqbf5f010d6i2an2ws23g2bjvk8jh1bk";

     

       524
       524
       +
           version = "5.0.0";

     

       525
       525
       +
           sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x";

     

       521
       526
        
         })

     

       522
       527
        
         (fetchNuGet {

     

       523
       528
        
           name = "Microsoft.Extensions.FileProviders.Abstractions";

     
···

       551
       556
        
         })

     

       552
       557
        
         (fetchNuGet {

     

       553
       558
        
           name = "Microsoft.Extensions.Identity.Core";

     

       554
       554
       -
           version = "3.1.4";

     

       555
       555
       -
           sha256 = "0kyi03l9d7pnsvrcylc86fcxwnj59mhvmbz4c1d142f8djdrqfid";

     

       559
       559
       +
           version = "3.1.19";

     

       560
       560
       +
           sha256 = "14mywrm6mv7hzfappgdrmwwk97a4qpfkir5a55443awy8wl3bylr";

     

       556
       561
        
         })

     

       557
       562
        
         (fetchNuGet {

     

       558
       563
        
           name = "Microsoft.Extensions.Identity.Stores";

     

       559
       559
       -
           version = "3.1.4";

     

       560
       560
       -
           sha256 = "0jb3syy0glyn4nnd7lb7aj412xnqyrwhfavh98rbc5adq9v09nbw";

     

       564
       564
       +
           version = "3.1.19";

     

       565
       565
       +
           sha256 = "0pkrhf1vffll986hh49gyvfdqn1vnjd0qnpfkag2b76d681xlvgg";

     

       561
       566
        
         })

     

       562
       567
        
         (fetchNuGet {

     

       563
       568
        
           name = "Microsoft.Extensions.Logging.Abstractions";

     
···

       581
       586
        
         })

     

       582
       587
        
         (fetchNuGet {

     

       583
       588
        
           name = "Microsoft.Extensions.Logging.Abstractions";

     

       584
       584
       -
           version = "3.1.4";

     

       585
       585
       -
           sha256 = "1rkl0yqmi5vfivn641866v2mdsgdy8amym546y6lzbab39g24b5n";

     

       589
       589
       +
           version = "3.1.19";

     

       590
       590
       +
           sha256 = "07jnqb6518xrw086rqlc28ms80d57xg0pl5x72032rk2x5x8hhnn";

     

       586
       591
        
         })

     

       587
       592
        
         (fetchNuGet {

     

       588
       593
        
           name = "Microsoft.Extensions.Logging.Abstractions";

     
···

       601
       606
        
         })

     

       602
       607
        
         (fetchNuGet {

     

       603
       608
        
           name = "Microsoft.Extensions.Logging";

     

       604
       604
       -
           version = "3.1.4";

     

       605
       605
       -
           sha256 = "04asfrhfrcl3ijilry2pr28ql5m6pgrwapadikgcg66jjxbx75zq";

     

       609
       609
       +
           version = "3.1.19";

     

       610
       610
       +
           sha256 = "0j2874x847xa1nfbppjn10cnxd486f6lwy53mxmansvlmp96h2sn";

     

       606
       611
        
         })

     

       607
       612
        
         (fetchNuGet {

     

       608
       613
        
           name = "Microsoft.Extensions.Options.ConfigurationExtensions";

     
···

       621
       626
        
         })

     

       622
       627
        
         (fetchNuGet {

     

       623
       628
        
           name = "Microsoft.Extensions.Options";

     

       624
       624
       -
           version = "3.1.4";

     

       625
       625
       -
           sha256 = "0jphncx82l7jm5xi49dfxhbh24wv86sy44022chd7bkizllsypp4";

     

       629
       629
       +
           version = "3.1.19";

     

       630
       630
       +
           sha256 = "1jm7rd2sbfscyfysvl8zcaypyzpd6d5w52ha2npa9c7q84cmn4r9";

     

       626
       631
        
         })

     

       627
       632
        
         (fetchNuGet {

     

       628
       633
        
           name = "Microsoft.Extensions.Options";

     
···

       656
       661
        
         })

     

       657
       662
        
         (fetchNuGet {

     

       658
       663
        
           name = "Microsoft.Extensions.Primitives";

     

       659
       659
       -
           version = "3.1.4";

     

       660
       660
       -
           sha256 = "12xvysk024aghrcwzv4525vznnk8lqmknl2vqqxhq4k5hjxpsysp";

     

       664
       664
       +
           version = "3.1.19";

     

       665
       665
       +
           sha256 = "0vcwwqqfwm5vj87psmic6mxix3prgkzw8sqbg5m1c2q662kby380";

     

       661
       666
        
         })

     

       662
       667
        
         (fetchNuGet {

     

       663
       668
        
           name = "Microsoft.Extensions.Primitives";

     
···

       681
       686
        
         })

     

       682
       687
        
         (fetchNuGet {

     

       683
       688
        
           name = "Microsoft.NET.Test.Sdk";

     

       684
       684
       -
           version = "16.6.1";

     

       685
       685
       -
           sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv";

     

       689
       689
       +
           version = "16.11.0";

     

       690
       690
       +
           sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl";

     

       686
       691
        
         })

     

       687
       692
        
         (fetchNuGet {

     

       688
       693
        
           name = "Microsoft.NetCore.Analyzers";

     

       689
       689
       -
           version = "2.9.8";

     

       690
       690
       -
           sha256 = "1klybsdy9yw49zlpmix4vjdhmfaibg5h9yx03vszdnijzap7vpsx";

     

       694
       694
       +
           version = "3.3.2";

     

       695
       695
       +
           sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq";

     

       691
       696
        
         })

     

       692
       697
        
         (fetchNuGet {

     

       693
       698
        
           name = "Microsoft.NETCore.Platforms";

     
···

       726
       731
        
         })

     

       727
       732
        
         (fetchNuGet {

     

       728
       733
        
           name = "Microsoft.TestPlatform.ObjectModel";

     

       729
       729
       -
           version = "16.6.1";

     

       730
       730
       -
           sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h";

     

       734
       734
       +
           version = "16.11.0";

     

       735
       735
       +
           sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh";

     

       731
       736
        
         })

     

       732
       737
        
         (fetchNuGet {

     

       733
       738
        
           name = "Microsoft.TestPlatform.TestHost";

     

       734
       734
       -
           version = "16.6.1";

     

       735
       735
       -
           sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix";

     

       739
       739
       +
           version = "16.11.0";

     

       740
       740
       +
           sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k";

     

       736
       741
        
         })

     

       737
       742
        
         (fetchNuGet {

     

       738
       743
        
           name = "Microsoft.Win32.Primitives";

     
···

       751
       756
        
         })

     

       752
       757
        
         (fetchNuGet {

     

       753
       758
        
           name = "MySqlConnector";

     

       754
       754
       -
           version = "0.61.0";

     

       755
       755
       -
           sha256 = "0b0mc41dsih4p1ky3kcmibsz4bw14w439nraq5732wjfkq2sqdxg";

     

       759
       759
       +
           version = "0.69.10";

     

       760
       760
       +
           sha256 = "159xir7czzz291cs0f2dsgmnhar41s4wglm5r5lw3kqpd50q3i9v";

     

       756
       761
        
         })

     

       757
       762
        
         (fetchNuGet {

     

       758
       763
        
           name = "NBitcoin.Altcoins";

     

       759
       759
       -
           version = "3.0.4";

     

       760
       760
       -
           sha256 = "03aia31sznw81jjr9k6dkwgvm9dc38fgp1z8y5i45vlkf5fp89pb";

     

       764
       764
       +
           version = "3.0.8";

     

       765
       765
       +
           sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618";

     

       761
       766
        
         })

     

       762
       767
        
         (fetchNuGet {

     

       763
       763
       -
           name = "NBitcoin";

     

       764
       764
       -
           version = "5.0.33";

     

       765
       765
       -
           sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";

     

       768
       768
       +
           name = "NBitcoin.Secp256k1";

     

       769
       769
       +
           version = "1.0.3";

     

       770
       770
       +
           sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj";

     

       766
       771
        
         })

     

       767
       772
        
         (fetchNuGet {

     

       768
       773
        
           name = "NBitcoin";

     

       769
       774
        
           version = "5.0.40";

     

       770
       775
        
           sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh";

     

       776
       776
       +
         })

     

       777
       777
       +
         (fetchNuGet {

     

       778
       778
       +
           name = "NBitcoin";

     

       779
       779
       +
           version = "5.0.54";

     

       780
       780
       +
           sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b";

     

       781
       781
       +
         })

     

       782
       782
       +
         (fetchNuGet {

     

       783
       783
       +
           name = "NBitcoin";

     

       784
       784
       +
           version = "6.0.15";

     

       785
       785
       +
           sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";

     

       771
       786
        
         })

     

       772
       787
        
         (fetchNuGet {

     

       773
       788
        
           name = "NBitcoin";

     
···

       786
       801
        
         })

     

       787
       802
        
         (fetchNuGet {

     

       788
       803
        
           name = "NBXplorer.Client";

     

       789
       789
       -
           version = "4.1.0";

     

       790
       790
       -
           sha256 = "1al9j14k51ql7m6yd2w89xlnklj64jqjikq8wpl2vwi1zy2gxqrl";

     

       804
       804
       +
           version = "4.1.3";

     

       805
       805
       +
           sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251";

     

       791
       806
        
         })

     

       792
       807
        
         (fetchNuGet {

     

       793
       808
        
           name = "Nethereum.ABI";

     

       794
       794
       -
           version = "3.8.0";

     

       795
       795
       -
           sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c";

     

       809
       809
       +
           version = "4.1.0";

     

       810
       810
       +
           sha256 = "1mhg6mh7wkz93fq3pclkxjipcvzglnk70gr9s1cgr2ak84y3g5lr";

     

       796
       811
        
         })

     

       797
       812
        
         (fetchNuGet {

     

       798
       813
        
           name = "Nethereum.Accounts";

     

       799
       799
       -
           version = "3.8.0";

     

       800
       800
       -
           sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m";

     

       814
       814
       +
           version = "4.1.0";

     

       815
       815
       +
           sha256 = "0wd4wa2d1dm4ni5l208bn7wi63m1whmbh4x6sfk8m4qh4dlh1bq0";

     

       801
       816
        
         })

     

       802
       817
        
         (fetchNuGet {

     

       803
       818
        
           name = "Nethereum.BlockchainProcessing";

     

       804
       804
       -
           version = "3.8.0";

     

       805
       805
       -
           sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax";

     

       819
       819
       +
           version = "4.1.0";

     

       820
       820
       +
           sha256 = "1986y39mpd61s7kkkbcc9hcg7vwmp9mamhiiy9pzsnfgc2jna6c4";

     

       806
       821
        
         })

     

       807
       822
        
         (fetchNuGet {

     

       808
       823
        
           name = "Nethereum.Contracts";

     

       809
       809
       -
           version = "3.8.0";

     

       810
       810
       -
           sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8";

     

       824
       824
       +
           version = "4.1.0";

     

       825
       825
       +
           sha256 = "07yj2fqx0p22aayhn7zjczq5xj55b2w48qar8j5q2klzl9q64iwc";

     

       811
       826
        
         })

     

       812
       827
        
         (fetchNuGet {

     

       813
       828
        
           name = "Nethereum.HdWallet";

     

       814
       814
       -
           version = "3.8.0";

     

       815
       815
       -
           sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2";

     

       829
       829
       +
           version = "4.1.0";

     

       830
       830
       +
           sha256 = "052g15iqhkx94igvnv5qr8gxpvbi34c7avqn6j4i4p0yf6kwbwsi";

     

       816
       831
        
         })

     

       817
       832
        
         (fetchNuGet {

     

       818
       833
        
           name = "Nethereum.Hex";

     

       819
       819
       -
           version = "3.8.0";

     

       820
       820
       -
           sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6";

     

       834
       834
       +
           version = "4.1.0";

     

       835
       835
       +
           sha256 = "1bkmbfclbkr3336za7ii5vac7c4h2l1vd4bl3a15s54piwfgx44w";

     

       821
       836
        
         })

     

       822
       837
        
         (fetchNuGet {

     

       823
       838
        
           name = "Nethereum.JsonRpc.Client";

     

       824
       824
       -
           version = "3.8.0";

     

       825
       825
       -
           sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l";

     

       839
       839
       +
           version = "4.1.0";

     

       840
       840
       +
           sha256 = "1260pr9y83nrfqpgq37s91dbsxdfkvdh55x48554c33ldrqsqk4p";

     

       826
       841
        
         })

     

       827
       842
        
         (fetchNuGet {

     

       828
       843
        
           name = "Nethereum.JsonRpc.RpcClient";

     

       829
       829
       -
           version = "3.8.0";

     

       830
       830
       -
           sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a";

     

       844
       844
       +
           version = "4.1.0";

     

       845
       845
       +
           sha256 = "0jybgfzy4cj9jx1djjc66vpk9sg88dymy5jrcrply3y6bq85arq3";

     

       831
       846
        
         })

     

       832
       847
        
         (fetchNuGet {

     

       833
       848
        
           name = "Nethereum.KeyStore";

     

       834
       834
       -
           version = "3.8.0";

     

       835
       835
       -
           sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s";

     

       849
       849
       +
           version = "4.1.0";

     

       850
       850
       +
           sha256 = "16xffhfx7k9rfb5kr717cpbircj66gazbkbbwvf5hss3v9a6imzz";

     

       836
       851
        
         })

     

       837
       852
        
         (fetchNuGet {

     

       838
       853
        
           name = "Nethereum.Model";

     

       839
       839
       -
           version = "3.8.0";

     

       840
       840
       -
           sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh";

     

       854
       854
       +
           version = "4.1.0";

     

       855
       855
       +
           sha256 = "03aaizfpjvbf367mprni2ixlyfvz7ic8cn1cfmjk1n3f3q63qbqh";

     

       841
       856
        
         })

     

       842
       857
        
         (fetchNuGet {

     

       843
       858
        
           name = "Nethereum.RLP";

     

       844
       844
       -
           version = "3.8.0";

     

       845
       845
       -
           sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym";

     

       859
       859
       +
           version = "4.1.0";

     

       860
       860
       +
           sha256 = "19ixlvv91s0xhn3bvwn0yydd5932vcylin037dv4wzgbk2v0vdpm";

     

       846
       861
        
         })

     

       847
       862
        
         (fetchNuGet {

     

       848
       863
        
           name = "Nethereum.RPC";

     

       849
       849
       -
           version = "3.8.0";

     

       850
       850
       -
           sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb";

     

       864
       864
       +
           version = "4.1.0";

     

       865
       865
       +
           sha256 = "0ivvic38wpay9ry1hp4n88bgglnxcd8id7p5h235ilviq2gxgmmb";

     

       851
       866
        
         })

     

       852
       867
        
         (fetchNuGet {

     

       853
       868
        
           name = "Nethereum.Signer";

     

       854
       854
       -
           version = "3.8.0";

     

       855
       855
       -
           sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf";

     

       869
       869
       +
           version = "4.1.0";

     

       870
       870
       +
           sha256 = "1lgyb80l7xwhp4jbfbba0d47p7nxhx0lac08k23nzwnqmg95y4n6";

     

       856
       871
        
         })

     

       857
       872
        
         (fetchNuGet {

     

       858
       873
        
           name = "Nethereum.StandardTokenEIP20";

     

       859
       859
       -
           version = "3.8.0";

     

       860
       860
       -
           sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g";

     

       874
       874
       +
           version = "4.1.0";

     

       875
       875
       +
           sha256 = "1i08kpa6knrm3jbhxgfaa2ing5w42j3jsdx72hl6a9xcjdkjr405";

     

       861
       876
        
         })

     

       862
       877
        
         (fetchNuGet {

     

       863
       878
        
           name = "Nethereum.Util";

     

       864
       864
       -
           version = "3.8.0";

     

       865
       865
       -
           sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8";

     

       879
       879
       +
           version = "4.1.0";

     

       880
       880
       +
           sha256 = "1fp7ii6ic13d1s8n6l63f1kyb03s04fghhfm7sshvk6bhjlynfqw";

     

       866
       881
        
         })

     

       867
       882
        
         (fetchNuGet {

     

       868
       883
        
           name = "Nethereum.Web3";

     

       869
       869
       -
           version = "3.8.0";

     

       870
       870
       -
           sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i";

     

       884
       884
       +
           version = "4.1.0";

     

       885
       885
       +
           sha256 = "1b8myc9wr44vf7kcl9rmhc8zimpfda3mmizhiq1x287xs44nam0b";

     

       871
       886
        
         })

     

       872
       887
        
         (fetchNuGet {

     

       873
       888
        
           name = "NETStandard.Library";

     
···

       875
       890
        
           sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8";

     

       876
       891
        
         })

     

       877
       892
        
         (fetchNuGet {

     

       893
       893
       +
           name = "NETStandard.Library";

     

       894
       894
       +
           version = "2.0.3";

     

       895
       895
       +
           sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y";

     

       896
       896
       +
         })

     

       897
       897
       +
         (fetchNuGet {

     

       878
       898
        
           name = "Newtonsoft.Json.Bson";

     

       879
       899
        
           version = "1.0.1";

     

       880
       900
        
           sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa";

     
···

       886
       906
        
         })

     

       887
       907
        
         (fetchNuGet {

     

       888
       908
        
           name = "Newtonsoft.Json.Schema";

     

       889
       889
       -
           version = "3.0.13";

     

       890
       890
       -
           sha256 = "04vzjz5fb588rh6ji5a0svfzjsdcfpr1qrz9hxpc64z5zhnh6sf4";

     

       909
       909
       +
           version = "3.0.14";

     

       910
       910
       +
           sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6";

     

       891
       911
        
         })

     

       892
       912
        
         (fetchNuGet {

     

       893
       913
        
           name = "Newtonsoft.Json";

     
···

       901
       921
        
         })

     

       902
       922
        
         (fetchNuGet {

     

       903
       923
        
           name = "Newtonsoft.Json";

     

       904
       904
       -
           version = "12.0.2";

     

       905
       905
       -
           sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";

     

       924
       924
       +
           version = "12.0.3";

     

       925
       925
       +
           sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";

     

       906
       926
        
         })

     

       907
       927
        
         (fetchNuGet {

     

       908
       928
        
           name = "Newtonsoft.Json";

     

       909
       909
       -
           version = "12.0.3";

     

       910
       910
       -
           sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";

     

       929
       929
       +
           version = "13.0.1";

     

       930
       930
       +
           sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb";

     

       911
       931
        
         })

     

       912
       932
        
         (fetchNuGet {

     

       913
       933
        
           name = "Newtonsoft.Json";

     
···

       941
       961
        
         })

     

       942
       962
        
         (fetchNuGet {

     

       943
       963
        
           name = "Npgsql.EntityFrameworkCore.PostgreSQL";

     

       944
       944
       -
           version = "3.1.4";

     

       945
       945
       -
           sha256 = "1ng9pbamh93g0fbnjq8ygaf40d6rs0fy4s08bjmxpa69k3s8c7a4";

     

       964
       964
       +
           version = "3.1.18";

     

       965
       965
       +
           sha256 = "0yjrp87m0kj8bzybszxnj7n1h21zag3rqpva74xzvm78gz1asc04";

     

       946
       966
        
         })

     

       947
       967
        
         (fetchNuGet {

     

       948
       968
        
           name = "Npgsql";

     

       949
       949
       -
           version = "4.1.3.1";

     

       950
       950
       -
           sha256 = "0qk3hb8s521c2gy4k3m1i6fhpr133mnw9w85cwsy9j7ghxyca1nv";

     

       969
       969
       +
           version = "4.1.9";

     

       970
       970
       +
           sha256 = "1b9qp3cjwydd4g1yy8nxxr0b0nwdbijmcmzjpkb9r13ndgdrd8nq";

     

       951
       971
        
         })

     

       952
       972
        
         (fetchNuGet {

     

       953
       973
        
           name = "NSec.Cryptography";

     
···

       981
       1001
        
         })

     

       982
       1002
        
         (fetchNuGet {

     

       983
       1003
        
           name = "Pomelo.EntityFrameworkCore.MySql";

     

       984
       984
       -
           version = "3.1.1";

     

       985
       985
       -
           sha256 = "1jvv2q7pmh5wzsfjim7iby4r1scb30kgj9w6sbm2dp60i6vm32dx";

     

       1004
       1004
       +
           version = "3.2.7";

     

       1005
       1005
       +
           sha256 = "018za1ax17ibxld9rk2nc29716qpn2afh1prfrdjchf5cp56ba2p";

     

       986
       1006
        
         })

     

       987
       1007
        
         (fetchNuGet {

     

       988
       1008
        
           name = "Pomelo.JsonObject";

     
···

       1101
       1121
        
         })

     

       1102
       1122
        
         (fetchNuGet {

     

       1103
       1123
        
           name = "Selenium.WebDriver.ChromeDriver";

     

       1104
       1104
       -
           version = "90.0.4430.2400";

     

       1105
       1105
       -
           sha256 = "18gjm92nzzvxf0hk7c0nnabs0vmh6yyzq3m4si7p21m6xa3bqiga";

     

       1124
       1124
       +
           version = "94.0.4606.6100";

     

       1125
       1125
       +
           sha256 = "04kn91qcgsx92yhcqlhpm1yy3m34m371k70szf8h93gcwfs42b9c";

     

       1106
       1126
        
         })

     

       1107
       1127
        
         (fetchNuGet {

     

       1108
       1128
        
           name = "Selenium.WebDriver";

     
···

       1218
       1238
        
           name = "System.Collections.Immutable";

     

       1219
       1239
        
           version = "1.7.1";

     

       1220
       1240
        
           sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq";

     

       1241
       1241
       +
         })

     

       1242
       1242
       +
         (fetchNuGet {

     

       1243
       1243
       +
           name = "System.Collections.Immutable";

     

       1244
       1244
       +
           version = "5.0.0";

     

       1245
       1245
       +
           sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";

     

       1221
       1246
        
         })

     

       1222
       1247
        
         (fetchNuGet {

     

       1223
       1248
        
           name = "System.Collections.NonGeneric";

     
···

       1391
       1416
        
         })

     

       1392
       1417
        
         (fetchNuGet {

     

       1393
       1418
        
           name = "System.IO.Pipelines";

     

       1394
       1394
       -
           version = "4.7.2";

     

       1395
       1395
       -
           sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9";

     

       1419
       1419
       +
           version = "4.7.4";

     

       1420
       1420
       +
           sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r";

     

       1396
       1421
        
         })

     

       1397
       1422
        
         (fetchNuGet {

     

       1398
       1423
        
           name = "System.IO";

     
···

       1555
       1580
        
           sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";

     

       1556
       1581
        
         })

     

       1557
       1582
        
         (fetchNuGet {

     

       1583
       1583
       +
           name = "System.Reflection.Metadata";

     

       1584
       1584
       +
           version = "5.0.0";

     

       1585
       1585
       +
           sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss";

     

       1586
       1586
       +
         })

     

       1587
       1587
       +
         (fetchNuGet {

     

       1558
       1588
        
           name = "System.Reflection.Primitives";

     

       1559
       1589
        
           version = "4.0.1";

     

       1560
       1590
        
           sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";

     
···

       1628
       1658
        
           name = "System.Runtime.CompilerServices.Unsafe";

     

       1629
       1659
        
           version = "4.7.0";

     

       1630
       1660
        
           sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54";

     

       1661
       1661
       +
         })

     

       1662
       1662
       +
         (fetchNuGet {

     

       1663
       1663
       +
           name = "System.Runtime.CompilerServices.Unsafe";

     

       1664
       1664
       +
           version = "5.0.0";

     

       1665
       1665
       +
           sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x";

     

       1631
       1666
        
         })

     

       1632
       1667
        
         (fetchNuGet {

     

       1633
       1668
        
           name = "System.Runtime.Extensions";

     
···

       1845
       1880
        
           sha256 = "05qp3yivh6gz0vva0v3wjlj3g1b45d5jmz362f2y8ah6yb3rx088";

     

       1846
       1881
        
         })

     

       1847
       1882
        
         (fetchNuGet {

     

       1848
       1848
       -
           name = "System.Text.Json";

     

       1849
       1849
       -
           version = "4.7.0";

     

       1850
       1850
       -
           sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr";

     

       1883
       1883
       +
           name = "System.Text.Encodings.Web";

     

       1884
       1884
       +
           version = "5.0.0";

     

       1885
       1885
       +
           sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1";

     

       1851
       1886
        
         })

     

       1852
       1887
        
         (fetchNuGet {

     

       1853
       1888
        
           name = "System.Text.Json";

     

       1854
       1889
        
           version = "4.7.2";

     

       1855
       1890
        
           sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4";

     

       1891
       1891
       +
         })

     

       1892
       1892
       +
         (fetchNuGet {

     

       1893
       1893
       +
           name = "System.Text.Json";

     

       1894
       1894
       +
           version = "5.0.0";

     

       1895
       1895
       +
           sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks";

     

       1856
       1896
        
         })

     

       1857
       1897
        
         (fetchNuGet {

     

       1858
       1898
        
           name = "System.Text.RegularExpressions";

     
···

       1883
       1923
        
           name = "System.Threading.Tasks.Extensions";

     

       1884
       1924
        
           version = "4.5.3";

     

       1885
       1925
        
           sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i";

     

       1926
       1926
       +
         })

     

       1927
       1927
       +
         (fetchNuGet {

     

       1928
       1928
       +
           name = "System.Threading.Tasks.Extensions";

     

       1929
       1929
       +
           version = "4.5.4";

     

       1930
       1930
       +
           sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153";

     

       1886
       1931
        
         })

     

       1887
       1932
        
         (fetchNuGet {

     

       1888
       1933
        
           name = "System.Threading.Tasks";

+2 -2

pkgs/applications/blockchains/nbxplorer/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildDotnetModule rec {

     

       4
       4
        
         pname = "nbxplorer";

     

       5
       5
       -
         version = "2.2.11";

     

       5
       5
       +
         version = "2.2.16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "dgarage";

     

       9
       9
        
           repo = "NBXplorer";

     

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

     

       11
       11
       -
           sha256 = "sha256-ZDqzkANGMdvv3e5gWCYcacUYKLJRquXRHLr8RAzT9hY=";

     

       11
       11
       +
           sha256 = "sha256-6nq5oCEVADZbzQJaEizzt6Lag11bZYLKGMTl2snZob8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         projectFile = "NBXplorer/NBXplorer.csproj";

+27 -22

pkgs/applications/blockchains/nbxplorer/deps.nix

···

       6
       6
        
         })

     

       7
       7
        
         (fetchNuGet {

     

       8
       8
        
           name = "Microsoft.AspNetCore.JsonPatch";

     

       9
       9
       -
           version = "3.1.5";

     

       10
       10
       -
           sha256 = "0agcp9c8zf59bliybjfg5whby7k1i1xc4sccyyyj3qcx1snf6lfx";

     

       9
       9
       +
           version = "3.1.19";

     

       10
       10
       +
           sha256 = "1fh3k85k988jw35sf5hvm6jwmvzmslzpfvf3jk3sn3f3s6gyk0an";

     

       11
       11
        
         })

     

       12
       12
        
         (fetchNuGet {

     

       13
       13
        
           name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";

     

       14
       14
       -
           version = "3.1.5";

     

       15
       15
       -
           sha256 = "1n76xr3jn4bcxm9f3lk8k76zn39mhyqcj5b0dqhi2xykyvvrqjgc";

     

       14
       14
       +
           version = "3.1.19";

     

       15
       15
       +
           sha256 = "1nh08kjdc152m85ycwxn1q8r69f0l02p6cac6q57nzlyy5gyj2rs";

     

       16
       16
        
         })

     

       17
       17
        
         (fetchNuGet {

     

       18
       18
        
           name = "Microsoft.Azure.Amqp";

     

       19
       19
       -
           version = "2.4.2";

     

       20
       20
       -
           sha256 = "0pfgl6fnw3apwasfg1dp5pvi5h0z0vmznhn2bfsgwndn1xlfw1g9";

     

       19
       19
       +
           version = "2.4.9";

     

       20
       20
       +
           sha256 = "15kvklhfl17713kwin8p71lcxq2jx87bk1d8gsl597z3w6l4cqma";

     

       21
       21
        
         })

     

       22
       22
        
         (fetchNuGet {

     

       23
       23
        
           name = "Microsoft.Azure.ServiceBus";

     

       24
       24
       -
           version = "4.1.3";

     

       25
       25
       -
           sha256 = "1mj21nal3hv8b5678rah808521c5rkb0yh6hrlqirsdgxwnl6z6g";

     

       24
       24
       +
           version = "4.2.1";

     

       25
       25
       +
           sha256 = "0akxqds078p7djd5g95i9dh4wrlfarabkq2ybn614cqdgl4z0is5";

     

       26
       26
        
         })

     

       27
       27
        
         (fetchNuGet {

     

       28
       28
        
           name = "Microsoft.Azure.Services.AppAuthentication";

     
···

       31
       31
        
         })

     

       32
       32
        
         (fetchNuGet {

     

       33
       33
        
           name = "Microsoft.CodeCoverage";

     

       34
       34
       -
           version = "16.7.1";

     

       35
       35
       -
           sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4";

     

       34
       34
       +
           version = "16.11.0";

     

       35
       35
       +
           sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv";

     

       36
       36
        
         })

     

       37
       37
        
         (fetchNuGet {

     

       38
       38
        
           name = "Microsoft.CSharp";

     
···

       126
       126
        
         })

     

       127
       127
        
         (fetchNuGet {

     

       128
       128
        
           name = "Microsoft.NET.Test.Sdk";

     

       129
       129
       -
           version = "16.7.1";

     

       130
       130
       -
           sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8";

     

       129
       129
       +
           version = "16.11.0";

     

       130
       130
       +
           sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl";

     

       131
       131
        
         })

     

       132
       132
        
         (fetchNuGet {

     

       133
       133
        
           name = "Microsoft.NETCore.Platforms";

     
···

       156
       156
        
         })

     

       157
       157
        
         (fetchNuGet {

     

       158
       158
        
           name = "Microsoft.TestPlatform.ObjectModel";

     

       159
       159
       -
           version = "16.7.1";

     

       160
       160
       -
           sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0";

     

       159
       159
       +
           version = "16.11.0";

     

       160
       160
       +
           sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh";

     

       161
       161
        
         })

     

       162
       162
        
         (fetchNuGet {

     

       163
       163
        
           name = "Microsoft.TestPlatform.TestHost";

     

       164
       164
       -
           version = "16.7.1";

     

       165
       165
       -
           sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs";

     

       164
       164
       +
           version = "16.11.0";

     

       165
       165
       +
           sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k";

     

       166
       166
        
         })

     

       167
       167
        
         (fetchNuGet {

     

       168
       168
        
           name = "Microsoft.Win32.Primitives";

     
···

       181
       181
        
         })

     

       182
       182
        
         (fetchNuGet {

     

       183
       183
        
           name = "NBitcoin.Altcoins";

     

       184
       184
       -
           version = "3.0.7";

     

       185
       185
       -
           sha256 = "0nrkdbsc4k9fd4588axnkfa9gmif9b59wxw8fnmpg0nf4x8scm4n";

     

       184
       184
       +
           version = "3.0.8";

     

       185
       185
       +
           sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618";

     

       186
       186
        
         })

     

       187
       187
        
         (fetchNuGet {

     

       188
       188
        
           name = "NBitcoin.TestFramework";

     

       189
       189
       -
           version = "3.0.5";

     

       190
       190
       -
           sha256 = "09cgjzbkxvsi65qzns0ignp0x89z630vqacsgwj3b1h30dycwqdr";

     

       189
       189
       +
           version = "3.0.6";

     

       190
       190
       +
           sha256 = "0yw382238rjv0qmhz1xlb5v696s8sxbjf839c2ck6dqd947q403w";

     

       191
       191
        
         })

     

       192
       192
        
         (fetchNuGet {

     

       193
       193
        
           name = "NBitcoin";

     

       194
       194
       -
           version = "6.0.10";

     

       195
       195
       -
           sha256 = "00m0j74pqyjqal1wc28j6734rfd9zd7ajqb1p3fsdpqr16kfg56s";

     

       194
       194
       +
           version = "6.0.15";

     

       195
       195
       +
           sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";

     

       196
       196
        
         })

     

       197
       197
        
         (fetchNuGet {

     

       198
       198
        
           name = "NETStandard.Library";

     
···

       698
       698
        
           name = "System.Reflection.Extensions";

     

       699
       699
        
           version = "4.3.0";

     

       700
       700
        
           sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";

     

       701
       701
       +
         })

     

       702
       702
       +
         (fetchNuGet {

     

       703
       703
       +
           name = "System.Reflection.Metadata";

     

       704
       704
       +
           version = "1.6.0";

     

       705
       705
       +
           sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4";

     

       701
       706
        
         })

     

       702
       707
        
         (fetchNuGet {

     

       703
       708
        
           name = "System.Reflection.Primitives";

+4 -4

pkgs/applications/editors/android-studio/default.nix

···

       13
       13
        
           sha256Hash = "10gpwb130bzp6a9g958cjqcb2gsm0vdgm08nm5xy45xdh54nxjfg";

     

       14
       14
        
         };

     

       15
       15
        
         betaVersion = {

     

       16
       16
       -
           version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1"

     

       17
       17
       -
           sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0";

     

       16
       16
       +
           version = "2021.1.1.15"; # "Android Studio Bumblebee (2021.1.1) Beta 2"

     

       17
       17
       +
           sha256Hash = "sha256-J+Jw9F8pEE0SMWka//jADOiQ+GSOeRf5GBfp0RDtwqA=";

     

       18
       18
        
         };

     

       19
       19
        
         latestVersion = { # canary & dev

     

       20
       20
       -
           version = "2021.2.1.2"; # "Android Studio Chipmunk (2021.2.1) Canary 2"

     

       21
       21
       -
           sha256Hash = "0xvn9zgn4cc9lhjynhiavmvx8bdzg4kcllmhg7xv18kp6wz4lh6z";

     

       20
       20
       +
           version = "2021.2.1.3"; # "Android Studio Chipmunk (2021.2.1) Canary 3"

     

       21
       21
       +
           sha256Hash = "sha256-xIVdM28NDadvJklDIw71iJ7Z5GPVJ1ZDJ+t1y+bt8cE=";

     

       22
       22
        
         };

     

       23
       23
        
       in {

     

       24
       24
        
         # Attributes are named by their corresponding release channels

+2 -2

pkgs/applications/graphics/ImageMagick/7.0.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "imagemagick";

     

       21
       21
       -
         version = "7.1.0-11";

     

       21
       21
       +
         version = "7.1.0-13";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "ImageMagick";

     

       25
       25
        
           repo = "ImageMagick";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-z7ZpoB8NlcS5NVyoW0ngSlakCcb5qC3bh3xDVYuWS6w=";

     

       27
       27
       +
           sha256 = "sha256-W/XqgYOlSailHQdNBYsvf2P9go9sblWayDLrQQlekro=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

+2 -2

pkgs/applications/networking/mpop/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "mpop";

     

       13
       13
       -
         version = "1.4.15";

     

       13
       13
       +
         version = "1.4.16";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";

     

       17
       17
       -
           sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA=";

     

       17
       17
       +
           sha256 = "sha256-hw61cerm0j+5KtDITXnenDjF9iTjYUk31XS/5Jumh/k=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+2 -2

pkgs/applications/networking/msmtp/default.nix

···

       9
       9
        
       

     

       10
       10
        
       in stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "msmtp";

     

       12
       12
       -
         version = "1.8.17";

     

       12
       12
       +
         version = "1.8.18";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "sha256-D92+dMGp3PZGG0obDbPk00JmGEUAxAPX8QetQttOxNM=";

     

       16
       16
       +
           sha256 = "sha256-FPxirzfr3MXtGaJFoF64N27+cBYRjwDJxZS8mZ1VYKU=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         patches = [

pkgs/applications/terminal-emulators/kitty/default.nix

···

       100
       100
        
               else "linux-package/bin";

     

       101
       101
        
           in

     

       102
       102
        
           ''

     

       103
       103
       +
             # Fontconfig error: Cannot load default config file: No such file: (null)

     

       104
       104
       +
             export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf

     

       105
       105
       +
       

     

       103
       106
        
             env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py

     

       104
       107
        
           '';

     

       105
       108

+3 -3

pkgs/applications/window-managers/leftwm/default.nix

···

       6
       6
        
       

     

       7
       7
        
       rustPlatform.buildRustPackage rec {

     

       8
       8
        
         pname = "leftwm";

     

       9
       9
       -
         version = "0.2.8";

     

       9
       9
       +
         version = "0.2.9";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "leftwm";

     

       13
       13
        
           repo = "leftwm";

     

       14
       14
        
           rev = version;

     

       15
       15
       -
           sha256 = "sha256-T4A9NGT6sUSTKmLcAWjcp3Y8QQzZFAVSXevXtGm3szY=";

     

       15
       15
       +
           sha256 = "sha256:0w4afhrp2cxz0nmpvalyaxz1dpywajjj2wschw8dpkvgxqs64gd5";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE=";

     

       18
       18
       +
         cargoSha256 = "sha256:0r0smpv50gim2naaa0qf6yhvqvsa2f40rkgiryi686y69m5ii7mv";

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = rpathLibs;

     

       21
       21

+8 -2

pkgs/development/libraries/draco/default.nix

···

       2
       2
        
       }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         version = "1.4.1";

     

       5
       5
       +
         version = "1.4.3";

     

       6
       6
        
         pname = "draco";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "google";

     

       10
       10
        
           repo = "draco";

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd";

     

       12
       12
       +
           sha256 = "sha256-eSu6tkWbRHzJkWwPgljaScAuL0gRkp8PJUHWC8mUvOw=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake ];

     
···

       21
       21
        
       

     

       22
       22
        
           "-DBUILD_UNITY_PLUGIN=1"

     

       23
       23
        
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         # Upstream mistakenly installs to /nix/store/.../nix/store/.../*, work around that

     

       26
       26
       +
         postInstall = ''

     

       27
       27
       +
           mv $out/nix/store/*/* $out

     

       28
       28
       +
           rm -rf $out/nix

     

       29
       29
       +
         '';

     

       24
       30
        
       

     

       25
       31
        
         meta = with lib; {

     

       26
       32
        
           description = "Library for compressing and decompressing 3D geometric meshes and point clouds";

+4 -4

pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch

···

       1
       1
        
       diff --git a/meson_options.txt b/meson_options.txt

     

       2
       2
       -
       index 66791f3a..93b5e2a9 100644

     

       2
       2
       +
       index 71c2e35e9..a0f380c04 100644

     

       3
       3
        
       --- a/meson_options.txt

     

       4
       4
        
       +++ b/meson_options.txt

     

       5
       5
       -
       @@ -172,6 +172,9 @@ option('udev',

     

       5
       5
       +
       @@ -176,6 +176,9 @@ option('udev',

     

       6
       6
        
        option('udevrulesdir',

     

       7
       7
        
               type : 'string',

     

       8
       8
        
               description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')

     
···

       13
       13
        
               type : 'string',

     

       14
       14
        
               description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')

     

       15
       15
        
       diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build

     

       16
       16
       -
       index aa30a86f..1edebb2d 100644

     

       16
       16
       +
       index 5bd134537..5a3ca9ed5 100644

     

       17
       17
        
       --- a/src/daemon/systemd/user/meson.build

     

       18
       18
        
       +++ b/src/daemon/systemd/user/meson.build

     

       19
       19
        
       @@ -9,7 +9,7 @@ install_data(

     
···

       22
       22
        
        systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')

     

       23
       23
        
       -systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse')

     

       24
       24
        
       +systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')

     

       25
       25
       -
        systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')

     

       26
       25
        
        

     

       27
       26
        
        configure_file(input : 'pipewire.service.in',

     

       27
       27
       +
                       output : 'pipewire.service',

-24

pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch

···

       1
       1
       -
       diff --git a/meson_options.txt b/meson_options.txt

     

       2
       2
       -
       index 93b5e2a9..1b915ac3 100644

     

       3
       3
       -
       --- a/meson_options.txt

     

       4
       4
       -
       +++ b/meson_options.txt

     

       5
       5
       -
       @@ -200,3 +200,6 @@ option('media-session',

     

       6
       6
       -
               type: 'feature',

     

       7
       7
       -
               value: 'auto')

     

       8
       8
       -
       +option('media-session-prefix',

     

       9
       9
       -
       +       description: 'Install directory for pipewire-media-session and its support files',

     

       10
       10
       -
       +       type: 'string')

     

       11
       11
       -
        option('session-managers',

     

       12
       12
       -
       diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build

     

       13
       13
       -
       index 1edebb2d..251270eb 100644

     

       14
       14
       -
       --- a/src/daemon/systemd/user/meson.build

     

       15
       15
       -
       +++ b/src/daemon/systemd/user/meson.build

     

       16
       16
       -
       @@ -10,7 +10,7 @@ install_data(

     

       17
       17
       -
        systemd_config = configuration_data()

     

       18
       18
       -
        systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')

     

       19
       19
       -
        systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')

     

       20
       20
       -
       -systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')

     

       21
       21
       -
       +systemd_config.set('PW_MEDIA_SESSION_BINARY', get_option('media-session-prefix') / 'bin/pipewire-media-session')

     

       22
       22
       -
        

     

       23
       23
       -
        configure_file(input : 'pipewire.service.in',

     

       24
       24
       -
                       output : 'pipewire.service',

+19 -38

pkgs/development/libraries/pipewire/default.nix

···

       63
       63
        
       

     

       64
       64
        
         self = stdenv.mkDerivation rec {

     

       65
       65
        
           pname = "pipewire";

     

       66
       66
       -
           version = "0.3.38";

     

       66
       66
       +
           version = "0.3.39";

     

       67
       67
        
       

     

       68
       68
        
           outputs = [

     

       69
       69
        
             "out"

     
···

       73
       73
        
             "dev"

     

       74
       74
        
             "doc"

     

       75
       75
        
             "man"

     

       76
       76
       -
             "mediaSession"

     

       77
       76
        
             "installedTests"

     

       78
       77
        
           ];

     

       79
       78
        
       

     
···

       82
       81
        
             owner = "pipewire";

     

       83
       82
        
             repo = "pipewire";

     

       84
       83
        
             rev = version;

     

       85
       85
       -
             sha256 = "sha256-QENz4MVyKuPJynA+NBdmKa6g1GrcRg9vzXLJ1/i3VJU=";

     

       84
       84
       +
             sha256 = "sha256-peTS1+NuQxZg1rrv8DrnJW5BR9yReleqooIwhZWHLjM=";

     

       86
       85
        
           };

     

       87
       86
        
       

     

       88
       87
        
           patches = [

     
···

       90
       89
        
             ./0040-alsa-profiles-use-libdir.patch

     

       91
       90
        
             # Change the path of the pipewire-pulse binary in the service definition.

     

       92
       91
        
             ./0050-pipewire-pulse-path.patch

     

       93
       93
       -
             # Change the path of the pipewire-media-session binary in the service definition.

     

       94
       94
       -
             ./0055-pipewire-media-session-path.patch

     

       95
       92
        
             # Move installed tests into their own output.

     

       96
       93
        
             ./0070-installed-tests-path.patch

     

       97
       94
        
             # Add option for changing the config install directory

     
···

       100
       97
        
             ./0090-pipewire-config-template-paths.patch

     

       101
       98
        
             # Place SPA data files in lib output to avoid dependency cycles

     

       102
       99
        
             ./0095-spa-data-dir.patch

     

       103
       103
       -
             # Fix compilation on AArch64

     

       100
       100
       +
             # Fix compilation on some architectures

     

       104
       101
        
             # XXX: REMOVE ON NEXT RELEASE

     

       105
       102
        
             (fetchpatch {

     

       106
       106
       -
               url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.diff";

     

       107
       107
       -
               sha256 = "0j4xds01h20mc606xp90h5v56kf17hf7n06k0xfa9qmmmfrh7i04";

     

       103
       103
       +
               url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.diff";

     

       104
       104
       +
               sha256 = "1bmpi5qn750mcspaw7m57ww0503sl9781jswqby4gr0f7c5wmqvj";

     

       108
       105
        
             })

     

       109
       106
        
           ];

     

       110
       107
        
       

     
···

       147
       144
        
             "-Dinstalled_tests=enabled"

     

       148
       145
        
             "-Dinstalled_test_prefix=${placeholder "installedTests"}"

     

       149
       146
        
             "-Dpipewire_pulse_prefix=${placeholder "pulse"}"

     

       150
       150
       -
             "-Dmedia-session-prefix=${placeholder "mediaSession"}"

     

       151
       147
        
             "-Dlibjack-path=${placeholder "jack"}/lib"

     

       152
       148
        
             "-Dlibcamera=${mesonEnable libcameraSupport}"

     

       153
       149
        
             "-Droc=disabled"

     
···

       162
       158
        
             "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"

     

       163
       159
        
             "-Dsysconfdir=/etc"

     

       164
       160
        
             "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"

     

       165
       165
       -
             "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"

     

       161
       161
       +
             "-Dsession-managers="

     

       162
       162
       +
             "-Dvulkan=enabled"

     

       166
       163
        
           ];

     

       167
       164
        
       

     

       168
       165
        
           FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

     
···

       171
       168
        
       

     

       172
       169
        
           postUnpack = ''

     

       173
       170
        
             patchShebangs source/doc/strip-static.sh

     

       171
       171
       +
             patchShebangs source/doc/input-filter.sh

     

       172
       172
       +
             patchShebangs source/doc/input-filter-h.sh

     

       174
       173
        
             patchShebangs source/spa/tests/gen-cpp-test.py

     

       175
       174
        
           '';

     

       176
       175
        
       

     

       177
       176
        
           postInstall = ''

     

       178
       178
       -
             pushd $lib/share

     

       179
       179
       -
             mkdir -p $out/nix-support/etc/pipewire

     

       180
       180
       -
             for f in pipewire/*.conf; do

     

       177
       177
       +
             mkdir $out/nix-support

     

       178
       178
       +
             pushd $lib/share/pipewire

     

       179
       179
       +
             for f in *.conf; do

     

       181
       180
        
               echo "Generating JSON from $f"

     

       182
       182
       -
               $out/bin/spa-json-dump "$f" > "$out/nix-support/etc/$f.json"

     

       183
       183
       -
             done

     

       184
       184
       -
       

     

       185
       185
       -
             mkdir -p $mediaSession/nix-support/etc/pipewire/media-session.d

     

       186
       186
       -
             for f in pipewire/media-session.d/*.conf; do

     

       187
       187
       -
               echo "Generating JSON from $f"

     

       188
       188
       -
               $out/bin/spa-json-dump "$f" > "$mediaSession/nix-support/etc/$f.json"

     

       181
       181
       +
               $out/bin/spa-json-dump "$f" > "$out/nix-support/$f.json"

     

       189
       182
        
             done

     

       190
       183
        
             popd

     

       191
       184
        
       

     

       192
       192
       -
             moveToOutput "share/pipewire/media-session.d/*.conf" "$mediaSession"

     

       193
       193
       -
             moveToOutput "share/systemd/user/pipewire-media-session.*" "$mediaSession"

     

       194
       194
       -
             moveToOutput "lib/systemd/user/pipewire-media-session.*" "$mediaSession"

     

       195
       195
       -
             moveToOutput "bin/pipewire-media-session" "$mediaSession"

     

       196
       196
       -
       

     

       197
       185
        
             moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse"

     

       198
       186
        
             moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse"

     

       199
       187
        
             moveToOutput "bin/pipewire-pulse" "$pulse"

     
···

       205
       193
        
               installedTests = nixosTests.installed-tests.pipewire;

     

       206
       194
        
       

     

       207
       195
        
               # This ensures that all the paths used by the NixOS module are found.

     

       208
       208
       -
               test-paths = callPackage ./test-paths.nix {

     

       196
       196
       +
               test-paths = callPackage ./test-paths.nix { package = self; } {

     

       209
       197
        
                 paths-out = [

     

       210
       198
        
                   "share/alsa/alsa.conf.d/50-pipewire.conf"

     

       211
       211
       -
                   "nix-support/etc/pipewire/client-rt.conf.json"

     

       212
       212
       -
                   "nix-support/etc/pipewire/client.conf.json"

     

       213
       213
       -
                   "nix-support/etc/pipewire/jack.conf.json"

     

       214
       214
       -
                   "nix-support/etc/pipewire/pipewire.conf.json"

     

       215
       215
       -
                   "nix-support/etc/pipewire/pipewire-pulse.conf.json"

     

       216
       216
       -
                 ];

     

       217
       217
       -
                 paths-out-media-session = [

     

       218
       218
       -
                   "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"

     

       219
       219
       -
                   "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"

     

       220
       220
       -
                   "nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json"

     

       221
       221
       -
                   "nix-support/etc/pipewire/media-session.d/media-session.conf.json"

     

       222
       222
       -
                   "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"

     

       199
       199
       +
                   "nix-support/client-rt.conf.json"

     

       200
       200
       +
                   "nix-support/client.conf.json"

     

       201
       201
       +
                   "nix-support/jack.conf.json"

     

       202
       202
       +
                   "nix-support/pipewire.conf.json"

     

       203
       203
       +
                   "nix-support/pipewire-pulse.conf.json"

     

       223
       204
        
                 ];

     

       224
       205
        
                 paths-lib = [

     

       225
       206
        
                   "lib/alsa-lib/libasound_module_pcm_pipewire.so"

+93

pkgs/development/libraries/pipewire/media-session.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitLab

     

       4
       4
       +
       , meson

     

       5
       5
       +
       , ninja

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , doxygen

     

       8
       8
       +
       , graphviz

     

       9
       9
       +
       , systemd

     

       10
       10
       +
       , pipewire

     

       11
       11
       +
       , glib

     

       12
       12
       +
       , dbus

     

       13
       13
       +
       , alsa-lib

     

       14
       14
       +
       , callPackage

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       let

     

       18
       18
       +
         mesonEnable = b: if b then "enabled" else "disabled";

     

       19
       19
       +
         mesonList = l: "[" + lib.concatStringsSep "," l + "]";

     

       20
       20
       +
       

     

       21
       21
       +
         self = stdenv.mkDerivation rec {

     

       22
       22
       +
           pname = "pipewire-media-session";

     

       23
       23
       +
           version = "0.4.0";

     

       24
       24
       +
       

     

       25
       25
       +
           src = fetchFromGitLab {

     

       26
       26
       +
             domain = "gitlab.freedesktop.org";

     

       27
       27
       +
             owner = "pipewire";

     

       28
       28
       +
             repo = "media-session";

     

       29
       29
       +
             rev = version;

     

       30
       30
       +
             sha256 = "sha256-zhOvBlG7DuQkJ+ZZBhBhfKwk+bbLljpt3w4JlK3cJLk=";

     

       31
       31
       +
           };

     

       32
       32
       +
       

     

       33
       33
       +
           nativeBuildInputs = [

     

       34
       34
       +
             doxygen

     

       35
       35
       +
             graphviz

     

       36
       36
       +
             meson

     

       37
       37
       +
             ninja

     

       38
       38
       +
             pkg-config

     

       39
       39
       +
           ];

     

       40
       40
       +
       

     

       41
       41
       +
           buildInputs = [

     

       42
       42
       +
             alsa-lib

     

       43
       43
       +
             dbus

     

       44
       44
       +
             glib

     

       45
       45
       +
             pipewire

     

       46
       46
       +
             systemd

     

       47
       47
       +
           ];

     

       48
       48
       +
       

     

       49
       49
       +
           mesonFlags = [

     

       50
       50
       +
             "-Ddocs=enabled"

     

       51
       51
       +
             # We generate these empty files from the nixos module, don't bother installing them

     

       52
       52
       +
             "-Dwith-module-sets=[]"

     

       53
       53
       +
           ];

     

       54
       54
       +
       

     

       55
       55
       +
           postUnpack = ''

     

       56
       56
       +
             patchShebangs source/doc/input-filter-h.sh

     

       57
       57
       +
             patchShebangs source/doc/input-filter.sh

     

       58
       58
       +
           '';

     

       59
       59
       +
       

     

       60
       60
       +
           postInstall = ''

     

       61
       61
       +
             mkdir $out/nix-support

     

       62
       62
       +
             cd $out/share/pipewire/media-session.d

     

       63
       63
       +
             for f in *.conf; do

     

       64
       64
       +
               echo "Generating JSON from $f"

     

       65
       65
       +
               ${pipewire}/bin/spa-json-dump "$f" > "$out/nix-support/$f.json"

     

       66
       66
       +
             done

     

       67
       67
       +
           '';

     

       68
       68
       +
       

     

       69
       69
       +
           passthru = {

     

       70
       70
       +
             tests = {

     

       71
       71
       +
               test-paths = callPackage ./test-paths.nix { package = self; } {

     

       72
       72
       +
                 paths-out = [

     

       73
       73
       +
                   "nix-support/alsa-monitor.conf.json"

     

       74
       74
       +
                   "nix-support/bluez-monitor.conf.json"

     

       75
       75
       +
                   "nix-support/media-session.conf.json"

     

       76
       76
       +
                   "nix-support/v4l2-monitor.conf.json"

     

       77
       77
       +
                 ];

     

       78
       78
       +
                 paths-lib = [];

     

       79
       79
       +
               };

     

       80
       80
       +
             };

     

       81
       81
       +
           };

     

       82
       82
       +
       

     

       83
       83
       +
           meta = with lib; {

     

       84
       84
       +
             description = "Example session manager for PipeWire";

     

       85
       85
       +
             homepage = "https://pipewire.org";

     

       86
       86
       +
             license = licenses.mit;

     

       87
       87
       +
             platforms = platforms.linux;

     

       88
       88
       +
             maintainers = with maintainers; [ jtojnar kranzes ];

     

       89
       89
       +
           };

     

       90
       90
       +
         };

     

       91
       91
       +
       

     

       92
       92
       +
       in

     

       93
       93
       +
       self

+3 -4

pkgs/development/libraries/pipewire/test-paths.nix

···

       1
       1
       -
       { lib, runCommand, pipewire, paths-out, paths-lib, paths-out-media-session }:

     

       1
       1
       +
       { lib, runCommand, package, paths-out, paths-lib }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         check-path = output: path: ''

     
···

       14
       14
        
       in runCommand "pipewire-test-paths" { } ''

     

       15
       15
        
         touch $out

     

       16
       16
        
       

     

       17
       17
       -
         ${check-output pipewire.mediaSession paths-out-media-session}

     

       18
       18
       -
         ${check-output pipewire.lib paths-lib}

     

       19
       19
       -
         ${check-output pipewire paths-out}

     

       17
       17
       +
         ${check-output package.lib paths-lib}

     

       18
       18
       +
         ${check-output package paths-out}

     

       20
       19
        
       

     

       21
       20
        
         if [[ -n "$error" ]]; then

     

       22
       21
        
           exit 1

+17 -4

pkgs/development/libraries/pipewire/update.sh

···

       11
       11
        
       

     

       12
       12
        
       cd "$NIXPKGS_ROOT"

     

       13
       13
        
       nix-update pipewire

     

       14
       14
       -
       outputs=$(nix-build . -A pipewire -A pipewire.mediaSession)

     

       14
       14
       +
       outputs=$(nix-build . -A pipewire)

     

       15
       15
       +
       for p in $outputs; do

     

       16
       16
       +
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       17
       17
       +
           for c in $conf_files; do

     

       18
       18
       +
               file_name=$(basename "$c")

     

       19
       19
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/daemon/$file_name" ]]; then

     

       20
       20
       +
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       21
       +
               fi

     

       22
       22
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/daemon/"

     

       23
       23
       +
           done

     

       24
       24
       +
       done

     

       25
       25
       +
       

     

       26
       26
       +
       nix-update pipewire-media-session

     

       27
       27
       +
       outputs=$(nix-build . -A pipewire-media-session)

     

       15
       28
        
       for p in $outputs; do

     

       16
       16
       -
           conf_files=$(find "$p/nix-support/etc/pipewire/" -name '*.conf.json')

     

       29
       29
       +
           conf_files=$(find "$p/nix-support/" -name '*.conf.json')

     

       17
       30
        
           for c in $conf_files; do

     

       18
       31
        
               file_name=$(basename "$c")

     

       19
       19
       -
               if [[ ! -e "nixos/modules/services/desktops/pipewire/$file_name" ]]; then

     

       32
       32
       +
               if [[ ! -e "nixos/modules/services/desktops/pipewire/media-session/$file_name" ]]; then

     

       20
       33
        
                   echo "New file $file_name found! Add it to the module config and passthru tests!"

     

       21
       34
        
               fi

     

       22
       22
       -
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/"

     

       35
       35
       +
               install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/media-session/"

     

       23
       36
        
           done

     

       24
       37
        
       done

+3 -3

pkgs/development/libraries/spirv-headers/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "spirv-headers";

     

       5
       5
       -
         version = "1.5.3";

     

       5
       5
       +
         version = "unstable-2021-08-11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "KhronosGroup";

     

       9
       9
        
           repo = "SPIRV-Headers";

     

       10
       10
       -
           rev = version;

     

       11
       11
       -
           sha256 = "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj";

     

       10
       10
       +
           rev = "e71feddb3f17c5586ff7f4cfb5ed1258b800574b";

     

       11
       11
       +
           sha256 = "sha256-9m0EBcgdya+KCNJHC3x+YV2sXoSNToTcgDkpeKzId6U=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "jc";

     

       13
       13
       -
         version = "1.17.0";

     

       13
       13
       +
         version = "1.17.1";

     

       14
       14
        
         disabled = pythonOlder "3.6";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "kellyjonbrazil";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           sha256 = "sha256-8GTRBoZuA/fsfVxCBpvNefWHuWLvN/L/BT31OFpslxA=";

     

       20
       20
       +
           sha256 = "sha256-ISggj6oOF0B7TKIQAlZtauRrDAWP88OOFezLJK6edjI=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];

+2 -6

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

···

       11
       11
        
       , cython

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
       -
       let

     

       15
       15
       -
         rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";

     

       16
       16
       -
       in

     

       17
       14
        
       buildPythonPackage {

     

       18
       15
        
         pname = "pycangjie";

     

       19
       19
       -
         version = "1.3_rev_${rev}";

     

       16
       16
       +
         version = "unstable-2015-05-03";

     

       20
       17
        
         format = "other";

     

       21
       18
        
       

     

       22
       19
        
         src = fetchFromGitHub {

     

       23
       20
        
           owner = "Cangjians";

     

       24
       21
        
           repo = "pycangjie";

     

       25
       25
       -
           inherit rev;

     

       22
       22
       +
           rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3";

     

       26
       23
        
           sha256 = "sha256-sS0Demzm89WtEIN4Efz0OTsUQ/c3gIX+/koekQGOca4=";

     

       27
       24
        
         };

     

       28
       28
       -
       

     

       29
       25
        
       

     

       30
       26
        
         nativeBuildInputs = [ pkg-config libtool autoconf automake cython ];

     

       31
       27
        
         buildInputs = [ libcangjie sqlite ];

+3 -5

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , cffi

     

       6
       6
       -
       , pkgs

     

       6
       6
       +
       , libspotify

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ cffi ];

     

       21
       21
       -
         buildInputs = [ pkgs.libspotify ];

     

       21
       21
       +
         buildInputs = [ libspotify ];

     

       22
       22
        
       

     

       23
       23
        
         # python zip complains about old timestamps

     

       24
       24
        
         preConfigure = ''

     
···

       29
       29
        
           find "$out" -name _spotify.so -exec \

     

       30
       30
        
               install_name_tool -change \

     

       31
       31
        
               @loader_path/../Frameworks/libspotify.framework/libspotify \

     

       32
       32
       -
               ${pkgs.libspotify}/lib/libspotify.dylib \

     

       32
       32
       +
               ${libspotify}/lib/libspotify.dylib \

     

       33
       33
        
               {} \;

     

       34
       34
        
         '';

     

       35
       35
        
       

     
···

       41
       41
        
           description = "A Python interface to Spotify’s online music streaming service";

     

       42
       42
        
           license = licenses.unfree;

     

       43
       43
        
           maintainers = with maintainers; [ lovek323 ];

     

       44
       44
       -
           platforms = platforms.unix;

     

       45
       44
        
         };

     

       46
       46
       -
       

     

       47
       45
        
       }

+18 -4

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

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
       -
         version = "0.1.4";

     

       10
       9
        
         pname = "upass";

     

       10
       10
       +
         version = "0.2.1";

     

       11
       11
       +
         format = "setuptools";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "Kwpolska";

     

       14
       15
        
           repo = "upass";

     

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

     

       16
       16
       -
           sha256 = "sha256-1y/OE8Gbc8bShEiLWg8w4J6icAcoldYQLI10WSQuO1Y=";

     

       17
       17
       +
           sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         propagatedBuildInputs = [ pyperclip urwid ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           pyperclip

     

       22
       22
       +
           urwid

     

       23
       23
       +
         ];

     

       20
       24
        
       

     

       25
       25
       +
         # Projec thas no tests

     

       21
       26
        
         doCheck = false;

     

       22
       27
        
       

     

       28
       28
       +
         postInstall = ''

     

       29
       29
       +
           export HOME=$(mktemp -d);

     

       30
       30
       +
           mkdir $HOME/.config

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         pythonImportsCheck = [

     

       34
       34
       +
           "upass"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       23
       37
        
         meta = with lib; {

     

       24
       38
        
           description = "Console UI for pass";

     

       25
       39
        
           homepage = "https://github.com/Kwpolska/upass";

     

       26
       40
        
           license = licenses.bsd3;

     

       41
       41
       +
           maintainers = with maintainers; [ ];

     

       27
       42
        
         };

     

       28
       28
       -
       

     

       29
       43
        
       }

+1 -1

pkgs/development/tools/ocaml/ocaml-top/default.nix

···

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "OCamlPro";

     

       11
       11
        
           repo = "ocaml-top";

     

       12
       12
       -
           rev = "1.2.0-rc";

     

       12
       12
       +
           rev = version;

     

       13
       13
        
           sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ=";

     

       14
       14
        
         };

     

       15
       15

+2 -2

pkgs/development/tools/scalafmt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         baseName = "scalafmt";

     

       5
       5
       -
         version = "3.0.0";

     

       5
       5
       +
         version = "3.0.8";

     

       6
       6
        
         deps = stdenv.mkDerivation {

     

       7
       7
        
           name = "${baseName}-deps-${version}";

     

       8
       8
        
           buildCommand = ''

     
···

       13
       13
        
           '';

     

       14
       14
        
           outputHashMode = "recursive";

     

       15
       15
        
           outputHashAlgo = "sha256";

     

       16
       16
       -
           outputHash     = "fZVOyxswtDtCDDGmGzKbRnM5MVncKaicRKyEdPiXOr8=";

     

       16
       16
       +
           outputHash     = "VBU6Jg6Sq3RBy0ym5YbjLjvcfx/85f6wNMmkGVV0W88=";

     

       17
       17
        
         };

     

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation {

+2 -2

pkgs/development/tools/spirv-tools/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "spirv-tools";

     

       5
       5
        
         # Update spirv-headers rev in lockstep according to DEPs file

     

       6
       6
       -
         version = "2020.2";

     

       6
       6
       +
         version = "2021.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "KhronosGroup";

     

       10
       10
        
           repo = "SPIRV-Tools";

     

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

     

       12
       12
       -
           sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";

     

       12
       12
       +
           sha256 = "sha256-skpsxpgl6hR5uiKfphKFQJfh+LJvhGvDW/t2u5AhXzk=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ cmake python3 ];

pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix

···

       405
       405
        
       

     

       406
       406
        
           yarnFlags = defaultYarnFlags ++ ["--production=true"];

     

       407
       407
        
       

     

       408
       408
       +
           nativeBuildInputs = [ pkgs.makeWrapper ];

     

       409
       409
       +
       

     

       408
       410
        
           buildPhase = ''

     

       409
       411
        
             source ${./nix/expectShFunctions.sh}

     

       410
       412
        
       

     
···

       416
       418
        
             # check devDependencies are not installed

     

       417
       419
        
             expectFileOrDirAbsent ./node_modules/.bin/eslint

     

       418
       420
        
             expectFileOrDirAbsent ./node_modules/eslint/package.json

     

       421
       421
       +
           '';

     

       422
       422
       +
       

     

       423
       423
       +
           postInstall = ''

     

       424
       424
       +
             wrapProgram $out/bin/yarn2nix --prefix PATH : "${pkgs.nix-prefetch-git}/bin"

     

       419
       425
        
           '';

     

       420
       426
        
         };

     

       421
       427

+1 -1

pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js

···

       48
       48
        
       

     

       49
       49
        
         const [url, sha1] = pkg.resolved.split('#', 2)

     

       50
       50
        
       

     

       51
       51
       -
         if (sha1) {

     

       51
       51
       +
         if (sha1 || url.startsWith('https://codeload.github.com')) {

     

       52
       52
        
           return pkg

     

       53
       53
        
         }

     

       54
       54

+33

pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
         # can either be "EU" or "Global"; it's unclear what the difference is

     

       5
       5
       +
       , region ? "Global"

     

       6
       6
       +
         # can be either "English", "French", "German", "Italian", "Portguese" or "Spanish"

     

       7
       7
       +
       , language ? "English"

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "cups-kyocera-ecosys-m2x35-40-p2x35-40dnw";

     

       12
       12
       +
         version = "8.1606";

     

       13
       13
       +
       

     

       14
       14
       +
         src = let

     

       15
       15
       +
           urlVersion = builtins.replaceStrings [ "." ] [ "_" ] version;

     

       16
       16
       +
         in fetchzip {

     

       17
       17
       +
           url = "https://www.kyoceradocumentsolutions.de/content/download-center/de/drivers/all/Linux_${urlVersion}_ECOSYS_M2x35_40_P2x35_40dnw_zip.download.zip";

     

       18
       18
       +
           sha256 = "10crxdfj62ini70vv471445zi6q0l9fmg2jsd74sp6fr0qa0kvr7";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         installPhase = ''

     

       22
       22
       +
           mkdir -p $out/share/cups/model/Kyocera

     

       23
       23
       +
           cp ${region}/${language}/*.PPD $out/share/cups/model/Kyocera/

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with lib; {

     

       27
       27
       +
           description = "PPD files for Kyocera ECOSYS M2040dn/M2135dn/M2540dn/M2540dw/M2635dn/M2635dw/M2640idw/M2735dw/P2040dn/M2040dw/P2235dn/P2235dw";

     

       28
       28
       +
           homepage = "https://www.kyoceradocumentsolutions.com";

     

       29
       29
       +
           license = licenses.unfree;

     

       30
       30
       +
           maintainers = with maintainers; [ hexa ];

     

       31
       31
       +
           platforms = platforms.linux;

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+1 -1

pkgs/servers/ttyd/default.nix

···

       25
       25
        
           homepage    = "https://github.com/tsl0922/ttyd";

     

       26
       26
        
           license     = lib.licenses.mit;

     

       27
       27
        
           maintainers = [ lib.maintainers.thoughtpolice ];

     

       28
       28
       -
           platforms   = lib.platforms.linux;

     

       28
       28
       +
           platforms   = lib.platforms.all;

     

       29
       29
        
         };

     

       30
       30
        
       }

+11 -9

pkgs/tools/graphics/goverlay/default.nix

···

       5
       5
        
       , fetchFromGitHub

     

       6
       6
        
       , fpc

     

       7
       7
        
       , lazarus-qt

     

       8
       8
       -
       , qt5

     

       8
       8
       +
       , wrapQtAppsHook

     

       9
       9
       +
       , libGL

     

       10
       10
       +
       , libGLU

     

       11
       11
       +
       , libqt5pas

     

       9
       12
        
       , libX11

     

       10
       10
       -
       , libqt5pas

     

       11
       13
        
       , coreutils

     

       12
       14
        
       , git

     

       13
       15
        
       , gnugrep

     

       14
       16
        
       , libnotify

     

       15
       15
       -
       , mesa-demos

     

       16
       17
        
       , polkit

     

       17
       18
        
       , procps

     

       18
       19
        
       , systemd

     
···

       34
       35
        
         '';

     

       35
       36
        
       in stdenv.mkDerivation rec {

     

       36
       37
        
         pname = "goverlay";

     

       37
       37
       -
         version = "0.6";

     

       38
       38
       +
         version = "0.6.3";

     

       38
       39
        
       

     

       39
       40
        
         src = fetchFromGitHub {

     

       40
       41
        
           owner = "benjamimgois";

     

       41
       42
        
           repo = pname;

     

       42
       43
        
           rev = version;

     

       43
       43
       -
           hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw=";

     

       44
       44
       +
           hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs=";

     

       44
       45
        
         };

     

       45
       46
        
       

     

       46
       47
        
         outputs = [ "out" "man" ];

     
···

       61
       62
        
         nativeBuildInputs = [

     

       62
       63
        
           fpc

     

       63
       64
        
           lazarus-qt

     

       64
       64
       -
           qt5.wrapQtAppsHook

     

       65
       65
       +
           wrapQtAppsHook

     

       65
       66
        
         ];

     

       66
       67
        
       

     

       67
       68
        
         buildInputs = [

     

       68
       68
       -
           libX11

     

       69
       69
       +
           libGL

     

       70
       70
       +
           libGLU

     

       69
       71
        
           libqt5pas

     

       72
       72
       +
           libX11

     

       70
       73
        
         ];

     

       71
       74
        
       

     

       72
       72
       -
         NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";

     

       75
       75
       +
         NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";

     

       73
       76
        
       

     

       74
       77
        
         buildPhase = ''

     

       75
       78
        
           runHook preBuild

     
···

       85
       88
        
             git

     

       86
       89
        
             gnugrep

     

       87
       90
        
             libnotify

     

       88
       88
       -
             mesa-demos

     

       89
       91
        
             polkit

     

       90
       92
        
             procps

     

       91
       93
        
             systemd

+5 -5

pkgs/tools/graphics/goverlay/find-xdg-data-files.patch

···

       1
       1
        
       diff --git a/overlayunit.pas b/overlayunit.pas

     

       2
       2
       -
       index de8725f..005f171 100644

     

       2
       2
       +
       index a56cea7..9a4f547 100644

     

       3
       3
        
       --- a/overlayunit.pas

     

       4
       4
        
       +++ b/overlayunit.pas

     

       5
       5
       -
       @@ -5377,7 +5377,7 @@ begin

     

       5
       5
       +
       @@ -4880,7 +4880,7 @@ begin

     

       6
       6
        
           //Determine Mangohud dependency status

     

       7
       7
        
        

     

       8
       8
        
                  //locate MangoHud and store result in tmp folder

     
···

       11
       11
        
        

     

       12
       12
        
                  // Assign Text file dependency_mangohud to variable mangohudVAR

     

       13
       13
        
                  AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');

     

       14
       14
       -
       @@ -5386,7 +5386,7 @@ begin

     

       14
       14
       +
       @@ -4889,7 +4889,7 @@ begin

     

       15
       15
        
                  CloseFile(mangohudVAR);

     

       16
       16
        
        

     

       17
       17
        
                  // Read String and store value on mangohuddependencyVALUE based on result

     
···

       20
       20
        
                  mangohuddependencyVALUE := 1

     

       21
       21
        
                  else

     

       22
       22
        
                  mangohuddependencyVALUE := 0;

     

       23
       23
       -
       @@ -5395,7 +5395,7 @@ begin

     

       23
       23
       +
       @@ -4898,7 +4898,7 @@ begin

     

       24
       24
        
           //Determine vkBasalt dependency staus

     

       25
       25
        
        

     

       26
       26
        
                   //locate vkBasalt and store result in tmp folder

     
···

       29
       29
        
        

     

       30
       30
        
                   // Assign Text file dependency_mangohud to variable mangohudVAR

     

       31
       31
        
                   AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');

     

       32
       32
       -
       @@ -5404,7 +5404,7 @@ begin

     

       32
       32
       +
       @@ -4907,7 +4907,7 @@ begin

     

       33
       33
        
                   CloseFile(vkbasaltVAR);

     

       34
       34
        
        

     

       35
       35
        
                   // Read String and store value on vkbasaltdependencyVALUE based on result

+3 -3

pkgs/tools/graphics/netpbm/default.nix

···

       20
       20
        
         # Determine version and revision from:

     

       21
       21
        
         # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced

     

       22
       22
        
         pname = "netpbm";

     

       23
       23
       -
         version = "10.92.0";

     

       23
       23
       +
         version = "10.96.2";

     

       24
       24
        
       

     

       25
       25
        
         outputs = [ "bin" "out" "dev" ];

     

       26
       26
        
       

     

       27
       27
        
         src = fetchsvn {

     

       28
       28
        
           url = "https://svn.code.sf.net/p/netpbm/code/advanced";

     

       29
       29
       -
           rev = "3972";

     

       30
       30
       -
           sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3";

     

       29
       29
       +
           rev = "4158";

     

       30
       30
       +
           sha256 = "NK8GXCvCEnbQJWvVngB5UMOVmfsiyU4Fq0JIY9UNSjo=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

+2 -2

pkgs/tools/networking/getmail6/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "getmail6";

     

       8
       8
       -
         version = "6.18.4";

     

       8
       8
       +
         version = "6.18.5";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = pname;

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "1pxrwqpg8vnrrljigzzaq8g2g6nx55x7a8q032bp4wqyhc6jhpxq";

     

       14
       14
       +
           sha256 = "1bckrnvjkkbrybs9ccknd4vakzvd7vpp541p2cpv4isaizyxp2ji";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         # needs a Docker setup

+6 -1

pkgs/top-level/all-packages.nix

···

       5848
       5848
        
       

     

       5849
       5849
        
         govc = callPackage ../tools/virtualization/govc { };

     

       5850
       5850
        
       

     

       5851
       5851
       -
         goverlay = callPackage ../tools/graphics/goverlay { };

     

       5851
       5851
       +
         goverlay = callPackage ../tools/graphics/goverlay {

     

       5852
       5852
       +
           inherit (qt5) wrapQtAppsHook;

     

       5853
       5853
       +
         };

     

       5852
       5854
        
       

     

       5853
       5855
        
         gpart = callPackage ../tools/filesystems/gpart { };

     

       5854
       5856
        
       

     
···

       13499
       13501
        
         pipenv = callPackage ../development/tools/pipenv {};

     

       13500
       13502
        
       

     

       13501
       13503
        
         pipewire = callPackage ../development/libraries/pipewire {};

     

       13504
       13504
       +
         pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {};

     

       13502
       13505
        
         pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {};

     

       13503
       13506
        
       

     

       13504
       13507
        
         pyradio = callPackage ../applications/audio/pyradio {};

     
···

       31871
       31874
        
         cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };

     

       31872
       31875
        
       

     

       31873
       31876
        
         cups-kyocera = callPackage ../misc/cups/drivers/kyocera {};

     

       31877
       31877
       +
       

     

       31878
       31878
       +
         cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw {};

     

       31874
       31879
        
       

     

       31875
       31880
        
         cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {};

     

       31876
       31881

+20

pkgs/top-level/perl-packages.nix

···

       3518
       3518
        
           };

     

       3519
       3519
        
         };

     

       3520
       3520
        
       

     

       3521
       3521
       +
         CompressRawLzma = buildPerlPackage {

     

       3522
       3522
       +
           pname = "Compress-Raw-Lzma";

     

       3523
       3523
       +
           version = "2.101";

     

       3524
       3524
       +
           src = fetchurl {

     

       3525
       3525
       +
             url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.101.tar.gz";

     

       3526
       3526
       +
             sha256 = "bb267fd31981eda11f444038f8a0fca4b94a51ae61b2db71246abf6a4d322a36";

     

       3527
       3527
       +
           };

     

       3528
       3528
       +
           preConfigure = ''

     

       3529
       3529
       +
             cat > config.in <<EOF

     

       3530
       3530
       +
               INCLUDE      = ${pkgs.xz.dev}/include

     

       3531
       3531
       +
               LIB          = ${pkgs.xz.out}/lib

     

       3532
       3532
       +
             EOF

     

       3533
       3533
       +
           '';

     

       3534
       3534
       +
           meta = {

     

       3535
       3535
       +
             homepage = "https://github.com/pmqs/Compress-Raw-Lzma";

     

       3536
       3536
       +
             description = "Low-Level Interface to lzma compression library";

     

       3537
       3537
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       3538
       3538
       +
           };

     

       3539
       3539
       +
         };

     

       3540
       3540
       +
       

     

       3521
       3541
        
         CompressRawZlib = buildPerlPackage {

     

       3522
       3542
        
           pname = "Compress-Raw-Zlib";

     

       3523
       3543
        
           version = "2.096";