diff options
406 files changed, 2333 insertions, 1296 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fe00f03a8a3a..96e2861a706d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15461,6 +15461,12 @@ githubId = 780485; name = "Misty De Méo"; }; + mistyttm = { + name = "Emmey Rose"; + email = "contact@mistyttm.dev"; + github = "Mistyttm"; + githubId = 51770769; + }; misuzu = { email = "bakalolka@gmail.com"; github = "misuzu"; diff --git a/nixos/modules/programs/mdevctl.nix b/nixos/modules/programs/mdevctl.nix index f967b7487b2a..e96aca9185ca 100644 --- a/nixos/modules/programs/mdevctl.nix +++ b/nixos/modules/programs/mdevctl.nix @@ -16,8 +16,9 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ mdevctl ]; - environment.etc."mdevctl.d/scripts.d/notifiers/.keep".text = ""; - environment.etc."mdevctl.d/scripts.d/callouts/.keep".text = ""; + environment.etc."mdevctl.d/.keep".text = ""; + environment.etc."mdevctl/scripts.d/notifiers/.keep".text = ""; + environment.etc."mdevctl/scripts.d/callouts/.keep".text = ""; }; } diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix index 7e021281f91a..e359ea9671d8 100644 --- a/nixos/modules/services/web-servers/h2o/default.nix +++ b/nixos/modules/services/web-servers/h2o/default.nix @@ -5,11 +5,11 @@ ... }: -# TODO: ACME # TODO: Gems includes for Mruby # TODO: Recommended options let cfg = config.services.h2o; + inherit (config.security.acme) certs; inherit (lib) literalExpression @@ -20,8 +20,62 @@ let types ; + mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix lib; + settingsFormat = pkgs.formats.yaml { }; + getNames = name: vhostSettings: rec { + server = if vhostSettings.serverName != null then vhostSettings.serverName else name; + cert = + if lib.attrByPath [ "acme" "useHost" ] null vhostSettings == null then + server + else + vhostSettings.acme.useHost; + }; + + # Attrset with the virtual hosts relevant to ACME configuration + acmeEnabledHostsConfigs = lib.foldlAttrs ( + acc: name: value: + if value.acme == null || (!value.acme.enable && value.acme.useHost == null) then + acc + else + let + names = getNames name value; + virtualHostConfig = value // { + serverName = names.server; + certName = names.cert; + }; + in + acc ++ [ virtualHostConfig ] + ) [ ] cfg.hosts; + + # Attrset with the ACME certificate names split by whether or not they depend + # on H2O serving challenges. + certNames = + let + partition = + acc: vhostSettings: + let + inherit (vhostSettings) certName; + isDependent = certs.${certName}.dnsProvider == null; + in + if isDependent && !(builtins.elem certName acc.dependent) then + acc // { dependent = acc.dependent ++ [ certName ]; } + else if !isDependent && !(builtins.elem certName acc.independent) then + acc // { independent = acc.independent ++ [ certName ]; } + else + acc; + + certNames' = lib.lists.foldl partition { + dependent = [ ]; + independent = [ ]; + } acmeEnabledHostsConfigs; + in + certNames' + // { + all = certNames'.dependent ++ certNames'.independent; + }; + hostsConfig = lib.concatMapAttrs ( name: value: let @@ -29,56 +83,88 @@ let HTTP = lib.attrByPath [ "http" "port" ] cfg.defaultHTTPListenPort value; TLS = lib.attrByPath [ "tls" "port" ] cfg.defaultTLSListenPort value; }; - serverName = if value.serverName != null then value.serverName else name; - in - # HTTP settings - lib.optionalAttrs (value.tls == null || value.tls.policy == "add") { - "${serverName}:${builtins.toString port.HTTP}" = value.settings // { - listen.port = port.HTTP; - }; - } - # Redirect settings - // lib.optionalAttrs (value.tls != null && value.tls.policy == "force") { - "${serverName}:${builtins.toString port.HTTP}" = { - listen.port = port.HTTP; - paths."/" = { - redirect = { - status = value.tls.redirectCode; - url = "https://${serverName}:${builtins.toString port.TLS}"; + + names = getNames name value; + + acmeSettings = lib.optionalAttrs (builtins.elem names.cert certNames.dependent) ( + let + acmePort = 80; + acmeChallengePath = "/.well-known/acme-challenge"; + in + { + "${names.server}:${builtins.toString acmePort}" = { + listen.port = acmePort; + paths."${acmeChallengePath}/" = { + "file.dir" = value.acme.root + acmeChallengePath; + }; + }; + } + ); + + httpSettings = + lib.optionalAttrs (value.tls == null || value.tls.policy == "add") { + "${names.server}:${builtins.toString port.HTTP}" = value.settings // { + listen.port = port.HTTP; + }; + } + // lib.optionalAttrs (value.tls != null && value.tls.policy == "force") { + "${names.server}:${builtins.toString port.HTTP}" = { + listen.port = port.HTTP; + paths."/" = { + redirect = { + status = value.tls.redirectCode; + url = "https://${names.server}:${builtins.toString port.TLS}"; + }; + }; }; }; - }; - } - # TLS settings - // - lib.optionalAttrs - ( - value.tls != null - && builtins.elem value.tls.policy [ - "add" - "only" - "force" - ] - ) - { - "${serverName}:${builtins.toString port.TLS}" = value.settings // { - listen = - let - identity = value.tls.identity; - in - { - port = port.TLS; - ssl = value.tls.extraSettings or { } // { - inherit identity; + + tlsSettings = + lib.optionalAttrs + ( + value.tls != null + && builtins.elem value.tls.policy [ + "add" + "only" + "force" + ] + ) + { + "${names.server}:${builtins.toString port.TLS}" = value.settings // { + listen = + let + identity = + value.tls.identity + ++ lib.optional (builtins.elem names.cert certNames.all) { + key-file = "${certs.${names.cert}.directory}/key.pem"; + certificate-file = "${certs.${names.cert}.directory}/fullchain.pem"; + }; + in + { + port = port.TLS; + ssl = value.tls.extraSettings // { + inherit identity; + }; }; - }; + }; }; - } + in + # With a high likelihood of HTTP & ACME challenges being on the same port, + # 80, do a recursive update to merge the 2 settings together + (lib.recursiveUpdate acmeSettings httpSettings) // tlsSettings ) cfg.hosts; h2oConfig = settingsFormat.generate "h2o.yaml" ( lib.recursiveUpdate { hosts = hostsConfig; } cfg.settings ); + + # Executing H2O with our generated configuration; `mode` added as needed + h2oExe = ''${lib.getExe cfg.package} ${ + lib.strings.escapeShellArgs [ + "--conf" + "${h2oConfig}" + ] + }''; in { options = { @@ -100,7 +186,7 @@ in package = lib.mkPackageOption pkgs "h2o" { example = '' pkgs.h2o.override { - withMruby = true; + withMruby = false; }; ''; }; @@ -123,21 +209,9 @@ in example = 8443; }; - mode = mkOption { - type = - with types; - nullOr (enum [ - "daemon" - "master" - "worker" - "test" - ]); - default = "master"; - description = "Operating mode of H2O"; - }; - settings = mkOption { type = settingsFormat.type; + default = { }; description = "Configuration for H2O (see <https://h2o.examp1e.net/configure.html>)"; }; @@ -189,6 +263,47 @@ in }; config = mkIf cfg.enable { + assertions = + [ + { + assertion = + !(builtins.hasAttr "hosts" h2oConfig) + || builtins.all ( + host: + let + hasKeyPlusCert = attrs: (attrs.key-file or "") != "" && (attrs.certificate-file or "") != ""; + in + # TLS not used + (lib.attrByPath [ "listen" "ssl" ] null host == null) + # TLS identity property + || ( + builtins.hasAttr "identity" host + && builtins.length host.identity > 0 + && builtins.all hasKeyPlusCert host.listen.ssl.identity + ) + # TLS short-hand (was manually specified) + || (hasKeyPlusCert host.listen.ssl) + ) (lib.attrValues h2oConfig.hosts); + message = '' + TLS support will require at least one non-empty certificate & key + file. Use services.h2o.hosts.<name>.acme.enable, + services.h2o.hosts.<name>.acme.useHost, + services.h2o.hosts.<name>.tls.identity, or + services.h2o.hosts.<name>.tls.extraSettings. + ''; + } + ] + ++ builtins.map ( + name: + mkCertOwnershipAssertion { + cert = certs.${name}; + groups = config.users.groups; + services = [ + config.systemd.services.h2o + ] ++ lib.optional (certNames.all != [ ]) config.systemd.services.h2o-config-reload; + } + ) certNames.all; + users = { users.${cfg.user} = { @@ -201,14 +316,25 @@ in }; systemd.services.h2o = { - description = "H2O web server service"; + description = "H2O HTTP server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wants = lib.concatLists (map (certName: [ "acme-finished-${certName}.target" ]) certNames.all); + # Since H2O will be hosting the challenges, H2O must be started + before = builtins.map (certName: "acme-${certName}.service") certNames.dependent; + after = + [ "network.target" ] + ++ builtins.map (certName: "acme-selfsigned-${certName}.service") certNames.all + ++ builtins.map (certName: "acme-${certName}.service") certNames.independent; # avoid loading self-signed key w/ real cert, or vice-versa serviceConfig = { - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${h2oExe} --mode 'master'"; + ExecReload = [ + "${h2oExe} --mode 'test'" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; ExecStop = "${pkgs.coreutils}/bin/kill -s QUIT $MAINPID"; User = cfg.user; + Group = cfg.group; Restart = "always"; RestartSec = "10s"; RuntimeDirectory = "h2o"; @@ -242,22 +368,66 @@ in CapabilitiesBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; - script = - let - args = - [ - "--conf" - "${h2oConfig}" - ] - ++ lib.optionals (cfg.mode != null) [ - "--mode" - cfg.mode - ]; - in - '' - ${lib.getExe cfg.package} ${lib.strings.escapeShellArgs args} - ''; + preStart = "${h2oExe} --mode 'test'"; }; - }; + # This service waits for all certificates to be available before reloading + # H2O configuration. `tlsTargets` are added to `wantedBy` + `before` which + # allows the `acme-finished-$cert.target` to signify the successful updating + # of certs end-to-end. + systemd.services.h2o-config-reload = + let + tlsTargets = map (certName: "acme-${certName}.target") certNames.all; + tlsServices = map (certName: "acme-${certName}.service") certNames.all; + in + mkIf (certNames.all != [ ]) { + wantedBy = tlsServices ++ [ "multi-user.target" ]; + before = tlsTargets; + after = tlsServices; + unitConfig = { + ConditionPathExists = map (certName: "${certs.${certName}.directory}/fullchain.pem") certNames.all; + # Disable rate limiting for this since it may be triggered quickly + # a bunch of times if a lot of certificates are renewed in quick + # succession. The reload itself is cheap, so even doing a lot of them + # in a short burst is fine. + # + # FIXME: like Nginx’s FIXME, there’s probably a better way to do + # this. + StartLimitIntervalSec = 0; + }; + serviceConfig = { + Type = "oneshot"; + TimeoutSec = 60; + ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active h2o.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl reload h2o.service"; + }; + }; + + security.acme.certs = + let + mkCerts = + acc: vhostSettings: + if vhostSettings.acme.useHost == null then + let + hasRoot = vhostSettings.acme.root != null; + in + acc + // { + "${vhostSettings.serverName}" = { + group = mkDefault cfg.group; + # If `acme.root` is `null`, inherit `config.security.acme`. + # Since `config.security.acme.certs.<cert>.webroot`’s own + # default value should take precedence set priority higher than + # mkOptionDefault + webroot = lib.mkOverride (if hasRoot then 1000 else 2000) vhostSettings.acme.root; + # Also nudge dnsProvider to null in case it is inherited + dnsProvider = lib.mkOverride (if hasRoot then 1000 else 2000) null; + extraDomainNames = vhostSettings.serverAliases; + }; + } + else + acc; + in + lib.lists.foldl mkCerts { } acmeEnabledHostsConfigs; + }; } diff --git a/nixos/modules/services/web-servers/h2o/vhost-options.nix b/nixos/modules/services/web-servers/h2o/vhost-options.nix index 26abf8eb4f6a..f0ebf5a7b6d9 100644 --- a/nixos/modules/services/web-servers/h2o/vhost-options.nix +++ b/nixos/modules/services/web-servers/h2o/vhost-options.nix @@ -19,6 +19,18 @@ in example = "example.org"; }; + serverAliases = mkOption { + type = types.listOf types.nonEmptyStr; + default = [ ]; + example = [ + "www.example.org" + "example.org" + ]; + description = '' + Additional names of virtual hosts served by this virtual host configuration. + ''; + }; + http = mkOption { type = types.nullOr ( types.submodule { @@ -82,7 +94,7 @@ in ''; }; identity = mkOption { - type = types.nonEmptyListOf ( + type = types.listOf ( types.submodule { options = { key-file = mkOption { @@ -96,7 +108,7 @@ in }; } ); - default = null; + default = [ ]; description = '' Key / certificate pairs for the virtual host. ''; @@ -104,23 +116,21 @@ in literalExpression # nix '' - { - indentities = [ - { - key-file = "/path/to/rsa.key"; - certificate-file = "/path/to/rsa.crt"; - } - { - key-file = "/path/to/ecdsa.key"; - certificate-file = "/path/to/ecdsa.crt"; - } - ]; - } + [ + { + key-file = "/path/to/rsa.key"; + certificate-file = "/path/to/rsa.crt"; + } + { + key-file = "/path/to/ecdsa.key"; + certificate-file = "/path/to/ecdsa.crt"; + } + ] ''; }; extraSettings = mkOption { - type = types.nullOr types.attrs; - default = null; + type = types.attrs; + default = { }; description = '' Additional TLS/SSL-related configuration options. ''; @@ -140,6 +150,49 @@ in description = "TLS options for virtual host"; }; + acme = mkOption { + type = types.nullOr ( + types.addCheck (types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to ask Let’s Encrypt to sign a certificate for this + virtual host. Alternatively, an existing host can be used thru + {option}`acme.useHost`. + ''; + }; + useHost = mkOption { + type = types.nullOr types.nonEmptyStr; + default = null; + description = '' + An existing Let’s Encrypt certificate to use for this virtual + host. This is useful if you have many subdomains and want to + avoid hitting the [rate + limit](https://letsencrypt.org/docs/rate-limits). Alternately, + you can generate a certificate through {option}`acme.enable`. + Note that this option neither creates any certificates nor does + it add subdomains to existing ones — you will need to create + them manually using [](#opt-security.acme.certs). + ''; + }; + root = mkOption { + type = types.nullOr types.path; + default = "/var/lib/acme/acme-challenge"; + description = '' + Directory for the ACME challenge, which is **public**. Don’t put + certs or keys in here. Set to `null` to inherit from + config.security.acme. + ''; + }; + }; + }) (a: (a.enable || a.useHost != null) && !(a.enable && a.useHost != null)) + ); + default = null; + description = "ACME options for virtual host."; + }; + settings = mkOption { type = types.attrs; description = '' diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index 4f2ff71c85e8..69b22bfd424a 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -1,4 +1,5 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ( + { pkgs, ... }: let test-certificates = pkgs.runCommandLocal "test-certificates" { } '' mkdir -p $out @@ -10,83 +11,127 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "step-ca"; - nodes = - { - caserver = - { config, pkgs, ... }: { - environment.etc.password-file.source = "${test-certificates}/intermediate-password-file"; - services.step-ca = { - enable = true; - address = "[::]"; - port = 8443; - openFirewall = true; - intermediatePasswordFile = "/etc/${config.environment.etc.password-file.target}"; - settings = { - dnsNames = [ "caserver" ]; - root = "${test-certificates}/root_ca.crt"; - crt = "${test-certificates}/intermediate_ca.crt"; - key = "${test-certificates}/intermediate_ca.key"; - db = { - type = "badger"; - dataSource = "/var/lib/step-ca/db"; - }; - authority = { - provisioners = [ - { - type = "ACME"; - name = "acme"; - } - ]; - }; + nodes = { + caserver = + { config, pkgs, ... }: + { + environment.etc.password-file.source = "${test-certificates}/intermediate-password-file"; + services.step-ca = { + enable = true; + address = "[::]"; + port = 8443; + openFirewall = true; + intermediatePasswordFile = "/etc/${config.environment.etc.password-file.target}"; + settings = { + dnsNames = [ "caserver" ]; + root = "${test-certificates}/root_ca.crt"; + crt = "${test-certificates}/intermediate_ca.crt"; + key = "${test-certificates}/intermediate_ca.key"; + db = { + type = "badger"; + dataSource = "/var/lib/step-ca/db"; + }; + authority = { + provisioners = [ + { + type = "ACME"; + name = "acme"; + } + ]; }; }; }; + }; - caclient = - { config, pkgs, ... }: { - security.acme.defaults.server = "https://caserver:8443/acme/acme/directory"; - security.acme.defaults.email = "root@example.org"; - security.acme.acceptTerms = true; + caclient = + { config, pkgs, ... }: + { + security.acme.defaults.server = "https://caserver:8443/acme/acme/directory"; + security.acme.defaults.email = "root@example.org"; + security.acme.acceptTerms = true; - security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; - services.nginx = { - enable = true; - virtualHosts = { - "caclient" = { - forceSSL = true; - enableACME = true; - }; + services.nginx = { + enable = true; + virtualHosts = { + "caclient" = { + forceSSL = true; + enableACME = true; }; }; }; + }; + + caclientcaddy = + { config, pkgs, ... }: + { + security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; - caclientcaddy = - { config, pkgs, ... }: { - security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + services.caddy = { + enable = true; + virtualHosts."caclientcaddy".extraConfig = '' + respond "Welcome to Caddy!" - services.caddy = { - enable = true; - virtualHosts."caclientcaddy".extraConfig = '' - respond "Welcome to Caddy!" + tls caddy@example.org { + ca https://caserver:8443/acme/acme/directory + } + ''; + }; + }; - tls caddy@example.org { - ca https://caserver:8443/acme/acme/directory - } - ''; + caclienth2o = + { config, pkgs, ... }: + { + security.acme = { + acceptTerms = true; + defaults = { + server = "https://caserver:8443/acme/acme/directory"; + email = "root@example.org"; }; }; + security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; - catester = { config, pkgs, ... }: { + services.h2o = { + enable = true; + hosts."caclienth2o" = { + tls.policy = "force"; + acme.enable = true; + settings = { + paths."/" = { + "file.file" = "${pkgs.writeTextFile { + name = "h2o_welcome.txt"; + text = "Welcome to H2O!"; + }}"; + }; + }; + }; + }; + }; + + catester = + { config, pkgs, ... }: + { security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; }; - }; + }; - testScript = + testScript = # python '' catester.start() caserver.wait_for_unit("step-ca.service") @@ -96,10 +141,13 @@ import ./make-test-python.nix ({ pkgs, ... }: catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"") caclientcaddy.wait_for_unit("caddy.service") - - # It's hard to know when caddy has finished the ACME - # dance with step-ca, so we keep trying to curl - # until succeess. + # It’s hard to know when Caddy has finished the ACME dance with + # step-ca, so we keep trying cURL until success. catester.wait_until_succeeds("curl https://caclientcaddy/ | grep \"Welcome to Caddy!\"") + + caclienth2o.wait_for_unit("acme-finished-caclienth2o.target") + caclienth2o.wait_for_unit("h2o.service") + catester.succeed("curl https://caclienth2o/ | grep \"Welcome to H2O!\"") ''; - }) + } +) diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix index 673e082322bb..5432a3b04172 100644 --- a/nixos/tests/web-servers/h2o/basic.nix +++ b/nixos/tests/web-servers/h2o/basic.nix @@ -118,7 +118,6 @@ import ../../make-test-python.nix ( assert "${sawatdi_chao_lok}" in http_hello_world_body tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'").lower() - print(tls_hello_world_head) assert "http/2 200" in tls_hello_world_head assert "server: h2o" in tls_hello_world_head assert "content-type: text/x-rst" in tls_hello_world_head diff --git a/pkgs/applications/editors/emacs/build-support/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix index c91fd033e0b6..2c3c5771292e 100644 --- a/pkgs/applications/editors/emacs/build-support/buffer.nix +++ b/pkgs/applications/editors/emacs/build-support/buffer.nix @@ -1,4 +1,4 @@ -# Functions to build elisp files to locally configure emcas buffers. +# Functions to build elisp files to locally configure emacs buffers. # See https://github.com/shlevy/nix-buffer { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 0db019dddb5c..535a8fde4e42 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -17,7 +17,7 @@ Alternatively, run the following command: ./update-from-overlay It will update both melpa and elpa packages using -https://github.com/nix-community/emacs-overlay. It's almost instantenous and +https://github.com/nix-community/emacs-overlay. It's almost instantaneous and formats commits for you. */ diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 64c05ba3154e..df36f18cf4ce 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -17,7 +17,7 @@ Alternatively, run the following command: ./update-from-overlay It will update both melpa and elpa packages using -https://github.com/nix-community/emacs-overlay. It's almost instantenous and +https://github.com/nix-community/emacs-overlay. It's almost instantaneous and formats commits for you. */ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix index 983117569476..8161a1e68626 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "straight"; - version = "0-unstable-2024-10-06"; + version = "0-unstable-2025-01-30"; src = fetchFromGitHub { owner = "radian-software"; repo = "straight.el"; - rev = "33fb4695066781c634ff1c3c81ba96e880deccf7"; - hash = "sha256-3NPVLTn0ka0RvSLXW9gDKam3xajp62/mLupc8uyatzo="; + rev = "44a866f28f3ded6bcd8bc79ddc73b8b5044de835"; + hash = "sha256-riKagjhCn5NyTerw1WqGOn37TZNfmhPb7DS49TXw1CA="; }; nativeBuildInputs = [ git ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index d1f7bf3440e2..288fc44ba55f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -67,7 +67,7 @@ ============================ The example file pkgs/applications/editors/vim/plugins/default.nix provides both: - * manually mantained plugins + * manually maintained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation I highly recommend to lookup vim plugin attribute names at the [vim-pi] project diff --git a/pkgs/applications/emulators/libretro/mkLibretroCore.nix b/pkgs/applications/emulators/libretro/mkLibretroCore.nix index 9e063fe02572..da4d73bb121e 100644 --- a/pkgs/applications/emulators/libretro/mkLibretroCore.nix +++ b/pkgs/applications/emulators/libretro/mkLibretroCore.nix @@ -13,7 +13,7 @@ extraNativeBuildInputs ? [ ], ## Location of resulting RetroArch core on $out libretroCore ? "/lib/retroarch/cores", - ## The core filename is derivated from the core name + ## The core filename is derived from the core name ## Setting `normalizeCore` to `true` will convert `-` to `_` on the core filename normalizeCore ? true, ... diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 0c5744e77c8c..633f133d9696 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -130,7 +130,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop application for creating diagrams"; homepage = "https://about.draw.io/"; - license = licenses.unfree; + license = with lib.licenses; [ + # The LICENSE file of https://github.com/jgraph/drawio claims Apache License Version 2.0 again since https://github.com/jgraph/drawio/commit/5b2e73471e4fea83d681f0cec5d1aaf7c3884996 + asl20 + # But the README says: + # The minified code authored by us in this repo is licensed under an Apache v2 license, but the sources to build those files are not in this repo. This is not an open source project. + unfreeRedistributable + ]; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 4d1cb07a6e5a..71804747150c 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -4,7 +4,7 @@ , cmake , help2man , gzip -# There is a f3d overriden with EGL enabled vtk in top-level/all-packages.nix +# There is a f3d overridden with EGL enabled vtk in top-level/all-packages.nix # compiling with EGL enabled vtk will result in f3d running in headless mode # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. , vtk_9 diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index b4493bdbc41c..378706775928 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { repo = "RawTherapee"; rev = version; hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730="; - # The developpers ask not to use the tarball from Github releases, see + # The developers ask not to use the tarball from Github releases, see # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers forceFetchGit = true; }; diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 4532d7317c57..2777e107511a 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -28,7 +28,7 @@ libtool, autoconf-archive, - # List of { src name backend } attibute sets - see installFirmware below: + # List of { src name backend } attribute sets - see installFirmware below: extraFirmware ? [ ], # For backwards compatibility with older setups; use extraFirmware instead: diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index 177f3ede6ceb..9e30a883d668 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -34,7 +34,7 @@ in dubLock = ./creator-dub-lock.json; patches = [ - # Upstream asks that we change the bug tracker URL to not point to the upsteam bug tracker + # Upstream asks that we change the bug tracker URL to not point to the upstream bug tracker (replaceVars ./support-url.patch { assignees = "TomaSajt"; # should be a comma separated list of the github usernames of the maintainers }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ecfda278b170..e77128287c77 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -673,14 +673,14 @@ let # Build Chromium using the system toolchain (for Linux distributions): # - # What you would expect to be caled "target_toolchain" is + # What you would expect to be called "target_toolchain" is # actually called either "default_toolchain" or "custom_toolchain", # depending on which part of the codebase you are in; see: # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44 custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; # We only build those specific toolchains when we cross-compile, as native non-cross-compilations would otherwise - # end up building much more things than they need to (roughtly double the build steps and time/compute): + # end up building much more things than they need to (roughly double the build steps and time/compute): } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { host_toolchain = "//build/toolchain/linux/unbundle:host"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index bd853b8fd10b..6da89cbd007b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -571,7 +571,7 @@ buildStdenv.mkDerivation { env = lib.optionalAttrs stdenv.hostPlatform.isMusl { # Firefox relies on nonstandard behavior of the glibc dynamic linker. It re-uses # previously loaded libraries even though they are not in the rpath of the newly loaded binary. - # On musl we have to explicity set the rpath to include these libraries. + # On musl we have to explicitly set the rpath to include these libraries. LDFLAGS = "-Wl,-rpath,${placeholder "out"}/lib/${binaryName}"; }; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ebccb73c85c5..dc95288ac562 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -95,7 +95,7 @@ let nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); - # Check that every extension has a unqiue .name attribute + # Check that every extension has a unique .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" @@ -259,7 +259,7 @@ let "1" ] ++ lib.optionals (!xdg-utils.meta.broken) [ - # make xdg-open overrideable at runtime + # make xdg-open overridable at runtime "--suffix" "PATH" ":" diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 34928938c1df..46d911e4efe9 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -3,7 +3,7 @@ let k3s_builder = import ./builder.nix lib; common = opts: callPackage (k3s_builder opts); - # extraArgs is the extra arguments passed in by the caller to propogate downward. + # extraArgs is the extra arguments passed in by the caller to propagate downward. # This is to allow all-packages.nix to do: # # let k3s_1_23 = (callPackage ./path/to/k3s { diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 44a91c5cb7c9..c78c4082cfb1 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.9.2"; + version = "2.9.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-c7ps2J15Hms1sM3e4uPvKZwYjhudEdw+220jNQemxag="; + hash = "sha256-EdAIP0hz93sEfHHdOS4SJMBaRVRLVLw9ZlUwYwgx/Iw="; }; - vendorHash = "sha256-++oL9OetEApRdfjypknPE3GFjLZbKexjtnySIOZJg8U="; + vendorHash = "sha256-0kqV7uFYyUmXB64GEZbU30V2GTKTXHB3KcS/FmHr5sE="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 7bfb6d45ef0d..a9be2325daae 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; patches = [ - # evolution-ews contains .so files loaded by evolution-data-server refering + # evolution-ews contains .so files loaded by evolution-data-server referring # schemas from evolution. evolution-data-server is not wrapped with # evolution's schemas because it would be a circular dependency with # evolution. diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 25904e5b44b0..77aa89e029a1 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -16,7 +16,7 @@ # Available plugins (can be overridden) availablePlugins, # Used in the withPlugins interface at passthru, can be overrided directly, or - # prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])` + # preferably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])` mailnag, userPlugins ? [ ], pluginsDeps ? [ ], diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index b62ce2d5edee..95c48d771758 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -38,7 +38,7 @@ openvpn.overrideAttrs ( configureFlags = [ - # Assignement instead of appending to make sure to use exactly the flags required by mullvad + # Assignment instead of appending to make sure to use exactly the flags required by mullvad # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L17 "--enable-static" diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index fd61993b5543..d50dbf09c5d2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -58,7 +58,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.3"; + version = "4.4.4"; outputs = [ "out" @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-QTDOwJXo9+A2J/uXdyTtK5D5DVYLUAaUKT8desQGvd4="; + hash = "sha256-8Xpi66UI7S1k1IQ/nWAnnX5EXR29tOCO8XqrzY9Frmw="; }; patches = [ diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 1bb8a60c3584..8e7eea39e440 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -12,7 +12,7 @@ dconf, librsvg, gdk-pixbuf, - # some scripts need these when used in conjuction with firejail + # some scripts need these when used in conjunction with firejail coreutils, gnugrep, # Configuration options for the wrapper diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix index 935585761d70..b2bcc7829414 100644 --- a/pkgs/applications/radio/cqrlog/default.nix +++ b/pkgs/applications/radio/cqrlog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb"; }; - # Adds the possiblity to change the lazarus directory, + # Adds the possibility to change the lazarus directory, # otherwise, we would get error : "directory lcl not found" patches = [ ./fix-makefile-lazarusdir.patch ]; diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix index 23be0ff1ac70..0ccb332bd0aa 100644 --- a/pkgs/applications/radio/sdr-j-fm/default.nix +++ b/pkgs/applications/radio/sdr-j-fm/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { features = { - # All of these features don't require an external depencies, althought it + # All of these features don't require an external dependencies, although it # may be implied - upstraem bundles everything they need in their repo. AIRSPY = true; SDRPLAY = true; diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index fac32fed596a..2fa26286e53f 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -53,7 +53,7 @@ buildPythonPackage { numpy ]; - # upstrem has no tests + # upstream has no tests doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index edfcf61c1a25..b98f3c28c073 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -90,7 +90,7 @@ let versionsImport = import ./versions.nix; # versions.nix does not provide us with version, src and rev. We - # need to turn this into approprate fetcher calls. + # need to turn this into appropriate fetcher calls. kicadSrcFetch = fetchFromGitLab { group = "kicad"; owner = "code"; diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 1f89610c568b..10b1306a099a 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "-DWITH_QT6=ON" ]; - # Make custom kernels avaible from qucs-s + # Make custom kernels available from qucs-s qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath kernels) ]; QTDIR = qtbase.dev; diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 6ad07b3f35cb..eaf54af16c7c 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -33,7 +33,7 @@ assert withMPI -> trilinos.withMPI; let version = "7.8.0"; - # useing fetchurl or fetchFromGitHub doesn't include the manuals + # using fetchurl or fetchFromGitHub doesn't include the manuals # due to .gitattributes files xyce_src = fetchgit { url = "https://github.com/Xyce/Xyce.git"; diff --git a/pkgs/applications/science/molecular-dynamics/raspa/default.nix b/pkgs/applications/science/molecular-dynamics/raspa/default.nix index 3830e3e72e06..088bc1ef4840 100644 --- a/pkgs/applications/science/molecular-dynamics/raspa/default.nix +++ b/pkgs/applications/science/molecular-dynamics/raspa/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # Wrap with RASPA_DIR # so that users can run $out/bin/simulate directly - # without the need of a `run` srcipt. + # without the need of a `run` script. postInstall = '' wrapProgram "$out/bin/simulate" \ --set RASPA_DIR "$out" diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index ec27bc6ecf34..a23e4476d90e 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-4SGkkC4LjZXTDXwK6jMOIKXR1qX76CasOwSqv8XUrjs="; }; - # Upstream splitted the project into gitlint and gitlint-core to + # Upstream split the project into gitlint and gitlint-core to # simplify the dependency handling sourceRoot = "${src.name}/gitlint-core"; diff --git a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix index 7fbd0f8c3d07..53700cb6f77d 100644 --- a/pkgs/applications/video/kodi/build-kodi-binary-addon.nix +++ b/pkgs/applications/video/kodi/build-kodi-binary-addon.nix @@ -39,7 +39,7 @@ toKodiAddon ( "-DOVERRIDE_PATHS=1" ] ++ extraCMakeFlags; - # kodi checks for addon .so libs existance in the addon folder (share/...) + # kodi checks for addon .so libs existence in the addon folder (share/...) # and the non-wrapped kodi lib/... folder before even trying to dlopen # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use installPhase = diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index ff014dc0aa5a..bfb069f4e053 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -214,7 +214,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ''; # TODO: Usage of -bios OVMF.fd is discouraged: https://lists.katacontainers.io/pipermail/kata-dev/2021-January/001650.html - # We should remove the isx86-specifc block here once we're ready to update nixpkgs to stop using that and update the + # We should remove the isx86-specific block here once we're ready to update nixpkgs to stop using that and update the # release notes accordingly. postInstall = '' diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 08c848feb17c..1d681883eb03 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -64,7 +64,7 @@ in # SingularityCE 3.10.0 and above requires explicit --without-seccomp when libseccomp is not available. enableSeccomp ? true, # Whether the configure script treat SUID support as default - # When equal to enableSuid, it supress the --with-suid / --without-suid build flag + # When equal to enableSuid, it suppress the --with-suid / --without-suid build flag # It can be set to `null` to always pass either --with-suid or --without-suided # Type: null or boolean defaultToSuid ? true, diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index fbb263dceb14..e23d5040aa09 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -39,7 +39,7 @@ # `pname` and `version` will throw if they were not provided. # Use `name` instead of directly evaluating `pname` or `version`. # -# If you need `pname` or `version` sepcifically, use `args` instead: +# If you need `pname` or `version` specifically, use `args` instead: # e.g. `args.pname or ...`. let diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 23a6319ba1eb..eadcd5bf0bcc 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -258,7 +258,7 @@ let machineFlags = # Always add -march based on cpu in triple. Sometimes there is a - # discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in + # discrepancy (x86_64 vs. x86-64), so we provide an "arch" arg in # that case. optional (targetPlatform ? gcc.arch && !(targetPlatform.isDarwin && targetPlatform.isAarch64) && isGccArchSupported targetPlatform.gcc.arch) "-march=${targetPlatform.gcc.arch}" ++ # TODO: aarch64-darwin has mcpu incompatible with gcc diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix index ec8c228a5353..c3cb5deda809 100644 --- a/pkgs/build-support/coq/extra-lib.nix +++ b/pkgs/build-support/coq/extra-lib.nix @@ -96,7 +96,7 @@ recursiveUpdate lib (rec { /* Returns a list of list, splitting it using a predicate. - This is analoguous to builtins.split sep list, + This is analogous to builtins.split sep list, with a predicate as a separator and a list instead of a string. Type: splitList :: (a -> bool) -> [a] -> [[a]] diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index ee7dc87a7bfb..dd6a8cfa87be 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -16,7 +16,7 @@ if hash != null && sha256 != null then throw "Only one of sha256 or hash can be set" else - # TODO: statically check if mercurial as the https support if the url starts woth https. + # TODO: statically check if mercurial as the https support if the url starts with https. stdenvNoCC.mkDerivation { name = "hg-archive" + (lib.optionalString (name != null) "-${name}"); builder = ./builder.sh; diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix index c5fc4b5c87b9..e6ddb4b4198c 100644 --- a/pkgs/build-support/make-darwin-bundle/default.nix +++ b/pkgs/build-support/make-darwin-bundle/default.nix @@ -1,6 +1,6 @@ # given a package with an executable and an icon, make a darwin bundle for # it. This package should be used when generating launchers for native Darwin -# applications. If the package conatins a .desktop file use +# applications. If the package contains a .desktop file use # `desktopToDarwinBundle` instead. { diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index a001f80b113c..158ff08fae6c 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -126,7 +126,7 @@ forceGitDeps = true; }; - # This package has a lockfile v1 git dependency with no `dependencies` attribute, since it sementically has no dependencies. + # This package has a lockfile v1 git dependency with no `dependencies` attribute, since it semantically has no dependencies. jitsiMeet9111 = makeTest { name = "jitsi-meet-9111"; diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix index 6e4d19914b70..7442d48bad16 100644 --- a/pkgs/build-support/node/import-npm-lock/default.nix +++ b/pkgs/build-support/node/import-npm-lock/default.nix @@ -88,7 +88,7 @@ lib.fix (self: { fetcherOpts ? { }, # A map from node_module path to an alternative package to use instead of fetching the source in package-lock.json. # Example: { "node_modules/axios" = stdenv.mkDerivation { ... }; } - # This is usefull if you want to inject custom sources for a specific package. + # This is useful if you want to inject custom sources for a specific package. packageSourceOverrides ? { }, }: let diff --git a/pkgs/build-support/nuke-references/default.nix b/pkgs/build-support/nuke-references/default.nix index 4472d6eeddc1..6351c82ce186 100644 --- a/pkgs/build-support/nuke-references/default.nix +++ b/pkgs/build-support/nuke-references/default.nix @@ -1,5 +1,5 @@ # The program `nuke-refs' created by this derivation replaces all -# references to the Nix store in the specified files by a non-existant +# references to the Nix store in the specified files by a non-existent # path (/nix/store/eeee...). This is useful for getting rid of # dependencies that you know are not actually needed at runtime. diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 3a7616262c73..3f2ec688dd3d 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { # symlink in share for autoconf to find macros # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a - # propagated dep once we can rely on downstream deps comming first in + # propagated dep once we can rely on downstream deps coming first in # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack # at this.) + '' diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 66aec1f74509..6ad860d4fac9 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -147,7 +147,7 @@ rec { /* Create a channel job which success depends on the success of all of its contituents. Channel jobs are a special type of jobs that are - listed in the channel tab of Hydra and that can be suscribed. + listed in the channel tab of Hydra and that can be subscribed. A tarball of the src attribute is distributed via the channel. - constituents: a list of derivations on which the channel success depends. diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index b1a07f1a9589..ef17b4d61dbb 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -13,7 +13,7 @@ let # This is more complicated than apparent at first sight # because: # * The color markers and the text must be print - # in the same echo statement. Otherise, other + # in the same echo statement. Otherwise, other # intermingled text from concurrent builds will # be colored as well. # * We need to preserve the trailing newline of the diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index fdfc8fdef01e..610222d2868a 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -589,7 +589,7 @@ rec { expectedTestOutputs = [ "test build_foo_check ... ok" ]; }; # Regression test for https://github.com/NixOS/nixpkgs/issues/74071 - # Whenevever a build.rs file is generating files those should not be overlayed onto the actual source dir + # Whenevever a build.rs file is generating files those should not be overlaid onto the actual source dir buildRsOutDirOverlay = { src = symlinkJoin { name = "buildrs-out-dir-overlay"; diff --git a/pkgs/build-support/rust/hooks/test/default.nix b/pkgs/build-support/rust/hooks/test/default.nix index 774f0ee54860..505c3edd577a 100644 --- a/pkgs/build-support/rust/hooks/test/default.nix +++ b/pkgs/build-support/rust/hooks/test/default.nix @@ -7,7 +7,7 @@ /* test each hook individually, to make sure that: - each hook works properly outside of buildRustPackage - - each hook is usable independantly from each other + - each hook is usable independently from each other */ cargoSetupHook = stdenv.mkDerivation { name = "test-cargoSetupHook"; diff --git a/pkgs/build-support/source-from-head-fun.nix b/pkgs/build-support/source-from-head-fun.nix index 51719682a5da..9ce5d54e9344 100644 --- a/pkgs/build-support/source-from-head-fun.nix +++ b/pkgs/build-support/source-from-head-fun.nix @@ -1,12 +1,12 @@ /* - purpose: mantain bleeding edge head sources. + purpose: maintain bleeding edge head sources. you run app --update app --publish to create source snapshots - The documentation is availible at https://github.com/MarcWeber/nix-repository-manager/raw/master/README + The documentation is available at https://github.com/MarcWeber/nix-repository-manager/raw/master/README */ { config }: localTarName: publishedSrcSnapshot: diff --git a/pkgs/build-support/testers/lychee.nix b/pkgs/build-support/testers/lychee.nix index 27ccfd7a7068..28395c9784f6 100644 --- a/pkgs/build-support/testers/lychee.nix +++ b/pkgs/build-support/testers/lychee.nix @@ -43,7 +43,7 @@ let nativeBuildInputs = [ finalAttrs.passthru.lychee ]; configFile = (formats.toml { }).generate "lychee.toml" finalAttrs.passthru.config; - # These can be overriden with overrideAttrs if needed. + # These can be overridden with overrideAttrs if needed. passthru = { inherit lychee remap; config = diff --git a/pkgs/build-support/trivial-builders/test/references/default.nix b/pkgs/build-support/trivial-builders/test/references/default.nix index bc9f8913e99a..df0366bf46ba 100644 --- a/pkgs/build-support/trivial-builders/test/references/default.nix +++ b/pkgs/build-support/trivial-builders/test/references/default.nix @@ -41,7 +41,7 @@ # -------------------------------------------------------------------------- # let - # Map each attribute to an element specification of Bash associative arrary + # Map each attribute to an element specification of Bash associative array # and concatenate them with white spaces, to be used to define a # one-line Bash associative array. samplesToString = diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix index 78a4f0ef6f85..5c022718ef2a 100644 --- a/pkgs/by-name/ad/adminer/package.nix +++ b/pkgs/by-name/ad/adminer/package.nix @@ -4,21 +4,23 @@ fetchurl, php, nix-update-script, + unzip, }: -stdenv.mkDerivation rec { - version = "4.8.1"; +stdenv.mkDerivation (finalAttrs: { + version = "4.16.0"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { - url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "sha256-2rkNq79sc5RBFxWuiaSlpWr0rwrnEFlnW1WcoxjoP2M="; + url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip"; + hash = "sha256-9pWyPVeS3LTwPOi5y1iEaRyChT0XevqEPifcPhi3pRM="; }; nativeBuildInputs = [ php php.packages.composer + unzip ]; buildPhase = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir $out - cp adminer-${version}.php $out/adminer.php + cp adminer-${finalAttrs.version}.php $out/adminer.php runHook postInstall ''; @@ -55,4 +57,4 @@ stdenv.mkDerivation rec { ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 5a9bdcd31787..114abcf5dd2b 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { built-in real-time video preview. ''; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd - # softwares - so the resulting program will be GPL + # software - so the resulting program will be GPL license = with lib.licenses; [ bsd3 ]; diff --git a/pkgs/by-name/al/altdns/package.nix b/pkgs/by-name/al/altdns/package.nix index f9e701eb91d5..549576644db7 100644 --- a/pkgs/by-name/al/altdns/package.nix +++ b/pkgs/by-name/al/altdns/package.nix @@ -16,12 +16,7 @@ python3.pkgs.buildPythonApplication { hash = "sha256-ElY6AZ7IBnOh7sRWNSQNmq7AYGlnjvYRn8/U+29BwWA="; }; - prePatch = '' - substituteInPlace requirements.txt \ - --replace-fail "argparse" "" - substituteInPlace setup.py \ - --replace-fail "argparse" "" - ''; + pythonRemoveDeps = [ "argparse" ]; build-system = with python3.pkgs; [ setuptools diff --git a/pkgs/by-name/ap/appimagekit/package.nix b/pkgs/by-name/ap/appimagekit/package.nix index 8b7c20fed19b..9f5b5d10bf96 100644 --- a/pkgs/by-name/ap/appimagekit/package.nix +++ b/pkgs/by-name/ap/appimagekit/package.nix @@ -36,7 +36,7 @@ let fetchSubmodules = true; }; - # squashfuse adapted to nix from cmake experession in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" + # squashfuse adapted to nix from cmake expression in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" appimagekit_squashfuse = squashfuse.overrideAttrs rec { pname = "squashfuse"; version = "unstable-2016-10-09"; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index f8c3d166079f..1e9256e82814 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-RrtRflMTsbR/A2kb2kdwsE7zN43TzzvFkUPcmL4YGqs="; + hash = "sha256-4lURe1DPgtoWToVdoXKQFYEbp5/1tmogx4u/4PLBluE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NxTWJ7uMblEIpumJhVCCek9UzJuqJeTrt5fLXYiITI4="; + cargoHash = "sha256-hM3c0O0IfZYycdGJu65ov2B5KkV3nhbRg5dzO4LxX3M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/av/avisynthplus/package.nix b/pkgs/by-name/av/avisynthplus/package.nix index 92904ff0cc01..41f5a2ac4fc3 100644 --- a/pkgs/by-name/av/avisynthplus/package.nix +++ b/pkgs/by-name/av/avisynthplus/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Remove after next relaese + # Remove after next release (fetchpatch { name = "fix-absolute-path.patch"; url = "https://github.com/AviSynth/AviSynthPlus/commit/818983691e962ec3e590fcad07032f8a139a6b16.patch"; diff --git a/pkgs/by-name/bm/bmon/package.nix b/pkgs/by-name/bm/bmon/package.nix index 9f50559b3817..49dfc9e71fad 100644 --- a/pkgs/by-name/bm/bmon/package.nix +++ b/pkgs/by-name/bm/bmon/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network bandwidth monitor"; homepage = "https://github.com/tgraf/bmon"; - # Licensed unter BSD and MIT + # Licensed under BSD and MIT # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT license = licenses.bsd2; diff --git a/pkgs/by-name/bs/bs-manager/package.nix b/pkgs/by-name/bs/bs-manager/package.nix new file mode 100644 index 000000000000..bedf992d0b23 --- /dev/null +++ b/pkgs/by-name/bs/bs-manager/package.nix @@ -0,0 +1,95 @@ +{ + asar, + autoPatchelfHook, + dpkg, + electron, + fetchurl, + lib, + makeWrapper, + nix-update-script, + openssl, + stdenv, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bs-manager"; + version = "1.5.2"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/Zagrios/bs-manager/releases/download/v1.5.2/bs-manager_1.5.2_amd64.deb"; + hash = "sha256-rNqnEez56t4TPIKhljC0HEams2xhj6nB3CGW0CuQBKQ="; + } + else + throw "BSManager is not available for your platform"; + + # TODO: Package BSManager's fork of DepotDownloader and replace vendored binary at $out/opt/BSManager/resources/assets/scripts/DepotDownloader + # See https://github.com/Iluhadesu/DepotDownloader + + nativeBuildInputs = [ + asar + autoPatchelfHook # for vendored DepotDownloader + dpkg + makeWrapper + ]; + + buildInputs = [ + stdenv.cc.cc + zlib + ]; + + # DepotDownloader dlopen()s libssl + runtimeDependencies = [ + (lib.getLib openssl) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/opt/BSManager + cp -r opt/BSManager/{locales,resources} $out/opt/BSManager + cp -Tr usr/ $out + + # Some assets aren't included in the asar bundle. BSManager relies on + # process.resourcesPath to load some of these assets which we have to patch later + asar extract $out/opt/BSManager/resources/app.asar $out/opt/BSManager/resources + rm $out/opt/BSManager/resources/app.asar + + # Update desktop Exec entry + substituteInPlace $out/share/applications/bs-manager.desktop \ + --replace-fail Exec=/opt/BSManager/bs-manager Exec=bs-manager + + mkdir -p $out/bin + makeWrapper ${lib.getExe electron} $out/bin/bs-manager \ + --add-flags $out/opt/BSManager/resources \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + preFixup = '' + substituteInPlace "$out/opt/BSManager/resources/dist/main/main.js" \ + --replace-fail "process.resourcesPath" "'$out/opt/BSManager/resources'" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/Zagrios/bs-manager/blob/master/CHANGELOG.md"; + description = "Your Beat Saber Assistant"; + homepage = "https://github.com/Zagrios/bs-manager"; + license = lib.licenses.gpl3Only; + mainProgram = "bs-manager"; + maintainers = with lib.maintainers; [ + mistyttm + Scrumplex + ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix index c32231997e7d..ee39c2207230 100644 --- a/pkgs/by-name/ca/capnproto/package.nix +++ b/pkgs/by-name/ca/capnproto/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "1.0.2"; + version = "1.1.0"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8="; + hash = "sha256-gxkko7LFyJNlxpTS+CWOd/p9x/778/kNIXfpDGiKM2A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix index 2b08d81fba07..7e57f150c335 100644 --- a/pkgs/by-name/ca/castero/package.nix +++ b/pkgs/by-name/ca/castero/package.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; - # Satisfy the python-mpv depedency, which is mpv within NixOS + # Satisfy the python-mpv dependency, which is mpv within NixOS postPatch = '' substituteInPlace setup.py --replace-fail "python-mpv" "mpv" ''; diff --git a/pkgs/by-name/ca/catclock/package.nix b/pkgs/by-name/ca/catclock/package.nix index 4d2d81aa282b..54fff59769e6 100644 --- a/pkgs/by-name/ca/catclock/package.nix +++ b/pkgs/by-name/ca/catclock/package.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation { cp xclock.man $out/share/man/man1/xclock.1 ''; - makeFlags = [ "DESTINATION=$(out)/bin/" ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; + makeFlags = [ + "DESTINATION=$(out)/bin/" + "CFLAGS=-Wno-incompatible-pointer-types" + ] ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; buildInputs = [ diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 0437aae99580..5b938f117a2a 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { "test_godot_plugin" ] ++ - # There are no docker images available for the aarch64 architecutre + # There are no docker images available for the aarch64 architecture # which are required for tests. lib.optionals stdenv.hostPlatform.isAarch64 [ "test_arch" diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 557fc4761922..717e3f90603f 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { }) ++ [ # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 - # Needed to corretly link curl in pkgsStatic. + # Needed to correctly link curl in pkgsStatic. ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff ]; diff --git a/pkgs/by-name/cn/cnijfilter2/package.nix b/pkgs/by-name/cn/cnijfilter2/package.nix index b3a2e4f8afa6..2a25ed7b212e 100644 --- a/pkgs/by-name/cn/cnijfilter2/package.nix +++ b/pkgs/by-name/cn/cnijfilter2/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ./patches/add_missing_import.patch ]; - # lgmon3's --enable-libdir flag is used soley for specifying in which + # lgmon3's --enable-libdir flag is used solely for specifying in which # directory the cnnnet.ini cache file should reside. # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable # place to put the cnnet.ini file, and thus we do so. diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix index 8ddbbe00998c..b18c003b63a1 100644 --- a/pkgs/by-name/co/colobot/package.nix +++ b/pkgs/by-name/co/colobot/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - # The binary ends in games directoy + # The binary ends in games directory postInstall = '' mv $out/games $out/bin for contents in ${colobot-data}/share/games/colobot/*; do diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 8a917697a4eb..f55460cb8a7a 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # The tests check what CPU the host has and makes sure it can query information. - # not all build environments may have this information availaible. And, cpuinfo may + # not all build environments may have this information available. And, cpuinfo may # not understand all CPUs (causing test failures such as https://github.com/pytorch/cpuinfo/issues/132) # Instead, allow building in any environment. doCheck = false; diff --git a/pkgs/by-name/cr/creds/package.nix b/pkgs/by-name/cr/creds/package.nix index 5bb3bb793cfd..bbf3bf544c04 100644 --- a/pkgs/by-name/cr/creds/package.nix +++ b/pkgs/by-name/cr/creds/package.nix @@ -16,10 +16,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-CtwGSF3EGcPqL49paNRCsB2qxYjKpCLqyRsC67nAyVk="; }; + pythonRelaxDeps = [ "tinydb" ]; + pythonRemoveDeps = [ "pathlib" ]; + postPatch = '' - substituteInPlace requirements.txt \ - --replace "tinydb==4.3" "tinydb" \ - --replace "pathlib" "" substituteInPlace creds \ --replace "pathlib.Path(__file__).parent" "pathlib.Path.home()" ''; diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 6a466fa686f8..e4d5cd6c7abe 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "crowdsec"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = pname; tag = "v${version}"; - hash = "sha256-U3YnLjsD+Kl/6HD+RPP0gWa4N96X5wkbdCmIrxas1I8="; + hash = "sha256-Jt5qFY41TnkvDw2BPd+vfyskhLpnJnsiUmUJcADQ0so="; }; - vendorHash = "sha256-PtBVXPbLNdJyS8v8H9eRB6sTPaiseg18+eXToHvH7tw="; + vendorHash = "sha256-I9h63iePhEMCy8IQNTomhgduGOyC3aoxz/0L4JQhhF8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index f0be6044acb2..995fc3d2bf64 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -35,7 +35,7 @@ buildDotnetGlobalTool rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ GaetanLepage ]; badPlatforms = [ - # Crashes immediatly at runtime + # Crashes immediately at runtime # terminated by signal SIGKILL (Forced quit) # https://github.com/razzmatazz/csharp-language-server/issues/211 "aarch64-darwin" diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix index 427ca4c0e830..cdf3f59ea54b 100644 --- a/pkgs/by-name/cs/csharprepl/package.nix +++ b/pkgs/by-name/cs/csharprepl/package.nix @@ -10,7 +10,7 @@ buildDotnetGlobalTool { version = "0.6.7"; dotnet-sdk = dotnetCorePackages.sdk_8_0; - # We're using an SDK here because it's a REPL, and it requires an SDK instaed of a runtime + # We're using an SDK here because it's a REPL, and it requires an SDK instead of a runtime dotnet-runtime = dotnetCorePackages.sdk_8_0; nugetHash = "sha256-a0CiU3D6RZp1FF459NIUUry5TFRDgm4FRhqJZNAGYWs="; diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix index 1a28a2992eb5..8df467210862 100644 --- a/pkgs/by-name/de/devspace/package.nix +++ b/pkgs/by-name/de/devspace/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - # Check are disable since they requiered a working K8S cluster + # Check are disable since they required a working K8S cluster # TODO: add a nixosTest to be able to perform the package check doCheck = false; diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix index 3c15b6f969d2..d8d864d27523 100644 --- a/pkgs/by-name/de/devtoolbox/package.nix +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -20,14 +20,14 @@ }: python3Packages.buildPythonApplication rec { pname = "devtoolbox"; - version = "1.2.1"; + version = "1.2.2"; pyproject = false; # uses meson src = fetchFromGitHub { owner = "aleiepure"; repo = "devtoolbox"; tag = "v${version}"; - hash = "sha256-yeOX2ASQWpo3TN9ou25voOVD3pSK4SE0CDXHkrwu+E4="; + hash = "sha256-kgnCqPlLFVQ6kgfstQ59OeF28etMsfK4qvCn4P92ET4="; }; postPatch = '' diff --git a/pkgs/by-name/dj/djenrandom/package.nix b/pkgs/by-name/dj/djenrandom/package.nix index 2f955f7cd365..5a88117159ca 100644 --- a/pkgs/by-name/dj/djenrandom/package.nix +++ b/pkgs/by-name/dj/djenrandom/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { with parameterized non uniformities and flexible output formats ''; license = lib.licenses.gpl2Only; - # djenrandom uses x86 specific instructions, therefore we can only compile for the x86 architechture + # djenrandom uses x86 specific instructions, therefore we can only compile for the x86 architecture platforms = lib.platforms.x86; maintainers = with lib.maintainers; [ orichter diff --git a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix index 9d3ce402abf4..37ae59e83d99 100644 --- a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix +++ b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the + # Fix build with meson 1.2. We use the gentoo patch instead of the # usptream one because the latter only applies on the libsoup_3 based # merged dLeyna project. # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix index 565e6519e6e1..99d6bd0c1216 100644 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ b/pkgs/by-name/dl/dleyna-renderer/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the + # Fix build with meson 1.2. We use the gentoo patch instead of the # usptream one because the latter only applies on the libsoup_3 based # merged dLeyna project. # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix index cbaf5e1e2667..6850d3d8200c 100644 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ b/pkgs/by-name/dl/dleyna-server/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix build with meson 1.2. We use the gentoo patch intead of the + # Fix build with meson 1.2. We use the gentoo patch instead of the # usptream one because the latter only applies on the libsoup_3 based # merged dLeyna project. # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix index 088405f92c47..8299840df458 100644 --- a/pkgs/by-name/ds/dsniff/package.nix +++ b/pkgs/by-name/ds/dsniff/package.nix @@ -18,7 +18,7 @@ let /* - dsniff's build system unconditionnaly wants static libraries and does not + dsniff's build system unconditionally wants static libraries and does not support multi output derivations. We do some overriding to give it satisfaction. */ diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix index 701499ea28f6..228bcbc2aaba 100644 --- a/pkgs/by-name/du/duckstation/sources.nix +++ b/pkgs/by-name/du/duckstation/sources.nix @@ -25,7 +25,7 @@ # Some files are filled by using Git commands; it requires deepClone. # More info at `checkout_ref` function in nix-prefetch-git. # However, `.git` is a bit nondeterministic (and Git itself makes no - # guarrantees whatsoever). + # guarantees whatsoever). # Then, in order to enhance reproducibility, what we will do here is: # # - Execute the desired Git commands; diff --git a/pkgs/by-name/du/dumpasn1/package.nix b/pkgs/by-name/du/dumpasn1/package.nix index e3314ff389fc..960a5aa5ae54 100644 --- a/pkgs/by-name/du/dumpasn1/package.nix +++ b/pkgs/by-name/du/dumpasn1/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=$(out)" ]; patches = [ - # Allow adding a config file path during build via makro. + # Allow adding a config file path during build via macro. # Used to add the store path of the included config file through CFLAGS. # This won't be merged upstream. ./configpath.patch diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index f77e13b18949..ba6cc7c6ae76 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -301,7 +301,7 @@ symlinkJoin { platforms maintainers ; - # To differenciate it from the original YGOPro + # To differentiate it from the original YGOPro mainProgram = "edopro"; }; } diff --git a/pkgs/by-name/ek/ekam/package.nix b/pkgs/by-name/ek/ekam/package.nix index cb3f44a210ad..1de11de315c7 100644 --- a/pkgs/by-name/ek/ekam/package.nix +++ b/pkgs/by-name/ek/ekam/package.nix @@ -2,9 +2,16 @@ lib, stdenv, fetchFromGitHub, - capnproto, }: +let + capnproto.src = fetchFromGitHub { + owner = "capnproto"; + repo = "capnproto"; + tag = "v1.0.2"; + hash = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8="; + }; +in stdenv.mkDerivation { pname = "ekam"; version = "unstable-2021-09-18"; diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index d48df7666f52..794ce30a59bd 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -14,7 +14,7 @@ buildFHSEnv { strictDeps = true; - # TODO: I'm pretty suspicious of this list of additonal required dependencies. Are they all really needed? + # TODO: I'm pretty suspicious of this list of additional required dependencies. Are they all really needed? targetPkgs = pkgs: [ pkgs.envision-unwrapped ] diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix index 55e7f9974a55..a06ecf6487b7 100644 --- a/pkgs/by-name/ep/epson-escpr2/package.nix +++ b/pkgs/by-name/ep/epson-escpr2/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php - # and retreive the download link for source package for x86 CPU + # and retrieve the download link for source package for x86 CPU url = "https://download3.ebz.epson.net/dsc/f/03/00/16/65/06/8fdecc271f6473178d08ffd6b6f6ca2abc92e32f/epson-inkjet-printer-escpr2-1.2.26-1.src.rpm"; sha256 = "sha256-Js2iZCS9ZzJVRF8PbDA/U1muOne+upq4sA0u+NVIk/0="; }; diff --git a/pkgs/by-name/es/esdm/package.nix b/pkgs/by-name/es/esdm/package.nix index f99227535c51..176bdf1a07fc 100644 --- a/pkgs/by-name/es/esdm/package.nix +++ b/pkgs/by-name/es/esdm/package.nix @@ -13,7 +13,7 @@ openssl, libkcapi, - # A more detailed explaination of the following meson build options can be found + # A more detailed explanation of the following meson build options can be found # in the source code of esdm. # A brief explanation is given. diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e51197c7dcba..bb5de7d0d423 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) (lib.cmakeBool "ENABLE_GLX" x11Support) (lib.cmakeBool "ENABLE_RPM" rpmSupport) - (lib.cmakeBool "ENABLE_VULKAN" x11Support) + (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) (lib.cmakeBool "ENABLE_X11" x11Support) (lib.cmakeBool "ENABLE_XCB" x11Support) diff --git a/pkgs/by-name/fl/flips/package.nix b/pkgs/by-name/fl/flips/package.nix index d6a7a808243d..3f87a8a75e39 100644 --- a/pkgs/by-name/fl/flips/package.nix +++ b/pkgs/by-name/fl/flips/package.nix @@ -8,39 +8,37 @@ wrapGAppsHook3, }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "flips"; - version = "unstable-2023-03-15"; + version = "196"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "fdd5c6e34285beef5b9be759c9b91390df486c66"; - hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; + tag = "v${version}"; + hash = "sha256-lQ88Iz607AcVzvN/jLGhOn7qiRe9pau9oQcLMt7JIT8="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + buildInputs = [ gtk3 libdivsufsort ]; + patches = [ ./use-system-libdivsufsort.patch ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - buildPhase = '' - runHook preBuild - ./make.sh - runHook postBuild - ''; - meta = with lib; { + meta = { description = "Patcher for IPS and BPS files"; homepage = "https://github.com/Alcaro/Flips"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aleksana ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "flips"; }; } diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix index a117cb6ccaf6..7cb26990622e 100644 --- a/pkgs/by-name/fl/flottbot/package.nix +++ b/pkgs/by-name/fl/flottbot/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { }; patches = [ - # patch out debug.ReadBuidlInfo since version information is not available with buildGoModule + # patch out debug.ReadBuildInfo since version information is not available with buildGoModule (replaceVars ./version.patch { version = version; vcsHash = version; # Maybe there is a way to get the git ref from src? idk. diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix index efe02f87dfcb..86d50584db48 100644 --- a/pkgs/by-name/fo/fontforge/package.nix +++ b/pkgs/by-name/fo/fontforge/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { sed -r -i 's#sprintf\(.+ author \);#if (!getenv("SOURCE_DATE_EPOCH")) &#g' fontforgeexe/fontinfo.c ''; - # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries + # do not use x87's 80-bit arithmetic, rounding errors result in very different font binaries env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/foomatic-db/package.nix b/pkgs/by-name/fo/foomatic-db/package.nix index 0c6763508411..da5d1edae061 100644 --- a/pkgs/by-name/fo/foomatic-db/package.nix +++ b/pkgs/by-name/fo/foomatic-db/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ./make_configure ''; - # don't let the intaller gzip ppd files as we would + # don't let the installer gzip ppd files as we would # have to unzip them later in order to patch them configureFlags = [ "--disable-gzip-ppds" ]; diff --git a/pkgs/by-name/fo/fork-cleaner/package.nix b/pkgs/by-name/fo/fork-cleaner/package.nix index dbeee75f0068..3ccc31f2d3e7 100644 --- a/pkgs/by-name/fo/fork-cleaner/package.nix +++ b/pkgs/by-name/fo/fork-cleaner/package.nix @@ -19,7 +19,7 @@ buildGoModule { vendorHash = "sha256-QuIaXXkch5PCpX8P755X8j7MeNnbewWo7NB+Vue1/Pk="; - # allowGoRefence adds the flag `-trimpath` which is also denoted by, fork-cleaner goreleaser config + # allowGoReference adds the flag `-trimpath` which is also denoted by, fork-cleaner goreleaser config # <https://github.com/caarlos0/fork-cleaner/blob/645345bf97d751614270de4ade698ddbc53509c1/goreleaser.yml#L38> allowGoReference = true; diff --git a/pkgs/by-name/fr/frozen/package.nix b/pkgs/by-name/fr/frozen/package.nix index 9ea5d64ed289..06f38a00e0b7 100644 --- a/pkgs/by-name/fr/frozen/package.nix +++ b/pkgs/by-name/fr/frozen/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Since it has only two source files, the best course of action to support # cross compilation is to create a small meson.build file. # Relevant upstream issue: https://github.com/cesanta/frozen/pull/71 - # We also remove the GN BUILD file to prevent conflicts on case-insesitive + # We also remove the GN BUILD file to prevent conflicts on case-insensitive # file systems. preConfigure = '' rm BUILD diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 9ed5943cdfea..2b375496b83e 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -3,7 +3,7 @@ buildGoModule, fetchFromGitHub, - # required for completion and cross-complilation + # required for completion and cross-compilation installShellFiles, buildPackages, stdenv, diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 6683bdccc3be..eba06f9754cf 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "4.3"; + version = "4.3.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-3YE2dWkvb/nAQnhwzR3DOLcjUNmni+OQPxGucmecs/k="; + hash = "sha256-zLjpYGZR/o76onSjwfpHEx26vd8rUa/1PXL+DuC8C2o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-pw/package.nix b/pkgs/by-name/gi/git-pw/package.nix index ba2a02d6c000..cf9bce02d574 100644 --- a/pkgs/by-name/gi/git-pw/package.nix +++ b/pkgs/by-name/gi/git-pw/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { git ]; - # This is needed because `git-pw` always rely on an ambiant git. + # This is needed because `git-pw` always rely on an ambient git. # Furthermore, this doesn't really make sense to resholve git inside this derivation. # As `testVersion` does not offer the right knob, we can just `overrideAttrs`-it ourselves. passthru.tests.version = (testers.testVersion { package = git-pw; }).overrideAttrs (old: { diff --git a/pkgs/by-name/gi/gitingest/package.nix b/pkgs/by-name/gi/gitingest/package.nix new file mode 100644 index 000000000000..5730bfd6d303 --- /dev/null +++ b/pkgs/by-name/gi/gitingest/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.gitingest diff --git a/pkgs/by-name/gn/gnupth/package.nix b/pkgs/by-name/gn/gnupth/package.nix index 0f105195f057..6c76ea2dd7d2 100644 --- a/pkgs/by-name/gn/gnupth/package.nix +++ b/pkgs/by-name/gn/gnupth/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("ac_cv_check_sjlj=ssjlj") ''; - # Fails parallel build due to missing dependency on autogenrated + # Fails parallel build due to missing dependency on autogenerated # 'pth_p.h' file: # ./shtool scpp -o pth_p.h ... # ./libtool --mode=compile --quiet gcc -c -I. -O2 -pipe pth_uctx.c diff --git a/pkgs/by-name/gn/gnuradioMinimal/package.nix b/pkgs/by-name/gn/gnuradioMinimal/package.nix index 7d52dd744c96..f0e3c01b1e55 100644 --- a/pkgs/by-name/gn/gnuradioMinimal/package.nix +++ b/pkgs/by-name/gn/gnuradioMinimal/package.nix @@ -3,7 +3,7 @@ volk, uhdMinimal, }: -# A build without gui components and other utilites not needed for end user +# A build without gui components and other utilities not needed for end user # libraries gnuradio.override { doWrap = false; @@ -24,7 +24,7 @@ gnuradio.override { sphinx = false; doxygen = false; # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. + # dependencies require python to use cmake files of GR. gr-ctrlport = false; }; }; diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 06d4651b4782..6fd2daa147b2 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ) ''; - # Doesn't get installed automaticallly if PREFIX != /usr + # Doesn't get installed automatically if PREFIX != /usr postInstall = '' install -D -m0644 org.gnome.gparted.policy \ $out/share/polkit-1/actions/org.gnome.gparted.policy diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index fd600399b1d2..427f37b2c8f5 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Remove CFLAGS from the binaries to avoid closure bloat. - # In the past we have had -dev packages in the closure of the binaries soley + # In the past we have had -dev packages in the closure of the binaries solely # due to the string references. postConfigure = '' nuke-refs -e $out ./magick/magick_config.h diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 66f1e5712bef..5afdcbeab9aa 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -16,6 +16,7 @@ withMruby ? true, bison, ruby, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -71,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: { done ''; + passthru = { + tests = { inherit (nixosTests) h2o; }; + }; + meta = with lib; { description = "Optimized HTTP/1.x, HTTP/2, HTTP/3 server"; homepage = "https://h2o.examp1e.net"; diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix index d953de197b31..301b4b3faf35 100644 --- a/pkgs/by-name/ha/hap-py/package.nix +++ b/pkgs/by-name/ha/hap-py/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # For illumina script BOOST_ROOT = "${boost.out}"; ZLIBSTATIC = "${zlib.static}"; - # For cmake : boost lib and includedir are in differernt location + # For cmake : boost lib and includedir are in different location BOOST_LIBRARYDIR = "${boost.out}/lib"; BOOST_INCLUDEDIR = "${boost.dev}/include"; diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix index 963a51068b66..addfc59018a0 100644 --- a/pkgs/by-name/ha/haunt/package.nix +++ b/pkgs/by-name/ha/haunt/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { guile-reader ]; - # Test suite is non-determinisitic in later versions + # Test suite is non-deterministic in later versions doCheck = false; postInstall = '' diff --git a/pkgs/by-name/hd/hdos/package.nix b/pkgs/by-name/hd/hdos/package.nix index 9737d12d273d..2bc26b636859 100644 --- a/pkgs/by-name/hd/hdos/package.nix +++ b/pkgs/by-name/hd/hdos/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchurl, makeWrapper, - # TODO: for jre 17+, we'll need a workaroud: + # TODO: for jre 17+, we'll need a workaround: # https://gitlab.com/hdos/issues/-/issues/2004 openjdk11, makeDesktopItem, diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 5c938806ec76..9b1e0be75ed4 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -25,7 +25,7 @@ buildGo123Module { vendorHash = "sha256-Zo/yI1mNeN0O9gZsHux6aOzBlv72h17s7QNO+MaG2/g="; modRoot = "backend"; # the goModules derivation inherits our buildInputs and buildPhases - # Since we do pnpm thing in those it fails if we don't explicitely remove them + # Since we do pnpm thing in those it fails if we don't explicitly remove them overrideModAttrs = _: { nativeBuildInputs = [ go_1_23 diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 6b1bb80b8e24..c00fc8a21849 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.45.6"; + version = "0.46.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-dNiF1MbDhQKETQf3O+5joFR82cQsQezSayEwY2YJeNs="; + hash = "sha256-KihorfQfHBNUhePnNbjrY+X4j0lOLW3C3bHMZSW57N0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-YnJoJ3npiURcmV36kgyhAcXla/tBTK7Hkqxrq6D/XRk="; + cargoHash = "sha256-ierJVMenS/VT23Nd0tsfI3TpPOWMsZOkWTN5PvYwsj4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydrapaper/package.nix b/pkgs/by-name/hy/hydrapaper/package.nix index 6935eece8a3d..040e5acb05fc 100644 --- a/pkgs/by-name/hy/hydrapaper/package.nix +++ b/pkgs/by-name/hy/hydrapaper/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { pillow ]; - # wrapGAppsHook4 propogates gtk4 -- which provides gtk4-update-icon-cache instead + # wrapGAppsHook4 propagates gtk4 -- which provides gtk4-update-icon-cache instead postPatch = '' substituteInPlace meson_post_install.py \ --replace-fail gtk-update-icon-cache gtk4-update-icon-cache diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index c1276b0cf7db..7189fa8215c6 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.26.1"; + version = "1.27.0"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; - rev = "v${version}"; - hash = "sha256-VCDGOxW4kSfPoSOana94QRPxiGMKdbTY3ZTLcoScJbk="; + tag = "v${version}"; + hash = "sha256-lYCUdDUGaUsRrL0Wpjv106XVlme+vGYdnf5mUqkjnNw="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ic/iconpack-obsidian/package.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix index 86ff31786e04..b8aa25969c81 100644 --- a/pkgs/by-name/ic/iconpack-obsidian/package.nix +++ b/pkgs/by-name/ic/iconpack-obsidian/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { mint-x-icons hicolor-icon-theme ]; - # still missing parent themes: Ambiant-MATE, Faenza-Dark, KFaenza + # still missing parent themes: Ambient-MATE, Faenza-Dark, KFaenza dontDropIconThemeCache = true; diff --git a/pkgs/by-name/ii/iio-oscilloscope/package.nix b/pkgs/by-name/ii/iio-oscilloscope/package.nix index 15a6d16e1973..70fd9d092e5e 100644 --- a/pkgs/by-name/ii/iio-oscilloscope/package.nix +++ b/pkgs/by-name/ii/iio-oscilloscope/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, wrapGAppsHook3, @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-wCeOLAkrytrBaXzUbNu8z2Ayz44M+b+mbyaRoWHpZYU="; }; + patches = [ + # make sure the sizeof argument to calloc is the second argument. + (fetchpatch { + url = "https://github.com/analogdevicesinc/iio-oscilloscope/commit/565cade20566d50adec7be191a6dd7b21217f878.patch"; + hash = "sha256-JeRve3xtWi+EcZR+qZlek+YwAbPB56OYxkFVd8MmIb0="; + }) + ]; + postPatch = '' # error: 'idx' may be used uninitialized substituteInPlace plugins/lidar.c --replace-fail "int i, j, idx;" "int i, j, idx = 0;" diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index 5f5bf16d793c..da4cc45cf942 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-f6lDPjRUa64MnkFYcLCveaIYBTLFXjwQ1AFYbGQgFwQ="; + hash = "sha256-2XhTe10YuQjLME2s/njeoU2lPGPsKM87Q7ABLrBaDAM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ofq/UYxL85fO3dv5tuCfBOOlJTZGrkeVNl16YVbHNnw="; + cargoHash = "sha256-n1SfPb0n15O73yfJvRHB5buPQYk7ne6wJdXAfY7ExPU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 5614e73ba0cd..7c66b8996345 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace jogl/make/build-*.xml \ --replace-warn 'dir="''${TARGET_PLATFORM_USRLIBS}"' "" '' - # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers + # force way to do dysfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers # if arm/aarch64 support will be added, this block might be commented out on those platforms # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so + '' diff --git a/pkgs/by-name/ki/kinect-audio-setup/package.nix b/pkgs/by-name/ki/kinect-audio-setup/package.nix index 5534ceb497ce..cf4f9a0ada0b 100644 --- a/pkgs/by-name/ki/kinect-audio-setup/package.nix +++ b/pkgs/by-name/ki/kinect-audio-setup/package.nix @@ -10,7 +10,7 @@ let # The last known good firmware package to have been tested - # by the upstream projet. + # by the upstream project. # The firmware URL is hardcoded in the upstream project's installation script firmwareUrl = "https://download.microsoft.com/download/F/9/9/F99791F2-D5BE-478A-B77A-830AD14950C3/KinectSDK-v1.0-beta2-x86.msi"; # The original URL "https://research.microsoft.com/en-us/um/legal/kinectsdk-tou_noncommercial.htm" diff --git a/pkgs/by-name/ko/konstraint/package.nix b/pkgs/by-name/ko/konstraint/package.nix index 9c9ae6081f35..7dbd94af18c7 100644 --- a/pkgs/by-name/ko/konstraint/package.nix +++ b/pkgs/by-name/ko/konstraint/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pn5uL3ibDb3vXaBhf34LmFNGpR8SYJkg5IcnN+eVfWk="; + sha256 = "sha256-xSDJ9UaAYjsyEy+VGOQNrJSYh+Fulp+vDnXxPjRSotk="; }; - vendorHash = "sha256-ZpNLxoUHwNMzMiKSm8rY27dH9AukXZEitrFb7TlSyQ0="; + vendorHash = "sha256-pb34eqOmGBdYMRw8mIP4upnKEhevxoCkPVnH9E7W2Q8="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 8eefeea6d768..3e590bb5e67e 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM. # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, - # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. + # which trigger libc++ debug assertions due to trying to take the address of the first element of an empty vector. mesonBuildType = "release"; mesonFlags = [ diff --git a/pkgs/by-name/ld/ldmtool/package.nix b/pkgs/by-name/ld/ldmtool/package.nix index 19495696c14c..23c522c6e831 100644 --- a/pkgs/by-name/ld/ldmtool/package.nix +++ b/pkgs/by-name/ld/ldmtool/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Remove useage of deprecrated G_PARAM_PRIVATE + # Remove usage of deprecrated G_PARAM_PRIVATE (fetchpatch { url = "https://github.com/mdbooth/libldm/commit/ee1b37a034038f09d61b121cc8b3651024acc46f.patch"; sha256 = "02y34kbcpcpffvy1n9yqngvdldmxmvdkha1v2xjqvrnclanpigcp"; diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix index 0172b7230483..c6d058c55b67 100644 --- a/pkgs/by-name/le/lensfun/package.nix +++ b/pkgs/by-name/le/lensfun/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { # replace database with a more recent snapshot # the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, # so we run the conversion tool the project provides, - # then untar the verson 1 profiles into the source dir before we build + # then untar the version 1 profiles into the source dir before we build prePatch = '' rm -R data/db python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 2b933502d2a7..131574187409 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -56,7 +56,7 @@ buildDotnetModule rec { --replace-fail "/usr/bin/libation" "${meta.mainProgram}" ''; - # wrap manually, because we need lower case excutables + # wrap manually, because we need lower case executables dontDotnetFixup = true; preFixup = '' diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix index dec30fe9d0d4..9f90233e996a 100644 --- a/pkgs/by-name/li/libgpg-error/package.nix +++ b/pkgs/by-name/li/libgpg-error/package.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation (rec { lib.optionalString stdenv.hostPlatform.isSunOS '' ${stdenv.shell} config.status '' - # ./configure errorneous decides to use weak symbols on pkgsStatic, + # ./configure erroneous decides to use weak symbols on pkgsStatic, # which, together with other defines results in locking functions in # src/posix-lock.c to be no-op, causing tests/t-lock.c to fail. + lib.optionalString stdenv.hostPlatform.isStatic '' diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index 243d68d8dc69..85b80c91a0e5 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { env.GTEST_FILTER = let disabledTests = [ - # Some locale releated tests fail because they need the LOCALE_ARCHIVE env var to be set to "${glibcLocales}/lib/locale/locale-archive" + # Some locale related tests fail because they need the LOCALE_ARCHIVE env var to be set to "${glibcLocales}/lib/locale/locale-archive" # Due to storage size concerns of `glibcLocales`, we skip this "CompareFilenames.shouldBeCaseInsensitiveAndLocaleInvariant" "NormalizeFilename.shouldCaseFoldStringsAndBeLocaleInvariant" diff --git a/pkgs/by-name/li/libngspice/package.nix b/pkgs/by-name/li/libngspice/package.nix index 18720937e01b..58ccd41a8cb9 100644 --- a/pkgs/by-name/li/libngspice/package.nix +++ b/pkgs/by-name/li/libngspice/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "43"; + version = "44.2"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk="; + hash = "sha256-59rft71UdP0iQJweWmes3sGfd+WX32jhfFVJvBOQ1/0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/litehtml/package.nix b/pkgs/by-name/li/litehtml/package.nix index f5029dc9b27f..d111b8dd538c 100644 --- a/pkgs/by-name/li/litehtml/package.nix +++ b/pkgs/by-name/li/litehtml/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZE/HKzo3ejKpW/ih3sJwn2hzCtsBhAXeJWGezYd6Yc4"; }; - # Don't search for non-existant gumbo cmake config + # Don't search for non-existent gumbo cmake config # This will mislead cmake that litehtml is not found # Affects build of pkgs that depend on litehtml postPatch = '' diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 17a7aa5d6a84..d1517bc690f3 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -579,7 +579,7 @@ let runHook postInstall ''; - # patching rpath with patchelf doens't work. The execuable + # patching rpath with patchelf doens't work. The executable # raises an segmentation fault postFixup = let diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix index 973ca6ce4a0a..fee839c35392 100644 --- a/pkgs/by-name/lo/looking-glass-client/package.nix +++ b/pkgs/by-name/lo/looking-glass-client/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland. + # Fix failing cmake assertion when disabling X11 without explicitly enabling Wayland. (fetchpatch { url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch"; hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU="; diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix index 0d94114f4e6d..351e51118cb5 100644 --- a/pkgs/by-name/lp/LPCNet/package.nix +++ b/pkgs/by-name/lp/LPCNet/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0="; }; passthru = { - # Prebuilt neural network model that is needed during the build - can be overrwritten + # Prebuilt neural network model that is needed during the build - can be overwritten nnmodel = fetchurl { url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz"; hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 7fe8b446c6e2..81582f831eef 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-FjPvjlAq3Xj2WTRvzvhZ87CaUjhJf9R1VDUs+XQchtU="; - # maa-cli would only seach libMaaCore.so and resources in itself's path + # maa-cli would only search libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 postInstall = '' diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix index c65764750573..8a8b47900c58 100644 --- a/pkgs/by-name/ma/matlab-language-server/package.nix +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -12,7 +12,7 @@ buildNpmPackage { src = fetchFromGitHub { owner = "mathworks"; repo = "matlab-language-server"; - # Upstream doesn't tag commits unfortunatly, but lists versions and dates + # Upstream doesn't tag commits unfortunately, but lists versions and dates # in README... See complaint at: # https://github.com/mathworks/MATLAB-language-server/issues/24 rev = "c8c901956e3bbfbd6eab440a1b60c3fe016cf567"; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix new file mode 100644 index 000000000000..64ab8f0e2c99 --- /dev/null +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + go_1_24, + pkg-config, + nix-update-script, +}: + +buildGoModule.override { go = go_1_24; } rec { + pname = "matrix-alertmanager-receiver"; + version = "2025.2.19"; + + src = fetchFromGitHub { + owner = "metio"; + repo = "matrix-alertmanager-receiver"; + tag = version; + hash = "sha256-mzWxAR82tD5zbviAjRFyBLZSpaETti85kzolWRmhx1o="; + }; + + vendorHash = "sha256-lRZGnkcdQtU9ecM6ezm97YtMzC/65yEgzJ99iKWY4QY="; + + nativeBuildInputs = [ + pkg-config + ]; + + env.CGO_ENABLED = "0"; + + ldflags = [ + "-s" + "-w" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Alertmanager client that forwards alerts to a Matrix room"; + homepage = "https://github.com/metio/matrix-alertmanager-receiver"; + changelog = "https://github.com/metio/matrix-alertmanager-receiver/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "matrix-alertmanager-receiver"; + }; +} diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 72897f5957cf..e48f2ca2d675 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-d3PKwvTpOpqp6J1i53T7FYSEGO+yuL+wtpAwNjrPZcQ="; + hash = "sha256-PsPCbuSK8JlNZOqFbxCK0f8h+7EC4tNFtjBfJqiPi7Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nV0VBbAivS6Qj62H1Uk/alDEPnryRmEfY3LZIIvDEKE="; + cargoHash = "sha256-emfO7D7JU/fQYdnaK7eWR8tCPx3ffvU/pTutSURZMBQ="; doCheck = false; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index 616293be2e46..790c4cfad6f5 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -8,15 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "mdevctl"; - version = "1.3.0"; + version = "1.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-4K4NW3DOTtzZJ7Gg0mnRPr88YeqEjTtKX+C4P8i923E="; + hash = "sha256-Zh+Dj3X87tTpqT/weZMpf7f3obqikjPy9pi50ifp6wQ="; }; + # https://github.com/mdevctl/mdevctl/issues/111 + patches = [ + ./script-dir.patch + ]; + useFetchCargoVendor = true; - cargoHash = "sha256-xfrW7WiKBM9Hz49he/42z9gBrwZ3sKGH/u105hcyln0="; + cargoHash = "sha256-LG5UaSUTF6pVx7BBLiZ/OmAZNCKswFlTqHymg3bDkuc="; nativeBuildInputs = [ docutils diff --git a/pkgs/by-name/md/mdevctl/script-dir.patch b/pkgs/by-name/md/mdevctl/script-dir.patch new file mode 100644 index 000000000000..0c2a3df2c5c2 --- /dev/null +++ b/pkgs/by-name/md/mdevctl/script-dir.patch @@ -0,0 +1,13 @@ +diff --git a/src/environment.rs b/src/environment.rs +index 3db5933..f6da56c 100644 +--- a/src/environment.rs ++++ b/src/environment.rs +@@ -35,7 +35,7 @@ pub trait Environment { + } + + fn scripts_base(&self) -> PathBuf { +- self.root().join("usr/lib/mdevctl/scripts.d") ++ self.root().join("etc/mdevctl/scripts.d") + } + + fn callout_dir(&self) -> PathBuf { diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 20ebeef2a94b..5d0c08933aae 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -56,7 +56,7 @@ pythonpkgs.buildPythonApplication rec { pythonRelaxDeps = true; patches = [ - # compatiblity with openai 1.63.0 + # compatibility with openai 1.63.0 ./0000_openai_1.63.0.patch ]; diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index e64b018136c2..2bc12b537c87 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # In the settings menu of Megapixels the user can select a different postprocessing script. The path to the script is then stored in a dconf setting. If the path changes, for example because it is in the Nix store and a dependency of the postprocessor changes, Megapixels will try to use this now non-existing old path. This will cause Megapixels to not save any images that were taken until the user opens the settings again and selects a postprocessor again. Using a global path allows the setting to keep working. - # Note that this patch only fixes the issue for external postprocessors like postprocessd but the postprocessor script that comes with Megapixels is still refered to by the Nix store path. + # Note that this patch only fixes the issue for external postprocessors like postprocessd but the postprocessor script that comes with Megapixels is still referred to by the Nix store path. ./search-for-postprocessors-in-NixOS-specific-global-location.patch ]; diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index c7bb965984ba..8d45ca5ab20c 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-90Ezv9PM1lFRq4b0ACrc34OteF6P/8DhZy+5kCnInSI="; + hash = "sha256-wSuZHHHLkS0Fr7NaRQpt7raUHeApBFy+C57YiaX6P0s="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-V1BDcAD84W5n/IOAcO+eMd+LnSe0sgNgBeq95dOl/Us="; + vendorHash = "sha256-Tc+ZpmCsJyuJyQDV6wAiagJ7kMxHxpRLOwLg/+o3P38="; subPackages = [ "." ]; diff --git a/pkgs/by-name/mm/mmark/package.nix b/pkgs/by-name/mm/mmark/package.nix index 93a86bf61f14..1c2c7c85f626 100644 --- a/pkgs/by-name/mm/mmark/package.nix +++ b/pkgs/by-name/mm/mmark/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; - # The tag has an outdated version number and fails the versio ntest + # The tag has an outdated version number and fails the version ntest # The pinned revision includes one extra commit that fixes the issue # rev = "v${version}"; rev = "158e9cca0280c58e205cb69b02bf33d7d826915e"; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index c9dd27486fbc..567f2237466c 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -34,7 +34,7 @@ }: let - version = "1.45.2"; + version = "1.45.3"; rpath = lib.makeLibraryPath [ alsa-lib @@ -84,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-sP4WKV8DF05Lwlh+jboWU3xCono85FyeUi+5vzgx+E0="; + hash = "sha256-tQ8EY0PFbrsYie5HKp1FExIfgeOs9fwlIZ8h22ueQnQ="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/mo/mongosh/package-lock.json b/pkgs/by-name/mo/mongosh/package-lock.json index 0441426f2961..dd7fe6e5fd8b 100644 --- a/pkgs/by-name/mo/mongosh/package-lock.json +++ b/pkgs/by-name/mo/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.3.8", + "version": "2.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.3.8", + "version": "2.4.0", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.3.8" + "@mongosh/cli-repl": "2.4.0" }, "bin": { "mongosh": "bin/mongosh.js" @@ -157,45 +157,45 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.738.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.738.0.tgz", - "integrity": "sha512-TjPpLZ2qkh+2jQIYtUbNh5D6jv4U0DQIUiLLZOKalUqSK2L9OzTc1463kX076QCpYlAZJNt3FvPyiMab0W8zBg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.750.0.tgz", + "integrity": "sha512-ia5+l7U1ludU/YqQAnEMj5DIp1kfMTu14lUOMG3uTIwTcj8OjkCvAe6BuM0OY6zd8enrJYWLqIqxuKPOWw4I7Q==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.734.0", - "@aws-sdk/credential-provider-node": "3.738.0", + "@aws-sdk/core": "3.750.0", + "@aws-sdk/credential-provider-node": "3.750.0", "@aws-sdk/middleware-host-header": "3.734.0", "@aws-sdk/middleware-logger": "3.734.0", "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.734.0", + "@aws-sdk/middleware-user-agent": "3.750.0", "@aws-sdk/region-config-resolver": "3.734.0", "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.734.0", + "@aws-sdk/util-endpoints": "3.743.0", "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.734.0", + "@aws-sdk/util-user-agent-node": "3.750.0", "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.1", + "@smithy/core": "^3.1.4", "@smithy/fetch-http-handler": "^5.0.1", "@smithy/hash-node": "^4.0.1", "@smithy/invalid-dependency": "^4.0.1", "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.2", - "@smithy/middleware-retry": "^4.0.3", - "@smithy/middleware-serde": "^4.0.1", + "@smithy/middleware-endpoint": "^4.0.5", + "@smithy/middleware-retry": "^4.0.6", + "@smithy/middleware-serde": "^4.0.2", "@smithy/middleware-stack": "^4.0.1", "@smithy/node-config-provider": "^4.0.1", "@smithy/node-http-handler": "^4.0.2", "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.2", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "@smithy/url-parser": "^4.0.1", "@smithy/util-base64": "^4.0.0", "@smithy/util-body-length-browser": "^4.0.0", "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.3", - "@smithy/util-defaults-mode-node": "^4.0.3", + "@smithy/util-defaults-mode-browser": "^4.0.6", + "@smithy/util-defaults-mode-node": "^4.0.6", "@smithy/util-endpoints": "^3.0.1", "@smithy/util-middleware": "^4.0.1", "@smithy/util-retry": "^4.0.1", @@ -207,44 +207,44 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.734.0.tgz", - "integrity": "sha512-oerepp0mut9VlgTwnG5Ds/lb0C0b2/rQ+hL/rF6q+HGKPfGsCuPvFx1GtwGKCXd49ase88/jVgrhcA9OQbz3kg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.750.0.tgz", + "integrity": "sha512-y0Rx6pTQXw0E61CaptpZF65qNggjqOgymq/RYZU5vWba5DGQ+iqGt8Yq8s+jfBoBBNXshxq8l8Dl5Uq/JTY1wg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/middleware-host-header": "3.734.0", "@aws-sdk/middleware-logger": "3.734.0", "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.734.0", + "@aws-sdk/middleware-user-agent": "3.750.0", "@aws-sdk/region-config-resolver": "3.734.0", "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.734.0", + "@aws-sdk/util-endpoints": "3.743.0", "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.734.0", + "@aws-sdk/util-user-agent-node": "3.750.0", "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.1", + "@smithy/core": "^3.1.4", "@smithy/fetch-http-handler": "^5.0.1", "@smithy/hash-node": "^4.0.1", "@smithy/invalid-dependency": "^4.0.1", "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.2", - "@smithy/middleware-retry": "^4.0.3", - "@smithy/middleware-serde": "^4.0.1", + "@smithy/middleware-endpoint": "^4.0.5", + "@smithy/middleware-retry": "^4.0.6", + "@smithy/middleware-serde": "^4.0.2", "@smithy/middleware-stack": "^4.0.1", "@smithy/node-config-provider": "^4.0.1", "@smithy/node-http-handler": "^4.0.2", "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.2", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "@smithy/url-parser": "^4.0.1", "@smithy/util-base64": "^4.0.0", "@smithy/util-body-length-browser": "^4.0.0", "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.3", - "@smithy/util-defaults-mode-node": "^4.0.3", + "@smithy/util-defaults-mode-browser": "^4.0.6", + "@smithy/util-defaults-mode-node": "^4.0.6", "@smithy/util-endpoints": "^3.0.1", "@smithy/util-middleware": "^4.0.1", "@smithy/util-retry": "^4.0.1", @@ -256,18 +256,18 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.734.0.tgz", - "integrity": "sha512-SxnDqf3vobdm50OLyAKfqZetv6zzwnSqwIwd3jrbopxxHKqNIM/I0xcYjD6Tn+mPig+u7iRKb9q3QnEooFTlmg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.750.0.tgz", + "integrity": "sha512-bZ5K7N5L4+Pa2epbVpUQqd1XLG2uU8BGs/Sd+2nbgTf+lNQJyIxAg/Qsrjz9MzmY8zzQIeRQEkNmR6yVAfCmmQ==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/types": "3.734.0", - "@smithy/core": "^3.1.1", + "@smithy/core": "^3.1.4", "@smithy/node-config-provider": "^4.0.1", "@smithy/property-provider": "^4.0.1", "@smithy/protocol-http": "^5.0.1", "@smithy/signature-v4": "^5.0.1", - "@smithy/smithy-client": "^4.1.2", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "@smithy/util-middleware": "^4.0.1", "fast-xml-parser": "4.4.1", @@ -278,12 +278,12 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.738.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.738.0.tgz", - "integrity": "sha512-zh8ATHUjy9CyVrq7qa7ICh4t5OF7mps0A22NY2NyLpSYWOErNnze+FvBi2uh+Jp+VIoojH4R2d9/IHTxENhq7g==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.750.0.tgz", + "integrity": "sha512-TwBzrxgIWcQk846XFn0A9DHBHbfg4sHR3M2GL4E7NcffEkh7r642ILiLa58VvQjO2nB1tcOOFtRqbZvVOKexUw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.738.0", + "@aws-sdk/client-cognito-identity": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/types": "^4.1.0", @@ -294,12 +294,12 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.734.0.tgz", - "integrity": "sha512-gtRkzYTGafnm1FPpiNO8VBmJrYMoxhDlGPYDVcijzx3DlF8dhWnowuSBCxLSi+MJMx5hvwrX2A+e/q0QAeHqmw==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.750.0.tgz", + "integrity": "sha512-In6bsG0p/P31HcH4DBRKBbcDS/3SHvEPjfXV8ODPWZO/l3/p7IRoYBdQ07C9R+VMZU2D0+/Sc/DWK/TUNDk1+Q==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/types": "^4.1.0", @@ -310,20 +310,20 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.734.0.tgz", - "integrity": "sha512-JFSL6xhONsq+hKM8xroIPhM5/FOhiQ1cov0lZxhzZWj6Ai3UAjucy3zyIFDr9MgP1KfCYNdvyaUq9/o+HWvEDg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.750.0.tgz", + "integrity": "sha512-wFB9qqfa20AB0dElsQz5ZlZT5o+a+XzpEpmg0erylmGYqEOvh8NQWfDUVpRmQuGq9VbvW/8cIbxPoNqEbPtuWQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/fetch-http-handler": "^5.0.1", "@smithy/node-http-handler": "^4.0.2", "@smithy/property-provider": "^4.0.1", "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.2", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", - "@smithy/util-stream": "^4.0.2", + "@smithy/util-stream": "^4.1.1", "tslib": "^2.6.2" }, "engines": { @@ -331,18 +331,18 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.734.0.tgz", - "integrity": "sha512-HEyaM/hWI7dNmb4NhdlcDLcgJvrilk8G4DQX6qz0i4pBZGC2l4iffuqP8K6ZQjUfz5/6894PzeFuhTORAMd+cg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.750.0.tgz", + "integrity": "sha512-2YIZmyEr5RUd3uxXpxOLD9G67Bibm4I/65M6vKFP17jVMUT+R1nL7mKqmhEVO2p+BoeV+bwMyJ/jpTYG368PCg==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", - "@aws-sdk/credential-provider-env": "3.734.0", - "@aws-sdk/credential-provider-http": "3.734.0", - "@aws-sdk/credential-provider-process": "3.734.0", - "@aws-sdk/credential-provider-sso": "3.734.0", - "@aws-sdk/credential-provider-web-identity": "3.734.0", - "@aws-sdk/nested-clients": "3.734.0", + "@aws-sdk/core": "3.750.0", + "@aws-sdk/credential-provider-env": "3.750.0", + "@aws-sdk/credential-provider-http": "3.750.0", + "@aws-sdk/credential-provider-process": "3.750.0", + "@aws-sdk/credential-provider-sso": "3.750.0", + "@aws-sdk/credential-provider-web-identity": "3.750.0", + "@aws-sdk/nested-clients": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/credential-provider-imds": "^4.0.1", "@smithy/property-provider": "^4.0.1", @@ -355,17 +355,17 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.738.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.738.0.tgz", - "integrity": "sha512-3MuREsazwBxghKb2sQQHvie+uuK4dX4/ckFYiSoffzJQd0YHxaGxf8cr4NOSCQCUesWu8D3Y0SzlnHGboVSkpA==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.750.0.tgz", + "integrity": "sha512-THWHHAceLwsOiowPEmKyhWVDlEUxH07GHSw5AQFDvNQtGKOQl0HSIFO1mKObT2Q2Vqzji9Bq8H58SO5BFtNPRw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/credential-provider-env": "3.734.0", - "@aws-sdk/credential-provider-http": "3.734.0", - "@aws-sdk/credential-provider-ini": "3.734.0", - "@aws-sdk/credential-provider-process": "3.734.0", - "@aws-sdk/credential-provider-sso": "3.734.0", - "@aws-sdk/credential-provider-web-identity": "3.734.0", + "@aws-sdk/credential-provider-env": "3.750.0", + "@aws-sdk/credential-provider-http": "3.750.0", + "@aws-sdk/credential-provider-ini": "3.750.0", + "@aws-sdk/credential-provider-process": "3.750.0", + "@aws-sdk/credential-provider-sso": "3.750.0", + "@aws-sdk/credential-provider-web-identity": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/credential-provider-imds": "^4.0.1", "@smithy/property-provider": "^4.0.1", @@ -378,12 +378,12 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.734.0.tgz", - "integrity": "sha512-zvjsUo+bkYn2vjT+EtLWu3eD6me+uun+Hws1IyWej/fKFAqiBPwyeyCgU7qjkiPQSXqk1U9+/HG9IQ6Iiz+eBw==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.750.0.tgz", + "integrity": "sha512-Q78SCH1n0m7tpu36sJwfrUSxI8l611OyysjQeMiIOliVfZICEoHcLHLcLkiR+tnIpZ3rk7d2EQ6R1jwlXnalMQ==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/shared-ini-file-loader": "^4.0.1", @@ -395,14 +395,14 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.734.0.tgz", - "integrity": "sha512-cCwwcgUBJOsV/ddyh1OGb4gKYWEaTeTsqaAK19hiNINfYV/DO9r4RMlnWAo84sSBfJuj9shUNsxzyoe6K7R92Q==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.750.0.tgz", + "integrity": "sha512-FGYrDjXN/FOQVi/t8fHSv8zCk+NEvtFnuc4cZUj5OIbM4vrfFc5VaPyn41Uza3iv6Qq9rZg0QOwWnqK8lNrqUw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-sso": "3.734.0", - "@aws-sdk/core": "3.734.0", - "@aws-sdk/token-providers": "3.734.0", + "@aws-sdk/client-sso": "3.750.0", + "@aws-sdk/core": "3.750.0", + "@aws-sdk/token-providers": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/shared-ini-file-loader": "^4.0.1", @@ -414,13 +414,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.734.0.tgz", - "integrity": "sha512-t4OSOerc+ppK541/Iyn1AS40+2vT/qE+MFMotFkhCgCJbApeRF2ozEdnDN6tGmnl4ybcUuxnp9JWLjwDVlR/4g==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.750.0.tgz", + "integrity": "sha512-Nz8zs3YJ+GOTSrq+LyzbbC1Ffpt7pK38gcOyNZv76pP5MswKTUKNYBJehqwa+i7FcFQHsCk3TdhR8MT1ZR23uA==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", - "@aws-sdk/nested-clients": "3.734.0", + "@aws-sdk/core": "3.750.0", + "@aws-sdk/nested-clients": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/types": "^4.1.0", @@ -431,24 +431,24 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.738.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.738.0.tgz", - "integrity": "sha512-Ff+7NMLmK9oadO1uHiMCS/V3Pmp3WnY7Ijy4ySx2HLUZQq7EKFZyFB0qslkeawdY0PGWqyj25anh8I/bhxqWoQ==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.750.0.tgz", + "integrity": "sha512-HpJyLHAjcn/IcvsL4WhEIgbzEWfTnn29u8QFNa5Ii9pVtxdeP/DkSthP3SNxLK2jVNcqWL9xago02SiasNOKfw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.738.0", - "@aws-sdk/core": "3.734.0", - "@aws-sdk/credential-provider-cognito-identity": "3.738.0", - "@aws-sdk/credential-provider-env": "3.734.0", - "@aws-sdk/credential-provider-http": "3.734.0", - "@aws-sdk/credential-provider-ini": "3.734.0", - "@aws-sdk/credential-provider-node": "3.738.0", - "@aws-sdk/credential-provider-process": "3.734.0", - "@aws-sdk/credential-provider-sso": "3.734.0", - "@aws-sdk/credential-provider-web-identity": "3.734.0", - "@aws-sdk/nested-clients": "3.734.0", + "@aws-sdk/client-cognito-identity": "3.750.0", + "@aws-sdk/core": "3.750.0", + "@aws-sdk/credential-provider-cognito-identity": "3.750.0", + "@aws-sdk/credential-provider-env": "3.750.0", + "@aws-sdk/credential-provider-http": "3.750.0", + "@aws-sdk/credential-provider-ini": "3.750.0", + "@aws-sdk/credential-provider-node": "3.750.0", + "@aws-sdk/credential-provider-process": "3.750.0", + "@aws-sdk/credential-provider-sso": "3.750.0", + "@aws-sdk/credential-provider-web-identity": "3.750.0", + "@aws-sdk/nested-clients": "3.750.0", "@aws-sdk/types": "3.734.0", - "@smithy/core": "^3.1.1", + "@smithy/core": "^3.1.4", "@smithy/credential-provider-imds": "^4.0.1", "@smithy/property-provider": "^4.0.1", "@smithy/types": "^4.1.0", @@ -503,15 +503,15 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.734.0.tgz", - "integrity": "sha512-MFVzLWRkfFz02GqGPjqSOteLe5kPfElUrXZft1eElnqulqs6RJfVSpOV7mO90gu293tNAeggMWAVSGRPKIYVMg==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.750.0.tgz", + "integrity": "sha512-YYcslDsP5+2NZoN3UwuhZGkhAHPSli7HlJHBafBrvjGV/I9f8FuOO1d1ebxGdEP4HyRXUGyh+7Ur4q+Psk0ryw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.734.0", - "@smithy/core": "^3.1.1", + "@aws-sdk/util-endpoints": "3.743.0", + "@smithy/core": "^3.1.4", "@smithy/protocol-http": "^5.0.1", "@smithy/types": "^4.1.0", "tslib": "^2.6.2" @@ -521,44 +521,44 @@ } }, "node_modules/@aws-sdk/nested-clients": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.734.0.tgz", - "integrity": "sha512-iph2XUy8UzIfdJFWo1r0Zng9uWj3253yvW9gljhtu+y/LNmNvSnJxQk1f3D2BC5WmcoPZqTS3UsycT3mLPSzWA==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.750.0.tgz", + "integrity": "sha512-OH68BRF0rt9nDloq4zsfeHI0G21lj11a66qosaljtEP66PWm7tQ06feKbFkXHT5E1K3QhJW3nVyK8v2fEBY5fg==", "license": "Apache-2.0", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.734.0", + "@aws-sdk/core": "3.750.0", "@aws-sdk/middleware-host-header": "3.734.0", "@aws-sdk/middleware-logger": "3.734.0", "@aws-sdk/middleware-recursion-detection": "3.734.0", - "@aws-sdk/middleware-user-agent": "3.734.0", + "@aws-sdk/middleware-user-agent": "3.750.0", "@aws-sdk/region-config-resolver": "3.734.0", "@aws-sdk/types": "3.734.0", - "@aws-sdk/util-endpoints": "3.734.0", + "@aws-sdk/util-endpoints": "3.743.0", "@aws-sdk/util-user-agent-browser": "3.734.0", - "@aws-sdk/util-user-agent-node": "3.734.0", + "@aws-sdk/util-user-agent-node": "3.750.0", "@smithy/config-resolver": "^4.0.1", - "@smithy/core": "^3.1.1", + "@smithy/core": "^3.1.4", "@smithy/fetch-http-handler": "^5.0.1", "@smithy/hash-node": "^4.0.1", "@smithy/invalid-dependency": "^4.0.1", "@smithy/middleware-content-length": "^4.0.1", - "@smithy/middleware-endpoint": "^4.0.2", - "@smithy/middleware-retry": "^4.0.3", - "@smithy/middleware-serde": "^4.0.1", + "@smithy/middleware-endpoint": "^4.0.5", + "@smithy/middleware-retry": "^4.0.6", + "@smithy/middleware-serde": "^4.0.2", "@smithy/middleware-stack": "^4.0.1", "@smithy/node-config-provider": "^4.0.1", "@smithy/node-http-handler": "^4.0.2", "@smithy/protocol-http": "^5.0.1", - "@smithy/smithy-client": "^4.1.2", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "@smithy/url-parser": "^4.0.1", "@smithy/util-base64": "^4.0.0", "@smithy/util-body-length-browser": "^4.0.0", "@smithy/util-body-length-node": "^4.0.0", - "@smithy/util-defaults-mode-browser": "^4.0.3", - "@smithy/util-defaults-mode-node": "^4.0.3", + "@smithy/util-defaults-mode-browser": "^4.0.6", + "@smithy/util-defaults-mode-node": "^4.0.6", "@smithy/util-endpoints": "^3.0.1", "@smithy/util-middleware": "^4.0.1", "@smithy/util-retry": "^4.0.1", @@ -587,12 +587,12 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.734.0.tgz", - "integrity": "sha512-2U6yWKrjWjZO8Y5SHQxkFvMVWHQWbS0ufqfAIBROqmIZNubOL7jXCiVdEFekz6MZ9LF2tvYGnOW4jX8OKDGfIw==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.750.0.tgz", + "integrity": "sha512-X/KzqZw41iWolwNdc8e3RMcNSMR364viHv78u6AefXOO5eRM40c4/LuST1jDzq35/LpnqRhL7/MuixOetw+sFw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/nested-clients": "3.734.0", + "@aws-sdk/nested-clients": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/property-provider": "^4.0.1", "@smithy/shared-ini-file-loader": "^4.0.1", @@ -617,9 +617,9 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.734.0.tgz", - "integrity": "sha512-w2+/E88NUbqql6uCVAsmMxDQKu7vsKV0KqhlQb0lL+RCq4zy07yXYptVNs13qrnuTfyX7uPXkXrlugvK9R1Ucg==", + "version": "3.743.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.743.0.tgz", + "integrity": "sha512-sN1l559zrixeh5x+pttrnd0A3+r34r0tmPkJ/eaaMaAzXqsmKU/xYre9K3FNnsSS1J1k4PEfk/nHDTVUgFYjnw==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/types": "3.734.0", @@ -656,12 +656,12 @@ } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.734.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.734.0.tgz", - "integrity": "sha512-c6Iinh+RVQKs6jYUFQ64htOU2HUXFQ3TVx+8Tu3EDF19+9vzWi9UukhIMH9rqyyEXIAkk9XL7avt8y2Uyw2dGA==", + "version": "3.750.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.750.0.tgz", + "integrity": "sha512-84HJj9G9zbrHX2opLk9eHfDceB+UIHVrmflMzWHpsmo9fDuro/flIBqaVDlE021Osj6qIM0SJJcnL6s23j7JEw==", "license": "Apache-2.0", "dependencies": { - "@aws-sdk/middleware-user-agent": "3.734.0", + "@aws-sdk/middleware-user-agent": "3.750.0", "@aws-sdk/types": "3.734.0", "@smithy/node-config-provider": "^4.0.1", "@smithy/types": "^4.1.0", @@ -694,30 +694,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", - "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", - "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz", + "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==", "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", + "@babel/generator": "^7.26.9", "@babel/helper-compilation-targets": "^7.26.5", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.7", - "@babel/parser": "^7.26.7", - "@babel/template": "^7.25.9", - "@babel/traverse": "^7.26.7", - "@babel/types": "^7.26.7", + "@babel/helpers": "^7.26.9", + "@babel/parser": "^7.26.9", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.9", + "@babel/types": "^7.26.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -742,13 +742,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", - "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz", + "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.5", - "@babel/types": "^7.26.5", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -864,25 +864,25 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz", - "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz", + "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==", "license": "MIT", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.7" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz", - "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz", + "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==", "license": "MIT", "dependencies": { - "@babel/types": "^7.26.7" + "@babel/types": "^7.26.9" }, "bin": { "parser": "bin/babel-parser.js" @@ -937,30 +937,30 @@ } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz", - "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz", + "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.7", - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.7", + "@babel/generator": "^7.26.9", + "@babel/parser": "^7.26.9", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -969,9 +969,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz", - "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz", + "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -981,21 +981,6 @@ "node": ">=6.9.0" } }, - "node_modules/@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", - "license": "BSD-3-Clause" - }, - "node_modules/@hapi/topo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", - "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1110,9 +1095,9 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.4.1.tgz", - "integrity": "sha512-J+n5Bz/V2e6jXSUSMUra9AGvYWJp9pKWxdTsQ6JEedufxiB7uM/glhyACGH2WIUaoOQk6nvSma8BdizUm/qNHg==", + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-3.6.4.tgz", + "integrity": "sha512-HtMSMxxAXPsZImXCXJK7rvmiMKHrZG6wJC+j5OrikoPHst/dzrnd5TtbR7cZJziFscuS5hfOtuMg3SHJSE67Qw==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", @@ -1130,7 +1115,7 @@ "peerDependencies": { "@mongodb-js/oidc-plugin": "^1.1.0", "mongodb": "^6.9.0", - "mongodb-log-writer": "^2.1.0" + "mongodb-log-writer": "^2.3.4" } }, "node_modules/@mongodb-js/devtools-proxy-support": { @@ -1182,9 +1167,9 @@ } }, "node_modules/@mongodb-js/saslprep": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz", - "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.2.0.tgz", + "integrity": "sha512-+ywrb0AqkfaYuhHs6LxKWgqbh3I72EpEgESCw37o+9qPx9WTCkgDm2B+eMrwehGtHBWHFU4GXvnSCNiFhhausg==", "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" @@ -1203,13 +1188,13 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.3.8.tgz", - "integrity": "sha512-oo6glzgsOyZJYijHvWMhnYJOZOI16J/u5y+puRLHL0oNwAaRwumJ1Kx+Zp9gQI9s6C523X80Hrs6op6/fCRp9Q==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-3.4.0.tgz", + "integrity": "sha512-eRJTLrwoA2M002YralaWt9dzO1ErtvkTcpnUFSrwHV/4VJk6oHUNRpIZNBPvRrKJTRZAWkAkvkJHk+GSPA8p+A==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.8", - "@mongosh/i18n": "2.3.8", + "@mongosh/errors": "2.4.0", + "@mongosh/i18n": "2.8.0", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1217,9 +1202,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.3.8.tgz", - "integrity": "sha512-YHt0m2MehX5UBILQqwDL1hToDRc1vtUPoD6Q2HH31iSY3Yer+uL83+BQe5AWaR5IBYGtNbul5IcKFwXCE5hA/w==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.4.4.tgz", + "integrity": "sha512-ATvCxKeIHPxevWhFWo+2bQy5yFFx22amoWzhf06cKUlUEvK9ipVptE14bjUEJHT5fjgJDpYuc8Dbr8cUq1LYSw==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.22.8", @@ -1236,13 +1221,13 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.3.8.tgz", - "integrity": "sha512-uiUhqTIFEei/YD1+MJOGJYGXC0tBmbteyDLzIudXYN8oCzvX+hqyZq3wbAQEH0jxF7aUzdAhxKVulIg2HxpIqQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-3.4.0.tgz", + "integrity": "sha512-I02pDPTaZsTA3XHclypOzOl1KheQkKaZZFNDlCyfSjBw7BlGDfZllWOqWegMUMcTfhvl0PjmE8eGG2xXid5C1Q==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.3.8", + "@mongosh/shell-api": "3.4.0", "semver": "^7.5.4" }, "engines": { @@ -1250,26 +1235,26 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.3.8.tgz", - "integrity": "sha512-mudXQeAqr4fbPfd9YysKPn3c57hsb60ImFsaBBW5SoAbQxbOCparA8pd1Tx1twZ3Nzin6VhEJs2Cj80VolEFxA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.4.0.tgz", + "integrity": "sha512-3wnEfi+DWft6Y8aL4WnQIt8c2LfMCnhApSYdTbCjL9fQwOobiICU6ZMQ9e5cB4oINu3Wiga7Xz2QFh5W75DV5w==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/arg-parser": "2.3.8", - "@mongosh/autocomplete": "2.3.8", - "@mongosh/editor": "2.3.8", - "@mongosh/errors": "2.3.8", - "@mongosh/history": "2.3.8", - "@mongosh/i18n": "2.3.8", - "@mongosh/js-multiline-to-singleline": "2.3.8", - "@mongosh/logging": "2.3.8", - "@mongosh/service-provider-core": "2.3.8", - "@mongosh/service-provider-node-driver": "2.3.8", - "@mongosh/shell-api": "2.3.8", - "@mongosh/shell-evaluator": "2.3.8", - "@mongosh/snippet-manager": "2.3.8", - "@mongosh/types": "2.3.8", + "@mongosh/arg-parser": "3.4.0", + "@mongosh/autocomplete": "3.4.0", + "@mongosh/editor": "3.4.0", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.4", + "@mongosh/i18n": "2.8.0", + "@mongosh/js-multiline-to-singleline": "2.4.4", + "@mongosh/logging": "3.4.0", + "@mongosh/service-provider-core": "3.0.4", + "@mongosh/service-provider-node-driver": "3.4.0", + "@mongosh/shell-api": "3.4.0", + "@mongosh/shell-evaluator": "3.4.0", + "@mongosh/snippet-manager": "3.4.0", + "@mongosh/types": "3.4.0", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1278,7 +1263,7 @@ "is-recoverable-error": "^1.0.3", "js-yaml": "^4.1.0", "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^1.4.2", + "mongodb-log-writer": "^2.3.1", "numeral": "^2.0.6", "pretty-repl": "^4.0.1", "semver": "^7.5.4", @@ -1290,7 +1275,7 @@ "mongosh": "bin/mongosh.js" }, "engines": { - "node": ">=16.15.0" + "node": ">=18.19.0" }, "optionalDependencies": { "get-console-process-list": "^1.0.5", @@ -1300,27 +1285,17 @@ "win-export-certificate-and-key": "^2.1.0" } }, - "node_modules/@mongosh/cli-repl/node_modules/mongodb-log-writer": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.4.2.tgz", - "integrity": "sha512-ZQYBgW1IZtuRWsv9hF0mjpfDg6usMawkkWKnFb/goXosbW0YyxVA9OHt32TJfppGK/U2p7jQx4V9DxRFsFmmKw==", - "license": "Apache-2.0", - "dependencies": { - "bson": "^4.5.1 || ^5.0.0 || ^6.0.0", - "heap-js": "^2.3.0" - } - }, "node_modules/@mongosh/editor": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.3.8.tgz", - "integrity": "sha512-QuhG8xWQJs66OvA8t3aCdxjbkcBsrR0Zw9fSGnraryRDNTdNO7rBIWHXIkpLeV3O/PGf8D9ucuWmQXsWr8O+pg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-3.4.0.tgz", + "integrity": "sha512-lS9D1aP6XFAIQNjmTCxEugsaTWJXw9a2XIgFk3Km74VFVSLX1gnJI+6kGEX7QsS5by6wQwrqLxRjgWGMQ/HMrA==", "license": "Apache-2.0", "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.3.8", - "@mongosh/service-provider-core": "2.3.8", - "@mongosh/shell-api": "2.3.8", - "@mongosh/shell-evaluator": "2.3.8", - "@mongosh/types": "2.3.8", + "@mongosh/js-multiline-to-singleline": "2.4.4", + "@mongosh/service-provider-core": "3.0.4", + "@mongosh/shell-api": "3.4.0", + "@mongosh/shell-evaluator": "3.4.0", + "@mongosh/types": "3.4.0", "js-beautify": "^1.15.1" }, "engines": { @@ -1328,43 +1303,43 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.3.8.tgz", - "integrity": "sha512-r7J2PxZec+Li0V6R7Mn1BgeTR9uyT2bYOqmXf1LApkuODTkjmrgZlZOwBl184eqF3jkLI7ZadUqZe8TBColXfw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.4.0.tgz", + "integrity": "sha512-2YwY4TYlrAy3VC9Y5Xa1OWlbdb57O0ZTDfntROFcfotrMXkZc9CU+jafrKRNcPJz8UAhoUcSTDJuaLpC3AutHg==", "license": "Apache-2.0", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.3.8.tgz", - "integrity": "sha512-u7R9dhk6qnbPoeSYkMu7h1JCkZuzFph6jEYy67e4lIviEL6J99u7hUHxNW70DqruOuoXyKREQ+mafPtxQNxu4w==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.4.4.tgz", + "integrity": "sha512-MyXfvloJuv/FkGk2zeNpYdraxIqw2Uh9v983HKOh0sz+Y79CBLww/IpvV9eJWUe5FF1f7fHf2oQw+b9yUoTKow==", "license": "Apache-2.0", "dependencies": { "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^1.1.2" + "mongodb-redact": "^1.1.5" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/i18n": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.3.8.tgz", - "integrity": "sha512-PbjAR7Dg8fYGRnnGTBvihPt8sHEZbg1BTgPas1jZGki6gUSiI/bwYeP0rOr7jgmvU2GcARJ8tfnxXBCIEIBasA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.8.0.tgz", + "integrity": "sha512-YowX9nS/bXP+WaI+R1S/WdodB6uAFKALi1I8t9pK2ynkQu7aSHIkB4nzv6OB36icJS+XUO5Gx1IquC64HKoMew==", "license": "Apache-2.0", "dependencies": { - "@mongosh/errors": "2.3.8" + "@mongosh/errors": "2.4.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.3.8.tgz", - "integrity": "sha512-J3frWA9gJo2i3osD3d2HHwOX+QqKPtV+//v/TKUXeOqe1CADxtAYnmDf0fphTcbncasaQVlMorarefHeotoTfQ==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.4.4.tgz", + "integrity": "sha512-mfPmw4CMMWI7YZiV/K7Kau2UqSPLuPha1YVUgpInLP7kHwCtZGj/IW9StQjWaMKWW/k5VOgTdHxeo9afyk+97w==", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.16.12", @@ -1375,42 +1350,32 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.3.8.tgz", - "integrity": "sha512-gbYyDImBumLtcQ4jG7gUukK4ON7z8At3sUfcDnOZmjt0Eodgfn/6ICvhUpy+UsKNGDwu6gJb5akOSkn6hC8fWQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-3.4.0.tgz", + "integrity": "sha512-xb1fpIJ/HvHAAe+dWKA4axpQc++0kdy/wuQJu6QSFe6K3ooPfNNvHtzDGwhoIO4v2j3kes04CMKBO/YaPHpPBw==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4", - "@mongosh/errors": "2.3.8", - "@mongosh/history": "2.3.8", - "@mongosh/types": "2.3.8", - "mongodb-log-writer": "^1.4.2", - "mongodb-redact": "^1.1.2" + "@mongodb-js/devtools-connect": "^3.4.1", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.4", + "@mongosh/types": "3.4.0", + "mongodb-log-writer": "^2.3.1", + "mongodb-redact": "^1.1.5" }, "engines": { "node": ">=14.15.1" } }, - "node_modules/@mongosh/logging/node_modules/mongodb-log-writer": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-1.4.2.tgz", - "integrity": "sha512-ZQYBgW1IZtuRWsv9hF0mjpfDg6usMawkkWKnFb/goXosbW0YyxVA9OHt32TJfppGK/U2p7jQx4V9DxRFsFmmKw==", - "license": "Apache-2.0", - "dependencies": { - "bson": "^4.5.1 || ^5.0.0 || ^6.0.0", - "heap-js": "^2.3.0" - } - }, "node_modules/@mongosh/service-provider-core": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.3.8.tgz", - "integrity": "sha512-zt7y+iXwPQhSojKzObPRICjKpQwJbOzOdo6yObF5iiG2/FX4Gi8WrVjwVqEAAZ//nVCXkMM7Y0epMhcZX+h5oQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-3.0.4.tgz", + "integrity": "sha512-wEt+UbnChid06TgscY64r99WRYVzD5z9OFsEQRA+cByuayx4Gvf7A1aqObjD5WGb75nLcX1RgV0Pu8Yvv3F+hQ==", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.3.8", - "bson": "^6.10.1", - "mongodb": "^6.12.0", + "@mongosh/errors": "2.4.0", + "bson": "^6.10.3", + "mongodb": "^6.13.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -1418,22 +1383,22 @@ "node": ">=14.15.1" }, "optionalDependencies": { - "mongodb-client-encryption": "^6.1.0" + "mongodb-client-encryption": "^6.1.1" } }, "node_modules/@mongosh/service-provider-node-driver": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-2.3.8.tgz", - "integrity": "sha512-lohfxdHosjigTqeXT4gr2IXuLRvnSJ8N/KbnpDsziG40S7b/t31s9t8WPtBWfVu51tOPdst10GjI3RINJyXIsg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-node-driver/-/service-provider-node-driver-3.4.0.tgz", + "integrity": "sha512-8Wd0WQu8GkhjjsWIsydYveWtjPS5dXIRA5aXxayef/hTMpfpAV4kr6tY+WkhH4cNZg+dnrAzaajmhBOnz8TojQ==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4", + "@mongodb-js/devtools-connect": "^3.4.1", "@mongodb-js/oidc-plugin": "^1.1.5", - "@mongosh/errors": "2.3.8", - "@mongosh/service-provider-core": "2.3.8", - "@mongosh/types": "2.3.8", + "@mongosh/errors": "2.4.0", + "@mongosh/service-provider-core": "3.0.4", + "@mongosh/types": "3.4.0", "aws4": "^1.12.0", - "mongodb": "^6.12.0", + "mongodb": "^6.13.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -1442,7 +1407,7 @@ }, "optionalDependencies": { "kerberos": "2.1.0", - "mongodb-client-encryption": "^6.1.0" + "mongodb-client-encryption": "^6.1.1" } }, "node_modules/@mongosh/service-provider-node-driver/node_modules/kerberos": { @@ -1503,63 +1468,63 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.3.8.tgz", - "integrity": "sha512-ulzeBdiQ5aGMtRqVxkDc6EYO6cELhDfxlB6XHF/v9C0m85Y+pFcBJnpMvy6vfSorWzBXQB6W0/DXLR/+z7USdg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-3.4.0.tgz", + "integrity": "sha512-f33ZKjL2JEDfM+1wE9x3Wc/KExuiZgChv4SVJs0PgY8w6L3/dYUCFDPyxV43Wj7GttwSwxqNrxvW/fIpmjxzuQ==", "license": "Apache-2.0", "dependencies": { - "@mongosh/arg-parser": "2.3.8", - "@mongosh/errors": "2.3.8", - "@mongosh/history": "2.3.8", - "@mongosh/i18n": "2.3.8", - "@mongosh/service-provider-core": "2.3.8", - "mongodb-redact": "^1.1.2" + "@mongosh/arg-parser": "3.4.0", + "@mongosh/errors": "2.4.0", + "@mongosh/history": "2.4.4", + "@mongosh/i18n": "2.8.0", + "@mongosh/service-provider-core": "3.0.4", + "mongodb-redact": "^1.1.5" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.3.8.tgz", - "integrity": "sha512-txC0yHDOjsy8a8Bg6PIY94M+KDcvHgLGlA/Ar/XoNZFSEAfF7I0Xj0wYf9iP22eqtfoU5FYEsqToVZLyyh+QFg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-3.4.0.tgz", + "integrity": "sha512-hyTySitzL6YoFkbKf4TbTEjx2nWVUZ7ZEL8w0YcBN4pU4fAelDj5SSk6f4Fpy+wdmgP039bqsulLMpzESLko0A==", "license": "Apache-2.0", "dependencies": { - "@mongosh/async-rewriter2": "2.3.8", - "@mongosh/history": "2.3.8", - "@mongosh/shell-api": "2.3.8" + "@mongosh/async-rewriter2": "2.4.4", + "@mongosh/history": "2.4.4", + "@mongosh/shell-api": "3.4.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.3.8.tgz", - "integrity": "sha512-waQhhpcg1JLDSBE0LLeCi7M0GG4Sp1J1eN8og4zrZHqw7HISq+StX+wY4iXZNsmn3oPjc3okgnpVd6DgIR4Idw==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-3.4.0.tgz", + "integrity": "sha512-VyIia+Swm7ZyaZFKO0ZGX2skTAH3i1gTZiTFT8up4IG4J/MrIi0fCRzz8Mb8XpHpZ4IpHsDhMDt5FmsxxX3Vmw==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-proxy-support": "^0.4.2", - "@mongosh/errors": "2.3.8", - "@mongosh/shell-api": "2.3.8", - "@mongosh/types": "2.3.8", - "bson": "^6.10.1", + "@mongosh/errors": "2.4.0", + "@mongosh/shell-api": "3.4.0", + "@mongosh/types": "3.4.0", + "bson": "^6.10.3", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", - "joi": "^17.4.0", - "tar": "^6.1.15" + "tar": "^6.1.15", + "zod": "^3.24.1" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/types": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.3.8.tgz", - "integrity": "sha512-WFx/SPMWwQIcCeSBlYiIEbVg3YEYKo6Dr+IKVBpUw6Vr82CGQ1zZXRChIhdhu/H7jo3O+kdeGOPIftn0kvYmLA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-3.4.0.tgz", + "integrity": "sha512-LEGt7Qijc8M/lYGd6Xx++2nlCfTb4NNNvL1D1TBqz3tPaiZHu4g/svV1sjwArsTTQrMAfNc7cDBXLHJQ5A6gRA==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/devtools-connect": "^3.3.4" + "@mongodb-js/devtools-connect": "^3.4.1" }, "engines": { "node": ">=14.15.1" @@ -1661,27 +1626,6 @@ "webidl-conversions": "^3.0.0" } }, - "node_modules/@sideway/address": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", - "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@sideway/formula": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", - "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==", - "license": "BSD-3-Clause" - }, - "node_modules/@sideway/pinpoint": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", - "license": "BSD-3-Clause" - }, "node_modules/@smithy/abort-controller": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.1.tgz", @@ -1712,9 +1656,9 @@ } }, "node_modules/@smithy/core": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.1.2.tgz", - "integrity": "sha512-htwQXkbdF13uwwDevz9BEzL5ABK+1sJpVQXywwGSH973AVOvisHNfpcB8A8761G6XgHoS2kHPqc9DqHJ2gp+/Q==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.1.4.tgz", + "integrity": "sha512-wFExFGK+7r2wYriOqe7RRIBNpvxwiS95ih09+GSLRBdoyK/O1uZA7K7pKesj5CBvwJuSBeXwLyR88WwIAY+DGA==", "license": "Apache-2.0", "dependencies": { "@smithy/middleware-serde": "^4.0.2", @@ -1722,7 +1666,7 @@ "@smithy/types": "^4.1.0", "@smithy/util-body-length-browser": "^4.0.0", "@smithy/util-middleware": "^4.0.1", - "@smithy/util-stream": "^4.0.2", + "@smithy/util-stream": "^4.1.1", "@smithy/util-utf8": "^4.0.0", "tslib": "^2.6.2" }, @@ -1817,12 +1761,12 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.3.tgz", - "integrity": "sha512-YdbmWhQF5kIxZjWqPIgboVfi8i5XgiYMM7GGKFMTvBei4XjNQfNv8sukT50ITvgnWKKKpOtp0C0h7qixLgb77Q==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.5.tgz", + "integrity": "sha512-cPzGZV7qStHwboFrm6GfrzQE+YDiCzWcTh4+7wKrP/ZQ4gkw+r7qDjV8GjM4N0UYsuUyLfpzLGg5hxsYTU11WA==", "license": "Apache-2.0", "dependencies": { - "@smithy/core": "^3.1.2", + "@smithy/core": "^3.1.4", "@smithy/middleware-serde": "^4.0.2", "@smithy/node-config-provider": "^4.0.1", "@smithy/shared-ini-file-loader": "^4.0.1", @@ -1836,15 +1780,15 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.4.tgz", - "integrity": "sha512-wmxyUBGHaYUqul0wZiset4M39SMtDBOtUr2KpDuftKNN74Do9Y36Go6Eqzj9tL0mIPpr31ulB5UUtxcsCeGXsQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.6.tgz", + "integrity": "sha512-s8QzuOQnbdvRymD9Gt9c9zMq10wUQAHQ3z72uirrBHCwZcLTrL5iCOuVTMdka2IXOYhQE890WD5t6G24+F+Qcg==", "license": "Apache-2.0", "dependencies": { "@smithy/node-config-provider": "^4.0.1", "@smithy/protocol-http": "^5.0.1", "@smithy/service-error-classification": "^4.0.1", - "@smithy/smithy-client": "^4.1.3", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "@smithy/util-middleware": "^4.0.1", "@smithy/util-retry": "^4.0.1", @@ -2010,17 +1954,17 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.3.tgz", - "integrity": "sha512-A2Hz85pu8BJJaYFdX8yb1yocqigyqBzn+OVaVgm+Kwi/DkN8vhN2kbDVEfADo6jXf5hPKquMLGA3UINA64UZ7A==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.5.tgz", + "integrity": "sha512-DMXYoYeL4QkElr216n1yodTFeATbfb4jwYM9gKn71Rw/FNA1/Sm36tkTSCsZEs7mgpG3OINmkxL9vgVFzyGPaw==", "license": "Apache-2.0", "dependencies": { - "@smithy/core": "^3.1.2", - "@smithy/middleware-endpoint": "^4.0.3", + "@smithy/core": "^3.1.4", + "@smithy/middleware-endpoint": "^4.0.5", "@smithy/middleware-stack": "^4.0.1", "@smithy/protocol-http": "^5.0.1", "@smithy/types": "^4.1.0", - "@smithy/util-stream": "^4.0.2", + "@smithy/util-stream": "^4.1.1", "tslib": "^2.6.2" }, "engines": { @@ -2117,13 +2061,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.4.tgz", - "integrity": "sha512-Ej1bV5sbrIfH++KnWxjjzFNq9nyP3RIUq2c9Iqq7SmMO/idUR24sqvKH2LUQFTSPy/K7G4sB2m8n7YYlEAfZaw==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.6.tgz", + "integrity": "sha512-N8+VCt+piupH1A7DgSVDNrVHqRLz8r6DvBkpS7EWHiIxsUk4jqGuQLjqC/gnCzmwGkVBdNruHoYAzzaSQ8e80w==", "license": "Apache-2.0", "dependencies": { "@smithy/property-provider": "^4.0.1", - "@smithy/smithy-client": "^4.1.3", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "bowser": "^2.11.0", "tslib": "^2.6.2" @@ -2133,16 +2077,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.4.tgz", - "integrity": "sha512-HE1I7gxa6yP7ZgXPCFfZSDmVmMtY7SHqzFF55gM/GPegzZKaQWZZ+nYn9C2Cc3JltCMyWe63VPR3tSFDEvuGjw==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.6.tgz", + "integrity": "sha512-9zhx1shd1VwSSVvLZB8CM3qQ3RPD3le7A3h/UPuyh/PC7g4OaWDi2xUNzamsVoSmCGtmUBONl56lM2EU6LcH7A==", "license": "Apache-2.0", "dependencies": { "@smithy/config-resolver": "^4.0.1", "@smithy/credential-provider-imds": "^4.0.1", "@smithy/node-config-provider": "^4.0.1", "@smithy/property-provider": "^4.0.1", - "@smithy/smithy-client": "^4.1.3", + "@smithy/smithy-client": "^4.1.5", "@smithy/types": "^4.1.0", "tslib": "^2.6.2" }, @@ -2204,9 +2148,9 @@ } }, "node_modules/@smithy/util-stream": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.0.2.tgz", - "integrity": "sha512-0eZ4G5fRzIoewtHtwaYyl8g2C+osYOT4KClXgfdNEDAgkbe2TYPqcnw4GAWabqkZCax2ihRGPe9LZnsPdIUIHA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.1.1.tgz", + "integrity": "sha512-+Xvh8nhy0Wjv1y71rBVyV3eJU3356XsFQNI8dEZVNrQju7Eib8G31GWtO+zMa9kTCGd41Mflu+ZKfmQL/o2XzQ==", "license": "Apache-2.0", "dependencies": { "@smithy/fetch-http-handler": "^5.0.1", @@ -2269,12 +2213,12 @@ } }, "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.0.tgz", + "integrity": "sha512-+/kfrslGQ7TNV2ecmQwMJj/B65g5KVq1/L3SGVZ3tCYGqlzFuFCGBZJtMP99wH3NpEUyAjn0zPdPUg0D+DwrOA==", "license": "ISC", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/accepts": { @@ -2683,9 +2627,9 @@ } }, "node_modules/bson": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.2.tgz", - "integrity": "sha512-5afhLTjqDSA3akH56E+/2J6kTDuSIlBxyXPdQslj9hcIgOUE378xdOfZvC/9q3LifJNI6KR/juZ+d0NRNYBwXg==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz", + "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==", "license": "Apache-2.0", "engines": { "node": ">=16.20.1" @@ -2749,9 +2693,9 @@ } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -2778,9 +2722,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001696", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz", - "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==", + "version": "1.0.30001700", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz", + "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==", "funding": [ { "type": "opencollective", @@ -3124,9 +3068,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.90", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz", - "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==", + "version": "1.5.103", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz", + "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -3604,17 +3548,17 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -3698,9 +3642,9 @@ } }, "node_modules/glibc-version/node_modules/node-addon-api": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz", - "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==", + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz", + "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==", "license": "MIT", "optional": true, "engines": { @@ -4065,19 +4009,6 @@ "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/joi": { - "version": "17.13.3", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz", - "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^9.3.0", - "@hapi/topo": "^5.1.0", - "@sideway/address": "^4.1.5", - "@sideway/formula": "^3.0.1", - "@sideway/pinpoint": "^2.0.0" - } - }, "node_modules/jose": { "version": "4.15.9", "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz", @@ -4088,16 +4019,16 @@ } }, "node_modules/js-beautify": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz", - "integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.3.tgz", + "integrity": "sha512-rKKGuyTxGNlyN4EQKWzNndzXpi0bOl8Gl8YQAW1as/oMz0XhD6sHJO1hTvoBDOSzKuJb9WkwoAb34FfdkKMv2A==", "license": "MIT", "dependencies": { "config-chain": "^1.1.13", "editorconfig": "^1.0.4", - "glob": "^10.3.3", + "glob": "^10.4.2", "js-cookie": "^3.0.5", - "nopt": "^7.2.0" + "nopt": "^8.0.0" }, "bin": { "css-beautify": "js/bin/css-beautify.js", @@ -4416,20 +4347,20 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.0.tgz", - "integrity": "sha512-KeESYR5TEaFxOuwRqkOm3XOsMqCSkdeDMjaW5u2nuKfX7rqaofp7JQGoi7sVqQcNJTKuveNbzZtWMstb8ABP6Q==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.1.tgz", + "integrity": "sha512-gdq40tX8StmhP6akMp1pPoEVv+9jTYFSrga/g23JxajPAQhH39ysZrHGzQCSd9PEOnuEQEdjIWqxO7ZSwC0w7Q==", "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.1", + "bson": "^6.10.3", "mongodb-connection-string-url": "^3.0.0" }, "engines": { "node": ">=16.20.1" }, "peerDependencies": { - "@aws-sdk/credential-providers": "^3.188.0", + "@aws-sdk/credential-providers": "^3.632.0", "@mongodb-js/zstd": "^1.1.0 || ^2.0.0", "gcp-metadata": "^5.2.0", "kerberos": "^2.0.1", @@ -4471,15 +4402,15 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.1.tgz", - "integrity": "sha512-hqy68WWNZmkoqldFlpw8TQNaJUOor4YCM/FuxETZTeTZpGEbQwkTwdrQlgiV14qyOizPw8abbAxGi3zX+raA9w==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.2.0.tgz", + "integrity": "sha512-jfOCthPH0jxd9RJCerNbf1aRAcUJFwiWikJ2j9oBPRc+Oets3aKUriyZe4n16sF3Ibc1xar1zNInAfHEcVtYRg==", "hasInstallScript": true, "license": "Apache-2.0", "optional": true, "dependencies": { "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" + "prebuild-install": "^7.1.3" }, "engines": { "node": ">=16.20.1" @@ -4511,11 +4442,10 @@ } }, "node_modules/mongodb-log-writer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.1.0.tgz", - "integrity": "sha512-ZlNts/L9fs6gQNRuqLcB0+yjjfeyapbxjdkDpeb2bEYOUUThG0iOEhzIFejv0g3TX1SSAsdrT2aGYnFqoQILgQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/mongodb-log-writer/-/mongodb-log-writer-2.3.4.tgz", + "integrity": "sha512-Z2rXUotJX3DVBlRN8y2Dzv26/SnEYlD7gh3uzvxL2myFKfyB2zQjY8DeQWb11WEam9v9LF9VwhndapLOTkJ+yA==", "license": "Apache-2.0", - "peer": true, "dependencies": { "heap-js": "^2.3.0" }, @@ -4536,9 +4466,9 @@ "license": "MIT" }, "node_modules/nan": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", - "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.1.tgz", + "integrity": "sha512-pfRR4ZcNTSm2ZFHaztuvbICf+hyiG6ecA06SfAxoPmuHjvMu0KUIae7Y8GyVkbBqeEIidsmXeYooWIX9+qjfRQ==", "license": "MIT", "optional": true }, @@ -4631,18 +4561,18 @@ "license": "MIT" }, "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", + "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==", "license": "ISC", "dependencies": { - "abbrev": "^2.0.0" + "abbrev": "^3.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-run-path": { @@ -4691,9 +4621,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", - "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -4703,9 +4633,9 @@ } }, "node_modules/oidc-token-hash": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz", - "integrity": "sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.1.0.tgz", + "integrity": "sha512-y0W+X7Ppo7oZX6eovsRkuzcSM40Bicg2JEJkDJ4irIt1wsYAP5MLSNv+QAogO8xivMffw/9OvV3um1pxXgt1uA==", "license": "MIT", "engines": { "node": "^10.13.0 || >=12.0.0" @@ -4808,9 +4738,9 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.1.0.tgz", - "integrity": "sha512-Z5FnLVVZSnX7WjBg0mhDtydeRZ1xMcATZThjySQUHqr+0ksP8kqaw23fNKkaaN/Z8gwLUs/W7xdl0I75eP2Xyw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz", + "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==", "license": "MIT", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", @@ -5198,9 +5128,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz", - "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -5441,9 +5371,9 @@ } }, "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", + "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", "license": "MIT", "dependencies": { "ip-address": "^9.0.5", @@ -5642,9 +5572,15 @@ } }, "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.1.tgz", + "integrity": "sha512-O7aCHfYCamLCctjAiaucmE+fHf2DYHkus2OKCn4Wv03sykfFtgeECn505X6K4mPl8CRNd/qurC9guq+ynoN4pw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], "license": "MIT" }, "node_modules/supports-color": { @@ -5914,9 +5850,9 @@ } }, "node_modules/whatwg-url": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz", - "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==", + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz", + "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==", "license": "MIT", "dependencies": { "tr46": "^5.0.0", @@ -6078,6 +6014,15 @@ "engines": { "node": ">=10" } + }, + "node_modules/zod": { + "version": "3.24.2", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", + "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } } } } diff --git a/pkgs/by-name/mo/mongosh/source.json b/pkgs/by-name/mo/mongosh/source.json index d265d16f6249..4fa21a9160ba 100644 --- a/pkgs/by-name/mo/mongosh/source.json +++ b/pkgs/by-name/mo/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.3.8", - "integrity": "sha512-5kfrzB5gfnFz7vvAAOWuet3l7W9zbSsR8YLsdUb2k0JeV+y8MX21zQczWx3X+ItyL7m3YLGsb2sgxSTqQIKGiw==", - "filename": "mongosh-2.3.8.tgz", - "deps": "sha256-VaDipuQ53kMhruxhJ7m8r5NMO2zrY51XsZsJxlzvdCk=" + "version": "2.4.0", + "integrity": "sha512-CFpdfmJTpPFhKCfpNHkif5iPs/xnBBrBqA3xnBIOcOj0RxjKJzraRxpQqS/z1xdKZvWivfHtj3OIHJkvx/pwxQ==", + "filename": "mongosh-2.4.0.tgz", + "deps": "sha256-KN2MRQ3pSQe8wdmkTO0dysiWdFVzk4rZ/VG6FFPrstE=" } diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index afbb18e0c79c..e947a79ba881 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -118,7 +118,7 @@ let buildInputs = [ pin.tmd - # Mainline. The otherwise pinned glm realease from 2018 does + # Mainline. The otherwise pinned glm release from 2018 does # not build due to test failures and missing files. glm diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix index c43a9505de9f..4fcd165946c2 100644 --- a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM="; }; - # The Orignal Source code tries to execute `/usr/bin/blackbox` which is not valid in NixOS + # The original source code tries to execute `/usr/bin/blackbox` which is not valid in NixOS # This patch replaces the call with `blackbox` patches = [ ./paths.patch ]; diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 5c5090561b8e..b9de20df76ac 100644 --- a/pkgs/by-name/ne/nextcloud-client/package.nix +++ b/pkgs/by-name/ne/nextcloud-client/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" - # make xdg-open overrideable at runtime + # make xdg-open overridable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index addda09564c0..44c2c6ce26d7 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-DkM+BV0Qw8vpSjxiHFcYUauP9SaiSDhAgKz+13tEsDI="; + hash = "sha256-aRHMOyTWBYXgVBAXshQNHds+KZn4F8Gz9mzazIwT5TQ="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix new file mode 100644 index 000000000000..7c1e15edaf61 --- /dev/null +++ b/pkgs/by-name/ni/ni/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm_9, + npmHooks, + versionCheckHook, + nix-update-script, +}: +let + pnpm = pnpm_9; +in +stdenv.mkDerivation (finalAttrs: { + pname = "ni"; + version = "23.3.1"; + + src = fetchFromGitHub { + owner = "antfu-collective"; + repo = "ni"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jkynuN7w0YaIYQLX0KsEQWqrXkhvh3qKSLK63A/7mx8="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-gDBjAwut217mdbWyk/dSU4JOkoRbOk4Czlb/lXhWqRU="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + npmHooks.npmInstallHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build + find dist -type f \( -name '*.cjs' -or -name '*.cts' -or -name '*.ts' \) -delete + + runHook postBuild + ''; + + dontNpmPrune = true; + postInstall = '' + rm -rf $out/lib/node_modules/@antfu/ni/node_modules + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Use the right package manager"; + homepage = "https://github.com/antfu-collective/ni"; + changelog = "https://github.com/antfu-collective/ni/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + mainProgram = "ni"; + }; +}) diff --git a/pkgs/by-name/no/nomad-driver-containerd/package.nix b/pkgs/by-name/no/nomad-driver-containerd/package.nix index e6717bfd1201..6f56e85b83f9 100644 --- a/pkgs/by-name/no/nomad-driver-containerd/package.nix +++ b/pkgs/by-name/no/nomad-driver-containerd/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { }) ]; - # replace version in file as it's defined using const, and thus cannot be overriden by ldflags + # replace version in file as it's defined using const, and thus cannot be overridden by ldflags postPatch = '' substituteInPlace containerd/driver.go --replace-warn 'PluginVersion = "v0.9.3"' 'PluginVersion = "v${version}"' ''; diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index 268955c6a10d..dddac219c269 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -8,7 +8,7 @@ let version = "0.6.42"; src = fetchurl { - # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in + # Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in # the package name. We also hardcode the host arch in the release name, but should upstream # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix index b8f6e2648ed6..5e46502367ee 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix @@ -8,7 +8,7 @@ lib.makeScope newScope (self: { # The config is only exposed as an attrset so that the user may reach the - # deafult values, for inspectability purposes. + # default values, for inspectability purposes. dockerConfig = { disable-require = false; #swarm-resource = "DOCKER_RESOURCE_GPU" diff --git a/pkgs/by-name/op/open-english-wordnet/package.nix b/pkgs/by-name/op/open-english-wordnet/package.nix index 47522d7b7829..20f830ea4c90 100644 --- a/pkgs/by-name/op/open-english-wordnet/package.nix +++ b/pkgs/by-name/op/open-english-wordnet/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (self: { } ) { - # Upstream commit bumping the version number, accidentally ommited from the tagged release + # Upstream commit bumping the version number, accidentally omitted from the tagged release "bc07902f8995b62c70f01a282b23f40f30630540" = "sha256-1e4MG/k86g3OFUhiShCCbNXnvDKrYFr1KlGVsGl++KI="; # PR #982, “merge.py: Make result independent of filesystem order” "6da46a48dd76a48ad9ff563e6c807b8271fc83cd" = "sha256-QkkJH7NVGy/IbeSWkotU80IGF4esz0b8mIL9soHdQtQ="; diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix index 17587abb9bc5..306cdd851948 100644 --- a/pkgs/by-name/op/openbox/package.nix +++ b/pkgs/by-name/op/openbox/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }) # Fix crash with GLib 2.76. This is proposed on https://bugzilla.icculus.org/show_bug.cgi?id=6669 - # and commited to a work branch in the upstream repo. See https://bugs.archlinux.org/task/77853. + # and committed to a work branch in the upstream repo. See https://bugs.archlinux.org/task/77853. (fetchpatch { url = "https://github.com/Mikachu/openbox/commit/d41128e5a1002af41c976c8860f8299cfcd3cd72.patch"; sha256 = "sha256-4/aoI4y98JPybZ1MNI7egOhkroQgh/oeGnYrhNGX4t4="; diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix index 3e9694469f80..4e132dcbfd23 100644 --- a/pkgs/by-name/op/openjph/package.nix +++ b/pkgs/by-name/op/openjph/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjph"; - version = "0.18.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "aous72"; repo = "openjph"; rev = finalAttrs.version; - hash = "sha256-fF/llifGJb7NxzVJ7byLd3lecwC3dRlJ6qu8ApqB0fw="; + hash = "sha256-TU9K0msmhlfzBkwpsPXW8QWplthLBM2OeTPYV40rnBA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix index a570659ec290..802fdb101faa 100644 --- a/pkgs/by-name/op/openmm/package.nix +++ b/pkgs/by-name/op/openmm/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0="; }; - # "This test is stochastic and may occassionally fail". It does. + # "This test is stochastic and may occasionally fail". It does. postPatch = '' rm \ platforms/*/tests/Test*BrownianIntegrator.* \ diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix index a128f77044c0..fc95eed3e8bc 100644 --- a/pkgs/by-name/op/openvswitch/package.nix +++ b/pkgs/by-name/op/openvswitch/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "openvswitch"; repo = "ovs"; tag = "v${version}"; - hash = "sha256-EudcANZ0aUImQ/HWSX1PRklvhP2D5L3ugXaC0GKyF0Q="; + hash = "sha256-fEntEZHmQX78XZZic9hFr07PWC2RQIpuCfb1FYX3hd0="; }; outputs = [ diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix index d282055ef5dc..32dc5578b1a8 100644 --- a/pkgs/by-name/os/oscavmgr/package.nix +++ b/pkgs/by-name/os/oscavmgr/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "oscavmgr"; - version = "0.4.4"; + version = "25.2"; src = fetchFromGitHub { owner = "galister"; repo = "oscavmgr"; tag = "v${version}"; - hash = "sha256-Tx4FuKKorQLkuhBUbQXtfsm8sFdLgQCgXiGQsfX+MQg="; + hash = "sha256-592qj0dHn0fbIFt4Y+1TESIOUpwXcJ2tnlKNcYuxriQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-91gYGDZyk6qyAF+WVxlQV18kCf3ADgRB2tw9OatvGbY="; + cargoHash = "sha256-1/jjZ1jkLvE/L1lHFL3RCx3ox2w15WWDp6aQJOtFkcU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ot/otb/itk_4_13/package.nix b/pkgs/by-name/ot/otb/itk_4_13/package.nix index 54df690fb58a..7de4254392ad 100644 --- a/pkgs/by-name/ot/otb/itk_4_13/package.nix +++ b/pkgs/by-name/ot/otb/itk_4_13/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ libuuid ]; propagatedBuildInputs = [ - # similar to 5.2.x, we progagate these inputs for OTB + # similar to 5.2.x, we propagate these inputs for OTB expat fftw fftwFloat diff --git a/pkgs/by-name/pe/pentestgpt/package.nix b/pkgs/by-name/pe/pentestgpt/package.nix index 78f00e61c44d..cf2bdd3d487a 100644 --- a/pkgs/by-name/pe/pentestgpt/package.nix +++ b/pkgs/by-name/pe/pentestgpt/package.nix @@ -16,13 +16,12 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-m0R/kMmbr5Ixuqvw6ZRoaAGCnI3j86Iwk4+TYqv0WbU="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "playwright==1.28.0" "playwright" \ - --replace "beautifulsoup4~=4.11.2" "" \ - --replace "black" "" \ - --replace "pytest" "" - ''; + pythonRelaxDeps = [ "playwright" ]; + pythonRemoveDeps = [ + "beautifulsoup4" + "black" + "pytest" + ]; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 diff --git a/pkgs/by-name/ph/phantomsocks/package.nix b/pkgs/by-name/ph/phantomsocks/package.nix index 9f93d06139be..83cbe8435c77 100644 --- a/pkgs/by-name/ph/phantomsocks/package.nix +++ b/pkgs/by-name/ph/phantomsocks/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, stdenv, libpcap, - # Cann't be build with both pcap and rawsocket tags + # Can't be build with both pcap and rawsocket tags withPcap ? (!stdenv.hostPlatform.isLinux && !withRawsocket), withRawsocket ? (stdenv.hostPlatform.isLinux && !withPcap), }: diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix index ca0fc9497734..e6464cc5b20a 100644 --- a/pkgs/by-name/pl/plattenalbum/package.nix +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "plattenalbum"; - version = "2.2.1"; + version = "2.2.2"; pyproject = false; src = fetchFromGitHub { owner = "SoongNoonien"; repo = "plattenalbum"; tag = "v${version}"; - hash = "sha256-tbgSgbj77GvTgnI5eGu4cxYDie1gNa+5z053c0Nnu+Y="; + hash = "sha256-IuyEy6w1JxuuA+domZ+XNIq5vmcOVs0sHO4dp1dyE6k="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Client for the Music Player Daemon (originally named mpdevil)"; homepage = "https://github.com/SoongNoonien/plattenalbum"; - changelog = "https://github.com/SoongNoonien/plattenalbum/releases/tag/v${version}"; + changelog = "https://github.com/SoongNoonien/plattenalbum/releases/tag/${src.tag}"; license = with lib.licenses; [ gpl3Only cc0 diff --git a/pkgs/by-name/po/portmod/package.nix b/pkgs/by-name/po/portmod/package.nix index dfb372b6b34a..22b46a8cb7bc 100644 --- a/pkgs/by-name/po/portmod/package.nix +++ b/pkgs/by-name/po/portmod/package.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { pname = "portmod"; format = "pyproject"; - # build the rust library independantly + # build the rust library independently prePatch = '' substituteInPlace setup.py \ --replace "from setuptools_rust import Binding, RustExtension, Strip" "" \ diff --git a/pkgs/by-name/pr/printrun/package.nix b/pkgs/by-name/pr/printrun/package.nix index 088dc789b092..57aad66a6c23 100644 --- a/pkgs/by-name/pr/printrun/package.nix +++ b/pkgs/by-name/pr/printrun/package.nix @@ -18,12 +18,14 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "pyglet >= 1.1, < 2.0" "pyglet" \ - --replace "cairosvg >= 1.0.9, < 2.6.0" "cairosvg" sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py ''; + pythonRelaxDeps = [ + "pyglet" + "cairosvg" + ]; + nativeBuildInputs = [ glib wrapGAppsHook3 diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 5e9b395c94c2..e45281a03b4e 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchzip, writeScript, - # Can be overriden to alter the display name in steam + # Can be overridden to alter the display name in steam # This could be useful if multiple versions should be installed together steamDisplayName ? "GE-Proton", }: diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix index 83eb642ce5b7..4aad76fdc760 100644 --- a/pkgs/by-name/py/pybibget/package.nix +++ b/pkgs/by-name/py/pybibget/package.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication { requests ]; - # Tests for this applicaiton do not run on NixOS, and binaries were + # Tests for this application do not run on NixOS, and binaries were # manually tested instead doCheck = false; diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix index b112dce0e903..46c44ae6f870 100644 --- a/pkgs/by-name/py/pylode/package.nix +++ b/pkgs/by-name/py/pylode/package.nix @@ -28,10 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "rdflib==6.0.0" "rdflib" - ''; + pythonRelaxDeps = [ "rdflib" ]; # Path issues with the tests doCheck = false; diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix index b3233950779b..6b46522512b3 100644 --- a/pkgs/by-name/qt/qtscrcpy/package.nix +++ b/pkgs/by-name/qt/qtscrcpy/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "qtscrcpy"; - version = "3.1.0"; + version = "3.1.2"; src = (fetchFromGitHub { owner = "barry-ran"; repo = "QtScrcpy"; tag = "v${version}"; - hash = "sha256-wnzJHSx+HcbtcXDDksog4SAXEf1spcuXQ6+vdysPYQY="; + hash = "sha256-Fu6ZYS8B9YyeOLybyLknpbTOrCROshzd1O0Kn3qYYOs="; fetchSubmodules = true; }).overrideAttrs (_: { diff --git a/pkgs/by-name/qt/qtscrcpy/remove_vendors.patch b/pkgs/by-name/qt/qtscrcpy/remove_vendors.patch index d80e1c8b2ed0..5033bd33496f 100644 --- a/pkgs/by-name/qt/qtscrcpy/remove_vendors.patch +++ b/pkgs/by-name/qt/qtscrcpy/remove_vendors.patch @@ -1,14 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85c733e..02fea2c 100644 +index ba1c572..0a0ccdd 100644 --- a/QtScrcpy/QtScrcpyCore/CMakeLists.txt +++ b/QtScrcpy/QtScrcpyCore/CMakeLists.txt -@@ -139,87 +139,10 @@ target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DI +@@ -162,87 +162,8 @@ target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DI target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/device/recorder) target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/devicemanage) -# -# plantform deps -# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswscale) -# windows -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") @@ -39,14 +41,14 @@ index 85c733e..02fea2c 100644 - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${THIRD_PARTY_PATH}/scrcpy-server" "${QSC_DEPLOY_PATH}" - ) -endif() - +- -# MacOS -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # ffmpeg - # include - target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include) - # link -- set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib") +- set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/${QSC_CPU_ARCH}") - target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH}) - target_link_libraries(${QSC_PROJECT_NAME} PRIVATE - avformat.58 @@ -55,22 +57,20 @@ index 85c733e..02fea2c 100644 - swscale.5 - ) - -- # copy bundle file +- # copy bundle file - add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD - # dylib,scrcpy-server,adb copy to Contents/MacOS -- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" -- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" -- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS" -- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS" -- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS" +- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_LIB_PATH}/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" +- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_LIB_PATH}/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" +- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_LIB_PATH}/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS" +- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_LIB_PATH}/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS" +- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${FFMPEG_LIB_PATH}/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS" - - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS" - ) -endif() -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(FFMPEG REQUIRED libavcodec libavformat libavutil libswscale) - +- -# Linux -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - # include diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix index 6f94432e5b07..590cc95a2b8f 100644 --- a/pkgs/by-name/ra/ratchet/package.nix +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -4,9 +4,10 @@ fetchFromGitHub, callPackage, }: + buildGoModule rec { pname = "ratchet"; - version = "0.10.0"; + version = "0.10.2"; # ratchet uses the git sha-1 in the version string, e.g. # @@ -19,12 +20,13 @@ buildGoModule rec { src = fetchFromGitHub { owner = "sethvargo"; repo = "ratchet"; - rev = "ebb7f24e0cbc288ab913b635480412934a2a5371"; - hash = "sha256-Wt1/ahKQ8DOquXU5u6p+an9FJ5kYRl7F2EXOv/2rHlA="; + rev = "ee93c849418d0b9316703bb349055a4078ad205e"; + hash = "sha256-pVpZB8WWGgFbu0iK6gM2lEaXN4IqDJ1lMtVnUfcE4MQ="; }; proxyVendor = true; - vendorHash = "sha256-J7LijbhpKDIfTcQMgk2x5FVaYG7Kgkba/1aSTmgs5yw="; + + vendorHash = "sha256-KKHlegmvpmmUZGoiEawgSUwOPQEfTjfzTYvere1YAv4="; subPackages = [ "." ]; @@ -41,28 +43,28 @@ buildGoModule rec { ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/ratchet --version 2>&1 | grep ${version}; ''; installPhase = '' runHook preInstall - mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/ratchet" -T $out/bin/ratchet + runHook postInstall ''; - passthru.tests = { - execution = callPackage ./tests.nix { }; - }; + passthru.tests.execution = callPackage ./tests.nix { }; - meta = with lib; { + meta = { description = "Tool for securing CI/CD workflows with version pinning"; mainProgram = "ratchet"; downloadPage = "https://github.com/sethvargo/ratchet"; homepage = "https://github.com/sethvargo/ratchet"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cameronraysmith ryanccn ]; diff --git a/pkgs/by-name/re/realmd/package.nix b/pkgs/by-name/re/realmd/package.nix index 4757931926a3..e08e1de89cee 100644 --- a/pkgs/by-name/re/realmd/package.nix +++ b/pkgs/by-name/re/realmd/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system" # realmd doesn't fails without proper defaults and distro configuration files - # These settings will be overriden by the NixOS module + # These settings will be overridden by the NixOS module "--with-distro=redhat" # Documentation is disabled diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index b82c3a5bd5bf..6a4027a02325 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.02.03.00"; + version = "2025.02.17.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-dEtwCGtS8JE24aBGIHvTgUimNccDmjCCEjX5zA1I4bU="; + hash = "sha256-ANoqccJaVVybRZ9al2PAoWSDgYscSKJNZEp/2kxDNwg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mhqT0vZRrmYN6UR9omEjQa/1JJ2pI3yu5HveMlbvvR0="; + cargoHash = "sha256-3dYg2FqTj73L/EpUNEt9PhkRXyAUxeKT2n9/IDi9QPM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/rewind-ai/package.nix b/pkgs/by-name/re/rewind-ai/package.nix index d1ca6ddf5389..bc356f71bdac 100644 --- a/pkgs/by-name/re/rewind-ai/package.nix +++ b/pkgs/by-name/re/rewind-ai/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - # Example response to use when modifing the script: https://pastebin.com/raw/90qU3n6H + # Example response to use when modifying the script: https://pastebin.com/raw/90qU3n6H # There is a real harsh limit on update checks, so DO NOT send any unnecessary update checks # Wait at least 3 days since the last pub_date (you will find the date at the end of the version number) # Example: 20240504 would be 2024/05/04, and that would mean that we want to check no earlier than on 2024/05/07 for any updates diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index cf1364581387..9967a8d2dafa 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; # Leaving other flags from https://github.com/rqlite/rqlite/blob/master/package.sh - # since automatically retriving those is nontrivial and inessential + # since automatically retrieving those is nontrivial and inessential ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/sa/sage/sage.nix b/pkgs/by-name/sa/sage/sage.nix index e909d1ef58e0..834f9f974aa2 100644 --- a/pkgs/by-name/sa/sage/sage.nix +++ b/pkgs/by-name/sa/sage/sage.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals requireSageTests [ - # This is a hack to make sure sage-tests is evaluated. It doesn't acutally + # This is a hack to make sure sage-tests is evaluated. It doesn't actually # produce anything of value, it just decouples the tests from the build. sage-tests ]; diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index a4b150858520..aa26943c766d 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Don't use native macOS frameworks # Caution: do not set this as (!stdenv.hostPlatform.isDarwin) since it would be true - # outside Darwin - and ImageIO does not exist outisde Darwin + # outside Darwin - and ImageIO does not exist outside Darwin (lib.enableFeature false "imageio") ]; diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix index 755b1a2e222c..a1c492d03587 100644 --- a/pkgs/by-name/se/sequoia-sqv/package.nix +++ b/pkgs/by-name/se/sequoia-sqv/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ nettle ]; - # Install shell completion files and manual pages. Unfortunatly it is hard to + # Install shell completion files and manual pages. Unfortunately it is hard to # predict the paths to all of these files generated during the build, and it # is impossible to control these using `$OUT_DIR` or alike, as implied by # upstream's `build.rs`. This is a general Rust issue also discussed in diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index 412614537944..b9aaf9dc9a92 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ gnupg ]; - # Install shell completion files and manual pages. Unfortunatly it is hard to + # Install shell completion files and manual pages. Unfortunately it is hard to # predict the paths to all of these files generated during the build, and it # is impossible to control these using `$OUT_DIR` or alike, as implied by # upstream's `build.rs`. This is a general Rust issue also discussed in diff --git a/pkgs/by-name/si/sixpair/package.nix b/pkgs/by-name/si/sixpair/package.nix index aae35dca3943..267d1ddba501 100644 --- a/pkgs/by-name/si/sixpair/package.nix +++ b/pkgs/by-name/si/sixpair/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; }; - # hcitool is depricated + # hcitool is deprecated patches = [ ./hcitool.patch ]; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix index d7d959ec1b7d..afe3db6eaf27 100644 --- a/pkgs/by-name/sl/sleek/package.nix +++ b/pkgs/by-name/sl/sleek/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8="; }; - # 0.3.0 has been tagged before the actual Cargo.lock bump, resulting in an inconsitent lock file. + # 0.3.0 has been tagged before the actual Cargo.lock bump, resulting in an inconsistent lock file. # To work around this, the Cargo.lock below is from the commit right after the tag: # https://github.com/nrempel/sleek/commit/18c5457a813a16e3eebfc1c6f512131e6e8daa02 postPatch = '' diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index ace04ecc42db..de7d8d15d82e 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-ojHVH/GE2FonqqxpGK6t/AmCaeOS1TkWMt89iUt5i1s="; + hash = "sha256-iahhmoRcUvyX2QMW7SuIXcS1a7NXg/df8XarPHrTP8o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1xWSFM1LSFKTaGWgAK9M2TI5Gqes29A/L1WMDj+GSIA="; + cargoHash = "sha256-v8yl71rpePlqNwXRU3Ak3x5796qYtO95H3ipvwEeFww="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sn/snowflake-cli/package.nix b/pkgs/by-name/sn/snowflake-cli/package.nix index 13f87306232b..12845abe0b41 100644 --- a/pkgs/by-name/sn/snowflake-cli/package.nix +++ b/pkgs/by-name/sn/snowflake-cli/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "snowflake-cli"; - version = "3.2.2"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "snowflakedb"; repo = "snowflake-cli"; tag = "v${version}"; - hash = "sha256-1AXp2bCBNuYwnyQMIQn3uLLKdWVznBRK6HcB/E7Yjo8="; + hash = "sha256-W+/RW/oTFi7NyJZXlK9Yd3Gggmm+PtmOawWFSrK+SIo="; }; build-system = with python3Packages; [ @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" - "--snapshot-warn-unused" # Turn unused snapshots into a warning and not a failure + "--snapshot-warn-unused" ]; disabledTests = [ @@ -64,8 +64,13 @@ python3Packages.buildPythonApplication rec { "integration_experimental" "test_snow_typer_help_sanitization" # Snapshot needs update? "test_help_message" # Snapshot needs update? + "test_sql_help_if_no_query_file_or_stdin" # Snapshot needs update? + "test_multiple_streamlit_raise_error_if_multiple_entities" # Snapshot needs update? + "test_replace_and_not_exists_cannot_be_used_together" # Snapshot needs update? + "test_format" # Snapshot needs update? "test_executing_command_sends_telemetry_usage_data" # Fails on mocked version - "test_generate_jwt_with_passphrase" # Fails, upstream PR https://github.com/snowflakedb/snowflake-cli/pull/1898 + "test_internal_application_data_is_sent_if_feature_flag_is_set" + "test_if_bundling_dependencies_resolves_requirements" # impure? ]; pythonRelaxDeps = true; diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index d7e9a97d92b8..13887ef4a18f 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo="; + hash = "sha256-CZkx/ylSloFRzLellY7IyBbgMV/UppsxplyjfplaJWM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eleTawI5wJxzzuTS3npJTh3ZlhKYxLxHEJnK6K2DP20="; + cargoHash = "sha256-1KUb5GvHoR631XvTYXkxDbeCg9EMW2PyPPKJ2fe4gwU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 87f47b53f2d5..0796df1e0bfd 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -192,6 +192,8 @@ stdenv'.mkDerivation rec { substituteInPlace packaging/linux/sunshine.desktop \ --subst-var-by PROJECT_NAME 'Sunshine' \ --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \ + --subst-var-by SUNSHINE_DESKTOP_ICON 'sunshine' \ + --subst-var-by CMAKE_INSTALL_FULL_DATAROOTDIR "$out/share" \ --replace-fail '/usr/bin/env systemctl start --u sunshine' 'sunshine' substituteInPlace packaging/linux/sunshine.service.in \ diff --git a/pkgs/by-name/ta/target-isns/package.nix b/pkgs/by-name/ta/target-isns/package.nix index aac984c34807..912c2541019e 100644 --- a/pkgs/by-name/ta/target-isns/package.nix +++ b/pkgs/by-name/ta/target-isns/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; patches = [ - # fix absoulute paths + # fix absolute paths ./install_prefix_path.patch # fix gcc 10 compiler warning, remove with next update diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 56071dcbeb30..f8cbae0fe90a 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -47,11 +47,6 @@ python3Packages.buildPythonApplication rec { ''; postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "pysdl2-dll # Don't rely on system SDL2 https://github.com/py-sdl/py-sdl2#requirements" "" \ - --replace-fail "opencc; sys_platform != 'win32' # optional" "" \ - --replace-fail 'tekore # optional' "" - substituteInPlace src/tauon/__main__.py \ --replace-fail 'install_mode = False' 'install_mode = True' @@ -59,6 +54,12 @@ python3Packages.buildPythonApplication rec { --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")' ''; + pythonRemoveDeps = [ + "pysdl2-dll" + "opencc" + "tekore" + ]; + nativeBuildInputs = [ pkg-config python3Packages.wrapPython diff --git a/pkgs/by-name/th/thiefmd/package.nix b/pkgs/by-name/th/thiefmd/package.nix deleted file mode 100644 index 45ecb8651d6d..000000000000 --- a/pkgs/by-name/th/thiefmd/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - meson, - ninja, - vala, - pkg-config, - wrapGAppsHook3, - desktop-file-utils, - discount, - glib, - gtk3, - gtksourceview4, - gtkspell3, - json-glib, - libarchive, - libgee, - libhandy, - libsecret, - libxml2, - link-grammar, - webkitgtk_4_1, -}: - -stdenv.mkDerivation rec { - pname = "thiefmd"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "kmwallio"; - repo = "ThiefMD"; - rev = "v${version}"; - hash = "sha256-noNfGFMeIyKhAgiovJDn91TLELAOQ4nD/5QlQfsKTII="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - wrapGAppsHook3 - desktop-file-utils - ]; - - buildInputs = [ - discount # libmarkdown - glib - gtk3 - gtksourceview4 - gtkspell3 - json-glib - libarchive - libgee - libhandy - libsecret - libxml2 - link-grammar - webkitgtk_4_1 - ]; - - meta = with lib; { - description = "Markdown & Fountain editor that helps with organization and management"; - homepage = "https://thiefmd.com"; - downloadPage = "https://github.com/kmwallio/ThiefMD"; - mainProgram = "com.github.kmwallio.thiefmd"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ aleksana ]; - }; -} diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index e6768fd6b694..25b43707dde6 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { ); # NOTE: We cannot use pythonImportsCheck for this module because it uses torch to immediately - # initailize CUDA and GPU access is not allowed in the nix build environment. + # initialize CUDA and GPU access is not allowed in the nix build environment. # NOTE: There are no tests for the C++ library or the python bindings, so we just skip the check # phase -- we're not missing anything. doCheck = false; @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # When building the python bindings, we cannot re-use the artifacts from the C++ build so we - # skip the CMake confurePhase and the buildPhase. + # skip the CMake configurePhase and the buildPhase. dontUseCmakeConfigure = pythonSupport; # The configurePhase usually puts you in the build directory, so for the python bindings we diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix index b992e5abe2a6..5ffdd1076f0b 100644 --- a/pkgs/by-name/to/topiary/package.nix +++ b/pkgs/by-name/to/topiary/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { ]; cargoTestFlags = cargoBuildFlags; - # Skip tests that cannot be executed in sandbox (operation not permited) + # Skip tests that cannot be executed in sandbox (operation not permitted) checkFlags = [ "--skip=test_fmt_dir" "--skip=test_fmt_files" diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix index ae189e2ca505..ba90ba450dd0 100644 --- a/pkgs/by-name/tr/trigger-control/package.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Etaash-mathamsetty"; repo = "trigger-control"; - # upstream does not use consistant tags pattern, so we use git commit hash + # upstream does not use consistent tags pattern, so we use git commit hash # https://github.com/Etaash-mathamsetty/trigger-control/tags rev = "7b46e743227830d3a97720067d0a6cf20133af90"; hash = "sha256-nWSvsgksZ4Cxy1+i0xy8pNalgsiAuaqxNVwT/CThaBI="; diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix index f4ce01fe7cdc..89ffb9f86f99 100644 --- a/pkgs/by-name/tt/tts/package.nix +++ b/pkgs/by-name/tt/tts/package.nix @@ -135,7 +135,7 @@ python.pkgs.buildPythonApplication rec { ''; disabledTests = [ - # Requires network acccess to download models + # Requires network access to download models "test_korean_text_to_phonemes" "test_models_offset_0_step_3" "test_models_offset_1_step_3" diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index b87133ca8d83..797bafd0a162 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -10,7 +10,7 @@ x11Support ? stdenv.hostPlatform.isLinux, # pypinput is marked as broken for darwin pynputSupport ? stdenv.hostPlatform.isLinux, - # Experimental Drag & Drop support requires x11 & pyinput suport + # Experimental Drag & Drop support requires x11 & pyinput support hasDndSupport ? x11Support && pynputSupport, enableDragAndDrop ? false, }: diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index 37c4a04ed449..3a582fd21167 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -8,21 +8,31 @@ libadwaita, blueprint-compiler, wrapGAppsHook4, + gsettings-desktop-schemas, }: rustPlatform.buildRustPackage rec { pname = "turnon"; - version = "2.3.1"; + version = "2.3.4"; src = fetchFromGitHub { owner = "swsnr"; repo = "turnon"; rev = "v${version}"; - hash = "sha256-Dl0uTPXy57W18WBxHpytL6Nq9tTrzYOdC3u1O4Dnm3w="; + hash = "sha256-eKJRyQMZOa/QRUW0VQ0EkXbJSMcYHfCC9wTs0YEB1yo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EL7xLXtOzvitVMsDeMUcLR9hdvM2wjBZBEgJPJLanUE="; + cargoHash = "sha256-SjENjQjdg5Vrpd911QOcH9lmW7+BACaN4a/oGb2miI4="; + + doCheck = true; + + checkFlags = [ + # Skipped due to "Permission denied (os error 13)" + "--skip=net::ping::tests::ping_loopback_ipv4" + "--skip=net::ping::tests::ping_loopback_ipv6" + "--skip=net::ping::tests::ping_with_timeout_unroutable" + ]; nativeBuildInputs = [ cairo @@ -34,13 +44,18 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libadwaita + gsettings-desktop-schemas ]; strictDeps = true; - preBuild = '' - blueprint-compiler format resources/**/*.blp - ''; + postInstall = + # The build.rs compiles the settings schema and writes the compiled file next to the .xml file. + # This copies the compiled file to a path that can be detected by gsettings-desktop-schemas + '' + mkdir -p "$out/share/glib-2.0/schemas" + cp "schemas/gschemas.compiled" "$out/share/glib-2.0/schemas" + ''; meta = { description = "Turn on devices in your local network"; diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index e249b33706e0..1a72587e147d 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - # Derivations may check for the existance of this attribute, to know what to + # Derivations may check for the existence of this attribute, to know what to # link to. libiconv = libiconvReal; diff --git a/pkgs/by-name/uc/ucommon/package.nix b/pkgs/by-name/uc/ucommon/package.nix index b91c0461ed09..532df5e3be7e 100644 --- a/pkgs/by-name/uc/ucommon/package.nix +++ b/pkgs/by-name/uc/ucommon/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --replace 'ifndef UCOMMON_SYSRUNTIME' 'if 0' ''; - # ucommon.pc has link time depdendencies on -lusecure -lucommon -lgnutls + # ucommon.pc has link time dependencies on -lusecure -lucommon -lgnutls propagatedBuildInputs = [ gnutls ]; doCheck = true; diff --git a/pkgs/by-name/un/unnethack/package.nix b/pkgs/by-name/un/unnethack/package.nix index 892f29b82272..ec6637926b84 100644 --- a/pkgs/by-name/un/unnethack/package.nix +++ b/pkgs/by-name/un/unnethack/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # TODO: drop it once 6.x branch releases. hardeningDisable = [ "fortify3" ]; - # Fails the build occasionally due to missing buid depends: + # Fails the build occasionally due to missing build depends: # ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory # TODO: remove once upstream issue is fixed: # https://github.com/UnNetHack/UnNetHack/issues/56 diff --git a/pkgs/by-name/va/vamp-plugin-sdk/package.nix b/pkgs/by-name/va/vamp-plugin-sdk/package.nix index e7d538d1af06..4b2646693a02 100644 --- a/pkgs/by-name/va/vamp-plugin-sdk/package.nix +++ b/pkgs/by-name/va/vamp-plugin-sdk/package.nix @@ -1,5 +1,5 @@ # set VAMP_PATH ? -# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) +# plugins available on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) { lib, diff --git a/pkgs/by-name/vk/vkd3d-proton/sources.nix b/pkgs/by-name/vk/vkd3d-proton/sources.nix index 7db9c6804d92..4c4a39c6f6b6 100644 --- a/pkgs/by-name/vk/vkd3d-proton/sources.nix +++ b/pkgs/by-name/vk/vkd3d-proton/sources.nix @@ -16,7 +16,7 @@ # Some files are filled by using Git commands; it requires deepClone. # More info at `checkout_ref` function in nix-prefetch-git. # However, `.git` is a bit nondeterministic (and Git itself makes no - # guarrantees whatsoever). + # guarantees whatsoever). # Then, in order to enhance reproducibility, what we will do here is: # # - Execute the desired Git commands; diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 44cd0ab758ba..2b3cdbaf80a0 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -19,7 +19,7 @@ let #include <sys/types.h> #include <sys/ptrace.h> ''; - # vc is the V compiler's source translated to C (needed for boostrap). + # vc is the V compiler's source translated to C (needed for bootstrap). # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; diff --git a/pkgs/by-name/vm/vmagent/package.nix b/pkgs/by-name/vm/vmagent/package.nix index f31526026319..650ad38f0a40 100644 --- a/pkgs/by-name/vm/vmagent/package.nix +++ b/pkgs/by-name/vm/vmagent/package.nix @@ -1,7 +1,7 @@ { lib, victoriametrics }: # This package is build out of the victoriametrics package. -# so no separat update prs are needed for vmagent +# so no separate update prs are needed for vmagent # nixpkgs-update: no auto update lib.addMetaAttrs { mainProgram = "vmagent"; } ( victoriametrics.override { diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix index 47c789cc01e4..85145de6f34d 100644 --- a/pkgs/by-name/wa/wallust/package.nix +++ b/pkgs/by-name/wa/wallust/package.nix @@ -8,7 +8,7 @@ installShellFiles, }: let - version = "3.1.0"; + version = "3.2.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-Tad+zyhmTr734GEW0A4SNrfWzqcL0gLFsM6MoMrV17k="; + hash = "sha256-71vLHuzLcNTvwE7j6iIQZJWD18IQnA0OwF/cOAZCLL8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Kd+03yERyTxBJ5GSVQQqY4PxV7DfE1REeh43RpSfJNo="; + cargoHash = "sha256-TxlGzfupx9661T8nGvSxurz9cxc9C3udOnoU3PXVCdQ="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix index 29bb44015ec0..755c36547282 100644 --- a/pkgs/by-name/wi/wiliwili/package.nix +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wiliwili"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "xfangfang"; repo = "wiliwili"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-IHGUNnBSwCi+DU7K2yjRLUFRjeysiMojyGXMVecNyu4="; + hash = "sha256-37DQafP+PFjrfNXJt88oK0ghqQEVQjDdVbYsf1tHAN4="; }; nativeBuildInputs = diff --git a/pkgs/by-name/xv/xvidcore/package.nix b/pkgs/by-name/xv/xvidcore/package.nix index 5354931f43d4..b3dcbbd79d5d 100644 --- a/pkgs/by-name/xv/xvidcore/package.nix +++ b/pkgs/by-name/xv/xvidcore/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - # Dependants of xvidcore don't know to look in bin for dependecies. Link them + # Dependants of xvidcore don't know to look in bin for dependencies. Link them # in lib so other depedants of xvidcore can find the dlls. postFixup = lib.optionalString stdenv.hostPlatform.isMinGW '' ln -s $out/bin/*.dll $out/lib diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix index 34f05c5deeef..5004a4b6f130 100644 --- a/pkgs/by-name/ya/yaml-language-server/package.nix +++ b/pkgs/by-name/ya/yaml-language-server/package.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { yarn nodejs ]; + + # NodeJS is also needed here so that script interpreter get patched + buildInputs = [ nodejs ]; + strictDeps = true; configurePhase = '' diff --git a/pkgs/by-name/ze/zed-open-capture/package.nix b/pkgs/by-name/ze/zed-open-capture/package.nix index 648424d47443..ece760178aa8 100644 --- a/pkgs/by-name/ze/zed-open-capture/package.nix +++ b/pkgs/by-name/ze/zed-open-capture/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ]; # all but one example require opencv with UI support, so disable it. - # The input OpenCV can be overriden with (opencv.override { enableGtk3 = true; }) + # The input OpenCV can be overridden with (opencv.override { enableGtk3 = true; }) cmakeFlags = lib.optionals (!withExamples) [ "-DBUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/by-name/zi/zim/package.nix b/pkgs/by-name/zi/zim/package.nix index 066afeffae8b..63d15210ffb2 100644 --- a/pkgs/by-name/zi/zim/package.nix +++ b/pkgs/by-name/zi/zim/package.nix @@ -11,7 +11,7 @@ # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr -# - Included plugins depenencies: dot, ditaa, dia, any other? +# - Included plugins dependencies: dot, ditaa, dia, any other? # - pyxdg: Need to make it work first (see setupPyInstallFlags). python3Packages.buildPythonApplication rec { diff --git a/pkgs/by-name/zs/zsh-abbr/package.nix b/pkgs/by-name/zs/zsh-abbr/package.nix index 3bdbbb59166e..b7290c2addaa 100644 --- a/pkgs/by-name/zs/zsh-abbr/package.nix +++ b/pkgs/by-name/zs/zsh-abbr/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/olets/zsh-abbr"; description = "Zsh manager for auto-expanding abbreviations, inspired by fish shell"; - license = with licenses; [cc-by-nc-nd-40 hl3]; + license = with licenses; [cc-by-nc-sa-40 hl3]; maintainers = with maintainers; [icy-thought]; platforms = platforms.all; }; diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix index 359707c0731f..934bf7e97a95 100644 --- a/pkgs/by-name/zs/zsync/package.nix +++ b/pkgs/by-name/zs/zsync/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Suppress error "call to undeclared library function 'strcasecmp'" during compilation. # The function is found by the linker correctly, so this doesn't introduce any issues. - # Also supress errors that come from incompatible pointer types due to GCC 14 changes. + # Also suppress errors that come from incompatible pointer types due to GCC 14 changes. env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ "-Wno-implicit-function-declaration" diff --git a/pkgs/common-updater/combinators.nix b/pkgs/common-updater/combinators.nix index 3f028fa8e1bb..c4754848be87 100644 --- a/pkgs/common-updater/combinators.nix +++ b/pkgs/common-updater/combinators.nix @@ -14,7 +14,7 @@ = FilePath // Path to execute plus arguments to pass it | [ (FilePath | String) ] - // Advanced attribue set (experimental) + // Advanced attribute set (experimental) | { // Script to execute (same as basic update script above) command : (FilePath | [ (FilePath | String) ]) diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix index 27595a1fb4f6..b1620a44c173 100644 --- a/pkgs/data/fonts/nerd-fonts/default.nix +++ b/pkgs/data/fonts/nerd-fonts/default.nix @@ -77,7 +77,7 @@ let description = "Nerd Fonts: " + description; license = lib.unique ( (with lib.licenses; [ - # > Nerd Fonts source fonts, patched fonts, and folders with explict OFL SIL files + # > Nerd Fonts source fonts, patched fonts, and folders with explicit OFL SIL files ofl # > Nerd Fonts original source code files (such as `.sh`, `.py`, `font-patcher` and others) mit diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix index 42f4b1a2aefd..4c4738935ef1 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-x0hxOGPIxzQdwzb8f4wvllAW1hJ5lyR4qYvyX96RMoA="; }; - # We don't want absolute paths in dekstop files + # We don't want absolute paths in desktop files postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'CAMERA_SPLASH ''${CAMERA_APP_DIR}/assets/lomiri-camera-app-splash.svg' 'CAMERA_SPLASH lomiri-app-launch/splash/lomiri-camera-app.svg' \ diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 515561bb8bb1..2e9e3078c6cd 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitLab, + fetchpatch, gitUpdater, testers, accountsservice, @@ -17,7 +18,7 @@ gnome-desktop, gsettings-qt, gtk3, - icu, + icu75, intltool, json-glib, libqofono, @@ -62,7 +63,17 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - patches = [ ./2000-Support-wrapping-for-Nixpkgs.patch ]; + patches = [ + # Fixes compat with newer ICU + # Remove when version > 1.3.0 + (fetchpatch { + name = "0001-lomiri-system-settings-unwrapped-Unpin-Cxx-standard.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/c0b1c773237b28ea50850810b8844033b13fb666.patch"; + hash = "sha256-M73gQxstKyuzzx1VxdOiNYyfQbSZPIy2gxiCtKcdS1M="; + }) + + ./2000-Support-wrapping-for-Nixpkgs.patch + ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -110,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop gsettings-qt gtk3 - icu + icu75 json-glib polkit qtbase diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a96dd3dcf8a1..405a7c0a576e 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -140,7 +140,7 @@ mkDerivation { ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch - # Pass special environments through arguemnts to `kwin_wayland`, bypassing + # Pass special environments through arguments to `kwin_wayland`, bypassing # ld.so(8) environment stripping due to `kwin_wayland`'s capabilities. # We need this to have `TZDIR` correctly set for `plasmashell`, or # everything related to timezone, like clock widgets, will be broken. diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix index 94422e7b6e6b..1143e960a161 100644 --- a/pkgs/development/compilers/elm/packages/elm-review/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "elm-review"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "jfmengels"; repo = "node-elm-review"; rev = "v${version}"; - hash = "sha256-f7VEYTvFbNbHnl/aGeQdDxCr/PtkaLBJw9FVpk2T9is="; + hash = "sha256-HQ7ilGfw/sMXMQVoJQAj31LbyJfdCfbrZ22gTh1vbD8="; }; - npmDepsHash = "sha256-5tSe/nK3X1MgX7uwTrFApw60i8c14ZWbk+IrgXMxTVc"; + npmDepsHash = "sha256-YuN04MAKSu4InfGIS0EIZiNpSbLHA7/WzJiMFWY0Tqk="; postPatch = '' sed -i "s/elm-tooling install/echo 'skipping elm-tooling install'/g" package.json diff --git a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix index e823ea2c3443..00cb7f6cf53b 100644 --- a/pkgs/development/compilers/elm/packages/ghc9_2/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc9_2/default.nix @@ -52,7 +52,7 @@ pkgs.haskell.packages.ghc92.override { # elm-format requires text >= 2.0 text = self.text_2_0_2; - # unorderd-container's tests indirectly depend on text < 2.0 + # unordered-container's tests indirectly depend on text < 2.0 unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0 relude = overrideCabal (drv: { doCheck = false; }) super.relude; diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix index bd8d9069941f..e5edc8e3a2fc 100644 --- a/pkgs/development/compilers/factor-lang/factor99.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation { # For now, the check phase runs, but should always return 0. This way the logs # contain the test failures until all unit tests are fixed. Then, it should - # return 1 if any test failures have occured. + # return 1 if any test failures have occurred. doCheck = false; checkPhase = '' runHook preCheck diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 66affd84a593..4e0b9fd76339 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -164,7 +164,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; assert langGo -> langCC; assert langAda -> gnat-bootstrap != null; -# TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes). +# TODO: fixup D bootstrapping, probably by using gdc11 (and maybe other changes). # error: GDC is required to build d assert atLeast12 -> !langD; @@ -319,7 +319,7 @@ pipe ((callFile ./common/builder.nix {}) ({ ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the - # library headers and binaries, regarless of the language being compiled. + # library headers and binaries, regardless of the language being compiled. # # The LTO code doesn't find zlib, so we just add it to $CPATH and # $LIBRARY_PATH in this case. diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 6137777f2747..fc0e6e613195 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -44,7 +44,7 @@ let # on the compiler binary (`exePathForLibraryCheck`). # * To skip library checking for an architecture, # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specfic library, + # * To skip file checking for a specific arch specific library, # set `fileToCheckFor = null`. ghcBinDists = { # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) @@ -503,7 +503,7 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; } - # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, + # We duplicate binDistUsed here since we have a sensible default even if no bindist is available, # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { # Normal GHC derivations expose the hadrian derivation used to build them diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index e5e21a91b611..a0065f28a79b 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -44,7 +44,7 @@ let # on the compiler binary (`exePathForLibraryCheck`). # * To skip library checking for an architecture, # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specfic library, + # * To skip file checking for a specific arch specific library, # set `fileToCheckFor = null`. ghcBinDists = { # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) @@ -464,7 +464,7 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; } - # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, + # We duplicate binDistUsed here since we have a sensible default even if no bindist is available, # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { # Normal GHC derivations expose the hadrian derivation used to build them diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index e392fdd02f5b..6f9184899b1a 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -44,7 +44,7 @@ let # on the compiler binary (`exePathForLibraryCheck`). # * To skip library checking for an architecture, # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specfic library, + # * To skip file checking for a specific arch specific library, # set `fileToCheckFor = null`. ghcBinDists = { # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 5ca4e8461c56..6f829451d2b2 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -122,7 +122,7 @@ let ''; # allow an executable's dependencies to be built with source. this is convenient when - # building a development shell for the exectuable using `mkShell`'s `inputsFrom`. + # building a development shell for the executable using `mkShell`'s `inputsFrom`. passthru = derivation.passthru // { withSource = mkExecutable true; }; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index f72af0f08556..25952041800f 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -26,7 +26,7 @@ # In recent releases, the compiler-rt build seems to produce # many `libclang_rt*` libraries, but not a single unified # `libcompiler_rt` library, at least under certain configurations. Some -# platforms stil expect this, however, so we symlink one into place. +# platforms still expect this, however, so we symlink one into place. , forceLinkCompilerRt ? stdenv.hostPlatform.isOpenBSD , devExtraCmakeFlags ? [] }: @@ -188,7 +188,7 @@ stdenv.mkDerivation { ) ''; - # Hack around weird upsream RPATH bug + # Hack around weird upstream RPATH bug postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' @@ -226,7 +226,7 @@ stdenv.mkDerivation { # compiler-rt requires a Clang stdenv on 32-bit RISC-V: # https://reviews.llvm.org/D43106#1019077 (stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang) - # emutls wants `<pthread.h>` which isn't avaiable (without exeprimental WASM threads proposal). + # emutls wants `<pthread.h>` which isn't available (without experimental WASM threads proposal). # `enable_execute_stack.c` Also doesn't sound like something WASM would support. || (stdenv.hostPlatform.isWasm && haveLibc); }; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index efedb085e94e..33fba80e6303 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,9 +32,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.0-rc2".officialRelease.sha256 = "sha256-lBx+MWfYBM6XSJozacALMGlo0DUUWqnsBQyO8lDljSo="; "21.0.0-git".gitRelease = { - rev = "ef9f0b3c414a5d55e694829514d7b2ff8736d3c3"; - rev-version = "21.0.0-unstable-2025-02-17"; - sha256 = "sha256-EpMIADP2aIY68Ys1/Sl6hg1ew0An9ik0c17anxBEl1w="; + rev = "4d928d5b5858de18f47f68c0d309dafd24cea875"; + rev-version = "21.0.0-unstable-2025-02-23"; + sha256 = "sha256-wR/PuKdQhCVC0ONnJ/KUIcE6fUSkm0ZEeyhF4B9ZFA4="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index 2158dbe6a23e..030d7c36c6f4 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -4,7 +4,7 @@ import ./generic.nix { patch_version = "2"; sha256 = "0bhgjzi78l10824qga85nlh18jg9lb6aiamf9dah1cs6jhzfsn6i"; - # If the executable is stipped it does not work + # If the executable is stripped it does not work dontStrip = true; patches = [ diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index 3ce7068a827e..e14ef4e16807 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -4,7 +4,7 @@ import ./generic.nix { patch_version = "1"; sha256 = "1n3pygfssd6nkrq876wszm5nm3v4605q4k16a66h1nmq9wvf01vg"; - # If the executable is stipped it does not work + # If the executable is stripped it does not work dontStrip = true; patches = [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 03d170dfd389..88f7ea48fdc8 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,7 +2,7 @@ , version # Set this to a lisp binary to use a custom bootstrap lisp compiler for SBCL. # Leave as null to use the default. This is useful for local development of - # SBCL, because you can use your existing stock SBCL as a boostrap. On Hydra + # SBCL, because you can use your existing stock SBCL as a bootstrap. On Hydra # of course we can’t do that because SBCL hasn’t been built yet, so we use # ECL but that’s much slower. , bootstrapLisp ? null diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 48f8b49a8df4..93d73938be20 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -445,7 +445,7 @@ stdenv.mkDerivation ( # TERM=dumb swift-test -c release #''; - # The following is dervied from Utilities/bootstrap, see install_swiftpm. + # The following is derived from Utilities/bootstrap, see install_swiftpm. installPhase = '' binPath="$(swift-build --show-bin-path -c release)" diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ee9167016d20..274cdabf4a40 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -41,7 +41,7 @@ let - # Provides a wrapper for creating a yosys with the specifed plugins preloaded + # Provides a wrapper for creating a yosys with the specified plugins preloaded # # Example: # diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index f148ad2a04e9..a3e128c686da 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -15,6 +15,7 @@ let repo = "analysis"; owner = "math-comp"; + release."1.9.0".sha256 = "sha256-zj7WSDUg8ISWxcipGpjEwvvnLp1g8nm23BZiib/15+g="; release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc="; release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ="; release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88="; @@ -52,7 +53,7 @@ let (range "8.19" "8.20") (range "2.1.0" "2.3.0") ]; - out = "1.8.0"; + out = "1.9.0"; } { cases = [ @@ -239,7 +240,7 @@ let passthru = lib.mapAttrs (package: deps: mathcomp_ package) packages; }); - # split packages didn't exist before 0.6, so bulding nothing in that case + # split packages didn't exist before 0.6, so building nothing in that case patched-derivation1 = derivation.overrideAttrs ( o: lib.optionalAttrs @@ -266,7 +267,7 @@ let && lib.versions.isLt "0.6" o.version ) { preBuild = ""; } ); - # only packages classical and analysis existed before 1.7, so bulding nothing in that case + # only packages classical and analysis existed before 1.7, so building nothing in that case patched-derivation3 = patched-derivation2.overrideAttrs ( o: lib.optionalAttrs diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 6390270fa736..9f791ce654bf 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -26,6 +26,13 @@ { cases = [ (range "8.19" "8.20") + (isGe "1.9") + ]; + out = "0.9.1"; + } + { + cases = [ + (range "8.19" "8.20") (isGe "1.7") ]; out = "0.7.7"; @@ -81,6 +88,7 @@ } ] null; + release."0.9.1".sha256 = "sha256-WI20HxMHr1ZUwOGPIUl+nRI8TxVUa2+F1xcGjRDHO9g="; release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E="; release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0="; release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA="; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ea39fb8f9b38..99c79f4e5fba 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -223,7 +223,7 @@ let } ); # utils, common, template-pcuic, quotation, safechecker-plugin, and erasure-plugin - # packages didn't exist before 1.2, so bulding nothing in that case + # packages didn't exist before 1.2, so building nothing in that case patched-derivation = derivation.overrideAttrs ( o: lib.optionalAttrs diff --git a/pkgs/development/cuda-modules/cudnn-frontend/default.nix b/pkgs/development/cuda-modules/cudnn-frontend/default.nix index 8b020eae55a0..0ed13287e284 100644 --- a/pkgs/development/cuda-modules/cudnn-frontend/default.nix +++ b/pkgs/development/cuda-modules/cudnn-frontend/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a - # superset of the `out` (`bin`) or `dev` outputs (whih is what the multiple-outputs setup hook does by default). + # superset of the `out` (`bin`) or `dev` outputs (which is what the multiple-outputs setup hook does by default). outputs = [ "out" diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix index 2abffe025d63..94f4404c5b55 100644 --- a/pkgs/development/cuda-modules/cutensor/extension.nix +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -103,7 +103,7 @@ let redistArch ] null feature) != null; - # TODO(@connorbaker): With an auxilliary file keeping track of the CUDA versions each release supports, + # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports, # we could filter out releases that don't support our CUDA version. # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever # libPath corresponds to our CUDA version. diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 26f4f1b972ae..2d5925514e71 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -103,7 +103,7 @@ backendStdenv.mkDerivation (finalAttrs: { in outputs; - # Traversed in the order of the outputs speficied in outputs; + # Traversed in the order of the outputs specified in outputs; # entries are skipped if they don't exist in outputs. outputToPatterns = { bin = [ "bin" ]; diff --git a/pkgs/development/gnuradio-modules/mkDerivation.nix b/pkgs/development/gnuradio-modules/mkDerivation.nix index 1f6ee5f2f1ae..960ecd413439 100644 --- a/pkgs/development/gnuradio-modules/mkDerivation.nix +++ b/pkgs/development/gnuradio-modules/mkDerivation.nix @@ -27,7 +27,7 @@ else enableParallelBuilding = args.enableParallelBuilding or true; nativeBuildInputs = (args.nativeBuildInputs or [ ]); # We add gnuradio and volk itself by default - most gnuradio based packages - # will not consider it a depenency worth mentioning and it will almost + # will not consider it a dependency worth mentioning and it will almost # always be needed buildInputs = (args.buildInputs or [ ]) ++ [ unwrapped diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 0846a6976b62..1a98e3c5ab02 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -133,7 +133,7 @@ self: super: { # bundled with GHC < 9.0. wai-extra = dontHaddock super.wai-extra; - # Overly-strict bounds introducted by a revision in version 0.3.2. + # Overly-strict bounds introduced by a revision in version 0.3.2. text-metrics = doJailbreak super.text-metrics; # Doesn't build with 9.0, see https://github.com/yi-editor/yi/issues/1125 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 694b21a5e482..3f1b43e5616c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -121,7 +121,7 @@ self: super: gtk = doJailbreak super.gtk; # 2023-12-23: It needs this to build under ghc-9.6.3. - # A factor of 100 is insufficent, 200 seems seems to work. + # A factor of 100 is insufficient, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; # Doctest comments have bogus imports. diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index b221bcf2e589..f707cf4787d8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -133,7 +133,7 @@ self: super: { # # 2023-12-23: It needs this to build under ghc-9.6.3. - # A factor of 100 is insufficent, 200 seems seems to work. + # A factor of 100 is insufficient, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; } // lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c098a042b3ab..9ba180a102ee 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -18,7 +18,7 @@ # # * overriding a specific version of a haskell library because some package fails # to build with a newer version. Such overrides have nothing to do with Nix itself, -# and they would also be neccessary outside of Nix if you use the same set of +# and they would also be necessary outside of Nix if you use the same set of # package versions. # * disabling tests that fail due to missing files in the tarball or compile errors # * disabling tests that require too much memory @@ -624,7 +624,7 @@ self: super: builtins.intersectAttrs super { # # Note: Simply patching the dynamic library (.so) of the GLUT build will *not* work, since the # RPATH also needs to be propagated when using static linking. GHC automatically handles this for - # us when we patch the cabal file (Link options will be recored in the ghc package registry). + # us when we patch the cabal file (Link options will be recorded in the ghc package registry). # # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate, # so disable this on Darwin only diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 02868d749fa6..2af4246f0def 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation ( "PLAT=${plat}" "CC=${stdenv.cc.targetPrefix}cc" "RANLIB=${stdenv.cc.targetPrefix}ranlib" - # Lua links with readline wich depends on ncurses. For some reason when + # Lua links with readline which depends on ncurses. For some reason when # building pkgsStatic.lua it fails because symbols from ncurses are not # found. Adding ncurses here fixes the problem. "MYLIBS=-lncurses" diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f18ae7f68676..f5530b1545d6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -94,7 +94,7 @@ let ( # The stacktrace from exception feature causes memory leaks when built # with libc++. For all other standard library implementations, i.e. - # libstdc++, we must aknowledge this or stacktrace refuses to compile. + # libstdc++, we must acknowledge this or stacktrace refuses to compile. # Issue upstream: https://github.com/boostorg/stacktrace/issues/163 if (stdenv.cc.libcxx != null) then "boost.stacktrace.from_exception=off" diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/development/libraries/gssdp/tools.nix index 37fa43f91990..5013df1b04ec 100644 --- a/pkgs/development/libraries/gssdp/tools.nix +++ b/pkgs/development/libraries/gssdp/tools.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ # Allow building tools separately from the library. - # This is needed to break the depenency cycle. + # This is needed to break the dependency cycle. (replaceVars ./standalone-tools.patch { inherit version; }) diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 7ffe86b42f0b..6b72938f7811 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # The upstream supports two configuration workflow: # one is to generate ./configure via `autoconf`, # the other is to run ./configure2. - # ./configure2 is a configureation script included in the upstream source + # ./configure2 is a configuration script included in the upstream source # that supports common "--<name>" flags and generates config.mak and config.h. # See INSTALL inside the upstream source for detail. configureScript = "./configure2"; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index e38522173160..b9843c4b75e1 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" - # For ws2_32, refered to by a `*.pc` file + # For ws2_32, referred to by a `*.pc` file "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" ] ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ # openbsd headers fail with default c90 diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index 71c7114b296c..aec4fb6deaeb 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix buidling on platforms other than x86 + # Fix building on platforms other than x86 (replaceVars ./configure.patch { msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 5d2eb67c3a08..1d703fa5f89f 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -10,7 +10,7 @@ let # https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html - # macoOS libiconv 14 & 15 do not work with libunistring and a configure test + # macOS libiconv 14 & 15 do not work with libunistring and a configure test # added in 1.3 rejects even building with it so use gnu libiconv on darwin libiconv = if stdenv.hostPlatform.isDarwin then libiconvReal else args.libiconv; in diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index b876a8f1780d..c37b5773ccb5 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -84,7 +84,7 @@ , runAccuracyTests ? true , runPerformanceTests ? false # Modules to enable via BUILD_LIST to build a customized opencv. -# An empty lists means this setting is ommited which matches upstreams default. +# An empty lists means this setting is omitted which matches upstreams default. , enabledModules ? [ ] , AVFoundation @@ -519,7 +519,7 @@ effectiveStdenv.mkDerivation { "$out/lib/pkgconfig/opencv4.pc" mkdir "$cxxdev" '' - # fix deps not progagating from opencv4.cxxdev if cuda is disabled + # fix deps not propagating from opencv4.cxxdev if cuda is disabled # see https://github.com/NixOS/nixpkgs/issues/276691 + optionalString (!enableCuda) '' mkdir -p "$cxxdev/nix-support" diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 4decdf16d38b..b9546713ffef 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; }; - # Workaround broken zlib version detecion in CMake < 3.37. + # Workaround broken zlib version detection in CMake < 3.37. postPatch = '' substituteInPlace ./src/cmake/Config.cmake.in \ --replace " @ZLIB_VERSION@" "" diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 270a6593c740..98bea95922e4 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }) # Backport cursor fix for Qt6 apps - # Ajusted from https://github.com/FedoraQt/QGnomePlatform/pull/138 + # Adjusted from https://github.com/FedoraQt/QGnomePlatform/pull/138 ./qt6-cursor-fix.patch ]; diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index a36d230fcbbc..245322bef108 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { # This avoids conflicts between man pages of openssl subcommands (for # example 'ts' and 'err') man pages and their equivalent top-level # command in other packages (respectively man-pages and moreutils). - # This is done in ubuntu and archlinux, and possiibly many other distros. + # This is done in ubuntu and archlinux, and possibly many other distros. "MANSUFFIX=ssl" ]; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 47b038358a32..e67d91224678 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -4,7 +4,7 @@ fetchurl, shared ? !stdenv.hostPlatform.isStatic, static ? true, - # If true, a separate .static ouput is created and the .a is moved there. + # If true, a separate .static output is created and the .a is moved there. # In this case `pkg-config` auto detection does not currently work if the # .static output is given as `buildInputs` to another package (#66461), because # the `.pc` file lists only the main output's lib dir. @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = "-static-libgcc"; } // lib.optionalAttrs (stdenv.hostPlatform.linker == "lld") { - # lld 16 enables --no-undefined-version by defualt + # lld 16 enables --no-undefined-version by default # This makes configure think it can't build dynamic libraries # this may be removed when a version is packaged with https://github.com/madler/zlib/issues/960 fixed NIX_LDFLAGS = "--undefined-version"; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index 3a399d4d0dba..a2e0bca7092f 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -25,7 +25,7 @@ buildDunePackage rec { sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs="; }; - # Finds R and Rmathlib separatley + # Finds R and Rmathlib separately patches = [ (fetchpatch { url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch"; diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 9a74e7bceab7..58ce43e11407 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -6,7 +6,7 @@ # build-system setuptools, - # depedencies + # dependencies itsdangerous, python-multipart, diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index a22ab4afb9fa..2fe54fbad38c 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ pyerfa, pyyaml, - # optional-depedencies + # optional-dependencies scipy, matplotlib, ipython, diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix new file mode 100644 index 000000000000..63de78ae5559 --- /dev/null +++ b/pkgs/development/python-modules/atproto/default.nix @@ -0,0 +1,107 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pythonOlder, + nix-update-script, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + click, + cryptography, + dnspython, + httpx, + libipld, + pydantic, + typing-extensions, + websockets, + + # nativeCheckInputs + pytestCheckHook, + pytest-asyncio, + coverage, +}: + +buildPythonPackage rec { + pname = "atproto"; + version = "0.0.59"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + # use GitHub, pypi does not include tests + src = fetchFromGitHub { + owner = "MarshalX"; + repo = "atproto"; + tag = "v${version}"; + hash = "sha256-Q+ZJMbchz3u7kXAR9fJpzJd6Zdc44LkntPmEE7IeW6A="; + }; + + POETRY_DYNAMIC_VERSIONING_BYPASS = version; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + click + cryptography + dnspython + httpx + libipld + pydantic + typing-extensions + websockets + ]; + + pythonRelaxDeps = [ + "websockets" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + coverage + ]; + + disabledTestPaths = [ + # the required `_PATH_TO_LEXICONS` is outside the package tree + "tests/test_atproto_lexicon/test_lexicon_parser.py" + # touches network + "tests/test_atproto_identity/test_atproto_data.py" + "tests/test_atproto_identity/test_async_atproto_data.py" + "tests/test_atproto_identity/test_did_resolver.py" + "tests/test_atproto_identity/test_async_did_resolver.py" + "tests/test_atproto_identity/test_did_resolver_cache.py" + "tests/test_atproto_identity/test_async_did_resolver_cache.py" + "tests/test_atproto_identity/test_handle_resolver.py" + "tests/test_atproto_identity/test_async_handle_resolver.py" + "tests/test_atproto_server/auth/test_custom_feed_auth.py" + ]; + + pythonImportsCheck = [ + "atproto" + "atproto_cli" + "atproto_client" + "atproto_codegen" + "atproto_core" + "atproto_crypto" + "atproto_firehose" + "atproto_identity" + "atproto_lexicon" + "atproto_server" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "AT Protocol (Bluesky) SDK for Python"; + homepage = "https://github.com/MarshalX/atproto"; + changelog = "https://github.com/MarshalX/atproto/blob/v${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vji ]; + }; +} diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 48c5211dcdd0..4a2bdbef6da5 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # Want non exsiting test data + # Want non existing test data disabledTests = [ "test_rename" "test_rename_nested" diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index ab2d8cd55431..3dd4c485f7ef 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -61,7 +61,7 @@ buildPythonPackage { }; # By default, which library is loaded depends on the result of `torch.cuda.is_available()`. - # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally. + # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionally. # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not. # Also, hardcode the path to the previously built library instead of relying on # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too. diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 862b698762e7..999954614b91 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -49,10 +49,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/${pname}"; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "matplotlib~=3.0" "matplotlib" - ''; + pythonRelaxDeps = [ "matplotlib" ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index dcbe419854bc..209c7e443544 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { libmambapy ]; - # this package depends on conda for the import to run succesfully, but conda depends on this package to execute. + # this package depends on conda for the import to run successfully, but conda depends on this package to execute. # pythonImportsCheck = [ "conda_libmamba_solver" ]; pythonRemoveDeps = [ "conda" ]; diff --git a/pkgs/development/python-modules/craft-parts/bash-path.patch b/pkgs/development/python-modules/craft-parts/bash-path.patch index f684b3bf6920..3daa35310099 100644 --- a/pkgs/development/python-modules/craft-parts/bash-path.patch +++ b/pkgs/development/python-modules/craft-parts/bash-path.patch @@ -29,14 +29,13 @@ index f2b4064..cb4e9e8 100644 @override def get_build_environment(self) -> dict[str, str]: diff --git a/craft_parts/plugins/validator.py b/craft_parts/plugins/validator.py -index 5b4c735..8ff30c2 100644 +index 5b4c735..d7a446e 100644 --- a/craft_parts/plugins/validator.py +++ b/craft_parts/plugins/validator.py -@@ -141,9 +141,9 @@ class PluginEnvironmentValidator: - print(self._env, file=env_file) +@@ -142,8 +142,9 @@ class PluginEnvironmentValidator: print(cmd, file=env_file) env_file.flush() -- + + import shutil proc = subprocess.run( - ["/bin/bash", env_file.name], @@ -45,7 +44,7 @@ index 5b4c735..8ff30c2 100644 capture_output=True, text=True, diff --git a/tests/unit/executor/test_step_handler.py b/tests/unit/executor/test_step_handler.py -index 4e73c2b..b762fb8 100644 +index 4e73c2b..a5f9374 100644 --- a/tests/unit/executor/test_step_handler.py +++ b/tests/unit/executor/test_step_handler.py @@ -209,9 +209,10 @@ class TestStepHandlerBuiltins: @@ -56,21 +55,21 @@ index 4e73c2b..b762fb8 100644 assert file.read() == dedent( f"""\ - #!/bin/bash -+ #!{shutil.which('bash')} ++ #!{shutil.which("bash")} set -euo pipefail source {environment_script_path} set -x diff --git a/tests/unit/utils/test_process.py b/tests/unit/utils/test_process.py -index 84b29ad..dc2d772 100644 +index a025494..a76cfa2 100644 --- a/tests/unit/utils/test_process.py +++ b/tests/unit/utils/test_process.py @@ -33,7 +33,8 @@ _RUN_TEST_CASES = [ @pytest.mark.parametrize(("out", "err"), _RUN_TEST_CASES) def test_run(out, err): -- result = process.run(["/usr/bin/sh", "-c", f"echo {out};sleep 0;echo {err} >&2"]) +- result = process.run(["/usr/bin/sh", "-c", f"echo {out};sleep 0.1;echo {err} >&2"]) + import shutil -+ result = process.run([shutil.which("sh"), "-c", f"echo {out};sleep 0;echo {err} >&2"]) ++ result = process.run([shutil.which("sh"), "-c", f"echo {out};sleep 0.1;echo {err} >&2"]) assert result.returncode == 0 assert result.stdout == (out + "\n").encode() assert result.stderr == (err + "\n").encode() @@ -95,5 +94,5 @@ index 84b29ad..dc2d772 100644 - "/usr/bin/sh", + shutil.which("sh"), "-c", - f"echo {out};sleep 0;echo {err} >&2; echo -n {out}|socat - UNIX-CONNECT:{new_dir}/test.socket", + f"echo {out};sleep 0.1;echo {err} >&2; echo -n {out}|socat - UNIX-CONNECT:{new_dir}/test.socket", ], diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index ac6dcf7cdfde..636fde33039f 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-KQS4jjA66rROglOrGR7UofJL+oYEEC2X+o6pROrR5r4="; + hash = "sha256-3NFbAxgY183RmZ+ats6M5WM07VO2amj7EdqMCLcKNvI="; }; patches = [ ./bash-path.patch ]; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 16e2b58c3fab..c624ce1742ab 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both + # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Setting both # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in # a small amount of thrashing but it turns out there are a large number of # very short builds and a few extremely long ones, so setting both ends up diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 599e99853ad8..1c9e706633b7 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { disabledTests = [ # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and - # fail because of errrors on numpy slices + # fail because of errors on numpy slices # AttributeError: 'str' object has no attribute 'start' "test_find_objects" "test_3d_find_objects" diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index fae9c2b32085..8a25a90cbd51 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { disabledTests = [ # Require internet access - # ValueError: default auth: cannot configure default credentials, please chec... + # ValueError: default auth: cannot configure default credentials, please check... "test_azure_cli_does_not_specify_tenant_id_with_msi" "test_azure_cli_fallback" "test_azure_cli_user_no_management_access" diff --git a/pkgs/development/python-modules/dataclasses-serialization/default.nix b/pkgs/development/python-modules/dataclasses-serialization/default.nix index b1e014f0c163..d99f4ada0bdf 100644 --- a/pkgs/development/python-modules/dataclasses-serialization/default.nix +++ b/pkgs/development/python-modules/dataclasses-serialization/default.nix @@ -32,14 +32,13 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "project_root = Path(__file__).parents[1]" "project_root = Path(__file__).parents[0]" - # dataclasses is included in Python 3.7 - substituteInPlace requirements.txt \ - --replace dataclasses "" - # https://github.com/madman-bob/python-dataclasses-serialization/issues/16 sed -i '/(\(Dict\|List\)/d' tests/test_json.py tests/test_bson.py ''; + # dataclasses is included in Python 3.7 + pythonRemoveDeps = [ "dataclasses" ]; + propagatedBuildInputs = [ more-properties typing-inspect diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix index ec263a48aa09..814637801feb 100644 --- a/pkgs/development/python-modules/decopatch/default.nix +++ b/pkgs/development/python-modules/decopatch/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "decopatch" ]; - # Tests would introduce multiple cirucular dependencies + # Tests would introduce multiple circular dependencies # Affected: makefun, pytest-cases doCheck = false; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 8674a2ca2542..f347cc0a1a5b 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ # Upstream develops this package as well, and from some reason pins this # dependency to a patch version below this one. No significant changes - # happend in that relase, so we shouldn't worry, especially if tests pass. + # happend in that release, so we shouldn't worry, especially if tests pass. "orderly-set" ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 71f05cabd66f..c5a7ccd23b52 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - # Tests are inplemented in a custom DSL (RSpec) + # Tests are implemented in a custom DSL (RSpec) doCheck = false; pythonImportsCheck = [ "dict2xml" ]; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 93e6a18a3dbc..a0e10637956b 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { # playwright._impl._errors.TimeoutError: Locator.click: Timeout 30000ms exceeded "test_sidebar_hide" "test_show_search_bar" - # Unable to lauch browser + # Unable to launch browser "test_document_viewer" ]; diff --git a/pkgs/development/python-modules/django-markdownx/default.nix b/pkgs/development/python-modules/django-markdownx/default.nix index 36f1d022a581..5203c067e0bf 100644 --- a/pkgs/development/python-modules/django-markdownx/default.nix +++ b/pkgs/development/python-modules/django-markdownx/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pillow ]; - # tests only executeable in vagrant + # tests only executable in vagrant doCheck = false; pythonImportsCheck = [ "markdownx" ]; diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index d04533cbf4a0..9bcc73c74152 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { }) # prevent tests from messing with our pythonpath ./django_5_tests_pythonpath.patch - # disable test that excpects timezone issues + # disable test that expects timezone issues ./django_5_disable_failing_tests.patch # fix filename length limit tests on bcachefs diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix index 2b1be8c8449f..6d0b23f28c54 100644 --- a/pkgs/development/python-modules/dparse2/default.nix +++ b/pkgs/development/python-modules/dparse2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ - # Requries pipenv + # Requires pipenv "tests/test_parse.py" ]; diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index cfd6365f6b1d..86ba11f3c019 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # safe-pysha3 is not available on pypy ++ lib.optional (!isPyPy) optional-dependencies.pysha3; - # Backends need to be tested separatly and can not use hook + # Backends need to be tested separately and can not use hook checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix index ab54bd684f6f..7d71c84d483d 100644 --- a/pkgs/development/python-modules/exrex/default.nix +++ b/pkgs/development/python-modules/exrex/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dontWrapPythonPrograms = true; - # Projec thas no released tests + # Project thas no released tests doCheck = false; pythonImportsCheck = [ "exrex" ]; diff --git a/pkgs/development/python-modules/gfal2-util/fetchgfal2.nix b/pkgs/development/python-modules/gfal2-util/fetchgfal2.nix index d92cb9b96c06..00aa365f025b 100644 --- a/pkgs/development/python-modules/gfal2-util/fetchgfal2.nix +++ b/pkgs/development/python-modules/gfal2-util/fetchgfal2.nix @@ -4,7 +4,7 @@ gfal2-util, }: -# `url` and `urls` should only be overriden via `<pkg>.override`, but not `<pkg>.overrideAttrs`. +# `url` and `urls` should only be overridden via `<pkg>.override`, but not `<pkg>.overrideAttrs`. { name ? "", pname ? "", diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 3c7cb896bca3..50780ad682e9 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -186,7 +186,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ - # Wants none exsiting module + # Wants none existing module "bin/test_args.py" # Requires internet "tests/push/test_items.py" diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix new file mode 100644 index 000000000000..a7159ad43be9 --- /dev/null +++ b/pkgs/development/python-modules/gitingest/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # Dependencies + setuptools, + click, + fastapi, + python-dotenv, + slowapi, + starlette, + tiktoken, + tomli, + uvicorn, + + # Tests + httpx, + jinja2, + pytestCheckHook, + python-multipart, +}: + +buildPythonPackage rec { + pname = "gitingest"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cyclotruc"; + repo = "gitingest"; + tag = "v${version}"; + hash = "sha256-RGrenW0modLH9h5pQOexPvEDQ9Bczoj1qInYmgUoGdo="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "fastapi" + ]; + + dependencies = [ + click + fastapi + python-dotenv + slowapi + starlette + tiktoken + tomli + uvicorn + ]; + + pythonImportsCheck = [ + "gitingest" + ]; + + nativeCheckInputs = [ + httpx + jinja2 + pytestCheckHook + python-multipart + ]; + + disabledTests = [ + # Tests require network + "test_cli_with_default_options" + "test_cli_with_options" + "test_run_ingest_query" + ]; + + meta = { + changelog = "https://github.com/cyclotruc/gitingest/releases/tag/v${version}"; + description = "Replace 'hub' with 'ingest' in any github url to get a prompt-friendly extract of a codebase"; + homepage = "https://github.com/cyclotruc/gitingest"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "gitingest"; + }; +} diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index e621a4a6769d..9713e6a1ceed 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { protobuf ]; - # Projec thas no tests + # Project thas no tests doCheck = false; pythonImportsCheck = [ "grpc_status" ]; diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 7a070285d382..1dd0336158fa 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; disabledTests = [ - # tests pip install, which unsuprisingly fails + # tests pip install, which unsurprisingly fails "test_hatch_build" ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index abc35782cbc7..f87d61631abb 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { disabledTests = [ "test_colorize" - # Tests are flaky, OSError: [Errno 24] Too many open files happpens + # Tests are flaky, OSError: [Errno 24] Too many open files happens "test_answer_links_using_l_option" "test_answers_bing" "test_answers" diff --git a/pkgs/development/python-modules/inflate64/default.nix b/pkgs/development/python-modules/inflate64/default.nix new file mode 100644 index 000000000000..35da809726c4 --- /dev/null +++ b/pkgs/development/python-modules/inflate64/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + setuptools, + setuptools-scm, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "inflate64"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "miurahr"; + repo = "inflate64"; + tag = "v${version}"; + hash = "sha256-deFx8NMbGLP51CdNvmZ25LQ5FLPBb1PB3QhGhIfTMfc="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "inflate64" + ]; + + meta = { + description = "Compress and decompress with Enhanced Deflate compression algorithm"; + homepage = "https://codeberg.org/miurahr/inflate64"; + changelog = "https://codeberg.org/miurahr/inflate64/src/tag/v${version}/docs/Changelog.rst#v${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pitkling + PopeRigby + ]; + }; + +} diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index b2270ef11248..356d68a88c97 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { "test_write_points_from_dataframe_with_nan_json" "test_write_points_from_dataframe_with_tags_and_nan_json" "test_write_points_from_dataframe_with_numeric_precision" - # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that + # Response is not empty but `s = '孝'` and the JSON decoder chokes on that "test_query_with_empty_result" # Pandas API changes cause it to no longer infer datetimes in the expected manner "test_multiquery_into_dataframe" diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 206faab7ae1d..07e0376545ce 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; patches = [ - # Cannot use hatch-vcs, due to an inifinite recursion + # Cannot use hatch-vcs, due to an infinite recursion (replaceVars ./version.patch { inherit version; }) diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index 57559af6d9a1..a9503eddcfaf 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -26,14 +26,13 @@ buildPythonPackage rec { }; postPatch = '' - # Break circular dependency - substituteInPlace requirements.txt \ - --replace-fail "intake" "" - # Remove vendorized versioneer.py rm versioneer.py ''; + # Break circular dependency + pythonRemoveDeps = [ "intake" ]; + build-system = [ setuptools versioneer diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 89ac0be2d3d6..57d8b0a5f492 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -36,7 +36,7 @@ buildPythonPackage { disabledTests = [ - # The follwing three tests fail for unclear reasons. + # The following three tests fail for unclear reasons. # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8 "test_asyncio_interrupt" diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index c649bf57f04f..c55806f46106 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { # high parallelism will result in the tests getting stuck dontUsePytestXdist = true; - # NOTE: Don't run the tests in the expiremental directory as they require flax + # NOTE: Don't run the tests in the experimental directory as they require flax # which creates a circular dependency. See https://discourse.nixos.org/t/how-to-nix-ify-python-packages-with-circular-dependencies/14648/2. # Not a big deal, this is how the JAX docs suggest running the test suite # anyhow. diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index 622e923d1c27..517ccefadf5d 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { # disable tests depending on network connection "test_develop" "test_install" - # Avoid unmainted "mocker" fixture library, and calls to dependent "build" module + # Avoid unmaintained "mocker" fixture library, and calls to dependent "build" module "test_build" "test_npm_build" "test_create_cmdclass" diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index cbdf4c060b70..36433de8852c 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { malduck ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "malduck==4.1.0" "malduck" - ''; + pythonRelaxDeps = [ "malduck" ]; # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index c0cbb4a981d0..77f6eaa6e6fe 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; azureservicebus = [ azure-servicebus ]; confluentkafka = [ confluent-kafka ]; - # pyro4 doesn't suppport Python 3.11 + # pyro4 doesn't support Python 3.11 #pyro = [ # pyro4 #]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 14534ef1d15a..518f879c916d 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; patches = [ - # fix pyasn1 0.5.0 compability + # fix pyasn1 0.5.0 compatibility # https://github.com/cannatag/ldap3/pull/983 (fetchpatch { url = "https://github.com/cannatag/ldap3/commit/ca689f4893b944806f90e9d3be2a746ee3c502e4.patch"; diff --git a/pkgs/development/python-modules/libipld/default.nix b/pkgs/development/python-modules/libipld/default.nix new file mode 100644 index 000000000000..a4a478104737 --- /dev/null +++ b/pkgs/development/python-modules/libipld/default.nix @@ -0,0 +1,68 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + pythonOlder, + rustPlatform, + nix-update-script, + + # build-system + maturin, + + # nativeCheckInputs + pytestCheckHook, + pytest-benchmark, + pytest-codspeed, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "libipld"; + version = "3.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.8"; + + # use pypi, GitHub does not include Cargo.lock + src = fetchPypi { + inherit pname version; + hash = "sha256-KXB1LecOX9ysRkaQDN76oNygjbm11ZxAtUltmeO/+mQ="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-V/UGTO+VEBtv5gwKR/fZmmhbeYILsIVc7Mq/Rl6E4Dw="; + }; + + build-system = [ + maturin + ]; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-benchmark + pytest-codspeed + pytest-xdist + ]; + + disabledTests = [ + # touches network + "test_decode_car" + ]; + + pythonImportsCheck = [ "libipld" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast Python library to work with IPLD: DAG-CBOR, CID, CAR, multibase"; + homepage = "https://github.com/MarshalX/python-libipld"; + changelog = "https://github.com/MarshalX/python-libipld/blob/v${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vji ]; + }; +} diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index c8489e4a97e8..2bbd56eb15bb 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -139,7 +139,7 @@ buildPythonPackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ GuillaumeDesforges ]; badPlatforms = [ - # Several non-deterministic occurances of "Fatal Python error: Segmentation fault", both in + # Several non-deterministic occurrences of "Fatal Python error: Segmentation fault", both in # numpy's and in this package's code. "aarch64-linux" ]; diff --git a/pkgs/development/python-modules/lightwave/default.nix b/pkgs/development/python-modules/lightwave/default.nix index 621f413ca885..514b3349e029 100644 --- a/pkgs/development/python-modules/lightwave/default.nix +++ b/pkgs/development/python-modules/lightwave/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "lightwave" ]; - # Requires phyiscal hardware + # Requires physical hardware doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix index f9f0edd9d4fd..8f6a41af46d8 100644 --- a/pkgs/development/python-modules/lineax/default.nix +++ b/pkgs/development/python-modules/lineax/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pytest ]; - # Intentionaly not using pytest directly as it leads to JAX out-of-memory'ing + # Intentionally not using pytest directly as it leads to JAX out-of-memory'ing # https://github.com/patrick-kidger/lineax/blob/1909d190c1963d5f2d991508c1b2714f2266048b/tests/README.md checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix index 4639c08ed983..bcdf40616d43 100644 --- a/pkgs/development/python-modules/llguidance/default.nix +++ b/pkgs/development/python-modules/llguidance/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { "scripts/tokenizer_test.py" ]; - # As dynamo is not supported on Python 3.13+, no successfull tests remain. + # As dynamo is not supported on Python 3.13+, no successful tests remain. doCheck = pythonOlder "3.13"; meta = { diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index f5a4eb315d52..3772b33f2a29 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -107,7 +107,7 @@ buildPythonPackage rec { "test_run_chat" "test_run" "test_score_run" - # Test is time-senstive + # Test is time-sensitive "test_timing" ]; diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index ce0268daca80..c5cf6b8408e0 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -56,7 +56,7 @@ let # # https://community.chocolatey.org/packages/manim-latex#files # - # which includes another cutom distribution called tinytex, for which the + # which includes another custom distribution called tinytex, for which the # package list can be found at # # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt diff --git a/pkgs/development/python-modules/manim/failing_tests.nix b/pkgs/development/python-modules/manim/failing_tests.nix index ac788c25be20..279950f6cb4f 100644 --- a/pkgs/development/python-modules/manim/failing_tests.nix +++ b/pkgs/development/python-modules/manim/failing_tests.nix @@ -83,7 +83,7 @@ # TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? "test_force_window_opengl_render_with_movies" - # mismatching expecation on the new commandline + # mismatching expectation on the new commandline "test_manim_new_command" # This tests checks if the manim executable is a python script. In our case it is not. diff --git a/pkgs/development/python-modules/matplotlib-venn/default.nix b/pkgs/development/python-modules/matplotlib-venn/default.nix index 51a164faba6d..f4fbb44863f5 100644 --- a/pkgs/development/python-modules/matplotlib-venn/default.nix +++ b/pkgs/development/python-modules/matplotlib-venn/default.nix @@ -1,17 +1,19 @@ { lib, + stdenv, fetchPypi, buildPythonPackage, setuptools, matplotlib, numpy, scipy, + shapely, pytestCheckHook, }: buildPythonPackage rec { - version = "1.1.1"; pname = "matplotlib-venn"; + version = "1.1.1"; pyproject = true; @@ -26,6 +28,12 @@ buildPythonPackage rec { matplotlib numpy scipy + shapely + ]; + + disabledTests = [ + # See https://github.com/konstantint/matplotlib-venn/issues/85 + "matplotlib_venn.layout.venn3.cost_based.LayoutAlgorithm" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,5 +44,6 @@ buildPythonPackage rec { changelog = "https://github.com/konstantint/matplotlib-venn/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ moraxyc ]; + broken = stdenv.hostPlatform.isDarwin; # https://github.com/konstantint/matplotlib-venn/issues/87 }; } diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 06078a2b9b4f..a8e2768f1fbd 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -21,7 +21,7 @@ ffmpeg-headless, freetype, # By default, almost all tests fail due to the fact we use our version of - # freetype. We still define use this argument to define the overriden + # freetype. We still use this argument to define the overridden # derivation `matplotlib.passthru.tests.withoutOutdatedFreetype` - which # builds matplotlib with the freetype version they default to, with which all # tests should pass. diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index 4fdab49a521e..af2afd3d7502 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -25,11 +25,8 @@ buildPythonPackage rec { hash = "sha256-WIF3pFBOLgozYTrQHLzIRgSlT3dTZTe+7sF/dVjVdTo="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'pynacl~=1.4' 'pynacl>=1.4' \ - --replace 'ipaddress' "" - ''; + pythonRelaxDeps = [ "pynacl" ]; + pythonRemoveDeps = [ "ipaddress" ]; pythonImportsCheck = [ "monero" ]; diff --git a/pkgs/development/python-modules/motionblindsble/default.nix b/pkgs/development/python-modules/motionblindsble/default.nix index fa33b39fb6bb..8c1e2d3523d1 100644 --- a/pkgs/development/python-modules/motionblindsble/default.nix +++ b/pkgs/development/python-modules/motionblindsble/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "motionblindsble" ]; disabledTests = [ - # AssertionEror + # AssertionError "test_establish_connection" ]; diff --git a/pkgs/development/python-modules/multivolumefile/default.nix b/pkgs/development/python-modules/multivolumefile/default.nix new file mode 100644 index 000000000000..5ae5bacb33f4 --- /dev/null +++ b/pkgs/development/python-modules/multivolumefile/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + setuptools, + setuptools-scm, + hypothesis, + pytest-timeout, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "multivolumefile"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "miurahr"; + repo = "multivolume"; + tag = "v${version}"; + hash = "sha256-7gjfF7biQZOcph2dfwi2ouDn/uIYik/KBQ0k6u5Ne+Q="; + }; + + postPatch = + # Fix typo: `tools` -> `tool` + # upstream PR: https://codeberg.org/miurahr/multivolume/pulls/9 + '' + substituteInPlace pyproject.toml \ + --replace-fail 'tools.setuptools_scm' 'tool.setuptools_scm' + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + hypothesis + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "multivolumefile" + ]; + + meta = { + description = "Library to provide a file-object wrapping multiple files as virtually like as a single file"; + homepage = "https://codeberg.org/miurahr/multivolume"; + changelog = "https://codeberg.org/miurahr/multivolume/src/tag/v${version}/Changelog.rst#v${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pitkling + PopeRigby + ]; + }; +} diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 34b74dd1c2b1..216afbb96da5 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; # TODO: understand & possibly fix why tests fail. On github most testfiles - # have been comitted with msgs "wip" though. + # have been committed with msgs "wip" though. doCheck = false; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index 2d1244619d2a..fa75906b2a06 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "objax" ]; - # This is necessay to ignore the presence of two protobufs version (tensorflow is bringing an + # This is necessary to ignore the presence of two protobufs version (tensorflow is bringing an # older version). catchConflicts = false; diff --git a/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/pkgs/development/python-modules/oldest-supported-numpy/default.nix index 521094a8e4c0..4cd90976e8d7 100644 --- a/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # The purpose of oldest-supported-numpy is to build a project against the # oldest version of numpy for a given Python distribution in order to build - # a binary that is compatible with the largest possible versons of numpy. + # a binary that is compatible with the largest possible versions of numpy. # We only build against one version of numpy in nixpkgs, so instead we only # want to make sure that we have a version above the minimum. # diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 90df4cb2aff0..1de9d7d92c42 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { onnxruntime.protobuf # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib - # but these files are copied into this package too. If the origional non-python onnxruntime + # but these files are copied into this package too. If the original non-python onnxruntime # package is GC-ed, cuda support in this python package will break. # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support. diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index f1ea8488995b..4afdab81fee8 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -8,6 +8,7 @@ six, python-string-utils, pytest-bdd, + pytest-cov-stub, pytestCheckHook, }: @@ -23,12 +24,7 @@ buildPythonPackage rec { hash = "sha256-uLfewj7M8KNs3oL1AM18sR/WhAR2mvBfqadyhR73FP0="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "kubernetes ~= 12.0" "kubernetes" - - sed -i '/--cov/d' setup.cfg - ''; + pythonRelaxDeps = [ "kubernetes" ]; propagatedBuildInputs = [ jinja2 @@ -42,6 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-bdd + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index af8c05f9a9eb..669dc5a873ea 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -1,7 +1,8 @@ { + lib, buildPythonPackage, fetchFromGitHub, - lib, + fetchpatch, pandocfilters, psutil, setuptools, @@ -10,20 +11,29 @@ buildPythonPackage rec { pname = "pandoc-xnos"; version = "2.5.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "tomduck"; - repo = pname; - rev = version; + repo = "pandox-xnos"; + tag = version; hash = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; }; - nativeBuildInputs = [ setuptools ]; + patches = [ + # This patch fix the Pandoc 3 compatibility. + # See: https://github.com/tomduck/pandoc-xnos/pull/29 + (fetchpatch { + url = "https://github.com/tomduck/pandoc-xnos/commit/284474574f51888be75603e7d1df667a0890504d.patch"; + hash = "sha256-j6xaFXo3jtXGPL58aIp8RTqeQZhJ8cVKL/iUbUhXBF0="; + }) + ]; + + build-system = [ setuptools ]; pythonRelaxDeps = [ "psutil" ]; - propagatedBuildInputs = [ + dependencies = [ pandocfilters psutil ]; @@ -33,11 +43,11 @@ buildPythonPackage rec { # tests need some patching doCheck = false; - meta = with lib; { + meta = { description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; mainProgram = "pandoc-xnos"; homepage = "https://github.com/tomduck/pandoc-xnos"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ppenguin ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ppenguin ]; }; } diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index 34b0970ce545..5a6aa99e462e 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - # Test data contains properitary executables and malware, and is therefore encrypted + # Test data contains proprietary executables and malware, and is therefore encrypted doCheck = false; pythonImportsCheck = [ "pefile" ]; diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 53a0d1e6d940..98e168fd2cf5 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -103,7 +103,7 @@ buildPythonPackage rec { "tests/test_stat_summary.py" "tests/test_theme.py" - # Linting / formatting: useless as it has nothing to do with the package functionning + # Linting / formatting: useless as it has nothing to do with the package functioning # Disabling this prevents adding a dependency on 'ruff' and 'black'. "tests/test_lint_and_format.py" ]; diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 436a8bbd15dd..3e4eb695bde8 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -5,7 +5,7 @@ setuptools, }: -#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary +#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unnecessary buildPythonPackage rec { pname = "pmdsky-debug-py"; version = "10.0.21"; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 0292027a607b..4e1cbc07fd08 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { # In addition to the issues listed above there are some that occure due to # our sandboxing which we can work around by disabling some tests: # - cpu_times was flaky on darwin - # - the other disabled tests are likely due to sanboxing (missing specific errors) + # - the other disabled tests are likely due to sandboxing (missing specific errors) pytestFlagsArray = [ # Note: $out must be referenced as test import paths are relative "${placeholder "out"}/${python.sitePackages}/psutil/tests/test_system.py" diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix index 3715506eacbf..926b16e96e26 100644 --- a/pkgs/development/python-modules/pueblo/default.nix +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.11"; - # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # This tarball doesn't include tests unfortunately, and the GitHub tarball # could have been an alternative, but versioningit fails to detect the # version of it correctly, even with setuptools-scm and # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 6ae572b9cd2a..30983db1986b 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; - # Version is independant of pulumi's. + # Version is independent of pulumi's. version = "6.66.3"; pyproject = true; diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix index 2e6e4ca8e361..29bb30cda5db 100644 --- a/pkgs/development/python-modules/pwlf/default.nix +++ b/pkgs/development/python-modules/pwlf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pwlf"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; src = fetchFromGitHub { owner = "cjekel"; repo = "piecewise_linear_fit_py"; tag = "v${version}"; - hash = "sha256-TamFg+bX8QPRjY0HdrYviJRP8VwM7ucDFE2eZz5xNr0="; + hash = "sha256-tUJSVMhnUdqpbiKzrpznCEgaGHGOLylFm6DzNTnvnQQ="; }; nativeBuildInputs = [ @@ -37,11 +37,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pwlf" ]; - meta = with lib; { + meta = { description = "Fit piecewise linear data for a specified number of line segments"; homepage = "https://jekel.me/piecewise_linear_fit_py/"; changelog = "https://github.com/cjekel/piecewise_linear_fit_py/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/py7zr/default.nix b/pkgs/development/python-modules/py7zr/default.nix new file mode 100644 index 000000000000..e852a8317212 --- /dev/null +++ b/pkgs/development/python-modules/py7zr/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + brotli, + inflate64, + multivolumefile, + psutil, + pybcj, + pycryptodomex, + pyppmd, + pyzstd, + texttable, + py-cpuinfo, + pytest-benchmark, + pytest-remotedata, + pytest-timeout, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "py7zr"; + version = "0.22.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "miurahr"; + repo = "py7zr"; + tag = "v${version}"; + hash = "sha256-YR2cuHZWwqrytidAMbNvRV1/N4UZG8AMMmzcTcG9FvY="; + }; + + postPatch = + # Replace inaccessible mirror (qt.mirrors.tds.net): + # upstream PR: https://github.com/miurahr/py7zr/pull/637 + '' + substituteInPlace tests/test_concurrent.py \ + --replace-fail 'http://qt.mirrors.tds.net/qt/' 'https://download.qt.io/' + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + brotli + inflate64 + multivolumefile + psutil + pybcj + pycryptodomex + pyppmd + pyzstd + texttable + ]; + + nativeCheckInputs = [ + py-cpuinfo + pytest-benchmark + pytest-remotedata + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "py7zr" + ]; + + meta = { + description = "7zip in Python 3 with ZStandard, PPMd, LZMA2, LZMA1, Delta, BCJ, BZip2"; + homepage = "https://github.com/miurahr/py7zr"; + changelog = "https://github.com/miurahr/py7zr/blob/v${version}/docs/Changelog.rst#v${ + builtins.replaceStrings [ "." ] [ "" ] version + }"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ + pitkling + PopeRigby + ]; + }; +} diff --git a/pkgs/development/python-modules/pybcj/default.nix b/pkgs/development/python-modules/pybcj/default.nix new file mode 100644 index 000000000000..c82a9bff2a95 --- /dev/null +++ b/pkgs/development/python-modules/pybcj/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + setuptools, + setuptools-scm, + hypothesis, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pybcj"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "miurahr"; + repo = "pybcj"; + tag = "v${version}"; + hash = "sha256-ExSt7E7ZaVEa0NwAQHU0fOaXJW9jYmEUUy/1iUilGz8="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bcj" + ]; + + meta = { + description = "BCJ (Branch-Call-Jump) filter for Python"; + homepage = "https://codeberg.org/miurahr/pybcj"; + changelog = "https://codeberg.org/miurahr/pybcj/src/tag/v${version}/Changelog.rst#v${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pitkling + PopeRigby + ]; + }; +} diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index d41e35613eb1..0d475d688674 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "pyBigWigTest/test*.py" ]; disabledTests = [ - # Test file is donwloaded from GitHub + # Test file is downloaded from GitHub "testAll" "testBigBed" "testFoo" diff --git a/pkgs/development/python-modules/pycomm3/default.nix b/pkgs/development/python-modules/pycomm3/default.nix index c6dc04bf7be0..6281802e3786 100644 --- a/pkgs/development/python-modules/pycomm3/default.nix +++ b/pkgs/development/python-modules/pycomm3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycomm3" ]; disabledTestPaths = [ - # Don't test examples as some have aditional requirements + # Don't test examples as some have additional requirements "examples/" # No physical PLC available "tests/online/" diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix index 09b80a3aaf14..f780c16cd144 100644 --- a/pkgs/development/python-modules/pyflic/default.nix +++ b/pkgs/development/python-modules/pyflic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-K1trMBZfc1aHSNSddq0v//Gv8ySgT/ONQYgrKWzw2qs="; }; - # Projec thas no tests + # Project thas no tests doCheck = false; pythonImportsCheck = [ "pyflic" ]; diff --git a/pkgs/development/python-modules/pyhive-integration/default.nix b/pkgs/development/python-modules/pyhive-integration/default.nix index 29319768f1c3..45c0d7196c92 100644 --- a/pkgs/development/python-modules/pyhive-integration/default.nix +++ b/pkgs/development/python-modules/pyhive-integration/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { hash = "sha256-lfBr889s6NHcos/kdzQa9HJEcQ4dfCEMjuLYiLzesfE="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "pre-commit" "" - ''; + pythonRemoveDeps = [ "pre-commit" ]; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/pyls-memestra/default.nix b/pkgs/development/python-modules/pyls-memestra/default.nix index 5baf644630c4..c48a60b11495 100644 --- a/pkgs/development/python-modules/pyls-memestra/default.nix +++ b/pkgs/development/python-modules/pyls-memestra/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-lsp-server ]; - # Tests fail because they rely on writting to read-only files + # Tests fail because they rely on writing to read-only files doCheck = false; pythonImportsCheck = [ "pyls_memestra" ]; diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix index a5f14cbfebfc..e68fc984383f 100644 --- a/pkgs/development/python-modules/pymitv/default.nix +++ b/pkgs/development/python-modules/pymitv/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - # Projec thas no tests + # Project thas no tests doCheck = false; pythonImportsCheck = [ "pymitv" ]; diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index ee73ddc09ec4..ad8e17fc8bee 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { ]; # Remove enum34 requirement if Python >= 3.4 - postPatch = lib.optionalString (pythonAtLeast "3.4") '' - substituteInPlace requirements.txt --replace "enum34" "" - ''; + pythonRemoveDeps = lib.optionals (pythonAtLeast "3.4") [ + "enum34" + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyppmd/default.nix b/pkgs/development/python-modules/pyppmd/default.nix new file mode 100644 index 000000000000..511b696e17d6 --- /dev/null +++ b/pkgs/development/python-modules/pyppmd/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + setuptools, + setuptools-scm, + hypothesis, + pytest-benchmark, + pytest-timeout, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyppmd"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "miurahr"; + repo = "pyppmd"; + tag = "v${version}"; + hash = "sha256-0t1vyVMtmhb38C2teJ/Lq7dx4usm4Bzx+k7Zalf/nXE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + hypothesis + pytest-benchmark + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyppmd" + ]; + + meta = { + description = "PPMd compression/decompression library"; + homepage = "https://codeberg.org/miurahr/pyppmd"; + changelog = "https://codeberg.org/miurahr/pyppmd/src/tag/v${version}/Changelog.rst#v${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + pitkling + PopeRigby + ]; + }; +} diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index 95aedea3d074..ee460a27f566 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - # Tests require phyiscal hardware + # Tests require physical hardware doCheck = false; pythonImportsCheck = [ "pyskyqhub" ]; diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 1a7c541daea0..80897afcf851 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; patches = [ - # Switch to peotry-core, https://github.com/rbw/pysnow/pull/183 + # Switch to poetry-core, https://github.com/rbw/pysnow/pull/183 (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/rbw/pysnow/commit/f214a203432b329df5317f3a25b2c0d9b55a9029.patch"; diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 8ce6a6cbb15d..d055c84450c0 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -89,9 +89,6 @@ buildPythonPackage rec { "test_scan_multiple_output" "test_vector_taps_benchmark" - # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 - "test_jax_pad" - # Failure reported upstream: https://github.com/pymc-devs/pytensor/issues/980 "test_choose_signature" @@ -163,9 +160,6 @@ buildPythonPackage rec { "test_unbroadcast" "test_update_equiv" "test_update_same" - "test_solve_triangular_grad" - "test_numba_Cholesky_grad" - "test_alloc" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Fatal Python error: Segmentation fault diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix index 63c0d3735f38..99c2c8786673 100644 --- a/pkgs/development/python-modules/pytest-pytestrail/default.nix +++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ testrail-api ]; - # all tests require network accesss + # all tests require network access doCheck = false; pythonImportsCheck = [ "pytest_pytestrail" ]; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index eddc3fc06fa9..ff3b1f46601f 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -35,7 +35,7 @@ buildPythonPackage { six ]; - # Don't run intergration tests + # Don't run integration tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index bbd3b5f4d02a..a0c03c4c881b 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -38,11 +38,8 @@ buildPythonPackage rec { hash = "sha256-cXReOIfgC5Fx5gT0vF/pV7QwEuC2YfnW4OE+m7nqr20="; }; - postPatch = '' - # somehow python-neutronclient cannot be found despite it being supplied - substituteInPlace requirements.txt \ - --replace-fail "python-neutronclient>=6.7.0" "" - ''; + # somehow python-neutronclient cannot be found despite it being supplied + pythonRemoveDeps = [ "python-neutronclient" ]; build-system = [ setuptools diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index 4e456405cad8..5a01cd3c8778 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "onelogin.saml2" ]; disabledTests = [ - # Tests require network acces or additions files + # Tests require network access or additions files "OneLogin_Saml2_Metadata_Test" "OneLogin_Saml2_Response_Test" "OneLogin_Saml2_Utils_Test" diff --git a/pkgs/development/python-modules/pyzstd/default.nix b/pkgs/development/python-modules/pyzstd/default.nix index 62e77d821d08..df57669e8dcf 100644 --- a/pkgs/development/python-modules/pyzstd/default.nix +++ b/pkgs/development/python-modules/pyzstd/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ MattSturgeon + pitkling PopeRigby ]; }; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 28d8d16087e7..dfed5e2a7ff8 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { }; postPatch = - # build-time constriant, used to ensure forward and backward compat + # build-time constraint, used to ensure forward and backward compat '' substituteInPlace pyproject.toml setup.cfg \ --replace-fail "numpy>=2.0.0" "numpy" diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 21c9197e0673..17db349ccc67 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-9DaHJBLPpvBP/5kMYyIkaxOqOJ9gMjuWNYPtYQLXyEw="; }; - # The package does not ship tests, and the setup machinary confuses + # The package does not ship tests, and the setup machinery confuses # tests auto-discovery doCheck = false; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index c48b87d54094..dc185c53b060 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-E4i1JJOkwE+8lwotdXwwH6BaPDdkAxTCzp38jYpzDMY="; }; - # The package does not ship tests, and the setup machinary confuses + # The package does not ship tests, and the setup machinery confuses # tests auto-discovery doCheck = false; diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix index beeeb3c4c5f7..655767690105 100644 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Tests require netowrk access + # Tests require network access "tests/test_districts.py" "tests/test_endpoint_availibility.py" ]; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index af7c85863eb5..f662e223b1e2 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -14,7 +14,7 @@ numpy, libusb-compat-0_1, - # optional-dependenices + # optional-dependencies pyusb, # tests diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index c50af450b272..ca67a5e873f7 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -112,7 +112,7 @@ buildPythonPackage rec { disabledTestPaths = [ - # Varius integration tests fail every once in a while when we + # Various integration tests fail every once in a while when we # upgrade dependencies, so don't bother testing them. "tests/integrations/" ] diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 8dc26ddfdc0d..8420f3a3a6f4 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -48,9 +48,9 @@ buildPythonPackage rec { pythonImportsCheck = [ # https://www.riverbankcomputing.com/pipermail/pyqt/2023-January/045094.html - # the import check for "sip" will fail, as it segfaults as the interperter is shutting down. + # the import check for "sip" will fail, as it segfaults as the interpreter is shutting down. # This is an upstream bug with sip4 on python3.12, and happens in the ubuntu packages version as well. - # As the pacakge works fine until exit, just remove the import check for now. + # As the package works fine until exit, just remove the import check for now. # See discussion at https://github.com/NixOS/nixpkgs/pull/327976#discussion_r1706488319 (lib.optional (pythonOlder "3.12") sip-module) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 5baa8bb7405f..3d68f501919c 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -14,7 +14,7 @@ pmdsky-debug-py, range-typed-integers, pythonOlder, - # optional dependancies for SpriteCollab + # optional dependencies for SpriteCollab aiohttp, lru-dict, graphql-core, diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index efc53987d0c2..10b1800b24ae 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -49,6 +49,9 @@ buildPythonPackage rec { # AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. "test_endpoint_request_param_invalid" "test_endpoint_response_param_invalid" + # AssertionError: assert '1740326049.9886339' == '1740326049' + "test_headers_no_breach" + "test_headers_breach" ] ++ lib.optionals (pythonAtLeast "3.10") [ "test_multiple_decorators" ]; pythonImportsCheck = [ "slowapi" ]; diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index 8ac6396cf0ab..fd791827d522 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "spacy_loggers" ]; - # skipping the checks, becaus it requires a cycle dependency to spacy as well. + # skipping the checks, because it requires a cycle dependency to spacy as well. doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 771b674c18de..22ccb2d67599 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -15,7 +15,7 @@ }: # Latest tagged release release "1.1.2" (Nov 2018) does not contain -# documenation, it was added in commits Aug 10, 2019. Repository does not have +# documentation, it was added in commits Aug 10, 2019. Repository does not have # any activity since then. buildPythonPackage { pname = "sphinx-version-warning"; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index b27d221d75f4..10d5e35c6e2d 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -7,7 +7,7 @@ # build-system flit-core, - # dependenices + # dependencies progress, pyserial, diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 9b8784fe1f9a..500c99428424 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - python, poetry-core, pytest, pytest-xdist, @@ -11,16 +10,14 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; - disabled = lib.versionOlder python.version "3.8.1"; - src = fetchFromGitHub { owner = "syrupy-project"; repo = "syrupy"; tag = "v${version}"; - hash = "sha256-H/R2MKXdn/Oqow1Nt2tr45UQqJQs7O72hfA+lRU9V6w="; + hash = "sha256-3WC17rtk8FBNEECImIeiLnIFp/qsTGZSHxhh3F5K3G0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index a70d1f503723..a514235bcdf6 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -13,22 +14,23 @@ torch, torchvision, - # checks + # tests expecttest, pytestCheckHook, pytest-timeout, + pythonAtLeast, }: buildPythonPackage rec { pname = "timm"; - version = "1.0.14"; + version = "1.0.15"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${version}"; - hash = "sha256-mQd4xsKuAKj77lG6r14iHrkaBclRmBwICXuHs7pQoGI="; + hash = "sha256-TXc+D8GRrO46q88fOH44ZHKOGnCdP47ipEcobnGTxWU="; }; build-system = [ pdm-backend ]; @@ -49,16 +51,26 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests" ]; + disabledTests = + lib.optionals + ( + # RuntimeError: Dynamo is not supported on Python 3.13+ + (pythonAtLeast "3.13") + + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # CppCompileError: C++ compile error + # OpenMP support not found. + || stdenv.hostPlatform.isDarwin + ) + [ + "test_kron" + ]; + disabledTestPaths = [ # Takes too long and also tries to download models "tests/test_models.py" ]; - disabledTests = [ - # AttributeError: 'Lookahead' object has no attribute '_optimizer_step_pre... - "test_lookahead" - ]; - pythonImportsCheck = [ "timm" "timm.data" diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index a56d4df7d0cc..4c64ba3c9275 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -25,7 +25,7 @@ let # TODO: Reuse one defined in torch? - # Some of those dependencies are probbly not required, + # Some of those dependencies are probably not required, # but it breaks when the store path is different between torch and torchaudio rocmtoolkit_joined = symlinkJoin { name = "rocm-merged"; diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix index 9636b3dc9535..0e6ae4e47530 100644 --- a/pkgs/development/python-modules/tree-sitter-languages/default.nix +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rev = "v${version}"; hash = "sha256-wKU2c8QRBKFVFqg+DAeH5+cwm5jpDLmPZG3YBUsh/lM="; # Use git, to also fetch tree-sitter repositories that upstream puts their - # hases in the repository as well, in repos.txt. + # hashes in the repository as well, in repos.txt. forceFetchGit = true; postFetch = '' cd $out diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index aa313179af97..7138ea063672 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -7,7 +7,7 @@ incremental, setuptools, - # dependenices + # dependencies attrs, hyperlink, requests, diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 0e5a812d98b9..b5d9cfdbb370 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -11,8 +11,11 @@ hypothesis, jinja2, pydantic, + pytest-cov-stub, pytestCheckHook, pythonOlder, + rich-click, + sybil, tomli, typing-extensions, }: @@ -21,7 +24,7 @@ buildPythonPackage rec { version = "24.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "typed_settings"; @@ -55,17 +58,20 @@ buildPythonPackage rec { nativeBuildInputs = [ hatch-vcs ]; - nativeCheckInputs = [ - hypothesis - pytestCheckHook - typing-extensions - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + nativeCheckInputs = + [ + hypothesis + pytest-cov-stub + pytestCheckHook + rich-click + sybil + ] + ++ (lib.optional (pythonOlder "3.11") typing-extensions) + ++ (lib.flatten (lib.attrValues optional-dependencies)); pytestFlagsArray = [ "tests" ]; disabledTests = [ - # AssertionError: assert [OptionInfo(p... - "test_deep_options" # 1Password CLI is not available "TestOnePasswordLoader" "test_handle_op" diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 616afc78bcd4..9dbbe1b8bf4f 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { urwid ]; - # Projec thas no tests + # Project thas no tests doCheck = false; postInstall = '' diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix index 47c9d5f21aa2..05a7f3cb3fa2 100644 --- a/pkgs/development/python-modules/verlib2/default.nix +++ b/pkgs/development/python-modules/verlib2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "0.2.1"; pyproject = true; - # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # This tarball doesn't include tests unfortunately, and the GitHub tarball # could have been an alternative, but versioningit fails to detect the # version of it correctly, even with setuptools-scm and # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python diff --git a/pkgs/development/python-modules/xmind/default.nix b/pkgs/development/python-modules/xmind/default.nix index cd1510b263c5..3b5565955bdd 100644 --- a/pkgs/development/python-modules/xmind/default.nix +++ b/pkgs/development/python-modules/xmind/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "xC1WpHz2eHb5+xShM/QUQAIYnJNyK1EKWbTXJKhDwbQ="; }; - # Projec thas no tests + # Project thas no tests doCheck = false; pythonImportsCheck = [ "xmind" ]; diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/6/rocgdb/default.nix index cf51f05f9ee4..93484b42c40f 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/6/rocgdb/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - # Ensure we build the amdgpu traget + # Ensure we build the amdgpu target "--enable-targets=${stdenv.targetPlatform.config},amdgcn-amd-amdhsa" "--with-amd-dbgapi=yes" diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 6826682bf493..0a0b5818f375 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -14,7 +14,7 @@ # Then use rubyTool in the default.nix: # rubyTool { pname = "gemifiedTool"; gemdir = ./.; exes = ["gemified-tool"]; } -# The 'exes' parameter ensures that a copy of e.g. rake doesn't polute the system. +# The 'exes' parameter ensures that a copy of e.g. rake doesn't pollute the system. { # use the name of the name in question; its version will be picked up from the gemset pname, diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index f819173867c0..dd517b2a5d6b 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -1,7 +1,7 @@ # This builds gems in a way that is compatible with bundler. # # Bundler installs gems from git sources _very_ differently from how RubyGems -# installes gem packages, though they both install gem packages similarly. +# installs gem packages, though they both install gem packages similarly. # # We monkey-patch Bundler to remove any impurities and then drive its internals # to install git gems. diff --git a/pkgs/development/skaware-packages/build-skaware-package.nix b/pkgs/development/skaware-packages/build-skaware-package.nix index 2bb9340e6579..75a9716cb109 100644 --- a/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/pkgs/development/skaware-packages/build-skaware-package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { lib.assertMsg (!lib.elem "man" outputs) "If you pass `manpages` to `skawarePackages.buildPackage`, you cannot have a `man` output already!" ); - # insert as early as posible, but keep the first element + # insert as early as possible, but keep the first element if lib.length outputs > 0 then [ (lib.head outputs) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 195821e8333f..85182e74b690 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.31.0"; + version = "1.32.5"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-2418rlM8WdQ2b4wrtUC+6yCgy+wxfApQTaVDPXbnvKo="; + hash = "sha256-WiH0qiH3XiWiZ9RnfrIEC1Cq0d08hmpYL4quoh3Xvj0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dnC5MsfwqZZeZsbf80KkigOYHuG3qpHRGBRH66oM0Q0="; + cargoHash = "sha256-l12QzGEsVvgAKGTA/4rq3LpcsU7GJINsxq2yGtycMPI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index cebc3fe9bb68..f04e1a91ce82 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -94,7 +94,7 @@ let dontUnpack = true; dontBuild = true; - # darwin distributions come with libffmpeg dependecy + icudtl.dat file + # darwin distributions come with libffmpeg dependency + icudtl.dat file installPhase = '' runHook preInstall unzip $src diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 35b34db5a88b..e9d6d474e0a5 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -13,7 +13,7 @@ libiconv, xz, - # we are a dependency of gcc, this simplifies bootstraping + # we are a dependency of gcc, this simplifies bootstrapping interactive ? false, ncurses, procps, diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index b0ff25deebcf..2d5a798d7f21 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -14,7 +14,7 @@ libiconv, xz, - # we are a dependency of gcc, this simplifies bootstraping + # we are a dependency of gcc, this simplifies bootstrapping interactive ? false, ncurses, procps, diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index b0f2ea730331..39fd3f726caf 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; }; - # This should be fixed with the next verison bump + # This should be fixed with the next version bump # https://github.com/Andersbakken/rtags/issues/1411 patches = [ (fetchpatch { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 927c501bb413..6d7b27120555 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -35,7 +35,7 @@ let ; # Map Dwarf Fortress platform names to Nixpkgs platform names. - # Other srcs are avilable like 32-bit mac & win, but I have only + # Other srcs are available like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. platforms = { x86_64-linux = "linux"; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 95146c8f8804..f9ee4c923387 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -49,7 +49,7 @@ buildPythonApplication { ''; meta = with lib; { - # Fails to build, propably incompatible with latest Python + # Fails to build, probably incompatible with latest Python # error: Multiple top-level packages discovered in a flat-layout # https://github.com/RaaH/gscrabble/issues/13 broken = true; diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 77b2da8ad525..e2e8c2eac202 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -13,7 +13,7 @@ let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a separate file. + so instead we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/games/openra_2019/engine.nix b/pkgs/games/openra_2019/engine.nix index d5d79ede9a44..ae207f24729c 100644 --- a/pkgs/games/openra_2019/engine.nix +++ b/pkgs/games/openra_2019/engine.nix @@ -1,12 +1,12 @@ /* - The package defintion for an OpenRA engine. + The package definition for an OpenRA engine. It shares code with `mod.nix` by what is defined in `common.nix`. Similar to `mod.nix` it is a generic package definition, in order to make it easy to define multiple variants of the OpenRA engine. For each mod provided by the engine, a wrapper script is created, matching the naming convention used by `mod.nix`. This package could be seen as providing a set of in-tree mods, - while the `mod.nix` pacakges provide a single out-of-tree mod. + while the `mod.nix` packages provide a single out-of-tree mod. */ { lib, diff --git a/pkgs/games/openra_2019/mod.nix b/pkgs/games/openra_2019/mod.nix index 1241801e13c2..13152e7caa81 100644 --- a/pkgs/games/openra_2019/mod.nix +++ b/pkgs/games/openra_2019/mod.nix @@ -1,5 +1,5 @@ /* - The package defintion for an OpenRA out-of-tree mod. + The package definition for an OpenRA out-of-tree mod. It shares code with `engine.nix` by what is defined in `common.nix`. To build an out-of-tree mod it needs the source code of the engine available, and they each need to be build with a specific version or fork of the engine, diff --git a/pkgs/games/openra_2019/packages.nix b/pkgs/games/openra_2019/packages.nix index b38225464d86..abe2cc8ce8eb 100644 --- a/pkgs/games/openra_2019/packages.nix +++ b/pkgs/games/openra_2019/packages.nix @@ -4,7 +4,7 @@ let /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, - so instaed we define what is common between them in a separate file. + so instead we define what is common between them in a separate file. Although `callPackage` could be used, it would require undoing `makeOverridable`, because `common.nix` does not define a package, but just an attribute set, diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 4a5e15514124..47e607e42159 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchzip, + fetchpatch, cmake, pkg-config, SDL2, @@ -71,6 +72,16 @@ stdenv.mkDerivation rec { hash = "sha256-YT4IE/rJ9pnpeMWKbOra6AbSUwW19RwOKlXkxwoMeKY="; }; + patches = [ + # Fix build against icu-76: + # https://github.com/OpenTTD/OpenTTD/pull/13048 + (fetchpatch { + name = "icu-75.patch"; + url = "https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e.patch"; + hash = "sha256-L35ybnTKPO+HVP/7ZYzWM2mA+s1RAywhofSuzpy/6sc="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index d1e89f298e5c..7a47074e00e9 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -10,6 +10,7 @@ openttd.overrideAttrs (oldAttrs: rec { rev = "jgrpp-${version}"; hash = "sha256-aEmuwWNxqjuLmiWMrqwTUtCwdwDMA00eQspCHntxEXw="; }; + patches = []; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 1f0e1decad87..f4a556a8b548 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -1,4 +1,4 @@ -# idea: provide a build environments for your developement of preference +# idea: provide a build environments for your development of preference /* #### examples of use: #### # Add this to your ~/.config/nixpkgs/config.nix: diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index c3fc877c7479..0e6f623fe740 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -593,7 +593,7 @@ in { # A special build with much lower memory frequency (666 vs 1600 MT/s) which # makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing - # on that revision is marginal and not uncoditionally stable at the specified + # on that revision is marginal and not unconditionally stable at the specified # frequency. If your ROCK64 is unstable you can try this u-boot variant to # see if it works better for you. The only disadvantage is lowered memory # bandwidth. diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index c444975549ad..963c49ea1952 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -10,7 +10,7 @@ mkDerivation { "sys/modules/zfs/zfs_config.h" ]; - # Without a prefix it will try to put object files in nonexistant directories + # Without a prefix it will try to put object files in nonexistent directories preBuild = '' export MAKEOBJDIRPREFIX=$TMP/obj ''; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix index fcb4b29dc14d..4796b6d6a651 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libzfs.nix @@ -14,11 +14,11 @@ # or cddl/lib/Makefile let libs = [ - # Not really "zfs" libraries, they're solaris compatiblity libraries + # Not really "zfs" libraries, they're solaris compatibility libraries "libspl" "libumem" - # Libraires with no dependencies here execpt libumem and libspl + # Libraries with no dependencies here except libumem and libspl "libavl" "libicp" "libnvpair" @@ -61,7 +61,7 @@ mkDerivation { ''; # If we don't specify an object directory then - # make will try to put openzfs objects in nonexistant directories. + # make will try to put openzfs objects in nonexistent directories. # This one seems to work preBuild = '' diff --git a/pkgs/os-specific/darwin/libunwind/default.nix b/pkgs/os-specific/darwin/libunwind/default.nix index a19bfc6864e3..4923348b24a3 100644 --- a/pkgs/os-specific/darwin/libunwind/default.nix +++ b/pkgs/os-specific/darwin/libunwind/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "libunwind"; inherit (apple-sdk) version; - # No `-lunwind` is provided becuase you get it automatically from linking with libSystem. + # No `-lunwind` is provided because you get it automatically from linking with libSystem. # It’s also not possible to link libunwind directly, otherwise. Darwin requires going through libSystem. buildCommand = '' mkdir -p "$out/lib/pkgconfig" diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index c7aaa3789d6d..5d1ff0bed6af 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ipu6-drivers"; - version = "unstable-2024-11-19"; + version = "unstable-2025-02-19"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-drivers"; - rev = "0ad4988248d7e9382498a0b47fc78bb990b29a58"; - hash = "sha256-UFvwuoAzwk1k4YiUK+4EeMKeTx9nVvBgBN5JKAfqZkQ="; + rev = "7af071481f3d2d3cef1e70113c10f62ac6351723"; + hash = "sha256-pe7lqK+CHpgNWpC8GEZ3FKfYcuVuRUaWlW18D9AsrSk="; }; patches = [ diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9e9b4bb73894..1b35b83477ee 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.13.3"; # zen + version = "6.13.4"; # zen suffix = "zen1"; # zen - sha256 = "1z7zmvppdl77zn66lcf8fsrlsm56lz2xjimzwsc30vs8jgp91rq0"; # zen + sha256 = "04dnc6k15jslwbpk1fiayh730nd9rbz9sdwj1qabihc5lqz735f5"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index a0d7a58fe87c..82b12a07beec 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { stripLen = 1; }) - # securtiy patch for potential buffer overflow + # security patch for potential buffer overflow # https://github.com/gnif/LookingGlass/issues/1133 (fetchpatch { url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch"; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/heirloom/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/heirloom/default.nix index 2eece86cf1d3..a3aa461b2271 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/heirloom/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/heirloom/default.nix @@ -27,7 +27,7 @@ let # "tcc -ar" doesn't support creating empty archives ./tcc-empty-ar.patch - # meslibc doesn't have seperate libm + # meslibc doesn't have separate libm ./dont-link-lm.patch # meslibc's vprintf doesn't support %ll ./vprintf.patch diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix index a28b184f6d38..84b07682015d 100644 --- a/pkgs/os-specific/linux/scx/scx_cscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix @@ -95,7 +95,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { (lib.mapAttrsToList lib.mesonBool { # needed libs are already fetched as FOD "offline" = true; - # rust based schedulers are built seperately + # rust based schedulers are built separately "enable_rust" = false; }) # Clang to use when compiling .bpf.c diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 6d8a46afd2c6..0c80a69f4888 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linux-thinkpad/tp_smapi"; license = lib.licenses.gpl2Plus; maintainers = [ ]; - # driver is only ment for linux thinkpads i think bellow platforms should cover it. + # driver is only meant for linux thinkpads i think bellow platforms should cover it. platforms = [ "x86_64-linux" "i686-linux" diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 523e19b2d01b..2a2138bdbd10 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -96,7 +96,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; - path = ./formats.nix; + path = ./testfile; }; expected = '' { @@ -111,7 +111,7 @@ in runBuildTests { null ], "null": null, - "path": "${./formats.nix}", + "path": "${./testfile}", "str": "foo", "true": true } @@ -128,7 +128,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; - path = ./formats.nix; + path = ./testfile; no = "no"; time = "22:30:00"; }; @@ -142,7 +142,7 @@ in runBuildTests { - null 'no': 'no' 'null': null - path: ${./formats.nix} + path: ${./testfile} str: foo time: '22:30:00' 'true': true @@ -547,7 +547,7 @@ in runBuildTests { 1 null ]; - path = ./formats.nix; + path = ./testfile; }; expected = '' attrs { @@ -561,7 +561,7 @@ in runBuildTests { null ] "null": null - "path": "${./formats.nix}" + "path": "${./testfile}" "str": "foo" "true": true ''; diff --git a/pkgs/pkgs-lib/tests/testfile b/pkgs/pkgs-lib/tests/testfile new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/pkgs-lib/tests/testfile diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 3d74a30b3273..81458cdb0339 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -22,7 +22,7 @@ # The fourth and final goal is debugging. Normal packages should only source # their dependencies from the current stage. But for the sake of debugging, it # is nice that all packages still remain accessible. We make sure previous -# stages are kept around with a `stdenv.__bootPackges` attribute referring the +# stages are kept around with a `stdenv.__bootPackages` attribute referring the # previous stage. It is idiomatic that attributes prefixed with `__` come with # special restrictions and should not be used under normal circumstances. { lib, allPackages }: diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dd1035cc3d53..1f45c621be72 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -220,7 +220,7 @@ let }; # Dependencies - these are packages that are rebuilt together in groups. Defining them here ensures they are - # asserted and overlayed together. It also removes a lot of clutter from the stage definitions. + # asserted and overlaid together. It also removes a lot of clutter from the stage definitions. # # When multiple dependency sets share a dependency, it should be put in the one that will be (re)built first. # That makes sure everything else will share the same dependency in the final stdenv. @@ -954,7 +954,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # inputs. The following set of overrides allow the LLVM documentation to be built without # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap. # - # However, even without darwin.binutils-unwrapped, this has to be overriden in the LLVM package set + # However, even without darwin.binutils-unwrapped, this has to be overridden in the LLVM package set # because otherwise llvmPackages.llvm-manpages on its own is broken. llvm-manpages = superTools.llvm-manpages.override { python3Packages = self.python3.pkgs.overrideScope ( diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index d88ba53fbb47..6f0aa50e9083 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -407,7 +407,7 @@ else let # Derivations set it to choose what sort of machine could be used to # execute the build, The build platform entirely determines this, # indeed more finely than Nix knows or cares about. The `system` - # attribute of `buildPlatfom` matches Nix's degree of specificity. + # attribute of `buildPlatform` matches Nix's degree of specificity. # exactly. inherit (stdenv.buildPlatform) system; diff --git a/pkgs/test/coq/overrideCoqDerivation/default.nix b/pkgs/test/coq/overrideCoqDerivation/default.nix index 03253981af68..6b134fe09ad8 100644 --- a/pkgs/test/coq/overrideCoqDerivation/default.nix +++ b/pkgs/test/coq/overrideCoqDerivation/default.nix @@ -8,7 +8,7 @@ let # This is just coq, but with dontFilter set to true. We need to set - # dontFilter to true here so that _all_ packages are visibile in coqPackages. + # dontFilter to true here so that _all_ packages are visible in coqPackages. # There may be some versions of the top-level coq and coqPackages that don't # build QuickChick, which is what we are using for this test below. coqWithAllPackages = coq // { diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 30c16ff1ef44..eed21e73c364 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -10,7 +10,7 @@ }: let - # Mapping from GCS component architecture names to Nix archictecture names + # Mapping from GCS component architecture names to Nix architecture names arches = { x86 = "i686"; x86_64 = "x86_64"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 8cc13b4a0b0e..942eed2ca15d 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -511,7 +511,7 @@ rec { # | ^~~~~~~~~~~~~~~~~~ # Looks like `close()` is somehow not included. # But the relevant code is already removed in `open-telemetry` 1.10: https://github.com/open-telemetry/opentelemetry-cpp/pull/2031 - # So it's proably not worth trying to fix that for this Ceph version, + # So it's probably not worth trying to fix that for this Ceph version, # and instead just disable Ceph's Jaeger support. "-DWITH_JAEGER:BOOL=OFF" "-DWITH_TESTS:BOOL=OFF" diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 6cc7a02caade..149a0d04bd98 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -127,7 +127,7 @@ in description = "Portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; license = { - # Essentially a BSD license with one modifaction: + # Essentially a BSD license with one modification: # Permission to modify the software is granted, but not the right to # distribute the complete modified source code. Modifications are to # be distributed as patches to the released version. Permission to diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index 7d5289010daa..cf8bc4ea0a1a 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { strictDeps = true; - # reconf needed to sucesfully cross-compile + # reconf needed to successfully cross-compile nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index d2a46860416a..b11f637d104f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -84,7 +84,7 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - # version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled + # version 4 or newer would log the following error but tests currently don't fail because radare2 is disabled # ValueError: argument TNULL is not a TLSH hex string tlsh = prev.tlsh.overridePythonAttrs ( { src, ... }: diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 50917c8f683a..1c0f59f2d54f 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.118.0"; + version = "0.120.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-dx60Ai+IBF0lzAj73LqMm1oeP0o5FI9B7n+dk5vBloc="; + hash = "sha256-rGRo72Dsif11A0UaLktZS2r+9MToI6esnRGtODr2tHU="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-8g/92NOCj/mH1szrKR04R+Yy9GBYNnQFMi9KhqGKelU="; + vendorHash = "sha256-bfX43zWp3Zo627H/Zfhzy0R87ShXuP637JX4d5mVwsQ="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix index 8c8c2cde5bb0..a4d8cc4a188b 100644 --- a/pkgs/tools/misc/opentelemetry-collector/releases.nix +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -26,7 +26,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-collector-releases"; rev = "v${version}"; - hash = "sha256-wHi3/rby/AA37x3BCbTXlLgRaN4DpATLSXpQb31Jr/o="; + hash = "sha256-VJ/lIvTXU8jbmoA0eONotxIwo9TT8MZbbu7hbO0PK7k="; }; # Then from this src, we use the tool to generate some go code, including @@ -149,26 +149,26 @@ in lib.recurseIntoAttrs { otelcol = mkDistribution { name = "otelcol"; - sourceHash = "sha256-EGO5ns2Xi0g8PvPGdzMVxMJcPXvxaZDDi4YaJnIUAFc="; - vendorHash = "sha256-dCSOGT0n0I5Oxw30uNeg184Me7hwZUfDuvl1IOdVBeo="; + sourceHash = "sha256-faGOyieJ5uEXWIsQ2OD8fDVQbZxyKxqVxhS/eHhe1hI="; + vendorHash = "sha256-ACewGFHAa99Mu4xtn0vV8++im5CfqSuNT5w7A41lepE="; }; otelcol-contrib = mkDistribution { name = "otelcol-contrib"; - sourceHash = "sha256-1TIzfR9F6iwSwoDc08SdOWYH378Y3qjwOcQ4IDbHTWE="; - vendorHash = "sha256-AmSn2M+HkOpZ0ev6Gjb+gaeE+h70W/RtXKMqaModJPs="; + sourceHash = "sha256-NOvzp2izfSsNsvYV0/5bS1SDrqG2fYdKBHR82h7RiKU="; + vendorHash = "sha256-8sUQIe8RiHw8Mw9/CuxpEPyROY7eSKmBg5t4gKaU74w="; proxyVendor = true; # hash mismatch between linux and darwin }; otelcol-k8s = mkDistribution { name = "otelcol-k8s"; - sourceHash = "sha256-WffBw41dZ/e5/d22ny6611pFReUVeO5lmtqqfaSdGLs="; - vendorHash = "sha256-3EVJxma9U7FTzt1jIxotavMespFpCpU/oAAKMC0ya2E="; + sourceHash = "sha256-ACEi0YFMZvr64JAvjwZMQQTecFHx35jF8458lmUJq9Q="; + vendorHash = "sha256-pIOAKqR4LA/z5B8yESokHpdvHmXh75fc6D+uaHm1GSI="; }; otelcol-otlp = mkDistribution { name = "otelcol-otlp"; - sourceHash = "sha256-YQ9dIY9MdX0WtuOnFCZapDDWSl02S/dlTNce6RV48MM="; - vendorHash = "sha256-4wiIgYa9eHvGxDgLbqWPTus9zBznYJ4lpsIUvRjRYUQ="; + sourceHash = "sha256-H9Um4qVTjW28L/FvgNRS7EUevZ9h60r+Xl8X4ktcXy4="; + vendorHash = "sha256-Cl+bdVF+rlcdiOskP0Nybo77asz1lVVp6EnSiJxLiKY="; }; } diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index cfe99237fb2c..581ac08c5bd6 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-wm3zse5VqUNZ5d6ksCXXrngCcwrAniQbQqx9MOJoK58="; + hash = "sha256-yZGMibh6Qo4gIwj5v0LRt7kdrHGsJ1OG3ACvVKZY7hQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3deZMc1zrauldUZnFHYSRe2UjqWwYY7ePGBEE8g9g1g="; + cargoHash = "sha256-O2Y0LT16p8tV02OFFgKwPIPn7+qeACJPtT0VWLSyCVE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/package-management/akku/akku.nix b/pkgs/tools/package-management/akku/akku.nix index 160368fdd808..d487a20d85b3 100644 --- a/pkgs/tools/package-management/akku/akku.nix +++ b/pkgs/tools/package-management/akku/akku.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { git ]; - # Use a dummy package index to boostrap Akku + # Use a dummy package index to bootstrap Akku preBuild = '' touch bootstrap.db ''; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index c7b66de2d019..1da527cd692a 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -153,7 +153,7 @@ let lib.assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && lib.assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; - # Pre-defined evironment packages for TeX Live schemes, + # Pre-defined environment packages for TeX Live schemes, # to make nix-env usage more comfortable and build selected on Hydra. # these license lists should be the sorted union of the licenses of the packages the schemes contain. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa8a674da1a0..1b8e81bac8bc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1462,6 +1462,7 @@ mapAliases { termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 + thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd1df376f72d..5b3e79a75a6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1058,6 +1058,8 @@ with pkgs; pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; + py7zr = with python3Packages; toPythonApplication py7zr; + q = callPackage ../tools/networking/q { }; qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 185ecbe78436..f3c7a998019a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -212,7 +212,7 @@ in rec { * a set of libraries built with that specific Coq. More libraries are known to * this function than what is compatible with that version of Coq. Therefore, * libraries that are not known to be compatible are removed (filtered out) from - * the resulting set. For meta-programming purposes (inpecting the derivations + * the resulting set. For meta-programming purposes (inspecting the derivations * rather than building the libraries) this filtering can be disabled by setting * a `dontFilter` attribute into the Coq derivation. */ diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 5c1c518222ca..4da43f0bd117 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -11,7 +11,7 @@ # # To summarize: # -# - `prev` should only be used to access attributes which are going to be overriden. +# - `prev` should only be used to access attributes which are going to be overridden. # - `final` should only be used to access `callPackage` to build new packages. # - Attribute names should be computable without relying on `final`. # - Extensions should take arguments to build attribute names before relying on `final`. diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index fd443ac773ff..3888ccc9d9a1 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -148,7 +148,7 @@ in let # experience here.) nixpkgsFun = newArgs: import ./. (args // newArgs); - # Partially apply some arguments for building bootstraping stage pkgs + # Partially apply some arguments for building bootstrapping stage pkgs # sets. Only apply arguments which no stdenv would want to override. allPackages = newArgs: import ./stage.nix ({ inherit lib nixpkgsFun; diff --git a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix index 4773438ebd1c..1979006bf262 100644 --- a/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix +++ b/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -37,7 +37,7 @@ let # We return `null` instead of doing a `filterAttrs`, because with # `filterAttrs` the evaluator would not be able to return the attribute # set without first evaluating all of the attribute _values_. This would - # be rather expensive, and severly slow down the use case of getting a + # be rather expensive, and severely slow down the use case of getting a # single test, which we want to do in `passthru.tests`, or interactively. null diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 277c0614b7fc..fa6c77666d55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -998,6 +998,8 @@ self: super: with self; { atomman = callPackage ../development/python-modules/atomman { }; + atproto = callPackage ../development/python-modules/atproto { }; + atpublic = callPackage ../development/python-modules/atpublic { }; atsim-potentials = callPackage ../development/python-modules/atsim-potentials { }; @@ -5354,6 +5356,8 @@ self: super: with self; { github3-py = callPackage ../development/python-modules/github3-py { }; + gitingest = callPackage ../development/python-modules/gitingest { }; + gitignore-parser = callPackage ../development/python-modules/gitignore-parser { }; gitlike-commands = callPackage ../development/python-modules/gitlike-commands { }; @@ -6394,6 +6398,8 @@ self: super: with self; { infinity = callPackage ../development/python-modules/infinity { }; + inflate64 = callPackage ../development/python-modules/inflate64 { }; + inflect = callPackage ../development/python-modules/inflect { }; inflection = callPackage ../development/python-modules/inflection { }; @@ -7403,6 +7409,8 @@ self: super: with self; { inherit python; })).python; + libipld = callPackage ../development/python-modules/libipld { }; + libkeepass = callPackage ../development/python-modules/libkeepass { }; libknot = callPackage ../development/python-modules/libknot { }; @@ -8700,6 +8708,8 @@ self: super: with self; { multitasking = callPackage ../development/python-modules/multitasking { }; + multivolumefile = callPackage ../development/python-modules/multivolumefile { }; + munch = callPackage ../development/python-modules/munch { }; mung = callPackage ../development/python-modules/mung { }; @@ -10712,6 +10722,8 @@ self: super: with self; { py65 = callPackage ../development/python-modules/py65 { }; + py7zr = callPackage ../development/python-modules/py7zr { }; + pyabpoa = toPythonModule (pkgs.abpoa.override { enablePython = true; python3Packages = self; @@ -10727,6 +10739,8 @@ self: super: with self; { pyatome = callPackage ../development/python-modules/pyatome { }; + pybcj = callPackage ../development/python-modules/pybcj { }; + pycketcasts = callPackage ../development/python-modules/pycketcasts { }; pycolorecho = callPackage ../development/python-modules/pycolorecho { }; @@ -10856,6 +10870,8 @@ self: super: with self; { pypoolstation = callPackage ../development/python-modules/pypoolstation { }; + pyppmd = callPackage ../development/python-modules/pyppmd { }; + pyrail = callPackage ../development/python-modules/pyrail { }; pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c99caa4d3d12..fb9632c100d0 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -1,4 +1,4 @@ -# Extension with Python 2 packages that is overlayed on top +# Extension with Python 2 packages that is overlaid on top # of the Python 3 packages set. This way, Python 2+3 compatible # packages can still be used. diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d29382562986..ded7924f146f 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -194,7 +194,7 @@ in fuloongminipc = mapTestOnCross systems.examples.fuloongminipc linuxCommon; ben-nanonote = mapTestOnCross systems.examples.ben-nanonote linuxCommon; - /* Javacript */ + /* Javascript */ ghcjs = mapTestOnCross systems.examples.ghcjs { haskell.packages.ghcjs.hello = nativePlatforms; haskell.packages.native-bignum.ghcHEAD.hello = nativePlatforms; diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix index 44a59c87c407..a6478bda519f 100644 --- a/pkgs/top-level/rocq-packages.nix +++ b/pkgs/top-level/rocq-packages.nix @@ -41,7 +41,7 @@ in rec { * a set of libraries built with that specific Rocq. More libraries are known to * this function than what is compatible with that version of Rocq. Therefore, * libraries that are not known to be compatible are removed (filtered out) from - * the resulting set. For meta-programming purposes (inpecting the derivations + * the resulting set. For meta-programming purposes (inspecting the derivations * rather than building the libraries) this filtering can be disabled by setting * a `dontFilter` attribute into the Rocq derivation. */ |