diff options
123 files changed, 1356 insertions, 1732 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3032cad6e7c..40236d141d3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -459,7 +459,6 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function). with the `eggInstallHook` - `eggBuildHook` to skip building for eggs. - `eggInstallHook` to install eggs. -- `flitBuildHook` to build a wheel using `flit`. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. - `pypaBuildHook` to build a wheel using diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index af5147e0128..18f44320f07 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -347,4 +347,6 @@ The module update takes care of the new config syntax and the data itself (user can automatically format the root device by setting `virtualisation.fileSystems."/".autoFormat = true;`. +- `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead. + - The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`. diff --git a/nixos/modules/hardware/cpu/amd-sev.nix b/nixos/modules/hardware/cpu/amd-sev.nix index 28ee07f005b..08e1de49638 100644 --- a/nixos/modules/hardware/cpu/amd-sev.nix +++ b/nixos/modules/hardware/cpu/amd-sev.nix @@ -1,37 +1,43 @@ -{ config, lib, ... }: +{ config, options, lib, ... }: with lib; let - cfg = config.hardware.cpu.amd.sev; - defaultGroup = "sev"; -in - with lib; { - options.hardware.cpu.amd.sev = { - enable = mkEnableOption (lib.mdDoc "access to the AMD SEV device"); - user = mkOption { - description = lib.mdDoc "Owner to assign to the SEV device."; - type = types.str; - default = "root"; - }; - group = mkOption { - description = lib.mdDoc "Group to assign to the SEV device."; - type = types.str; - default = defaultGroup; - }; - mode = mkOption { - description = lib.mdDoc "Mode to set for the SEV device."; - type = types.str; - default = "0660"; - }; + cfgSev = config.hardware.cpu.amd.sev; + cfgSevGuest = config.hardware.cpu.amd.sevGuest; + + optionsFor = device: group: { + enable = mkEnableOption (lib.mdDoc "access to the AMD ${device} device"); + user = mkOption { + description = lib.mdDoc "Owner to assign to the ${device} device."; + type = types.str; + default = "root"; + }; + group = mkOption { + description = lib.mdDoc "Group to assign to the ${device} device."; + type = types.str; + default = group; }; + mode = mkOption { + description = lib.mdDoc "Mode to set for the ${device} device."; + type = types.str; + default = "0660"; + }; + }; +in +with lib; { + options.hardware.cpu.amd.sev = optionsFor "SEV" "sev"; + + options.hardware.cpu.amd.sevGuest = optionsFor "SEV guest" "sev-guest"; - config = mkIf cfg.enable { + config = mkMerge [ + # /dev/sev + (mkIf cfgSev.enable { assertions = [ { - assertion = hasAttr cfg.user config.users.users; + assertion = hasAttr cfgSev.user config.users.users; message = "Given user does not exist"; } { - assertion = (cfg.group == defaultGroup) || (hasAttr cfg.group config.users.groups); + assertion = (cfgSev.group == options.hardware.cpu.amd.sev.group.default) || (hasAttr cfgSev.group config.users.groups); message = "Given group does not exist"; } ]; @@ -40,12 +46,35 @@ in options kvm_amd sev=1 ''; - users.groups = optionalAttrs (cfg.group == defaultGroup) { - "${cfg.group}" = {}; + users.groups = optionalAttrs (cfgSev.group == options.hardware.cpu.amd.sev.group.default) { + "${cfgSev.group}" = { }; }; - services.udev.extraRules = with cfg; '' + services.udev.extraRules = with cfgSev; '' KERNEL=="sev", OWNER="${user}", GROUP="${group}", MODE="${mode}" ''; - }; - } + }) + + # /dev/sev-guest + (mkIf cfgSevGuest.enable { + assertions = [ + { + assertion = hasAttr cfgSevGuest.user config.users.users; + message = "Given user does not exist"; + } + { + assertion = (cfgSevGuest.group == options.hardware.cpu.amd.sevGuest.group.default) || (hasAttr cfgSevGuest.group config.users.groups); + message = "Given group does not exist"; + } + ]; + + users.groups = optionalAttrs (cfgSevGuest.group == options.hardware.cpu.amd.sevGuest.group.default) { + "${cfgSevGuest.group}" = { }; + }; + + services.udev.extraRules = with cfgSevGuest; '' + KERNEL=="sev-guest", OWNER="${user}", GROUP="${group}", MODE="${mode}" + ''; + }) + ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7744bbd76e6..206d5eaf75d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -499,6 +499,7 @@ ./services/games/quake3-server.nix ./services/games/teeworlds.nix ./services/games/terraria.nix + ./services/games/xonotic.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/argonone.nix diff --git a/nixos/modules/services/games/xonotic.nix b/nixos/modules/services/games/xonotic.nix new file mode 100644 index 00000000000..c84347ddc98 --- /dev/null +++ b/nixos/modules/services/games/xonotic.nix @@ -0,0 +1,198 @@ +{ config +, pkgs +, lib +, ... +}: + +let + cfg = config.services.xonotic; + + serverCfg = pkgs.writeText "xonotic-server.cfg" ( + toString cfg.prependConfig + + "\n" + + builtins.concatStringsSep "\n" ( + lib.mapAttrsToList (key: option: + let + escape = s: lib.escape [ "\"" ] s; + quote = s: "\"${s}\""; + + toValue = x: quote (escape (toString x)); + + value = (if lib.isList option then + builtins.concatStringsSep + " " + (builtins.map (x: toValue x) option) + else + toValue option + ); + in + "${key} ${value}" + ) cfg.settings + ) + + "\n" + + toString cfg.appendConfig + ); +in + +{ + options.services.xonotic = { + enable = lib.mkEnableOption (lib.mdDoc "Xonotic dedicated server"); + + package = lib.mkPackageOption pkgs "xonotic-dedicated" {}; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Open the firewall for TCP and UDP on the specified port. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + readOnly = true; + default = "/var/lib/xonotic"; + description = lib.mdDoc '' + Data directory. + ''; + }; + + settings = lib.mkOption { + description = lib.mdDoc '' + Generates the `server.cfg` file. Refer to [upstream's example][0] for + details. + + [0]: https://gitlab.com/xonotic/xonotic/-/blob/master/server/server.cfg + ''; + default = {}; + type = lib.types.submodule { + freeformType = with lib.types; let + scalars = oneOf [ singleLineStr int float ]; + in + attrsOf (oneOf [ scalars (nonEmptyListOf scalars) ]); + + options.sv_public = lib.mkOption { + type = lib.types.int; + default = 0; + example = [ (-1) 1 ]; + description = lib.mdDoc '' + Controls whether the server will be publicly listed. + ''; + }; + + options.hostname = lib.mkOption { + type = lib.types.singleLineStr; + default = "Xonotic $g_xonoticversion Server"; + description = lib.mdDoc '' + The name that will appear in the server list. `$g_xonoticversion` + gets replaced with the current version. + ''; + }; + + options.sv_motd = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + Text displayed when players join the server. + ''; + }; + + options.sv_termsofservice_url = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + URL for the Terms of Service for playing on your server. + ''; + }; + + options.maxplayers = lib.mkOption { + type = lib.types.int; + default = 16; + description = lib.mdDoc '' + Number of player slots on the server, including spectators. + ''; + }; + + options.net_address = lib.mkOption { + type = lib.types.singleLineStr; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address Xonotic will listen on. + ''; + }; + + options.port = lib.mkOption { + type = lib.types.port; + default = 26000; + description = lib.mdDoc '' + The port Xonotic will listen on. + ''; + }; + }; + }; + + # Still useful even though we're using RFC 42 settings because *some* keys + # can be repeated. + appendConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the end of `server.cfg`. + ''; + }; + + # Certain changes need to happen at the beginning of the file. + prependConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the start of `server.cfg`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.xonotic = { + description = "Xonotic server"; + wantedBy = [ "multi-user.target" ]; + + environment = { + # Required or else it tries to write the lock file into the nix store + HOME = cfg.dataDir; + }; + + serviceConfig = { + DynamicUser = true; + User = "xonotic"; + StateDirectory = "xonotic"; + ExecStart = "${cfg.package}/bin/xonotic-dedicated"; + + # Symlink the configuration from the nix store to where Xonotic actually + # looks for it + ExecStartPre = [ + "${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/.xonotic/data" + '' + ${pkgs.coreutils}/bin/ln -sf ${serverCfg} \ + ${cfg.dataDir}/.xonotic/data/server.cfg + '' + ]; + + # Cargo-culted from search results about writing Xonotic systemd units + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + + Restart = "on-failure"; + RestartSec = 10; + StartLimitBurst = 5; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + }; + + meta.maintainers = with lib.maintainers; [ CobaltCause ]; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 66aff30b5ed..1d06893bf1d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -68,6 +68,7 @@ let "redis" "rspamd" "rtl_433" + "sabnzbd" "scaphandre" "script" "shelly" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix b/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix new file mode 100644 index 00000000000..41127749401 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, options }: + +let + inherit (lib) mkOption types; + cfg = config.services.prometheus.exporters.sabnzbd; +in +{ + port = 9387; + + extraOpts = { + servers = mkOption { + description = "List of sabnzbd servers to connect to."; + type = types.listOf (types.submodule { + options = { + baseUrl = mkOption { + type = types.str; + description = "Base URL of the sabnzbd server."; + example = "http://localhost:8080/sabnzbd"; + }; + apiKeyFile = mkOption { + type = types.str; + description = "File containing the API key."; + example = "/run/secrets/sabnzbd_apikey"; + }; + }; + }); + }; + }; + + serviceOpts = + let + servers = lib.zipAttrs cfg.servers; + apiKeys = lib.concatStringsSep "," (builtins.map (file: "$(cat ${file})") servers.apiKeyFile); + in + { + environment = { + METRICS_PORT = toString cfg.port; + METRICS_ADDR = cfg.listenAddress; + SABNZBD_BASEURLS = lib.concatStringsSep "," servers.baseUrl; + }; + + script = '' + export SABNZBD_APIKEYS="${apiKeys}" + exec ${lib.getExe pkgs.prometheus-sabnzbd-exporter} + ''; + }; +} diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index dfa883a2c33..679567cbb73 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -173,6 +173,33 @@ let }]; })); + bridgeNetworks = mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "bridge"; + }; + }; + networks = listToAttrs (forEach bridge.interfaces (bi: + nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { + DHCP = mkOverride 0 (dhcpStr false); + networkConfig.Bridge = name; + } ]))); + })); + + vlanNetworks = mkMerge (flip mapAttrsToList cfg.vlans (name: vlan: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "vlan"; + }; + vlanConfig.Id = vlan.id; + }; + networks."40-${vlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + vlan = [ name ]; + } ]); + })); + in { @@ -182,7 +209,15 @@ in # Note this is if initrd.network.enable, not if # initrd.systemd.network.enable. By setting the latter and not the # former, the user retains full control over the configuration. - boot.initrd.systemd.network = mkMerge [(genericDhcpNetworks true) interfaceNetworks]; + boot.initrd.systemd.network = mkMerge [ + (genericDhcpNetworks true) + interfaceNetworks + bridgeNetworks + vlanNetworks + ]; + boot.initrd.availableKernelModules = + optional (cfg.bridges != {}) "bridge" ++ + optional (cfg.vlans != {}) "8021q"; }) (mkIf cfg.useNetworkd { @@ -212,19 +247,7 @@ in } (genericDhcpNetworks false) interfaceNetworks - (mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { - netdevs."40-${name}" = { - netdevConfig = { - Name = name; - Kind = "bridge"; - }; - }; - networks = listToAttrs (forEach bridge.interfaces (bi: - nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { - DHCP = mkOverride 0 (dhcpStr false); - networkConfig.Bridge = name; - } ]))); - }))) + bridgeNetworks (mkMerge (flip mapAttrsToList cfg.bonds (name: bond: { netdevs."40-${name}" = { netdevConfig = { @@ -377,18 +400,7 @@ in } ]); }; }))) - (mkMerge (flip mapAttrsToList cfg.vlans (name: vlan: { - netdevs."40-${name}" = { - netdevConfig = { - Name = name; - Kind = "vlan"; - }; - vlanConfig.Id = vlan.id; - }; - networks."40-${vlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { - vlan = [ name ]; - } ]); - }))) + vlanNetworks ]; # We need to prefill the slaved devices with networking options diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a9bac3346b9..a3e85c337aa 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -109,6 +109,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + amd-sev = runTest ./amd-sev.nix; anbox = runTest ./anbox.nix; anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; apcupsd = handleTest ./apcupsd.nix {}; @@ -764,6 +765,7 @@ in { systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; + systemd-initrd-bridge = handleTest ./systemd-initrd-bridge.nix {}; systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {}; systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix {}; systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {}; @@ -778,6 +780,7 @@ in { systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix {}; systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix {}; systemd-initrd-networkd-openvpn = handleTest ./initrd-network-openvpn { systemdStage1 = true; }; + systemd-initrd-vlan = handleTest ./systemd-initrd-vlan.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; diff --git a/nixos/tests/amd-sev.nix b/nixos/tests/amd-sev.nix new file mode 100644 index 00000000000..bf9a50c10d0 --- /dev/null +++ b/nixos/tests/amd-sev.nix @@ -0,0 +1,56 @@ +{ lib, ... }: { + name = "amd-sev"; + meta = { + maintainers = with lib.maintainers; [ trundle veehaitch ]; + }; + + nodes.machine = { lib, ... }: { + hardware.cpu.amd.sev.enable = true; + hardware.cpu.amd.sevGuest.enable = true; + + specialisation.sevCustomUserGroup.configuration = { + users.groups.sevtest = { }; + + hardware.cpu.amd.sev = { + enable = true; + group = "root"; + mode = "0600"; + }; + hardware.cpu.amd.sevGuest = { + enable = true; + group = "sevtest"; + }; + }; + }; + + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.wait_for_unit("multi-user.target") + + with subtest("Check default settings"): + out = machine.succeed("cat /etc/udev/rules.d/99-local.rules") + assert 'KERNEL=="sev", OWNER="root", GROUP="sev", MODE="0660"' in out + assert 'KERNEL=="sev-guest", OWNER="root", GROUP="sev-guest", MODE="0660"' in out + + out = machine.succeed("cat /etc/group") + assert "sev:" in out + assert "sev-guest:" in out + assert "sevtest:" not in out + + with subtest("Activate configuration with custom user/group"): + machine.succeed('${specialisations}/sevCustomUserGroup/bin/switch-to-configuration test') + + with subtest("Check custom user and group"): + out = machine.succeed("cat /etc/udev/rules.d/99-local.rules") + assert 'KERNEL=="sev", OWNER="root", GROUP="root", MODE="0600"' in out + assert 'KERNEL=="sev-guest", OWNER="root", GROUP="sevtest", MODE="0660"' in out + + out = machine.succeed("cat /etc/group") + assert "sev:" not in out + assert "sev-guest:" not in out + assert "sevtest:" in out + ''; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 306c5e071e7..7db7fdf13eb 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1178,6 +1178,44 @@ let ''; }; + sabnzbd = { + exporterConfig = { + enable = true; + servers = [{ + baseUrl = "http://localhost:8080"; + apiKeyFile = "/var/sabnzbd-apikey"; + }]; + }; + + metricProvider = { + services.sabnzbd.enable = true; + + # unrar is required for sabnzbd + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ "unrar" ]; + + # extract the generated api key before starting + systemd.services.sabnzbd-apikey = { + requires = [ "sabnzbd.service" ]; + after = [ "sabnzbd.service" ]; + requiredBy = [ "prometheus-sabnzbd-exporter.service" ]; + before = [ "prometheus-sabnzbd-exporter.service" ]; + script = '' + grep -Po '^api_key = \K.+' /var/lib/sabnzbd/sabnzbd.ini > /var/sabnzbd-apikey + ''; + }; + }; + + exporterTest = '' + wait_for_unit("sabnzbd.service") + wait_for_unit("prometheus-sabnzbd-exporter.service") + wait_for_open_port(8080) + wait_for_open_port(9387) + wait_until_succeeds( + "curl -sSf 'localhost:9387/metrics' | grep 'sabnzbd_queue_size{sabnzbd_instance=\"http://localhost:8080\"} 0.0'" + ) + ''; + }; + scaphandre = { exporterConfig = { enable = true; diff --git a/nixos/tests/systemd-initrd-bridge.nix b/nixos/tests/systemd-initrd-bridge.nix new file mode 100644 index 00000000000..f48a46ff2b9 --- /dev/null +++ b/nixos/tests/systemd-initrd-bridge.nix @@ -0,0 +1,63 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-initrd-bridge"; + meta.maintainers = [ lib.maintainers.majiir ]; + + # Tests bridge interface configuration in systemd-initrd. + # + # The 'a' and 'b' nodes are connected to a 'bridge' node through different + # links. The 'bridge' node configures a bridge across them. It waits forever + # in initrd (stage 1) with networking enabled. 'a' and 'b' ping 'bridge' to + # test connectivity with the bridge interface. Then, 'a' pings 'b' to test + # the bridge itself. + + nodes = { + bridge = { config, lib, ... }: { + boot.initrd.systemd.enable = true; + boot.initrd.network.enable = true; + boot.initrd.systemd.services.boot-blocker = { + before = [ "initrd.target" ]; + wantedBy = [ "initrd.target" ]; + script = "sleep infinity"; + serviceConfig.Type = "oneshot"; + }; + + networking.primaryIPAddress = "192.168.1.${toString config.virtualisation.test.nodeNumber}"; + + virtualisation.vlans = [ 1 2 ]; + networking.bridges.br0.interfaces = [ "eth1" "eth2" ]; + + networking.interfaces = { + eth1.ipv4.addresses = lib.mkForce []; + eth2.ipv4.addresses = lib.mkForce []; + br0.ipv4.addresses = [{ + address = config.networking.primaryIPAddress; + prefixLength = 24; + }]; + }; + }; + + a = { + virtualisation.vlans = [ 1 ]; + }; + + b = { config, ... }: { + virtualisation.vlans = [ 2 ]; + networking.primaryIPAddress = lib.mkForce "192.168.1.${toString config.virtualisation.test.nodeNumber}"; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ + address = config.networking.primaryIPAddress; + prefixLength = 24; + }]; + }; + }; + + testScript = '' + start_all() + a.wait_for_unit("network.target") + b.wait_for_unit("network.target") + + a.succeed("ping -n -w 10 -c 1 bridge >&2") + b.succeed("ping -n -w 10 -c 1 bridge >&2") + + a.succeed("ping -n -w 10 -c 1 b >&2") + ''; +}) diff --git a/nixos/tests/systemd-initrd-vlan.nix b/nixos/tests/systemd-initrd-vlan.nix new file mode 100644 index 00000000000..5060163a047 --- /dev/null +++ b/nixos/tests/systemd-initrd-vlan.nix @@ -0,0 +1,59 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-initrd-vlan"; + meta.maintainers = [ lib.maintainers.majiir ]; + + # Tests VLAN interface configuration in systemd-initrd. + # + # Two nodes are configured for a tagged VLAN. (Note that they also still have + # their ordinary eth0 and eth1 interfaces, which are not VLAN-tagged.) + # + # The 'server' node waits forever in initrd (stage 1) with networking + # enabled. The 'client' node pings it to test network connectivity. + + nodes = let + network = id: { + networking = { + vlans."eth1.10" = { + id = 10; + interface = "eth1"; + }; + interfaces."eth1.10" = { + ipv4.addresses = [{ + address = "192.168.10.${id}"; + prefixLength = 24; + }]; + }; + }; + }; + in { + # Node that will use initrd networking. + server = network "1" // { + boot.initrd.systemd.enable = true; + boot.initrd.network.enable = true; + boot.initrd.systemd.services.boot-blocker = { + before = [ "initrd.target" ]; + wantedBy = [ "initrd.target" ]; + script = "sleep infinity"; + serviceConfig.Type = "oneshot"; + }; + }; + + # Node that will ping the server. + client = network "2"; + }; + + testScript = '' + start_all() + client.wait_for_unit("network.target") + + # Wait for the regular (untagged) interface to be up. + def server_is_up(_) -> bool: + status, _ = client.execute("ping -n -c 1 server >&2") + return status == 0 + with client.nested("waiting for server to come up"): + retry(server_is_up) + + # Try to ping the (tagged) VLAN interface. + client.succeed("ping -n -w 10 -c 1 192.168.10.1 >&2") + ''; +}) diff --git a/nixos/tests/tinywl.nix b/nixos/tests/tinywl.nix index 411cdb1f641..9199866b57a 100644 --- a/nixos/tests/tinywl.nix +++ b/nixos/tests/tinywl.nix @@ -16,6 +16,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: systemPackages = with pkgs; [ tinywl foot wayland-utils ]; }; + hardware.opengl.enable = true; + # Automatically start TinyWL when logging in on tty1: programs.bash.loginShellInit = '' if [ "$(tty)" = "/dev/tty1" ]; then diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 441ff961549..a2f6b17a874 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec { pname = "sublime-music"; version = "0.12.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "sublime-music"; @@ -54,6 +54,7 @@ python.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ + python.pkgs.flit-core gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 2352cdb82a4..0fbb54df01a 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -39,11 +39,9 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # "--add-flags" (lib.escapeShellArgs flags) - # wrapper args used both when generating the manifest and in the final neovim executable - commonWrapperArgs = (lib.optionals (lib.isList wrapperArgs) wrapperArgs) + commonWrapperArgs = # vim accepts a limited number of commands so we join them all - ++ [ + [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' # (lib.intersperse "|" hostProviderViml) ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 94a04de14c9..bdca27eec69 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-bKRb7a5lEfE1uUeVl7i1He3qLJ4wI5HmKmWAk2oKdYI="; + sha256 = "sha256-Ygi7ioLOBQbD+QTD7pO2hIATV8HUDyrdhw7gBSSiHmc="; }; postPatch = '' diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/applications/misc/cambrinary/default.nix index 67e325cbce0..1fecfe1c17c 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/applications/misc/cambrinary/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, flit , aiohttp , beautifulsoup4 }: @@ -8,7 +9,7 @@ buildPythonApplication rec { pname = "cambrinary"; version = "unstable-2023-07-16"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "xueyuanl"; @@ -17,6 +18,10 @@ buildPythonApplication rec { hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp beautifulsoup4 diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 7adb6a1130f..e1b4fdcfa20 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -32,7 +32,7 @@ in python3Packages.buildPythonPackage rec { pname = "offpunk"; version = "1.10"; - format = "flit"; + format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ python3Packages.flit-core installShellFiles ]; propagatedBuildInputs = otherDependencies ++ pythonDependencies; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 263610b65cb..9ea8397e244 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -2,29 +2,30 @@ , stdenv , fetchurl , atomEnv +, electron_26 , systemd , pulseaudio , libxshmfence , libnotify , libappindicator-gtk3 -, wrapGAppsHook +, makeWrapper , autoPatchelfHook }: let pname = "mattermost-desktop"; - version = "5.3.1"; + version = "5.5.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-rw+SYCFmN2W4t5iIWEpV9VHxcvwTLOckMV58WRa5dZE="; + hash = "sha256-htjKGO16Qs1RVE4U47DdN8bNpUH4JD/LkMOeoIRmLPI="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-FEIldkb3FbUfVAYRkjs7oPRJDHdsIGDW5iaC2Qz1dpc="; + hash = "sha256-LQhMSIrWDZTXBnJfLKph5e6txHGvQSqEu+P1j1zOiTg="; }; }; @@ -37,11 +38,7 @@ stdenv.mkDerivation { src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); - dontBuild = true; - dontConfigure = true; - dontStrip = true; - - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; buildInputs = atomEnv.packages ++ [ libxshmfence @@ -63,21 +60,19 @@ stdenv.mkDerivation { find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x chmod +x mattermost-desktop chrome-sandbox - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop - - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop + mkdir -p $out/bin $out/share/applications $out/share/${pname}/ + cp -r app_icon.png create_desktop_file.sh locales/ resources/* $out/share/${pname}/ - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - chmod -x Mattermost.desktop + patchShebangs $out/share/${pname}/create_desktop_file.sh + $out/share/${pname}/create_desktop_file.sh + rm $out/share/${pname}/create_desktop_file.sh mv Mattermost.desktop $out/share/applications/Mattermost.desktop substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/app.asar + runHook postInstall ''; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index c1bb57b3b1b..c1b9b9fd606 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-SxmMCD7FdkmZ0ccDbuY2XUGcLxHlv62x4Pj55Wzf0AA="; + sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 5f088735438..cc467b243d1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.2.2"; + version = "115.2.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/af/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/af/thunderbird-115.2.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "abca901bd8ab959c56701ed2a1333cdc9e1c616755f7af66bfd2843beb150fbb"; + sha256 = "1ef112eb96e577d046d37becddf2149bec6a3264bd56db18e365e0fe1c52c37b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ar/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ar/thunderbird-115.2.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3b370800cf3020dd665438142b2510e1b93443fcdfb9afae4306fe783d65941d"; + sha256 = "7b6a78bcea4ca6a43dfc0ac5bc3e6fc664923308bd71adad52d57d0c475be5b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ast/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ast/thunderbird-115.2.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8877c0424559e17fdb8b7ebc543308c51325cd8ccfbcfb22de69a91cfb7da45c"; + sha256 = "d8fb2c2bd26a52c892fde59e2a85b2ac541e6bcb7040b42d105e3cfa8e9d691c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/be/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/be/thunderbird-115.2.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0efdf2e14de556028e1518123d2879e9a544f9db4abb81a45acbffe24c1b57a8"; + sha256 = "d3954e30ef0257364a4c661444ab873c9b6c14428b8d83a153b6b8527599c825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/bg/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/bg/thunderbird-115.2.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2090a1df798386de4f7ce018b440e682c0ee002cff6b6cb9e0fc4e8f2354ad2e"; + sha256 = "04b7c05e6686368fe416acbaa6db8d2f65f71ac281223ccb0d0be6564f0ed7d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/br/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/br/thunderbird-115.2.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "031139a2b4e02e9948c4ef2511e51007dabdaa427f87cc5ebc37213c066417d9"; + sha256 = "91cceedcd1240b362c2c210f00d5ba0fe4f63ec0fc2e783cdd2150b3cc5741b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ca/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ca/thunderbird-115.2.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9486b45ff6aa2249a68889fc8c14c2eeb6f4157404aa58b6c57d42d2c7224b3a"; + sha256 = "ba4755b72eb2df1df133b9005aa6b01e4a706b797749e064fd83d62ca434bc36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cak/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/cak/thunderbird-115.2.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e25b0ef1ca7825088a9d824333b7e3c15c0f34d91e24f2a6fb95ca321cb35fd6"; + sha256 = "533ee476f88e62c3645d04b15ede8b39e76efb4a8a9868f8eec95524c8976bf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cs/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/cs/thunderbird-115.2.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "66ff84c6eff82053899a5fb73d60b6dbe9a804a29d0a4c3e534b18b4f336d4a6"; + sha256 = "875f2dd2a2bd06a91fee900946f31c659015ae9477900cbeb0819857b89173cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/cy/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/cy/thunderbird-115.2.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c67d74d7647dfef7bfa623f343a98d91921788c317a3ce6e0bcb9589c7dc8231"; + sha256 = "896a64ca0f6c3fef047c854c17b45b2821c845d1e5d331599dfff524d228fbbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/da/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/da/thunderbird-115.2.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b3a297d57b2052d0a97279933a545602bb123c66501751a65cc73c8140fc78f7"; + sha256 = "427c875eaab7912c9350153af827860b8803154abf564d1957c668d003e532e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/de/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/de/thunderbird-115.2.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "43ffd505825af80846b644a36ef0a1254d8bed9c5a707aff633770f86c2be8a0"; + sha256 = "2706e6103a38ed9abd866e13e56d7d3c16585f774704d4ce3e6596e740b8e18e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/dsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/dsb/thunderbird-115.2.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "312109b1bfdc949873f3f7ed2e7ec58cbe6945c35ae5058d382e874bf458a2ae"; + sha256 = "b3f4d691650079376a87650c721bc26332cb06e5f705eac4c923a9efeeaf427a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/el/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/el/thunderbird-115.2.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ed5705d70b211e293c13728ae66da78e7c217f5e06c48d4954a7dfe18e5029af"; + sha256 = "2e15f8fcdd187daf643178b8c4f6ca8e1ec593ca67f90013b56010fa2a69c9d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-CA/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/en-CA/thunderbird-115.2.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a51444f889c9602749b92fcde62c162f109908de9f30e01e96d1a15aed7eced2"; + sha256 = "4a4f1789849d6965e7ef1f2e37c6cf0a455173e94d603efdb1e9bf4c960c9876"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-GB/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/en-GB/thunderbird-115.2.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a03bba9d46dab2e6582dc6e25a603db7a9343b042eb499b4fc47c355a7624fa5"; + sha256 = "965d5f32c3a64b85e9e73c8bb30978138a94848d19350115e048753d4a0e4cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/en-US/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/en-US/thunderbird-115.2.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ffaee7ade088747636abf9ef9edafacc95591c1c317e39847a6dace08a863561"; + sha256 = "b89f6d281224cbc9cabb419b7035a65dfc7bd9fc955d1416113c68dbb91335de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-AR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/es-AR/thunderbird-115.2.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e694f9aa4a95e633fd0efec32e7bad139de2d17eddfe16b6cf68c583dae3f0c0"; + sha256 = "df0fc5168ff3be2c27a617325e40656ee37e671d7753ceef1549c52629c2a38c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-ES/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/es-ES/thunderbird-115.2.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "3e62ec94a4882ff37796b0fb40d5da0f06f1f68d0f930ee5724d0a8be3e6ef90"; + sha256 = "c0dff3cb001447f454bb9e03c8bcfb8f40c8343f155470eb2978261ed7a67145"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/es-MX/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/es-MX/thunderbird-115.2.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b13f28b18f02119ed631f0dd7dc92e1e52053370987009846e01dcf63735f5dd"; + sha256 = "2ce450466fa1c3e10ba577cacac3341633448334821b72c6d7b3d4b974a66884"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/et/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/et/thunderbird-115.2.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9941b5a3a35ae4059f16feb5471d08199a54cbde85751098ae612c806fcf8b5c"; + sha256 = "f5f2fa06b92117a63dbda7d9206aec6f1bb2c586646d8469772de5f2b6338549"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/eu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/eu/thunderbird-115.2.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b7246ce71436f1894cc8440388e826d2b84d57e5b3666be6fa369ca80eac6aff"; + sha256 = "d284572381722dfed9e0ba1bc4e0b24e47dff673143852dd0a708d6ec2498dac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/fi/thunderbird-115.2.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "baac69f0a0c19ac5ca4ca541a67369dd94793929eaedd9e061f5edee39715864"; + sha256 = "0f9e251d0c9794349411f1cb0c32e2e941774ae083abde0f6502811dc1ddd5f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/fr/thunderbird-115.2.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2b19d69fdf5fa542e513920b0e9f0616b74d6490dcd24e0f6fb6a50948cf7c2a"; + sha256 = "cf06102a80ac1a5ec92716418955dea376274d5b807c2ba93763ac05a9a14c5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/fy-NL/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/fy-NL/thunderbird-115.2.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "56abf13ec4453ad693e825e771fc02bd6d8ea87d795d9d5025c737f6fc57058c"; + sha256 = "b25415d1cba48034f420142f78805284bb756885f30284b64343ed0a395abb54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ga-IE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ga-IE/thunderbird-115.2.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "640c68609d56c0a838305510ba208a9d9ce216dcb5fdec7126587ac418d8c067"; + sha256 = "9915c6d145a3f223086b67aa8e78b77648fe0bd5191fcf28f52d9b67026f5f4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/gd/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/gd/thunderbird-115.2.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c068ac36f73cfb2add5531e72e0268ec1d7d62505371fb0c7691655311fc26de"; + sha256 = "01cf0b60172cf490c54193ed53dce0f482e7bacf979196ca5e27bdaac752dba2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/gl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/gl/thunderbird-115.2.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5ea2c1bbd289d4a04306b247d773ee7fd30b93999c93b1a013a3b91ffcf5d843"; + sha256 = "fd20ad5e92ec3dee3ec3660230f2b1c3d48581961aae06176e7d06f4fe84d9fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/he/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/he/thunderbird-115.2.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0b343990193d616856c61d27655560e69114a41302806fccb688bc39e74c3ee0"; + sha256 = "93c3c610f0115365e3de0c2e1219986eb4b94b49d96b7882b65b31de35d93798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/hr/thunderbird-115.2.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7a2b5b4dbdbf7ce166ee378d55d3862fdbfccc1a4508cad6f042bbee4967e648"; + sha256 = "d9114a82f7c0f0440eaf8095ddcad7734967f174e846d518f603dedb40323f56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/hsb/thunderbird-115.2.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "624e6b231cd4b662c995237fa5c17e744106eca90cf6936877741ddb936a6880"; + sha256 = "304e8fe3b2be93a79544bb5747b17d2dd2cb34300e48913b4b3e37e925ef30ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/hu/thunderbird-115.2.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8b9a914ddcc8d86986d258e106584a7104b15d4e6be54c3f39df773cf0cc7aae"; + sha256 = "a7ab214e118c204ab3f1b9a4a6641d70b65241fa97ab6d1152b34c757bca0690"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/hy-AM/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/hy-AM/thunderbird-115.2.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a1090c31b81ad89734fefffe63b4c01c2a49bab91cf94d32c0ca429f9ae2409f"; + sha256 = "1c8a67c5d9e6ef8cb909bc4e2ec77a6b9159b21d3829650cc54ed9a6cc1cb7d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/id/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/id/thunderbird-115.2.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "31ac099a9049edb6e74d5e4443b11668a5cab97d82470d08df84f8dc9930b882"; + sha256 = "072d442f5d49c13704a6d5446dd04df6460b009676a4a7ff2a8b5e5a93f1a1b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/is/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/is/thunderbird-115.2.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c11befb7b259e6883b85730a1a423745782c80fd6d49ae1754d66789c553c2e8"; + sha256 = "fbf73fad3256e104a4b4f7c175f0c5df34453100cdcf701cd075f7ee82feed32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/it/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/it/thunderbird-115.2.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8e2f30430057194862d93e9fd076b42ac33499ba2fa38c3330070b872faf4693"; + sha256 = "f04eaaecb3f03254ecc07f00f414a8eb458a8a8905024260c83fbab363e0a77a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ja/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ja/thunderbird-115.2.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "36058ca20592a045a25621b3cb6e085fd7e4c79fb4d85e8851b1bc9429d7b987"; + sha256 = "d05d93887ccd2dc7eefb5682abdec36f59df61d318ed68133047674aec042409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ka/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ka/thunderbird-115.2.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1187cd5eac5511f48d93e053dd391b0b484d2ed8c925f4acd267e1253938812d"; + sha256 = "923e9a11d26bec0cc2b46e89041c2dc84ce803c32f3083c20c262bdfa1bf3c92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/kab/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/kab/thunderbird-115.2.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1058188515e686ec4a2cdf19bd18333b6786a66c8fba768c39435a9b53f6f17c"; + sha256 = "3dd8133d5991c1a87740d2923a12716b653f3c7f5643c1670d20e4187166d0b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/kk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/kk/thunderbird-115.2.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cd305ce3935fbb6b028f7eacb978bc05ebe068c90c67e35f8cb020a4546e50bb"; + sha256 = "f9d08c465cdb736b6939e54a4ae19f33491ae53053332333d6233fdec69943f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ko/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ko/thunderbird-115.2.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a54216fc0f6d5e73c830a8d2af6b8b67f76469c5312b18aaa90c5561d2400dcb"; + sha256 = "a50dc23492367b9afdac08c3eb0c7d20a5379954c8105efde335a9b356a210be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/lt/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/lt/thunderbird-115.2.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9cec3ecea52bf0de2be0afece9f93a83cd89c81a0fa5531aac5d0143c19e3eb5"; + sha256 = "e00e3de9b69cef1db8eaa59422e1b32ed2eaf2838bbadba119dcbf20394af3f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/lv/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/lv/thunderbird-115.2.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1d40bf00bfceb69058995d1b31d7eb1b95522b9c873c2e353bf91eeabc0fd4e9"; + sha256 = "01dc6a0ae0f013ef67d6e5b9135e7f65e7883356a028a66940c63273a7e9dfb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ms/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ms/thunderbird-115.2.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bf2257ee492c4b20dd2c393e783398379361fce3d6eb0e3c697dcc3e5c7692be"; + sha256 = "b1cb2d7f51adb6ad98e94d286d6143fa7938806ed44b2aa86144b9eefa2950e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nb-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/nb-NO/thunderbird-115.2.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8d10ff20e72063014de0af53284b6394dd137303de181a5568085b63e3556530"; + sha256 = "bfb8a81b674a0c924755162ace04c5367d723a9c6c1d1a179657f23c30624eb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/nl/thunderbird-115.2.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "afe6d63a0394d2130b31501c8ed3a7f2d0f1f063eefc737679ba4eb22e7f9f94"; + sha256 = "cdf8ac214968a31972bb077a9e2aa26fe7b6dfa9b5b4c7e8d6b34dc7b78466e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/nn-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/nn-NO/thunderbird-115.2.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "68e99bf9cf99fa8d8528dc7c18dc482922541ecbfad39251a1ae49dc8f73c0a2"; + sha256 = "741b5c925dc5b299cd86bdc4212b8d1074cdc04202f10a1d052ea17abfde1b4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pa-IN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/pa-IN/thunderbird-115.2.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d112133d7f9dc5d70bda58261f5b17fadd1da8ceb33f68ff98764658030266e2"; + sha256 = "0401e65f21bb164768eac9c6115e854f63b7c4382da2d385234f117c6c640e4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/pl/thunderbird-115.2.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a670c46af55bb5c01cca9763fdc51c7ba883f3e61419e49313de79030ee8f300"; + sha256 = "455983ba636160be7b4f334ab58b879fb15a8552c511532e0f8ded4a70fa896d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pt-BR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/pt-BR/thunderbird-115.2.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "94a4c6dc574ced2f5c8853fb8aa5028bd633372119875a84039b40945cd062af"; + sha256 = "f65a8e0c421cd379526c6d057229bbed4174f96b32da0e4c370d26a2d77e0de8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/pt-PT/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/pt-PT/thunderbird-115.2.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "510052bca71d439273e6101dc45a0dc5d5a0d0d73ca7d10799b60983ca8dad8b"; + sha256 = "f4d62c18b6a70b9cc247511a8d9672e55fc07f5446e0fb51c94ab5800c4519af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/rm/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/rm/thunderbird-115.2.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9cbf37597f5273d45e7f82fd6a63c4664621886c5b517b139ba32cc92ed699ad"; + sha256 = "6e2d8a0895d8c111d00aba6acf82bffde11fd1a295cd5703932d39dc21e4c463"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ro/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ro/thunderbird-115.2.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3824fb33a770c42cfb737b1ad2389df31d898f64f5464ef92b65446d84526276"; + sha256 = "903686033b896c95757243f2030e3353adddbe52899c923b2df5c6ae95bdb0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/ru/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/ru/thunderbird-115.2.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "25d898a873fac3aeedd635e35caccb012e2cfcbb3eb9d9b04e32fba331409fc4"; + sha256 = "7d42c1b399d901355fb1d7523c690284a721da26015ac59480c3c12e0f61fe47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/sk/thunderbird-115.2.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6efd3f4af7de7c11c5a028a5be5de0459067cd455c237ed1df860b1bb2c2a70b"; + sha256 = "6bc2ca89fd2e7bc5ed283deb8a55a6faafb20accc9182e4bdf70c6c8c68d2849"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/sl/thunderbird-115.2.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "87bdfa7acdaaeb4082190296f16540153696c3521ebdbf83b05e98b34d97423b"; + sha256 = "8392a334fc05856bbac484b800d368a739d19a86db69d905ccdad58dd717aaca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sq/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/sq/thunderbird-115.2.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "da6c4f5552bc8a13503af5228cc8197f76d4045ccf44d40839d46dbd3021cf8f"; + sha256 = "e4c8261948209d5243a1f6c016e3d88e7dffd46bb7eed6672360cac7c5ba5845"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/sr/thunderbird-115.2.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3f816d3718af424ce1ad395ae26899ee6a81d0b9cbc351b24284774f243f8a62"; + sha256 = "a7b4d4ea1e2739e9072e79c6485096704efdcb197e60ede508bf75786641974d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/sv-SE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/sv-SE/thunderbird-115.2.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "961695ad2889a4be8e0efc67537fbea786f72d9d0f900bc64346857249d74fde"; + sha256 = "94ccbb7939119926424f2ece7294808df529524a8578a479549c87268dde0848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/th/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/th/thunderbird-115.2.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "24b1c5b1560f6e4e9ccfb9d2913e94c817b5bcf460d08f6a26fe75e3bd84c75d"; + sha256 = "c681171a7593aea1455404447a7909b21d299acd5ed8eae2aa7cbd1fd3b2ebd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/tr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/tr/thunderbird-115.2.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7a45630926c83121d5b39705a45fc6534616df0a822c6f61c3d89bf8c5681563"; + sha256 = "0af1134ead1e970e8f1244b07711b2393faaa5224f027fdb274186aa72837901"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/uk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/uk/thunderbird-115.2.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "940ef8d84557c312b632b67f01f3b68dc1701a159caea8de34b4b950da05c8d9"; + sha256 = "fe2ed6649000e226ccd6285189f6807e98eafdb799f16299fe66967cbbd9a01a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/uz/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/uz/thunderbird-115.2.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1fd5533ac342d1a32d37428458fb2a08a99cf366b04cbb55acd745b8f931ba79"; + sha256 = "32fd9fd79fdde70344c2938ac250523c99e0f3ade4674e9043b7d8ef5601328a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/vi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/vi/thunderbird-115.2.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "1156dd69b7ab889c2e812096e3f8a16d85d11e88b730e35aa6c6d4213410b874"; + sha256 = "4a9eadabecf8c92173ca42811a6000356da8cb701ffcf5972bb0c3c056dd0fcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/zh-CN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/zh-CN/thunderbird-115.2.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e02ee486284735cf17e44fd15145265948e1548ba257be502f59662f81132278"; + sha256 = "9713705b9684e2769b29e9d8ce1dea726ef7c57b808f686c887c37844f17318d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-x86_64/zh-TW/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-x86_64/zh-TW/thunderbird-115.2.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1e0f7a45a93457c7a07366435df7e85c4a0f40dca7ab5a189495087aad11f0da"; + sha256 = "26a531640aa90f25cbbfa2a4e13e6fc655fe8a7a8da638ea85862a98c1663dc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/af/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/af/thunderbird-115.2.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3ee2902b72a9df7b2445fd4e729f8654493cb4b8052433dfd86dfecc26f3678b"; + sha256 = "32eeb18d57468c29615c60206d14b9052af7fefc8e698131da77cb70c0b57255"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ar/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ar/thunderbird-115.2.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8a882924914f3d7c7483ef778dfee8763102de06944f31b750fe95b7830da1a8"; + sha256 = "33dd953ebefa4aedf7dccd27b70e29615dca58609c10bf99219b06e84c13c3ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ast/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ast/thunderbird-115.2.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5a8feb49d844362b8938aaeca6d42a7d385cddfe8cfdb9e90b4fd304260895c0"; + sha256 = "c60273da4cfdb6c8796157da72548278c4fb6b7d8283785d0f71acb98316df4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/be/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/be/thunderbird-115.2.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b0376f86764c564d2fddc6a7c868924f14ea1378c8b503b651eaff83bfbcfdbe"; + sha256 = "060a27d6f982d65865dda71cbf70fd4be9d0f7889d928530162bc774c599d237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/bg/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/bg/thunderbird-115.2.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "dd6c5ff2a77340e03dff6779f620e5c0df5a51b1c0fcd4171e4436d301dcf1a2"; + sha256 = "76dce40becbf63c6703b9c44db199b19cb12cebd85555b51900dbf13fb841ef5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/br/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/br/thunderbird-115.2.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7a6283099532171a9f695a1a84315c334f87391f20f41421caa13a82c6ffdce6"; + sha256 = "14d05c4b402b2c5d3eaacba41d6614578167139de5df3f14e0630b328c7d1d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ca/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ca/thunderbird-115.2.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "46cf076753e50dae6295a50f0fe55fdf1462fdde5f17eef865adfa2413b76c4a"; + sha256 = "e6665ed36b6682c05ff31ba9f197f3d799742242c81a6550445aff085173b199"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cak/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/cak/thunderbird-115.2.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "af4a0806d404938b720af1c50331d8b20c049251629ce8e6040d54f0da3d6e4a"; + sha256 = "a58332ddc60f4bd8498261e8230ea0bae3d311dd188d1f57e80150922085b9cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cs/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/cs/thunderbird-115.2.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7f0af85bea543efd7ab154e42bd8aa077c96d8878f6850f0844daa3168af03b1"; + sha256 = "62d643f7018fbb4495086a6368b664efbbf627e9f86f7627de889f63cf96cae2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/cy/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/cy/thunderbird-115.2.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7c0992c257089531ec5b080f736bd10df364cf03f271e85d72398b28bbf5ea6a"; + sha256 = "651ed033c83f8f6a9ea3aa991e39536aaf0dc93c6b472e8ce8198054711123ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/da/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/da/thunderbird-115.2.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "18c73fdedad32683ff300d7ff0518ebc800bdab42bb54bd09820d9783770417f"; + sha256 = "c28dd14eb5e6a9825db2d0adb47db842f431ac101ac10f3b043187cae836bf4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/de/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/de/thunderbird-115.2.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a344a7de24b1c83882b395cd82dd1a9e6241b4b549a21290dea9efec9640caf4"; + sha256 = "850bbee1c29d24af7846d58c4f6ee04cdf34bf7784175a1d9789e71a6ab37e26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/dsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/dsb/thunderbird-115.2.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "88f81c3fe9096d84fe3461b1cd22b1df94fe4863ec2f10853f6ca69cbe4d812e"; + sha256 = "a7aaeaf73b5f98fd3e95b31c7710c40e3e1d3af3db8aa0628ee82bbd738c9249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/el/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/el/thunderbird-115.2.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e620620d471704ff8c7a4783f797a5df5150adf0bd359fa032c46336f4a608a2"; + sha256 = "adbe0d57c756db87e17581743850b68b23e910fe9e89afa2acb349d8c3876fbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-CA/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/en-CA/thunderbird-115.2.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f1e138849aa3fa71f23ce33710e7f547857b37cc66ba85853d3037e7f6c83c48"; + sha256 = "7925e4738c3337180787664a56836594888653ad8603ccf42d784ccca87798bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-GB/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/en-GB/thunderbird-115.2.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4425e8e5af32d72844504db55cd60ebcd730614e6e8edfe65c177aa2e8937d50"; + sha256 = "6ebdab8c64f9faeee42569941da45ec8a4dc944c31b625e8c6d995af24d6874f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/en-US/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/en-US/thunderbird-115.2.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c31a3a9f85d2d22812846dc91fecd7cca9801542cf5fcc68266ae44801df7575"; + sha256 = "b92adc1c2a593f16b7998c2b8b4227731ab78294c129a0ccf3ffeab311b12651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-AR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/es-AR/thunderbird-115.2.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "34a1296b1ddc22ea34c1996759cc74551533841e9802014085b18dd9e0cd1d5f"; + sha256 = "d2a477279e2336e745071c7b9e99f8594380e69f27a64615d28dd25b846dd9ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-ES/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/es-ES/thunderbird-115.2.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "57b0bdac83109b513858ff30598bb64d113a5bff0bd77f0f0b5f2946f8ed89c5"; + sha256 = "857e2f54b4084840b458c9159af08c724fc951fba56f021ec497bf83dad89bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/es-MX/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/es-MX/thunderbird-115.2.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e251157e06a0c380075a00f8690d387718bd553ec2aabf8c81c1951b141c2651"; + sha256 = "5d678d38c4ef516d893c9f4ce3b98bccb57357a10dc7eecc167b2ad3136ab8e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/et/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/et/thunderbird-115.2.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b4043ffdc9f5454a799243d5657860bbeb870d7343be0fc3c197527e4b20892c"; + sha256 = "7afe03b3090b8f305947da40308ff4bab077f0f226acd46ed4d3357041060647"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/eu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/eu/thunderbird-115.2.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "001662ce9fc1a7c9ab82ed4f0dbbc49d0fa0c6d5b3ae93573dbfd44af0e12a33"; + sha256 = "d00caf592c791ffccb36ddf6371a9653cc89808455564ddfbb26f6105b33195e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/fi/thunderbird-115.2.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c0c368797911327088819de0c1e6e6dbf6f7ccee871c11695ce64cacdd56341d"; + sha256 = "1adc0d3e0d68a2cc776d0704a28367e26fc3aa4bd72e136c28b42a333769a258"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/fr/thunderbird-115.2.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "cd444fbdd2febd5aeee98ba4f4db737b3e6cd7a85b9cb456da179bd4cb9f67dd"; + sha256 = "a03b04fcc076b74d89bdd74490412b169b3ab830c09f96f29a143b1ab06d9f6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/fy-NL/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/fy-NL/thunderbird-115.2.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "43203b502f5231c0caca6ea389a79558d5faa74f3b6256c3fe11c2392fbe45a2"; + sha256 = "d6fb5ab8b4ab7652bd01e95dd5cfa275b0468dc488fa857ffd8a3cc18cd96c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ga-IE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ga-IE/thunderbird-115.2.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0a86e1f993cc9f6cb9d19a481e028458287e765786bb5eb26fa1f45c253ef8e5"; + sha256 = "1aaa63178112ce993d13cd175e7fba32e8045ff76ebcf77747743abb3537d4ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/gd/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/gd/thunderbird-115.2.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3331e8a202a131e4b2ebaa5990d5b4976df286287eb1d22381ddac30368584da"; + sha256 = "608d5ed3242c125a7956ba78894782d8c5dd090dcb7cfa378a3143d82e6705cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/gl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/gl/thunderbird-115.2.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "ddf7a4655bb5992c064d26b8f6c2ebd68b57f8a08168699f385848ef8471b600"; + sha256 = "00715da49525cf55ed336d76ca571e451f36b27d6d8d50524ef2a8e8c9e7bac8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/he/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/he/thunderbird-115.2.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d792d930eba7c959cae93726c56bbe172e372067d0cae36519b060d996e33ace"; + sha256 = "23dfefa9a76e70a71ccb6bcb2f392f2a4cdeae58cc276073be8b3256f8f338d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/hr/thunderbird-115.2.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4e18f2e41e066226f90bc324d0353e0cfe50e8b6a819e8e15e2a9c11ca15520a"; + sha256 = "ef8fbfb9d46a83fa6ffd854d170257a92942db8ec220ad3c2dbee7ccddf3e567"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hsb/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/hsb/thunderbird-115.2.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f4a2d7b3f45b8fc238e62acec32a2f5512834933246f4f9c49eb8d77437e4fd7"; + sha256 = "a7ce3af8dd8305304c3904e1b9198e64e04a869d08c3b8a963ff85443809226d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hu/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/hu/thunderbird-115.2.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "73ea347abc31da1cadabef37698debe1656f57c40014ffeb6bc66293c21cb85e"; + sha256 = "9ee0ebc7a89774a5dd2599ba88120a4eccd853a82836ae084a5a651da270b09e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/hy-AM/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/hy-AM/thunderbird-115.2.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "5829588a384a770ab25008ccb16ee082c880d8e99082ab9df59c4d92e21aafd6"; + sha256 = "76f359b8aff76d27a2028c02b0a82c7c9227ce9f1142fb1030b43bdff9070acc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/id/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/id/thunderbird-115.2.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "77a6b3c5ba1454fe8e8a93b463b6cbe841da25ba352ed1eeba7bb5f32108cc18"; + sha256 = "4b6921bc43312069c94be12cf0ac69bd25bebc5dfe10151cf212bc312db4ef7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/is/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/is/thunderbird-115.2.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "aeede33f1040ee9e9647df43bc88bf848017a91e2fb8ad42f5c109b42aa0f533"; + sha256 = "2844eae9c4b18735a498935decc625dd7713efd91c8e36699acd2dc811b52b86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/it/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/it/thunderbird-115.2.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7cfd1ad0a4ad00bcb16539a8ff1a4b54447901501f05cba812245c70b8044d5c"; + sha256 = "823a78e62beaf2881990f829b18ff5954c438c34a96e039b92b03ed6cac5bd37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ja/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ja/thunderbird-115.2.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d9d8c0983592c4e44374739d089759c13cdd7d6b912efbab5972a97ec43ec00f"; + sha256 = "292728019d3401b8c7677df06c3c1eb7eefb4b761bf9af2f1f1f3fc071a85ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ka/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ka/thunderbird-115.2.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c3ac587b9d0cdfd74babff266f81538cdd701b75ecae61b9c0f7cbf499e16423"; + sha256 = "587304b4ca494b7928f75deea27b05225d2d271d7880f66174903b66b317cfc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/kab/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/kab/thunderbird-115.2.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "dfcff22ad267fafaea7d2e8892e50d24dbe191d3133ba927d2077b306a92d5c8"; + sha256 = "c34aa118f7f1a1506f4df973d252131a942d64b100fe8580befc113075b6bb27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/kk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/kk/thunderbird-115.2.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6ab9f8ca37108634778631d0f4a4231a9fd6c1a96e1b8fe48bd976ae6c4176be"; + sha256 = "a0c7faeb48a54e6e15abf0b20f6a177fcd2e0cc0c3538aced905435dd4074e81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ko/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ko/thunderbird-115.2.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "679d3f285efe8e3cfef0d6aac96e56638705f479cdd7a85decbc3376f684a362"; + sha256 = "974f6fce7f5d00dbc9c0991e24fad51d0c91a53e0e743f1d991d01be9a652240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/lt/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/lt/thunderbird-115.2.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "31c5bc57a65c371d13d6ecae2d9806462614cb0f25ae02385d64ad9b78e03e16"; + sha256 = "23aa86f6d2f6e6d27351a9a3c7f4034046ca5f1d840140ba2f9e8002434407c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/lv/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/lv/thunderbird-115.2.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4d6dc7af4709b1fcd30bade79462faba7f97b63969be5d03b0bd06de4b5b3545"; + sha256 = "8a2d4b1e023c437632c1c3210131258f17db0bd84ccff19934f214744c1f336a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ms/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ms/thunderbird-115.2.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a7a735fb888d4e1c93d5593c88e8c14080c3b05460c6b6b2ffedcc1ab5c1a53d"; + sha256 = "b34543abfdab6a58722a8348c45e2ca18b3aa3f340b4db1f07321fab21af5c34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nb-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/nb-NO/thunderbird-115.2.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "47df0274374aea382dcae2a0d083fb36fc666500b320a0e3eb97f056e0fb02fa"; + sha256 = "f2ccbbebdb7773e77927c9d5c36b9792c9adc2d32f9ca6ff07299c82367de071"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/nl/thunderbird-115.2.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "95c73823294cc2d9348ff4855d8bba4aed0a61d430ddaabaae90be250d198e1b"; + sha256 = "2cb74bdc8959d49893b6d017a916ee61f6be097bc69ea36490e5be467f15f0e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/nn-NO/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/nn-NO/thunderbird-115.2.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9b170811ddd271db68c417650da56d9eb61e976e20a6787b5505497e3acc588d"; + sha256 = "aa8cdebfa948469f76ebf795c96002f86878d7507a6d51b6df864bfb525b905f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pa-IN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/pa-IN/thunderbird-115.2.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a25dc5ebf2ba028f5f9a5e23eb90e0862ead94c5d8476d2f3429d640c36a75a3"; + sha256 = "6815b6a2b689f6a03dd85f8fc516cd4834b02bf36ba961827472b2edf54a84f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/pl/thunderbird-115.2.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dba916bca6c19c0771b7ef35199c89e77864f200df4ae40b15c3483ba3f02b2b"; + sha256 = "401acef92915e9cea136de7f3c3d2cbbf7f70baf8a322846f477497f4d3f1eff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pt-BR/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/pt-BR/thunderbird-115.2.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2d3583f7062659a8642ee952205235abcde36e86918e905be85a1070ead65f88"; + sha256 = "c94d05733c3b3cd7d7a48f684f5354eca06760988a94be3689fd88fbddd79f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/pt-PT/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/pt-PT/thunderbird-115.2.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c09cffe7f7043f6c757e478e46c30ada218999437d9e9748bb1ade9891365195"; + sha256 = "cd872217ce43cd339789ff2f7e3a05a8e120fb6033051caf04120b478f486863"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/rm/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/rm/thunderbird-115.2.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4a1853d5c7915181e949ee64611ea34525bc41fb72f16b02b083d81265d7bab9"; + sha256 = "6f9fd2c445682bbc08848f1a233744424f20076a993e8d55bad9f42fbbd7df77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ro/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ro/thunderbird-115.2.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "397379badeb37e27123c5316422567e7b2bcf1c3033a85d8549866f06090d2e0"; + sha256 = "8b10921f83e126d6626d36bafb6f92aea8a2850788b36e61b197da67aefce65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/ru/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/ru/thunderbird-115.2.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e23ceab86e0cce57522bea456f396fdf96bdca1b30eee4d7a2999709383544ae"; + sha256 = "79deca0f10cd4e6376eeb45a3717abf9876eca7a634ddffc8bc2faf8a7fe16ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/sk/thunderbird-115.2.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "87027b9270956fffa744d5d35b96094265a735eb7c361fd3badd2012b34e13ff"; + sha256 = "870c6e9586528ce5bfe5b62344ff22464ba35264dd4549d646aee542ee819ba1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sl/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/sl/thunderbird-115.2.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cb65c05b17419a69b0835a7be064e40c6cd29a114b28e5682cf5df2d6ff07c22"; + sha256 = "bbb4543683a244df04e8e0ac21e61eeafd4f5b183b8cd2e739fb98304f24d3fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sq/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/sq/thunderbird-115.2.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0a04b9f2de594d18a39ed04dbf503c50afe5281100c04887eb1d907c5268edb5"; + sha256 = "0ef0b25b190e51ba3d8b41db0ff18ba89271dc3f04b2b1477b3ece970896b4b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/sr/thunderbird-115.2.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "30f05101328e20f56c0e45505a6b579f19aa6fe8e88014be5f1b201dd19b8567"; + sha256 = "a47468bf55cb1279668be587705e7deaeea0b30384613ed5b3048e89e91fafdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/sv-SE/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/sv-SE/thunderbird-115.2.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1bd3ece9bc7d4c51d2f25d221eda2105e1f8ddd1071391a27d2875cd246f331f"; + sha256 = "cac1cda5f7d524ef6be3a48b1d8ad0bffb6ed831105b93b9ada402c87f025ed1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/th/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/th/thunderbird-115.2.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a448f673b6c4991faf6d6142a1557b2bd9f9c2f9cd540a7d48b5d27ac7d0419"; + sha256 = "ec4b773869ff9807b3491fe97fc873804674163b7ddafaee403d312015ec5d1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/tr/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/tr/thunderbird-115.2.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "87844be2d24111a275eb6e557cae904167c0c817bd98d8af8d198c4ca126950d"; + sha256 = "f56aec08002698a07e3d0c03b40b644f3af1fdc9644d6ef01c4f914175821a38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/uk/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/uk/thunderbird-115.2.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ea9214c1ca561dabc43be1a55d9e8bb56dad60b116f0e8814a2fa0dac2d740c"; + sha256 = "210665ce98e12e7613d7dfc8bf9883a1bd834120614a3d4e5af7fc406c804211"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/uz/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/uz/thunderbird-115.2.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ca6a23a0234a15e05f5ffd627102bfd357882f8187e4ee5568173a926c186163"; + sha256 = "692e027fdfcf71452815dbed7531d8b118eff89c1e8c3ebc9a4d5ff39f0aef27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/vi/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/vi/thunderbird-115.2.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "14ce4927f2695c6c7e1b35f9f0e00600861c8cf05351da21e3c19aa8f6243b2a"; + sha256 = "0f6a2e29b34738e803c5a086bf7e644faaf462c155887b1e757b4e85e866fc7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/zh-CN/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/zh-CN/thunderbird-115.2.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "014933d85792304b836d67bd449b85be0a17be014f842f9fcb1cf7a2e3077329"; + sha256 = "24f2bffee3258c5e344bc46117c079e706e19df7822d8a3407894cba47c25130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.2/linux-i686/zh-TW/thunderbird-115.2.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.3/linux-i686/zh-TW/thunderbird-115.2.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "339fa1de720d6d24b778757fe4dc0d5a7b663e7ce608600f78821199dc596441"; + sha256 = "a88f855669da4e009dc0198ae5599ce647d10eae0dca1c8f7331d426f64508d8"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index b233fe5739c..f90350586c8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -43,13 +43,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.2.2"; + version = "115.2.3"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha512-RYQ3CcIesZ1p1DIF2msvlDtYSBGimUL/7xkzwc54grSARrIBwv8Zhlj+wsU9R5MR2KNTcxr+bqU/l7MWdNYHSg=="; + sha512 = "983547b2be67ffbe7727efa50bd925f576ec19bcfcf940d5d36def19aebea27494b3af0a37756a441b544ebbca0cf546fcaf8737e76a859b4d860c8294bba1dc"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 719b62f9300..24d2e8dc217 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-cQwQEZjjNNR2Lu9l9km8Q/qKXddTA1VLis/sPrJfDlU="; + hash = "sha256-N84u9eUA+3UvaBEXxotFEYMD6kmn4mvVQIDO1U+rfe8="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix new file mode 100644 index 00000000000..a6f23e10bce --- /dev/null +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gitmoji-cli"; + version = "8.5.0"; + + src = fetchFromGitHub { + owner = "carloscuesta"; + repo = "gitmoji-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/gitmoji-cli" + cp -r lib node_modules "$out/lib/node_modules/gitmoji-cli" + + makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ + --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" + + runHook postInstall + ''; + + meta = { + description = "Gitmoji client for using emojis on commit messages"; + homepage = "https://github.com/carloscuesta/gitmoji-cli"; + license = lib.licenses.mit; + mainProgram = "gitmoji"; + maintainers = with lib.maintainers; [ nequissimus ]; + }; +}) diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix index 26b39da655e..710ec7121c9 100644 --- a/pkgs/by-name/re/rectangle-pro/package.nix +++ b/pkgs/by-name/re/rectangle-pro/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle-pro"; - version = "3.0.9"; + version = "3.0.11"; src = fetchurl { url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg"; - hash = "sha256-wD8yi2Pbgrn1fW/xrocepDcpzSMsQH5yjB/Jv90PuGQ="; + hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk="; }; sourceRoot = "."; diff --git a/pkgs/development/embedded/fpga/apio/default.nix b/pkgs/development/embedded/fpga/apio/default.nix index b201ca169d4..1ca1e3cd200 100644 --- a/pkgs/development/embedded/fpga/apio/default.nix +++ b/pkgs/development/embedded/fpga/apio/default.nix @@ -10,13 +10,14 @@ , scons , setuptools , tinyprog +, flit-core , pytestCheckHook }: buildPythonApplication rec { pname = "apio"; version = "0.8.1"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "FPGAwars"; @@ -47,6 +48,10 @@ buildPythonApplication rec { 'version = semantic_version.Version(pkg_version.replace(".dev", "-dev"))' ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ click semantic-version diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 306c33a91fd..700276e77af 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -45,15 +45,6 @@ in { propagatedBuildInputs = [ ]; } ./egg-unpack-hook.sh) {}; - flitBuildHook = callPackage ({ makePythonHook, flit }: - makePythonHook { - name = "flit-build-hook"; - propagatedBuildInputs = [ flit ]; - substitutions = { - inherit pythonInterpreter; - }; - } ./flit-build-hook.sh) {}; - pipBuildHook = callPackage ({ makePythonHook, pip, wheel }: makePythonHook { name = "pip-build-hook.sh"; diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh deleted file mode 100644 index 45893aae00f..00000000000 --- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -# Setup hook for flit -echo "Sourcing flit-build-hook" - -flitBuildPhase () { - echo "Executing flitBuildPhase" - runHook preBuild - @pythonInterpreter@ -m flit build --format wheel - runHook postBuild - echo "Finished executing flitBuildPhase" -} - -if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then - echo "Using flitBuildPhase" - buildPhase=flitBuildPhase -fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e9c783116b6..fbacf6bb233 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -11,7 +11,6 @@ , namePrefix , update-python-libraries , setuptools -, flitBuildHook , pypaBuildHook , pypaInstallHook , pythonCatchConflictsHook @@ -90,7 +89,6 @@ # Several package formats are supported. # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. # "wheel" : Install from a pre-compiled wheel. -# "flit" : Install a flit package. This builds a wheel. # "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. # "egg": Install a package from an egg. # "other" : Provide your own buildPhase and installPhase. @@ -122,7 +120,7 @@ let else "setuptools"; - withDistOutput = lib.elem format' ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -222,8 +220,6 @@ let unzip ] ++ lib.optionals (format' == "setuptools") [ setuptoolsBuildHook - ] ++ lib.optionals (format' == "flit") [ - flitBuildHook ] ++ lib.optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index e5f9c00b2fb..d42e4e85c10 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -98,12 +98,10 @@ , ... } @ attrs: -assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; - let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -171,7 +169,7 @@ let nativeBuildInputs = [ python wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ pythonCatchConflictsHook diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 8bece077f8c..b016aa4d4d6 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "2.2.0"; + version = "2.2.2"; # Dependencies buildInputs = [ curl netcdf hdf5 python3 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/28013/${pname}-${version}.tar.gz"; - sha256 = "sha256-Z5yNEFcGyv/LoJYOxd3EoTMsG0DFL4LDk3NWmZ2PrfI="; + url = "https://code.mpimet.mpg.de/attachments/download/28882/${pname}-${version}.tar.gz"; + sha256 = "sha256-QZx3MVJEAZr0GilsBQZvR0zMv5Tev6rp4hBtpRvHyTc="; }; configureFlags = [ diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6403ef4aaa9..9349a9d6a04 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -71,7 +71,9 @@ mapAliases { eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 + generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphqurl; # added 2023-08-19 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e4aa11738cc..2ca45fd86ec 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -37,7 +37,6 @@ fkill-cli = "fkill"; fleek-cli = "fleek"; git-run = "gr"; - gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 925e8b050da..04de42dd00c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -120,12 +120,10 @@ , "fx" , "ganache" , "gatsby-cli" -, "generator-code" , "get-graphql-schema" , "git-run" , "git-standup" , "@gitbeaker/cli" -, "gitmoji-cli" , "gramma" , "grammarly-languageserver" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 72af9e92a6f..19190ea18b0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -78768,846 +78768,6 @@ in bypassCache = true; reconstructLock = true; }; - generator-code = nodeEnv.buildNodePackage { - name = "generator-code"; - packageName = "generator-code"; - version = "1.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.8.tgz"; - sha512 = "vaqIRIxCAkY9NBep8qacZqJjZKezSjEK6UilcwgsS4vCRkd9PqjxhH2NLWnFjrNGaxG0k0u4piyHtOwagd/mfQ=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@gar/promisify-1.1.3" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@isaacs/string-locale-compare-1.1.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.3.1" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - (sources."ignore-walk-4.0.1" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - (sources."npm-packlist-3.0.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."proc-log-1.0.0" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/fs-3.1.0" - sources."@npmcli/git-4.1.0" - sources."@npmcli/installed-package-contents-2.0.2" - (sources."@npmcli/map-workspaces-2.0.4" // { - dependencies = [ - sources."glob-8.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."minimatch-5.1.6" - sources."npm-normalize-package-bin-1.0.1" - sources."read-package-json-fast-2.0.3" - ]; - }) - (sources."@npmcli/metavuln-calculator-2.0.0" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/move-file-1.1.2" - sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-1.0.1" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."@types/expect-1.20.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/vinyl-2.0.7" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."argparse-1.0.10" - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - (sources."bin-links-3.0.3" // { - dependencies = [ - sources."npm-normalize-package-bin-2.0.0" - ]; - }) - sources."binaryextensions-4.18.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - ]; - }) - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-table-0.3.11" - sources."cli-width-3.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."cmd-shim-5.0.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colors-1.0.3" - sources."commander-7.1.0" - sources."common-ancestor-path-1.0.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."dargs-7.0.0" - sources."dateformat-4.6.3" - sources."debug-4.3.4" - sources."debuglog-1.0.1" - sources."deep-extend-0.6.0" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."delegates-1.0.0" - sources."deprecation-2.3.1" - sources."dezalgo-1.0.4" - sources."diff-5.1.0" - sources."dir-glob-3.0.1" - sources."eastasianwidth-0.2.0" - sources."ejs-3.1.9" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-10.4.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-5.1.1" - sources."exponential-backoff-3.1.1" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-glob-3.3.1" - sources."fast-plist-0.1.3" - sources."fastq-1.15.0" - sources."figures-3.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."find-yarn-workspace-root2-1.2.16" - sources."first-chunk-stream-2.0.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" - sources."get-stdin-4.0.1" - sources."get-stream-6.0.1" - sources."github-username-6.0.0" - (sources."glob-7.2.3" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."grouped-queue-2.0.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" - sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."interpret-1.4.0" - sources."ip-2.0.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."is-plain-object-5.0.0" - sources."is-scoped-2.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isbinaryfile-5.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.3" - (sources."jake-10.8.7" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-stringify-nice-1.1.4" - sources."jsonparse-1.3.1" - sources."just-diff-5.2.0" - sources."just-diff-apply-5.5.0" - sources."lines-and-columns-1.2.4" - (sources."load-yaml-file-0.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."mem-fs-2.3.0" - sources."mem-fs-editor-9.7.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."minimatch-7.4.6" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" - sources."ms-2.1.2" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."mute-stream-0.0.8" - sources."negotiator-0.6.3" - sources."node-fetch-2.7.0" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" - sources."normalize-path-3.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npm-run-path-4.0.1" - sources."npmlog-6.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-queue-6.6.2" - sources."p-timeout-3.2.0" - sources."p-transform-1.3.0" - sources."p-try-2.2.0" - sources."pacote-15.2.0" - sources."pad-component-0.0.1" - (sources."parse-conflict-json-2.0.2" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - (sources."parse-json-5.2.0" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pkg-dir-4.2.0" - (sources."preferred-pm-3.1.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."pretty-bytes-5.6.0" - sources."proc-log-3.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."queue-microtask-1.2.3" - sources."read-cmd-shim-3.0.1" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - ]; - }) - sources."read-package-json-fast-3.0.2" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" - sources."type-fest-0.6.0" - ]; - }) - sources."read-pkg-up-7.0.1" - sources."readable-stream-2.3.8" - sources."readdir-scoped-modules-1.1.0" - sources."rechoir-0.6.2" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" - sources."request-light-0.7.0" - sources."resolve-1.22.6" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sanitize-filename-1.6.3" - sources."scoped-regex-2.1.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shelljs-0.8.5" - sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."sort-keys-4.2.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" - sources."strip-final-newline-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."taketalk-1.0.0" - (sources."tar-6.2.0" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."text-table-0.2.0" - sources."textextensions-5.16.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."treeverse-1.0.4" - sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.2" - sources."tuf-js-1.1.7" - sources."type-fest-0.8.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.0" - sources."untildify-4.0.0" - sources."utf8-byte-length-1.0.4" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."vinyl-2.2.1" - sources."vinyl-file-3.0.0" - sources."walk-up-path-1.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-3.0.1" - sources."which-pm-2.0.0" - sources."wide-align-1.1.5" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" - sources."yallist-4.0.0" - (sources."yeoman-environment-3.19.3" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."escape-string-regexp-4.0.0" - sources."find-up-5.0.0" - sources."fs-minipass-2.1.0" - sources."gauge-3.0.2" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."isbinaryfile-4.0.10" - sources."json-parse-even-better-errors-2.3.1" - sources."locate-path-6.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - ]; - }) - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."npmlog-5.0.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."readable-stream-4.4.2" - sources."safe-buffer-5.2.1" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."string_decoder-1.3.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."yeoman-generator-5.9.0" - sources."yocto-queue-0.1.0" - (sources."yosay-2.0.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Yeoman generator for Visual Studio Code extensions."; - homepage = "http://code.visualstudio.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -79732,329 +78892,6 @@ in bypassCache = true; reconstructLock = true; }; - gitmoji-cli = nodeEnv.buildNodePackage { - name = "gitmoji-cli"; - packageName = "gitmoji-cli"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-8.5.0.tgz"; - sha512 = "ZSplvgm8UiAjsWBOxYAfbLj8JTMFj5TjB6yM7RFlqEfsFMgP0fhIPpgnHU5aMiyVyvX6jBRVf1hzjrmP3/cgiA=="; - }; - dependencies = [ - sources."@ljharb/through-2.3.9" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/http-cache-semantics-4.0.2" - sources."agent-base-7.1.0" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ast-types-0.13.4" - sources."atomically-2.0.2" - sources."base64-js-1.5.1" - sources."basic-ftp-5.0.3" - sources."bl-4.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."buffer-5.7.1" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.13" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - sources."cli-boxes-3.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-width-4.1.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."conf-11.0.2" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-5.1.2" - sources."debug-4.3.4" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."degenerator-5.0.1" - sources."dot-prop-7.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-3.0.0" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-5.0.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."execa-8.0.1" - sources."external-editor-3.1.0" - sources."fast-deep-equal-3.1.3" - sources."fetch-blob-3.2.0" - sources."figures-5.0.0" - sources."form-data-encoder-2.1.4" - sources."formdata-polyfill-4.0.10" - sources."fs-extra-8.1.0" - sources."fuse.js-6.6.2" - sources."get-stream-8.0.1" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."data-uri-to-buffer-5.0.1" - ]; - }) - sources."global-dirs-3.0.1" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-7.0.2" - sources."human-signals-5.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-9.2.11" // { - dependencies = [ - sources."is-unicode-supported-0.1.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - ]; - }) - (sources."inquirer-autocomplete-prompt-3.0.0" // { - dependencies = [ - sources."ansi-escapes-6.2.0" - sources."run-async-2.4.1" - sources."type-fest-3.13.1" - ]; - }) - sources."ip-1.1.8" - sources."is-ci-3.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-npm-6.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-stream-3.0.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-1.3.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-8.0.1" - sources."jsonfile-4.0.0" - sources."keyv-4.5.3" - sources."latest-version-7.0.0" - sources."lodash-4.17.21" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."meow-12.1.1" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mimic-response-4.0.0" - sources."minimist-1.2.8" - sources."ms-2.1.2" - sources."mute-stream-1.0.0" - sources."netmask-2.0.2" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."normalize-url-8.0.0" - (sources."npm-run-path-5.1.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."onetime-6.0.0" - (sources."ora-7.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."cli-cursor-4.0.0" - sources."emoji-regex-10.2.1" - sources."is-interactive-2.0.0" - sources."log-symbols-5.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-4.0.0" - sources."signal-exit-3.0.7" - sources."string-width-6.1.0" - sources."strip-ansi-7.1.0" - ]; - }) - sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."package-json-8.1.1" - sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.0" - sources."proto-list-1.2.4" - (sources."proxy-agent-6.3.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.0" - sources."pupa-3.1.0" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."signal-exit-3.0.7" - ]; - }) - sources."run-async-3.0.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."semver-diff-4.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - (sources."stdin-discarder-0.1.0" // { - dependencies = [ - sources."bl-5.1.0" - sources."buffer-6.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.5" - sources."supports-color-7.2.0" - sources."tmp-0.0.33" - sources."tslib-2.6.2" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-3.0.0" - sources."universalify-0.1.2" - sources."update-notifier-6.0.2" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validator-13.11.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - sources."when-exit-2.1.1" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-6.2.0" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A gitmoji client for using emojis on commit messages."; - homepage = "https://github.com/carloscuesta/gitmoji-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index cd33ae2f7f5..b71712aba99 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -14,12 +14,11 @@ buildDunePackage (rec { tyxml ]; - duneVersion = "3"; doCheck = true; meta = with lib; { description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest."; - license = licenses.gpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; homepage = "https://github.com/Khady/ocaml-junit"; }; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 9c1914b0f32..1f23194582a 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -7,6 +7,9 @@ , topkg }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ptime is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; pname = "ocaml${ocaml.version}-ptime"; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 777f7778249..7adfc337888 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-nVkue3qB6OwXKcyaYU1WmXG7pamKQtk8cbztVVkNejo="; + hash = "sha256-gI1Hd/i3S+lNcXaGG/hBR/cdn3S1fQ6xJ0xtRXo48rI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ae0cbf99841..66f81b12329 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchPypi +, flit , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; version = "1.2.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index b09accb38b7..4a66a8f35d0 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 20271236723..f0e63e0ae37 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, fetchpatch +, flit-core , pygments , pytestCheckHook , uvloop @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiorun"; version = "2023.7.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +23,18 @@ buildPythonPackage rec { hash = "sha256-3AGsT8IUNi5SZHBsBfd7akj8eQ+xb0mrR7ydIr3T8gs="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/cjrh/aiorun/pull/85 + url = "https://github.com/cjrh/aiorun/commit/a0c027ea331167712738e35ca70fefcd794e16d5.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/argon2-cffi/default.nix b/pkgs/development/python-modules/argon2-cffi/default.nix index 24e32526682..2282a06e5c6 100644 --- a/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/pkgs/development/python-modules/argon2-cffi/default.nix @@ -6,6 +6,7 @@ , wheel , buildPythonPackage , fetchPypi +, flit-core , isPy3k , lib , stdenv @@ -15,13 +16,17 @@ buildPythonPackage rec { pname = "argon2-cffi"; version = "21.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 9257e12f721..9049a228518 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitLab +, flit-core , python }: buildPythonPackage rec { pname = "asyncinotify"; version = "4.0.2"; - format = "flit"; + format = "pyproject"; src = fetchFromGitLab { owner = "Taywee"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; }; + nativeBuildInputs = [ + flit-core + ]; + checkPhase = '' ${python.pythonForBuild.interpreter} ${src}/test.py ''; diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 4d27c6da882..8cd6af449f9 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , typing-extensions +, flit-core , pytestCheckHook , pythonOlder }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; version = "3.10.8"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7HQFyIR+NWRzbFkzkZiuEQotZfCXpCzrWfWIFg1lWv4="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix index b7ccfedfbb8..582e7c5dccf 100644 --- a/pkgs/development/python-modules/bash_kernel/default.nix +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , ipykernel , isPy27 , python @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "bash_kernel"; version = "0.9.0"; - format = "flit"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { @@ -33,6 +34,8 @@ buildPythonPackage rec { --replace "\"bash\"" "'${bash}/bin/bash'" ''; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipykernel pexpect ]; # no tests diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index e5420f26c1a..90cf6a4be7f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , psutil , pytestCheckHook , pyyaml @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ psutil pyzmq diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 1d2f56a85f1..a3a979f68f8 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "confuse"; version = "1.7.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix index 71542f2f9b4..5c16312538a 100644 --- a/pkgs/development/python-modules/django-types/default.nix +++ b/pkgs/development/python-modules/django-types/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "django-types"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-wcQqt4h2xXxyg0LVqwYHJas3H8jcg7uFuuC+BoRqrXA="; + hash = "sha256-uOIzTIEIZNer8RzTzbHaOyAVtn5/EnAAfjN3f/G9hlQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 07def603cb7..cd55d1c4c2b 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ecs-logging"; version = "2.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 0d7218ea3ea..b4b0b9b2106 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, flit-core , pytestCheckHook , pythonOlder , borgbackup @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "emborg"; version = "1.37"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ appdirs arrow diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index 387ee2bea4e..098d13e87c9 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core, bleach, markdown }: buildPythonPackage rec { pname = "formbox"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -13,6 +13,7 @@ buildPythonPackage rec { hash = "sha256-zOvXmSeBiwc0Z5mRMwMsHLU3A/iP7rpjXm0T0I2gUTk="; }; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ bleach markdown ]; doCheck = false; # there's no test pythonImportsCheck = [ "formbox" ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 37a9d75beee..e109f4fa048 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit , uritemplate , pyjwt , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "gidgethub"; version = "5.3.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-ns59N/vOuBm4BWDn7Vj5NuSKZdN+xfVtt5FFFWtCaiU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ uritemplate pyjwt diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index fd01e1b1d81..6ff8cc13be0 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , google-auth , google-auth-oauthlib , pytest-vcr @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 80068293145..6e6d0e21ef0 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, kubo, packaging, tomli }: +, kubo, packaging, tomli, flit-core }: buildPythonPackage rec { pname = "ipwhl"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { @@ -14,6 +14,7 @@ buildPythonPackage rec { hash = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; + nativeBuildInputs = [ flit-core ]; buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 81b89e77a8b..631a853833d 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "jupyter-book"; version = "0.15.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index cbeb05bde98..29a8bb02458 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jupyter-cache"; version = "0.6.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/loca/default.nix b/pkgs/development/python-modules/loca/default.nix index 8ad0a4adbe7..28a9020d744 100644 --- a/pkgs/development/python-modules/loca/default.nix +++ b/pkgs/development/python-modules/loca/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut }: +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, flit-core }: buildPythonPackage rec { pname = "loca"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "1l6jimw3wd81nz1jrzsfw1zzsdm0jm998xlddcqaq0h38sx69w8g"; }; + nativeBuildInputs = [ + flit-core + ]; + doCheck = false; # all checks are static analyses pythonImportsCheck = [ "loca" ]; diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 19b5d10ca0e..b16fd1a572d 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, hatchling }: buildPythonPackage rec { pname = "looseversion"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version pname; sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; + nativeBuildInputs = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 1d285d89c70..a7fd0f94037 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonPackage rec { pname = "mdformat-admon"; version = "1.0.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -35,6 +35,10 @@ in python.pkgs.buildPythonPackage rec { hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; }; + nativeBuildInputs = with python.pkgs; [ + flit-core + ]; + buildInputs = with python.pkgs; [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index cee0e1bd5e5..4d7b56f0c2f 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat-footnote"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 67e0634fa1d..b073bb83a59 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , markdown-it-py , mdformat @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "mdformat-frontmatter"; version = "2.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdit-py-plugins diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 73404542652..e8efd7bac91 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdformat-gfm , mdit-py-plugins @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; version = "1.0.4"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat mdformat-gfm diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index b4d293f6368..c5bbeeb46de 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-simple-breaks"; version = "0.0.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-4lJHB4r9lI2uGJ/BmFFc92sumTRKBBwiRmGBdQkzfd0="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 747029eab27..018371ada82 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , mdformat , mdit-py-plugins , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; version = "0.4.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; }; + nativeBuildInputs = [ + flit-core + ]; + buildInputs = [ mdformat ]; diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index a3c2ad7794f..00a657800da 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mediafile"; version = "0.10.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 28f754e98ed..c37aa8f867e 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , ipython , matplotlib , numpy @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "mediapy"; version = "1.1.8"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,9 +21,10 @@ buildPythonPackage rec { hash = "sha256-mVhBM+NQEkLYByp/kCPFJCAY26La5CWjcPl6PgclA9A="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; - format = "flit"; pythonImportsCheck = [ "mediapy" ]; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index f5243236189..86a1b5d3d32 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "more-itertools"; version = "9.1.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-yrqjQa0DieqDwXqUVmpTrkydBzSYYeyxTcbQNFz5rF0="; }; - nativeBuildInouts = [ + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 6ede481fba8..33c06fc2461 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "myst-nb"; version = "0.17.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 807060528ee..185fffba413 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , docopt , fetchFromGitHub -, flitBuildHook +, flit-core , hypothesis , inform , nestedtext @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix index 340af281269..35d6fa16e1d 100644 --- a/pkgs/development/python-modules/nkdfu/default.nix +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: +{ lib, buildPythonPackage, fetchPypi, flit-core, fire, tqdm, intelhex, libusb1 }: buildPythonPackage rec { pname = "nkdfu"; version = "0.2"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-8l913dOCxHKFtpQ83p9RV3sUlu0oT5PVi14FSuYJ9fg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fire tqdm diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 38370a1c805..4306579bc51 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core , pytestCheckHook , coveralls , numpy @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "parametrize-from-file"; version = "0.17.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit version; @@ -40,6 +41,10 @@ buildPythonPackage rec { --replace "more_itertools~=8.10" "more_itertools" ''; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index c9753a47d81..0faa3c324b3 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pep440"; version = "0.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 84f3798df84..62fb96fb31a 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - hash = "sha256-OR/kE3VO/U4O8AFUtEJx1jxM3Uvt8IjSMRGlcl2GMhA="; + hash = "sha256-LBzB1mSLK+ZulE2y/6WRZqN7kWTRE1rVJdnNix4pgWg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index d70cfd1c434..ddb610b53bc 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -1,13 +1,15 @@ { buildPythonPackage , fetchPypi +, fetchpatch , lib , nix-update-script , pythonOlder +, flit-core }: buildPythonPackage rec { pname = "pkgutil-resolve-name"; version = "1.3.10"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,6 +19,18 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + patches = [ + # Raise flit-core version constrains + (fetchpatch { # https://github.com/graingert/pkgutil-resolve-name/pull/5 + url = "https://github.com/graingert/pkgutil-resolve-name/commit/042834290c735fa836bb308ce9e93c9f64d67cbe.patch"; + hash = "sha256-M1rcrkdFcoFa3IncPnJaRhnXbelyk56QnMGtmgB6bvk="; + }) + ]; + + nativeBuildInputs = [ + flit-core + ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 2a6ad34d706..0af07db4ec1 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core }: buildPythonPackage rec { pname = "pytest-celery"; version = "0.1.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "celery"; @@ -19,6 +19,10 @@ buildPythonPackage rec { --replace '"celery >= 4.4.0"' "" ''; + nativeBuildInputs = [ + flit-core + ]; + # This package has nothing to test or import. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index dbbf42c9b6a..1f11f31e213 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytest , pytestCheckHook }: @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "pytest-check"; version = "2.1.4"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-AbN/1wPaD6ZntwF68fBGDHRKhfHuh2de4+D5Ssw98XI="; }; - buildInputs = [ + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index 29cf253fad2..eea7a6ead0e 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, flit-core , py-cid , pytestCheckHook , pytest-cov @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-cid"; version = "1.1.2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -25,6 +26,10 @@ buildPythonPackage rec { --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-cid ]; diff --git a/pkgs/development/python-modules/pytest-md-report/default.nix b/pkgs/development/python-modules/pytest-md-report/default.nix index 89b035e74d8..be52de50f41 100644 --- a/pkgs/development/python-modules/pytest-md-report/default.nix +++ b/pkgs/development/python-modules/pytest-md-report/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-md-report"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iabj6WuS6+65O4ztagT1/H+U8/SKySQ9bQiOfvln1AQ="; + hash = "sha256-4946iE+VYaPndJtQLQE7Q7VSs4aXxrg3wL4p84oT5to="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-param-files/default.nix b/pkgs/development/python-modules/pytest-param-files/default.nix index bf629cc356a..80dea1dbeaa 100644 --- a/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/pkgs/development/python-modules/pytest-param-files/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Q7wWoggJN2w2a2umQHx5TsVcugqpovBEtOKruNMZQ8A="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 2b3860c93f9..2da96d21c9e 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -1,14 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, flit-core +, flit , pytest }: buildPythonPackage rec { pname = "pytest-raisin"; version = "0.4"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "wimglenn"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + flit ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 51385c46434..27057d92ea1 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-lsp-jsonrpc"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk="; + hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix index 1e3776b906a..90cf78e4d69 100644 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/pkgs/development/python-modules/python_docs_theme/default.nix @@ -1,9 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, sphinx }: +{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: buildPythonPackage rec { pname = "python_docs_theme"; version = "2023.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "python"; @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ sphinx ]; pythonImportsCheck = [ "python_docs_theme" ]; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 18141543c98..367416c2960 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , buildPythonPackage , unittestCheckHook +, flit-core , daqp , ecos , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "qpsolvers"; version = "3.4.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + flit-core quadprog unittestCheckHook ]; diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix index 68eba2e9462..92e1f94c1ad 100644 --- a/pkgs/development/python-modules/quantiphy-eval/default.nix +++ b/pkgs/development/python-modules/quantiphy-eval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , inform , pythonOlder , sly @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "quantiphy-eval"; version = "0.5"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ inform sly diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix index b05a0428f97..57ac30017ce 100644 --- a/pkgs/development/python-modules/quantiphy/default.nix +++ b/pkgs/development/python-modules/quantiphy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , pytestCheckHook , pythonOlder , inform @@ -27,7 +27,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix index 558dcdc076a..ca003ed9069 100644 --- a/pkgs/development/python-modules/rkm-codes/default.nix +++ b/pkgs/development/python-modules/rkm-codes/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, flitBuildHook +, flit-core , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { format = "pyproject"; nativeBuildInputs = [ - flitBuildHook + flit-core ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/rsskey/default.nix b/pkgs/development/python-modules/rsskey/default.nix index 095ce2b5c8c..61cba286d1b 100644 --- a/pkgs/development/python-modules/rsskey/default.nix +++ b/pkgs/development/python-modules/rsskey/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , feedparser , httpx , loca @@ -11,13 +12,17 @@ buildPythonPackage rec { pname = "rsskey"; version = "0.2.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-QedLuwd0ES2LWhZ72Cjh3+ZZ7HbRyNsyLN9lNFbY5dQ="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ feedparser httpx diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index b0166c303d7..fef12eb963a 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, flit , click , cryptography , ecdsa @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "solo-python"; version = "0.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click cryptography diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e585353687..ad109b1d30f 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-design"; version = "0.5.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index cc0163ba3d6..0aff8f37caa 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; version = "0.3.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix index f11db7fc973..d6237387bf8 100644 --- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix +++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "sphinx-hoverxref"; version = "1.3.0"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix index 4803e8d4c1a..0f44efae979 100644 --- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix +++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , sphinx }: buildPythonPackage rec { pname = "sphinx-inline-tabs"; version = "2023.04.21"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "pradyunsg"; @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-1oZheHDNOQU0vWL3YClQrJe94WyUJ72bCAF1UKtjJ0w="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ca7e574c82f..d20446e91bb 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinx-mdinclude"; version = "0.5.3"; - format = "flit"; + format = "pyproject"; src = fetchPypi { pname = "sphinx_mdinclude"; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index c6255bbc538..edc8e2ce6b0 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "0.8.3"; - format = "flit"; + format = "pyproject"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index 6d05a38d63a..ecb2cbf55e7 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-vRHPq6BAuhn5QvHG2BGen9v6ezA3RgFVtustsNxU+n8="; }; - format = "flit"; + format = "pyproject"; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index bfe40429127..54d7fa12829 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, flit +, flit-core , pytestCheckHook , numpy , scipy @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.1.0"; disabled = pythonOlder "3.6"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "joblib"; @@ -22,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ pytestCheckHook numpy diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix index b4f7ed0ef58..5e14812fe7b 100644 --- a/pkgs/development/python-modules/tidyexc/default.nix +++ b/pkgs/development/python-modules/tidyexc/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit }: buildPythonPackage rec { pname = "tidyexc"; version = "0.10.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6"; }; + nativeBuildInputs = [ + flit + ]; + pythonImportsCheck = [ "tidyexc" ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 4c21305ac09..35c8578cab4 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinycss2"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix index 1fe1d303856..b003f134004 100644 --- a/pkgs/development/python-modules/turnt/default.nix +++ b/pkgs/development/python-modules/turnt/default.nix @@ -1,15 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, click, tomli }: +{ lib, buildPythonPackage, fetchPypi, flit, click, tomli }: buildPythonPackage rec { pname = "turnt"; version = "1.11.0"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ click tomli diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index bcf6f5afa78..4602a30fde9 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bFSpasqo+UUmhHPezulxdSTF23KOPZsqJadrdWo9kU="; + hash = "sha256-ryBymzmNLzuDklHXReT0DyPLCb1reX4Kb/bu1GynBCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeversolarlocal/default.nix b/pkgs/development/python-modules/zeversolarlocal/default.nix index 04063837b42..b1e515d7632 100644 --- a/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , flit-core +, dos2unix , httpx , pytest-asyncio , pytest-mock @@ -12,7 +14,7 @@ buildPythonPackage rec { pname = "zeversolarlocal"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,6 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core + dos2unix ]; propagatedBuildInputs = [ @@ -35,6 +38,20 @@ buildPythonPackage rec { pytestCheckHook ]; + # the patch below won't apply unless we fix the line endings + prePatch = '' + dos2unix pyproject.toml + ''; + + patches = [ + # Raise the flit-core limit + # https://github.com/sander76/zeversolarlocal/pull/4 + (fetchpatch { + url = "https://github.com/sander76/zeversolarlocal/commit/bff072ea046de07eced77bc79eb8e90dfef1f53f.patch"; + hash = "sha256-tzFCwPzhAfwVfN5mLY/DMwRv7zGzx3ScBe+kKzkYcvo="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov zeversolarlocal --cov-report xml:cov.xml --cov-report term-missing -vv" "" diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index fca02e80ee5..545236b561c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -4,6 +4,7 @@ , bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils +, diffutils, gnupatch # updater , python3, writeScript # Apple dependencies @@ -110,10 +111,12 @@ let [ bash coreutils + diffutils file findutils gawk gnugrep + gnupatch gnused gnutar gzip diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index b259b683dde..ece8f93b57a 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvmPackages }: +{ lib, stdenv, llvmPackages, enableLibcxx ? false }: +# enableLibcxx will use the c++ headers from clang instead of gcc. +# This shouldn't have any effect on platforms that use clang as the default compiler already. let unwrapped = llvmPackages.clang-unwrapped; @@ -9,7 +11,7 @@ in stdenv.mkDerivation { pname = "clang-tools"; version = lib.getVersion unwrapped; dontUnpack = true; - clang = llvmPackages.clang; + clang = if enableLibcxx then llvmPackages.libcxxClang else llvmPackages.clang; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix index cd2a9788f40..68093f39e4f 100644 --- a/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitea-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "gitea-actions-runner"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "act_runner"; rev = "v${version}"; - hash = "sha256-HWJrgZJfI5fOeZvQkmpd6wciJWh1JOmZMlyGHSbgHpc="; + hash = "sha256-GE9yqp5zWJ4lL0L/w3oSvU72AiHBNb+yh2qBPKPe9X0="; }; - vendorHash = "sha256-Z61kTbKHSUpt2F6jVUUK4KwMJ0ILT1FI4/62AkNQuZI="; + vendorHash = "sha256-NoaLq5pCwTuPd9ne5LYcvJsgUXAqcfkcW3Ck2K350JE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 225a2981a60..c9d2cc352e1 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.17"; + version = "0.7.19"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; + hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; }; - vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; + vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json index 10c7b9e4ca4..201aae3c920 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json @@ -4,7 +4,6 @@ "flit", "flit-core", "pbr", - "flitBuildHook", "cython", "hatchling", "hatch-vcs", diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index 176881caeed..04174d1c435 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -316,7 +316,7 @@ "setuptools" ], "aiohttp-remotes": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiohttp-retry": [ @@ -348,7 +348,7 @@ "setuptools" ], "aiojobs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiokafka": [ @@ -428,7 +428,6 @@ ], "aioprocessing": [ "flit-core", - "flitBuildHook", "setuptools" ], "aiopulse": [ @@ -476,7 +475,7 @@ "setuptools" ], "aiorun": [ - "flitBuildHook", + "flit-core", "setuptools" ], "aiosenseme": [ @@ -920,7 +919,7 @@ "setuptools" ], "argon2-cffi": [ - "flitBuildHook", + "flit-core", "setuptools" ], "argon2-cffi-bindings": [ @@ -1143,7 +1142,7 @@ "setuptools" ], "asyncstdlib": [ - "flitBuildHook", + "flit-core", "setuptools" ], "asynctest": [ @@ -2014,7 +2013,7 @@ "setuptools" ], "bash-kernel": [ - "flitBuildHook", + "flit-core", "setuptools" ], "bashlex": [ @@ -3297,7 +3296,6 @@ ], "confuse": [ "flit-core", - "flitBuildHook", "setuptools" ], "connect-box": [ @@ -4859,7 +4857,6 @@ ], "ecs-logging": [ "flit-core", - "flitBuildHook", "setuptools" ], "ed25519": [ @@ -5162,7 +5159,7 @@ "exceptiongroup": [ "flit-core", "flit-scm", - "flitBuildHook", + "flit-core", "setuptools" ], "exchangelib": [ @@ -5293,7 +5290,7 @@ "setuptools" ], "fastapi": [ - "flitBuildHook", + "flit-core", "hatchling", "setuptools" ], @@ -5897,7 +5894,7 @@ "setuptools" ], "formbox": [ - "flitBuildHook", + "flit-core", "setuptools" ], "formencode": [ @@ -6004,7 +6001,7 @@ "setuptools" ], "furo": [ - "flitBuildHook", + "flit-core", "setuptools" ], "fuse": [ @@ -6248,7 +6245,7 @@ "setuptools" ], "gidgethub": [ - "flitBuildHook", + "flit-core", "setuptools" ], "gigalixir": [ @@ -7612,14 +7609,14 @@ "setuptools" ], "ipfshttpclient": [ - "flitBuildHook", + "flit-core", "setuptools" ], "iptools": [ "setuptools" ], "ipwhl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "ipwhois": [ @@ -8068,7 +8065,6 @@ ], "jupyter-book": [ "flit-core", - "flitBuildHook", "setuptools" ], "jupyter-c-kernel": [ @@ -8755,7 +8751,7 @@ "setuptools" ], "loca": [ - "flitBuildHook", + "flit-core", "setuptools" ], "localimport": [ @@ -9166,7 +9162,6 @@ ], "mediafile": [ "flit-core", - "flitBuildHook", "setuptools" ], "mediapy": [ @@ -9536,7 +9531,6 @@ ], "more-itertools": [ "flit-core", - "flitBuildHook", "setuptools" ], "more-properties": [ @@ -9830,12 +9824,10 @@ ], "myst-nb": [ "flit-core", - "flitBuildHook", "setuptools" ], "myst-parser": [ "flit-core", - "flitBuildHook", "setuptools" ], "nad-receiver": [ @@ -10140,7 +10132,7 @@ "setuptools" ], "nkdfu": [ - "flitBuildHook", + "flit-core", "setuptools" ], "nltk": [ @@ -11239,7 +11231,6 @@ ], "pep440": [ "flit-core", - "flitBuildHook", "setuptools" ], "pep440-version-utils": [ @@ -11281,7 +11272,6 @@ ], "pex": [ "flit-core", - "flitBuildHook", "setuptools" ], "pexif": [ @@ -14144,15 +14134,15 @@ "setuptools" ], "pytest-celery": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-check": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-cid": [ - "flitBuildHook", + "flit-core", "setuptools" ], "pytest-clarity": [ @@ -14310,7 +14300,6 @@ ], "pytest-param-files": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-profiling": [ @@ -14332,7 +14321,6 @@ ], "pytest-raisin": [ "flit-core", - "flitBuildHook", "setuptools" ], "pytest-random-order": [ @@ -16016,7 +16004,7 @@ "setuptools" ], "rsskey": [ - "flitBuildHook", + "flit-core", "setuptools" ], "rst2ansi": [ @@ -16878,7 +16866,7 @@ "setuptools" ], "solo-python": [ - "flitBuildHook", + "flit-core", "setuptools" ], "somajo": [ @@ -17012,19 +17000,17 @@ ], "sphinx-design": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-external-toc": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-fortran": [ "setuptools" ], "sphinx-inline-tabs": [ - "flitBuildHook", + "flit-core", "setuptools" ], "sphinx-jinja": [ @@ -17042,7 +17028,6 @@ ], "sphinx-mdinclude": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-multitoc-numbering": [ @@ -17053,7 +17038,6 @@ ], "sphinx-pytest": [ "flit-core", - "flitBuildHook", "setuptools" ], "sphinx-rtd-theme": [ @@ -17434,7 +17418,7 @@ "setuptools" ], "structlog": [ - "flitBuildHook", + "flit-core", "hatch-fancy-pypi-readme", "hatch-vcs", "hatchling", @@ -17952,7 +17936,7 @@ "setuptools" ], "threadpoolctl": [ - "flitBuildHook", + "flit-core", "setuptools" ], "threat9-test-bed": [ @@ -18023,7 +18007,6 @@ ], "tinycss2": [ "flit-core", - "flitBuildHook", "setuptools" ], "tinydb": [ @@ -18343,7 +18326,7 @@ "setuptools" ], "turnt": [ - "flitBuildHook", + "flit-core", "setuptools" ], "tusker": [ @@ -19848,7 +19831,6 @@ ], "zeversolarlocal": [ "flit-core", - "flitBuildHook", "setuptools" ], "zfec": [ diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/games/brutalmaze/default.nix index d9c904d99a3..8f8930ce0c6 100644 --- a/pkgs/games/brutalmaze/default.nix +++ b/pkgs/games/brutalmaze/default.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "brutalmaze"; version = "1.1.1"; - format = "flit"; + format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; src = fetchFromSourcehut { @@ -13,6 +13,10 @@ python3Packages.buildPythonApplication rec { sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y"; }; + nativeBuildInputs = with python3Packages; [ + flit-core + ]; + propagatedBuildInputs = with python3Packages; [ loca palace diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index b08d4baf2a4..b8e333cd79c 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.2.1"; + version = "17.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-FJnwabNEEGZDM9wNWMGclFv2IMlXg4Ob3PEbGiGQKKc="; + hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-hUrsumBiKovSD7xT1PgH2Q+7HYgyxnFnz33YJPdd5+c="; + hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 0019a7c5f38..ea31ad62891 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.6-rc2", - "hash": "sha256:1hbva5vsfi48h82ll4kmhzm5hxp7340bj2smwgvjikam26icaj54" + "version": "6.6-rc3", + "hash": "sha256:1i0fii5lq8ij1y1pfypw08j4f7kv1nvj264x77mfcj1cjm1jx1zx" }, "6.5": { "version": "6.5.5", diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index b940f35e6a5..57004b66b03 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-fWcdnmpLZycg7hmPNnphGcuSMTI4bsq57XPoSyQSGDA="; + hash = "sha256-TZeQcrJCH9TW039r499fxY4xJ27nZm9GdrilsI33Iqc="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -25,7 +25,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-im7Pauit0tWi0BcyKtxybOqsu7rrIHZwY5Olta3nJJI="; + vendorHash = "sha256-TR6YGNhSMQ/1kvX3p3QGlXovuoJdaRH0LOwIPZwQ/xY="; doCheck = false; diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix index c90522edf04..326d42d5d78 100644 --- a/pkgs/servers/mail/spf-engine/default.nix +++ b/pkgs/servers/mail/spf-engine/default.nix @@ -1,15 +1,17 @@ -{ lib, buildPythonApplication, fetchurl, pyspf, dnspython, authres, pymilter }: +{ lib, buildPythonApplication, fetchurl, flit-core, pyspf, dnspython, authres, pymilter }: buildPythonApplication rec { pname = "spf-engine"; version = "3.0.4"; - format = "flit"; + format = "pyproject"; src = fetchurl { url = "https://launchpad.net/${pname}/${lib.versions.majorMinor version}/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "sha256-Gcw7enNIb/TrZEYa0Z04ezHUmfMmc1J+aEH6FlXbhTo="; }; + nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ pyspf dnspython authres pymilter ]; pythonImportsCheck = [ diff --git a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix new file mode 100644 index 00000000000..1412c4dff6c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "sabnzbd_exporter"; + version = "0.1.70"; + + format = "other"; + + src = fetchFromGitHub { + owner = "msroest"; + repo = pname; + rev = version; + hash = "sha256-FkZAWIIlGX2VxRL3WS5J9lBgToQGbEQUqvf0xcdvynk="; + }; + + propagatedBuildInputs = with python3Packages; [ prometheus-client requests ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp sabnzbd_exporter.py $out/bin/ + + mkdir -p $out/share/${pname} + cp examples/* $out/share/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Prometheus exporter for sabnzbd"; + homepage = "https://github.com/msroest/sabnzbd_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ fugi ]; + platforms = platforms.all; + mainProgram = "sabnzbd_exporter.py"; + }; +} diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index b4788d2dcf4..8681e704130 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-FeQTg0EuAwpSMf+rPLFNegXEXfVa6dqR2xjl4MfZnYg="; + hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; }; vendorHash = null; diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 37c344931e4..d99c00b2f3d 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3iY16ld2yKf5PffaS1FUwhWD657OAdY4eWHe5f3fIuQ="; + sha256 = "sha256-gUBSPkfIjvIU94tdasaoSl8zKPdfZ2PuT7sD8zU+iCI="; }; - cargoHash = "sha256-uRDRBe3rxkTSmO/uWSLQ6JI/t0KFta2kkf2ZihVYw0A="; + cargoHash = "sha256-ENFFhZ+OUcQPmQoYj5xFmUBJpofe8ovQgcEepujwcFA="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index c28f7971a86..e675cd1b760 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-EvNdE9SYO8+DEJoIxJEh3Fy/+AbtoAyUrOnZtd23K7Q="; + hash = "sha256-/Aqt4TjXAJCF6woyJ90lbVt0eN1QuPWk9A8RhggKHJk="; }; - cargoHash = "sha256-1QluALqSwu49/oz89m3KDDgGo91lqOj+WDP8erGmA/8="; + cargoHash = "sha256-ofB61CsXH+CxnuWBbwUgUbBiF5bg35swxcFpVOzDN9I="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 0f31ef01cf2..e4eb2eeaac4 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man +{ stdenv +, lib +, fetchurl +, fetchpatch +, ncurses +, perl +, help2man , apparmorRulesFromClosure , libxcrypt }: @@ -17,6 +23,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2023-40303.patch"; + url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=e4e65c03f4c11292a3e40ef72ca3f194c8bffdd6"; + hash = "sha256-I5skN537owfpFpAZr4vDKPHuERI6+oq5/hFW2RQeUxI="; + }) ]; strictDeps = true; @@ -40,9 +51,7 @@ stdenv.mkDerivation rec { "--disable-rexec" ] ++ lib.optional stdenv.isDarwin "--disable-servers"; - # Test fails with "UNIX socket name too long", probably because our - # $TMPDIR is too long. - doCheck = false; + doCheck = true; installFlags = [ "SUIDMODE=" ]; diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 800400ba93c..07d42879c89 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.5"; + version = "1.20.7"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-svAxEBRnqwWhmu3aRfeGeEjXfADbb1zWPj+REK9fsDM="; + sha256 = "sha256-k7QDdHwxM1RYoZy37rzhJunk3RQXVC3rkdoXUVL00wQ="; }; setOutputFlags = false; diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index b9847171616..9c36ceb3c84 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; version = "0.4.39"; - format = "flit"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -43,9 +43,13 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ + flit-core pythonRelaxDepsHook ]; + # FIXME: does pythonRelaxDepsHook not work for pypaBuildHook + flit-core? + pypaBuildFlags = [ "--skip-dependency-check" ]; + pythonRelaxDeps = [ "click" "cryptography" diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 607a1798452..a9c4f300141 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; version = "2.1.7"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "alterakey"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57e94596b54..3ea466165be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27356,6 +27356,7 @@ with pkgs; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-sabnzbd-exporter = callPackage ../servers/monitoring/prometheus/sabnzbd-exporter.nix { }; prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cffb020d468..a53b6e446ef 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1519,10 +1519,7 @@ let psq = callPackage ../development/ocaml-modules/psq { }; - ptime = - if lib.versionAtLeast ocaml.version "4.08" - then callPackage ../development/ocaml-modules/ptime { } - else null; + ptime = callPackage ../development/ocaml-modules/ptime { }; ptmap = callPackage ../development/ocaml-modules/ptmap { }; |