diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 42acab817b6a..523f5b26ec7f 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -11,7 +11,13 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: -- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. `vendorHash` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorHash = null;` +- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. + + `vendorHash` can also be set to `null`. + In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used. + + To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` + To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums. ```nix diff --git a/lib/default.nix b/lib/default.nix index cc4bedc5869b..68e5b8dea1eb 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -101,6 +101,7 @@ let upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion + mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature withFeatureAs fixedWidthString fixedWidthNumber isStorePath toInt toIntBase10 readPathsFromFile fileContents; diff --git a/lib/strings.nix b/lib/strings.nix index b5f5a4d9060b..96dfb779cd6f 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -661,6 +661,61 @@ rec { name = head (splitString sep filename); in assert name != filename; name; + /* Create a -D= string that can be passed to typical Meson + invocations. + + Type: mesonOption :: string -> string -> string + + @param feature The feature to be set + @param value The desired value + + Example: + mesonOption "engine" "opengl" + => "-Dengine=opengl" + */ + mesonOption = feature: value: + assert (lib.isString feature); + assert (lib.isString value); + "-D${feature}=${value}"; + + /* Create a -D={true,false} string that can be passed to typical + Meson invocations. + + Type: mesonBool :: string -> bool -> string + + @param condition The condition to be made true or false + @param flag The controlling flag of the condition + + Example: + mesonBool "hardened" true + => "-Dhardened=true" + mesonBool "static" false + => "-Dstatic=false" + */ + mesonBool = condition: flag: + assert (lib.isString condition); + assert (lib.isBool flag); + mesonOption condition (lib.boolToString flag); + + /* Create a -D={enabled,disabled} string that can be passed to + typical Meson invocations. + + Type: mesonEnable :: string -> bool -> string + + @param feature The feature to be enabled or disabled + @param flag The controlling flag + + Example: + mesonEnable "docs" true + => "-Ddocs=enabled" + mesonEnable "savage" false + => "-Dsavage=disabled" + */ + mesonEnable = feature: flag: + assert (lib.isString feature); + assert (lib.isBool flag); + mesonOption feature (if flag then "enabled" else "disabled"); + /* Create an --{enable,disable}- string that can be passed to standard GNU Autoconf scripts. diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c75f9aa71773..5e5a61875dbf 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -506,6 +506,18 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + node = { + members = [ + lilyinstarlight + marsam + winter + yuka + ]; + scope = "Maintain Node.js runtimes and build tooling."; + shortName = "Node.js"; + enableFeatureFreezePing = true; + }; + numtide = { members = [ mic92 diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 914be23576e0..61daeac86a64 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -22,7 +22,14 @@
New Services - + + + + blesh, + a line editor written in pure bash. Available as + programs.bash.blesh. + + fzf, diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 3640cf8e963e..f9c76b02f891 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -14,6 +14,8 @@ In addition to numerous new and upgraded packages, this release has the followin +- [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable). + - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e097aa5eebd8..694512115d40 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -111,14 +111,16 @@ in rec { inherit optionsNix; optionsAsciiDoc = pkgs.runCommand "options.adoc" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateAsciiDoc.py} \ - < ${optionsJSON}/share/doc/nixos/options.json \ + ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ + --format asciidoc \ + ${optionsJSON}/share/doc/nixos/options.json \ > $out ''; optionsCommonMark = pkgs.runCommand "options.md" {} '' - ${pkgs.python3Minimal}/bin/python ${./generateCommonMark.py} \ - < ${optionsJSON}/share/doc/nixos/options.json \ + ${pkgs.python3Minimal}/bin/python ${./generateDoc.py} \ + --format commonmark \ + ${optionsJSON}/share/doc/nixos/options.json \ > $out ''; diff --git a/nixos/lib/make-options-doc/generateAsciiDoc.py b/nixos/lib/make-options-doc/generateAsciiDoc.py deleted file mode 100644 index 48eadd248c5a..000000000000 --- a/nixos/lib/make-options-doc/generateAsciiDoc.py +++ /dev/null @@ -1,37 +0,0 @@ -import json -import sys - -options = json.load(sys.stdin) -# TODO: declarations: link to github -for (name, value) in options.items(): - print(f'== {name}') - print() - print(value['description']) - print() - print('[discrete]') - print('=== details') - print() - print(f'Type:: {value["type"]}') - if 'default' in value: - print('Default::') - print('+') - print('----') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) - print('----') - print() - else: - print('No Default:: {blank}') - if value['readOnly']: - print('Read Only:: {blank}') - else: - print() - if 'example' in value: - print('Example::') - print('+') - print('----') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) - print('----') - print() - else: - print('No Example:: {blank}') - print() diff --git a/nixos/lib/make-options-doc/generateCommonMark.py b/nixos/lib/make-options-doc/generateCommonMark.py deleted file mode 100644 index bf487bd89c3f..000000000000 --- a/nixos/lib/make-options-doc/generateCommonMark.py +++ /dev/null @@ -1,27 +0,0 @@ -import json -import sys - -options = json.load(sys.stdin) -for (name, value) in options.items(): - print('##', name.replace('<', '<').replace('>', '>')) - print(value['description']) - print() - if 'type' in value: - print('*_Type_*:') - print(value['type']) - print() - print() - if 'default' in value: - print('*_Default_*') - print('```') - print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) - print('```') - print() - print() - if 'example' in value: - print('*_Example_*') - print('```') - print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) - print('```') - print() - print() diff --git a/nixos/lib/make-options-doc/generateDoc.py b/nixos/lib/make-options-doc/generateDoc.py new file mode 100644 index 000000000000..1fe4eb0253ad --- /dev/null +++ b/nixos/lib/make-options-doc/generateDoc.py @@ -0,0 +1,108 @@ +import argparse +import json +import sys + +formats = ['commonmark', 'asciidoc'] + +parser = argparse.ArgumentParser( + description = 'Generate documentation for a set of JSON-formatted NixOS options' +) +parser.add_argument( + 'nix_options_path', + help = 'a path to a JSON file containing the NixOS options' +) +parser.add_argument( + '-f', + '--format', + choices = formats, + required = True, + help = f'the documentation format to generate' +) + +args = parser.parse_args() + +# Pretty-print certain Nix types, like literal expressions. +def render_types(obj): + if '_type' not in obj: return obj + + _type = obj['_type'] + if _type == 'literalExpression' or _type == 'literalDocBook': + return obj['text'] + + if _type == 'derivation': + return obj['name'] + + raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}') + +def generate_commonmark(options): + for (name, value) in options.items(): + print('##', name.replace('<', '<').replace('>', '>')) + print(value['description']) + print() + if 'type' in value: + print('*_Type_*') + print ('```') + print(value['type']) + print ('```') + print() + print() + if 'default' in value: + print('*_Default_*') + print('```') + print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) + print('```') + print() + print() + if 'example' in value: + print('*_Example_*') + print('```') + print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) + print('```') + print() + print() + +# TODO: declarations: link to github +def generate_asciidoc(options): + for (name, value) in options.items(): + print(f'== {name}') + print() + print(value['description']) + print() + print('[discrete]') + print('=== details') + print() + print(f'Type:: {value["type"]}') + if 'default' in value: + print('Default::') + print('+') + print('----') + print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':'))) + print('----') + print() + else: + print('No Default:: {blank}') + if value['readOnly']: + print('Read Only:: {blank}') + else: + print() + if 'example' in value: + print('Example::') + print('+') + print('----') + print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':'))) + print('----') + print() + else: + print('No Example:: {blank}') + print() + +with open(args.nix_options_path) as nix_options_json: + options = json.load(nix_options_json, object_hook=render_types) + + if args.format == 'commonmark': + generate_commonmark(options) + elif args.format == 'asciidoc': + generate_asciidoc(options) + else: + raise Exception(f'Unsupported documentation format `--format {args.format}`') + diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 18ea1f52a976..e5699161ec4b 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -43,6 +43,7 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index af6917ccab6f..24dd30e15750 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -135,6 +135,7 @@ ./programs/bandwhich.nix ./programs/bash/bash.nix ./programs/bash/bash-completion.nix + ./programs/bash/blesh.nix ./programs/bash/ls-colors.nix ./programs/bash/undistract-me.nix ./programs/bash-my-aws.nix @@ -1141,6 +1142,7 @@ ./services/web-apps/onlyoffice.nix ./services/web-apps/pict-rs.nix ./services/web-apps/peertube.nix + ./services/web-apps/peering-manager.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/pgpkeyserver-lite.nix diff --git a/nixos/modules/programs/bash/blesh.nix b/nixos/modules/programs/bash/blesh.nix new file mode 100644 index 000000000000..0a9aa6242425 --- /dev/null +++ b/nixos/modules/programs/bash/blesh.nix @@ -0,0 +1,16 @@ +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.programs.bash.blesh; +in { + options = { + programs.bash.blesh.enable = mkEnableOption (mdDoc "blesh"); + }; + + config = mkIf cfg.enable { + programs.bash.interactiveShellInit = mkBefore '' + source ${pkgs.blesh}/share/ble.sh + ''; + }; + meta.maintainers = with maintainers; [ laalsaas ]; +} diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 8b90c1913bc5..6453e6968dcc 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -50,14 +50,8 @@ in type = types.package; default = pkgs.bluez; defaultText = literalExpression "pkgs.bluez"; - example = literalExpression "pkgs.bluezFull"; description = lib.mdDoc '' Which BlueZ package to use. - - ::: {.note} - Use the `pkgs.bluezFull` package to enable all - bluez plugins. - ::: ''; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 8122c2449491..35b96734be77 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -546,7 +546,7 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ]; @@ -574,7 +574,7 @@ in { ExecStart = "${cfg.package}/run-streaming.sh"; Restart = "always"; RestartSec = 20; - EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-streaming"; @@ -601,7 +601,7 @@ in { ExecStart = "${cfg.package}/bin/puma -C config/puma.rb"; Restart = "always"; RestartSec = 20; - EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-web"; @@ -629,7 +629,7 @@ in { ExecStart = "${cfg.package}/bin/sidekiq -c ${toString cfg.sidekiqThreads} -r ${cfg.package}"; Restart = "always"; RestartSec = 20; - EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ]; @@ -642,7 +642,7 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - EnvironmentFile = "/var/lib/mastodon/.secrets_env"; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; } // cfgService; script = let olderThanDays = toString cfg.mediaAutoRemove.olderThanDays; diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix new file mode 100644 index 000000000000..0db2e8e4aeda --- /dev/null +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -0,0 +1,265 @@ +{ config, lib, pkgs, buildEnv, ... }: + +with lib; + +let + cfg = config.services.peering-manager; + configFile = pkgs.writeTextFile { + name = "configuration.py"; + text = '' + ALLOWED_HOSTS = ['*'] + DATABASE = { + 'NAME': 'peering-manager', + 'USER': 'peering-manager', + 'HOST': '/run/postgresql', + } + + # Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate + # configuration exists for each. Full connection details are required in both sections, and it is strongly recommended + # to use two separate database IDs. + REDIS = { + 'tasks': { + 'UNIX_SOCKET_PATH': '${config.services.redis.servers.peering-manager.unixSocket}', + 'DATABASE': 0, + }, + 'caching': { + 'UNIX_SOCKET_PATH': '${config.services.redis.servers.peering-manager.unixSocket}', + 'DATABASE': 1, + } + } + + with open("${cfg.secretKeyFile}", "r") as file: + SECRET_KEY = file.readline() + '' + lib.optionalString (cfg.peeringdbApiKeyFile != null) '' + with open("${cfg.peeringdbApiKeyFile}", "r") as file: + PEERINGDB_API_KEY = file.readline() + '' + '' + + ${cfg.extraConfig} + ''; + }; + pkg = (pkgs.peering-manager.overrideAttrs (old: { + postInstall = '' + ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py + '' + optionalString cfg.enableLdap '' + ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py + ''; + })).override { + inherit (cfg) plugins; + }; + peeringManagerManageScript = with pkgs; (writeScriptBin "peering-manager-manage" '' + #!${stdenv.shell} + export PYTHONPATH=${pkg.pythonPath} + sudo -u peering-manager ${pkg}/bin/peering-manager "$@" + ''); + +in { + options.services.peering-manager = { + enable = mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enable Peering Manager. + + This module requires a reverse proxy that serves `/static` separately. + See this [example](https://github.com/peering-manager-community/peering-manager/blob/develop/contrib/nginx.conf/) on how to configure this. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "[::1]"; + description = lib.mdDoc '' + Address the server will listen on. + ''; + }; + + port = mkOption { + type = types.port; + default = 8001; + description = lib.mdDoc '' + Port the server will listen on. + ''; + }; + + plugins = mkOption { + type = types.functionTo (types.listOf types.package); + default = _: []; + defaultText = literalExpression '' + python3Packages: with python3Packages; []; + ''; + description = lib.mdDoc '' + List of plugin packages to install. + ''; + }; + + secretKeyFile = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to a file containing the secret key. + ''; + }; + + peeringdbApiKeyFile = mkOption { + type = with types; nullOr path; + default = null; + description = lib.mdDoc '' + Path to a file containing the PeeringDB API key. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = lib.mdDoc '' + Additional lines of configuration appended to the `configuration.py`. + See the [documentation](https://peering-manager.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options. + ''; + }; + + enableLdap = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable LDAP-Authentication for Peering Manager. + + This requires a configuration file being pass through `ldapConfigPath`. + ''; + }; + + ldapConfigPath = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`. + See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options. + ''; + }; + }; + + config = mkIf cfg.enable { + services.peering-manager.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + + system.build.peeringManagerPkg = pkg; + + services.redis.servers.peering-manager.enable = true; + + services.postgresql = { + enable = true; + ensureDatabases = [ "peering-manager" ]; + ensureUsers = [ + { + name = "peering-manager"; + ensurePermissions = { + "DATABASE \"peering-manager\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + environment.systemPackages = [ peeringManagerManageScript ]; + + systemd.targets.peering-manager = { + description = "Target for all Peering Manager services"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" "redis-peering-manager.service" ]; + }; + + systemd.services = let + defaultServiceConfig = { + WorkingDirectory = "/var/lib/peering-manager"; + User = "peering-manager"; + Group = "peering-manager"; + StateDirectory = "peering-manager"; + StateDirectoryMode = "0750"; + Restart = "on-failure"; + }; + in { + peering-manager-migration = { + description = "Peering Manager migrations"; + wantedBy = [ "peering-manager.target" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + Type = "oneshot"; + ExecStart = '' + ${pkg}/bin/peering-manager migrate + ''; + }; + }; + + peering-manager = { + description = "Peering Manager WSGI Service"; + wantedBy = [ "peering-manager.target" ]; + after = [ "peering-manager-migration.service" ]; + + preStart = '' + ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input + ''; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + ExecStart = '' + ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \ + --bind ${cfg.listenAddress}:${toString cfg.port} \ + --pythonpath ${pkg}/opt/peering-manager + ''; + }; + }; + + peering-manager-rq = { + description = "Peering Manager Request Queue Worker"; + wantedBy = [ "peering-manager.target" ]; + after = [ "peering-manager.service" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + ExecStart = '' + ${pkg}/bin/peering-manager rqworker high default low + ''; + }; + }; + + peering-manager-housekeeping = { + description = "Peering Manager housekeeping job"; + after = [ "peering-manager.service" ]; + + environment = { + PYTHONPATH = pkg.pythonPath; + }; + + serviceConfig = defaultServiceConfig // { + Type = "oneshot"; + ExecStart = '' + ${pkg}/bin/peering-manager housekeeping + ''; + }; + }; + }; + + systemd.timers.peering-manager-housekeeping = { + description = "Run Peering Manager housekeeping job"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = "daily"; + }; + }; + + users.users.peering-manager = { + home = "/var/lib/peering-manager"; + isSystemUser = true; + group = "peering-manager"; + }; + users.groups.peering-manager = {}; + users.groups."${config.services.redis.servers.peering-manager.user}".members = [ "peering-manager" ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 8e6a44428fce..aaad1de5f87b 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -67,11 +67,11 @@ in # Taken from mint-artwork.gschema.override theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) { - name = mkDefault "Mint-X"; + name = mkDefault "Mint-Y-Aqua"; package = mkDefault pkgs.cinnamon.mint-themes; }; iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) { - name = mkDefault "Mint-X-Dark"; + name = mkDefault "Mint-Y-Aqua"; package = mkDefault pkgs.cinnamon.mint-x-icons; }; cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4d652210baae..70cd995ececa 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -489,6 +489,7 @@ in { parsedmarc = handleTest ./parsedmarc {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; + peering-manager = handleTest ./web-apps/peering-manager.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; pgadmin4 = handleTest ./pgadmin4.nix {}; pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; diff --git a/nixos/tests/bazarr.nix b/nixos/tests/bazarr.nix index 2e49c958dd00..e59833e5e945 100644 --- a/nixos/tests/bazarr.nix +++ b/nixos/tests/bazarr.nix @@ -16,7 +16,6 @@ in enable = true; listenPort = port; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"]; }; testScript = '' diff --git a/nixos/tests/web-apps/peering-manager.nix b/nixos/tests/web-apps/peering-manager.nix new file mode 100644 index 000000000000..56b7eebfadff --- /dev/null +++ b/nixos/tests/web-apps/peering-manager.nix @@ -0,0 +1,40 @@ +import ../make-test-python.nix ({ lib, pkgs, ... }: { + name = "peering-manager"; + + meta = with lib.maintainers; { + maintainers = [ yuka ]; + }; + + nodes.machine = { ... }: { + services.peering-manager = { + enable = true; + secretKeyFile = pkgs.writeText "secret" '' + abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + ''; + }; + }; + + testScript = { nodes }: '' + machine.start() + machine.wait_for_unit("peering-manager.target") + machine.wait_until_succeeds("journalctl --since -1m --unit peering-manager --grep Listening") + + print(machine.succeed( + "curl -sSfL http://[::1]:8001" + )) + with subtest("Home screen loads"): + machine.succeed( + "curl -sSfL http://[::1]:8001 | grep 'Home - Peering Manager'" + ) + with subtest("checks succeed"): + machine.succeed( + "systemctl stop peering-manager peering-manager-rq" + ) + machine.succeed( + "sudo -u postgres psql -c 'ALTER USER \"peering-manager\" WITH SUPERUSER;'" + ) + machine.succeed( + "cd ${nodes.machine.config.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input" + ) + ''; +}) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index c12cc30df26d..7acf919ea5ea 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -67,7 +67,7 @@ let inherit (lib) optionals; pname = "audacity"; - version = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation rec { inherit pname version; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-7rfttp9LnfM2LBT5seupPyDckS7LEzWDZoqtLsGgqgI="; + sha256 = "sha256-vDkIBsXINo7g8lbDfXYTaz2AB6HWPc5resITllVNd6o="; }; postPatch = '' diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index e1f6d25c2d7b..f1487312684e 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.10"; + version = "22.11"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-qr6akeSN0y6cDVZ8Y6SNuJ8OnAuwrlJL1pqhPPJ+/EQ="; + sha256 = "sha256-xYQi209whY5/lN+6Fp7PTp7JSzL6RS6VL+Exst7RrS0="; }; prePatch = '' diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index bbabcb45187e..77695f968969 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.53.1"; + version = "1.54"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-7qBvv4D86uX8oqqJ+UDI+fbaG5g1+Zg1otuU9lqyTdo="; + sha256 = "sha256-d/BUt6jqJmw2MnerbvvhuUWpTHgQr47XuSoFDXo7GEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index d3d0c7c2f939..55135c255bfb 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "22.08.1"; + version = "22.12"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - sha256 = "sha256-pqAhUxKeFN7eebVdNN3Ge38sA30SUSu4Xn4HDZAjjyY="; + sha256 = "sha256-En6SOyAPNPPzDGdm2XTjbGG0NQFGBVzjjoyCbdnHFao="; stripRoot = false; }; - cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M="; + cargoSha256 = "sha256-oSS0LkLg2JSRLYoF0+FVQzFUJtFuVKtU2MWYenmFC0s="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 2fd28714481c..01a428a9fd68 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , groff -, ncurses , makeWrapper -} : +, ncurses +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jove"; - version = "4.17.4.6"; + version = "4.17.4.7"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; - rev = version; - sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g="; + rev = finalAttrs.version; + sha256 = "sha256-a8amp8JAI25XIeL8MzvJEAvv6B0oIaQvUOQlAaS3PeI="; }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ groff ncurses @@ -34,11 +37,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jonathan's Own Version of Emacs"; homepage = "https://github.com/jonmacs/jove"; + description = "Jonathan's Own Version of Emacs"; + changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin + # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin + broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0a3b5ca421d3..98859ec2ef3b 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -12,12 +12,10 @@ , nodejs ? null, fish ? null, python3 ? null }: -with lib; - let neovimLuaEnv = lua.withPackages(ps: (with ps; [ lpeg luabitop mpack ] - ++ optionals doCheck [ + ++ lib.optionals doCheck [ nvim-client luv coxpcall busted luafilesystem penlight inspect ] )); @@ -61,8 +59,8 @@ in neovimLuaEnv tree-sitter unibilium - ] ++ optionals stdenv.isDarwin [ libiconv CoreServices ] - ++ optionals doCheck [ glibcLocales procps ] + ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ] + ++ lib.optionals doCheck [ glibcLocales procps ] ; inherit doCheck; @@ -86,7 +84,6 @@ in pyEnv # for src/clint.py ]; - # nvim --version output retains compilation flags and references to build tools postPatch = '' substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; @@ -101,7 +98,7 @@ in # third-party/CMakeLists.txt is not read at all. "-DUSE_BUNDLED=OFF" ] - ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" + ++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -112,7 +109,7 @@ in export VIMRUNTIME=$PWD/runtime ''; - meta = { + meta = with lib; { description = "Vim text editor fork focused on extensibility and agility"; longDescription = '' Neovim is a project that seeks to aggressively refactor Vim in order to: diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 7be6d4897109..03c6d19b80c4 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,65 @@ -{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python3, qtbase, qttools }: +{ lib +, stdenv +, env +, fetchFromGitHub +, pkg-config +, qbs +, wrapQtAppsHook +, qtbase +, qtdeclarative +, qttools +, qtsvg +, zlib +, libGL +}: -mkDerivation rec { +let + qtEnv = env "tiled-qt-env" [ qtbase qtdeclarative qtsvg qttools ]; +in + +stdenv.mkDerivation rec { pname = "tiled"; - version = "1.8.4"; + version = "1.9.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QYA2krbwH807BkzVST+/+sjSR6So/aGY/YenEjYxE48="; + sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ="; }; - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python3 qtbase qttools ]; + nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; + buildInputs = [ qtEnv zlib libGL ]; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + + configurePhase = '' + runHook preConfigure + + qbs setup-qt --settings-dir . ${qtEnv}/bin/qmake qtenv + qbs config --settings-dir . defaultProfile qtenv + qbs resolve --settings-dir . config:release qbs.installPrefix:/ projects.Tiled.installHeaders:true + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + qbs build --settings-dir . config:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + qbs install --settings-dir . --install-root $out config:release + + runHook postInstall + ''; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0e7f5ecb3ed8..6188496a80ba 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-10-13"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ebb1f3a20b83a950938c59200434a4e66b69612d"; - sha256 = "0f25qsfpk5m92cc70pjjsbh1ph11aybw2rfraxwdrcywwdr61w7w"; + rev = "1326f60715adf6c434c0a6287e071af02d13dc26"; + sha256 = "1zk7xy8fm5hqvbcn3jcpw7x0l4vcjx7zi09a04xvds1jf09s8l6g"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-11-30"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "39260e77f7471da2a14182f83ac58e1d2b1ff5be"; - sha256 = "07jqpm7vhm10pjni0i4q0bjzf5mahi9rvz698cj66idzkmz2i89k"; + rev = "cb67722e14fbfafd2ba3913bd9850005816ccccf"; + sha256 = "1afsd603v2v68d7cwp9vhjbdy5b89jwrkrra284akc1gmzkbck3d"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-11-29"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "38c6fe1c199b8f35918f7efc09cae3f8af56fd68"; - sha256 = "0p5b05psbhm5aig4106vc6cd795zqwnc0blnngi3jb1snvzb22a5"; + rev = "50d28ad4e3e1ff89b5fc1bff985760c19c2fa782"; + sha256 = "1m8wix6myx572d13qbn3g77az9zwbiszcldjk1nqq3isz2ix2b8n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -535,12 +535,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-11-25"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5ce2bf84ca00cee8f375f108952789302980ae57"; - sha256 = "0494g5nd7289zvmk5k0x7wh1psiwdx3vnhzjz7sf3rcxi8nifc7g"; + rev = "42a17dec166783dc50b7105a0837f715fe9bd432"; + sha256 = "1l8g4aiyxw207nrrb0vjbyqc1n91smxv5g8n8m0hd6wlw0fia1ls"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -703,12 +703,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-11-15"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "87ecb98982f11bb62a61a2ed4d46676c72918a4d"; - sha256 = "147yd7v21y8b59wj89zc103q1lp8dzmkyciby2nn8qb1kzvwvh0g"; + rev = "40e5b7d38b08b32a872986959cfad79b2ac00f12"; + sha256 = "0xc6h7kpwjg3nmxlpzg1q2kbr396kq1wirgrrb8lfg6bywr8iari"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -799,24 +799,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-11-21"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "9347ed838e0bfd8993d29eac1294f82b8e04c0c3"; - sha256 = "0iyxsvp2n2achwc8pxwb554wkv5dhsnblgydrh8wwkdld6116sva"; + rev = "e5f1393350cf842389be289c03885b92ab29ffb3"; + sha256 = "1dkbplm6h7gmf4w7gjs823qjczvvmlqqpnljlb91mglqpcd7wc87"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2022-11-30"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "2a8bff5c47ae7ef3ee2d362634be2d143948dc38"; - sha256 = "0ncqyb5a5mxhzj3mpsn11342mbl0m54jfqga90ds5430d02mm6fb"; + rev = "2f242375df96e8a82089d4424e5db0d237c5ae46"; + sha256 = "14gbx10gpng0n2bb3x7lbzx9n3vdw900yw19fa8qf9mlvi36gpxx"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -919,12 +919,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-11-16"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "3ebf4a98c380ec27b3066eaa5f1fdda332df1a9d"; - sha256 = "1cnlhl7kin27v57l2v4yn9v4kvdb9lp4h20ipyw3jh7r13p3y8gv"; + rev = "f79e9d186b42fba5f1b1362006e7c70240db97a4"; + sha256 = "08avd9icr7jclljlkzg8q74c95g0knzhxkldgfg9kl298h7qc521"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -979,12 +979,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-10-27"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "e4b6212f028f4293f965ed7d83e21516fe9d94c1"; - sha256 = "10dblr72w8zjckjz8ikpfh0f06ljm07aby27m6cbgjyf0qmsyjjv"; + rev = "8eee411e280277cd186a3fea0debe754132b5b7b"; + sha256 = "0haf5ls2y7p6b6nc7b9wlr47h7wbxnk8v6m2mpgvdmbrqylwp9zp"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1195,12 +1195,12 @@ final: prev: cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; - version = "2021-10-09"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "PaterJason"; repo = "cmp-conjure"; - rev = "ca39e595a0a64150a3fbad340635b0179fe275ec"; - sha256 = "08vpd8ibz9472iblw0qc64phvwvkm0byrkvw9b9lq0jcsmw2sgs5"; + rev = "d76e1fe5d724afe604dfa7b4b5ba93f3d3730617"; + sha256 = "026kmjrhfwqllr8qh0z4jgdl2fcxy4cqf33yy4lnalkgvapnja5s"; }; meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; @@ -1735,12 +1735,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-11-30"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "2c4d06e9fc712b259ae2320020818fbf4c533273"; - sha256 = "0b5fq7p5ddydxk1zy1s2b93x019n5mxn7vma3ij4ry9lhc1sqxi3"; + rev = "6adfb13aa16733aa5ede483f428750ce03954c4d"; + sha256 = "02nchj8kb038x75p7p4kvlpvvhfnc51v88ymffpjszplxmih5znn"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1759,12 +1759,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-08-16"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "28983696f59f47221380b4f7d78237dc04f9c62f"; - sha256 = "11di3w5gvw6a0npjj6y4n7ajra0xzv20nmz7rvq4aw78cvgrxa6a"; + rev = "6537ba677a0c7c6c796b195f29077b57fad33716"; + sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1807,12 +1807,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-10-21"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "491ffa37ea7033850998d7f0ef04387c063ed2f6"; - sha256 = "19pdrway7zx0rd9w96i8dl84v5m2ac8ag1c0qg3dny9c6ain2bjv"; + rev = "429b6b7b77764f5a660bd1d0c356029e32d71062"; + sha256 = "0d6854rm5q782hvapais9lnhrblmr9vvwanhc6jqa42g7946d61p"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2011,36 +2011,36 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-11-09"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "5a411d19ce7334ab10ba12516743fc25dad363fa"; - sha256 = "1v72i3f1w7q481grffm2grb9m11qiazs85xq3j89yiqh6jvvpvzh"; + rev = "2f4f9259a5c0f927b31c4256cd3e4d7c6df87662"; + sha256 = "0sl6n0hi3y7hw7yyd4p93dpqxq8vvgl4h89640579k28hms22i45"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "eea760e43c5800bbcb8d6053f5502ada3774b860"; - sha256 = "0n853wbpg02lw41lzs3c8yyq7ag363li0sslgrmli5h3fsd8d3j4"; + rev = "295c64b9f9084a78db4eee7450483ce3caf541e0"; + sha256 = "1ga254s56gbyyywwif4lhfgak3w5gam5ldry33d8h7nqfrvbmmdr"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "ed621364ec22289e912f680b9e5adc17be5af817"; - sha256 = "1xwnv4agszdqj7izspgzy8qsyhdzg8ydamrpn51611aafxzz74vm"; + rev = "b601b48b9a12ab4cd5baedc633f88b48a74100c5"; + sha256 = "0m93y7m159plhwwrsdqr7d651fzbp0z3p49g9l4v199kvsq0x50a"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2059,12 +2059,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "61ba300a71bf274af5c7a5069ab102729af79297"; - sha256 = "0718b7fpl10hpsaw09c4ylkxw8dflb0s2b449q8b8dcwqpgssm51"; + rev = "fd9c9eb2361f327969368f8eeadd063e5a7d5abe"; + sha256 = "070a632szjhb342jz41gg7lhw4m11wi5n33f1z8mhc976yy53cas"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2589,12 +2589,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-11-29"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "6a82dfcb59f0af1e814f34bf8344d68afe8618ec"; - sha256 = "1yggvdb0mzcimpv83jbrvyvp1m6k31i67dq05grwq879dr05igm9"; + rev = "e37b2d9aaba408954d0e894e27e6f4dbf939ef95"; + sha256 = "0a9m0ymjj6y1nmpf0yxzvqnz1j2ppwis43a26iqr94i4n5kva393"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2613,36 +2613,36 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-11-16"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "2d1345239ae7327339bcbd645425ec993bc855d1"; - sha256 = "1p2vjxry2bf9avxnf3hfbvxz8h37gh9rsdw4km3v42aphk49lvr0"; + rev = "a83452264666eeb966b7fd5f48ddf15b8ca05450"; + sha256 = "1v84dz04xbwwhh61fvpmfvydpvj5wkqskml908rgjzmk6y3hp8wq"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-11-29"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "3023bc68d286676115b660142fe126fc5a4374ae"; - sha256 = "1c7swpgbwss6f39c28p4gh5di153k7x3ycpkpx99qn8pjg27cfiv"; + rev = "7645a4de7d60a31ff75ddda52f224889ee4cc3f5"; + sha256 = "0nc4pzwa6nzk5nc5h6qx9srawq5vb0nl2f7dhkcrwv2k4mci3b56"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-11-18"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "7894d5bc504deacf37f0a479a53fa4746fe30a45"; - sha256 = "1jw8y86lq7k9d1ss4dg3ch1ij8c3b196g8giz881jipdkjy9q7w1"; + rev = "ed44aa798ab07dc298f43f35c8e0c93a1b335abb"; + sha256 = "0di5cwq25in8q9vj8ww8blrvf76hsm5qd1bac67blx3z8qsdpb16"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2747,12 +2747,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-11-21"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "d855af543410c4047fc03798f5d58ddd07abcf2d"; - sha256 = "0sjy8gpmcfs2byj23bnscfjawabdbkj5nqk0mkhax3p1kcvcm1fx"; + rev = "bed286c9f787a2b6f49edaa47bc286ff93a304b5"; + sha256 = "1987f2nm1rg5ig5qbi1nfsmm2iamypbimhw38m7ammv1wda840fx"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2807,12 +2807,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-11-16"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "6d4e3f934bffaa1893a690cd9b8f8b584ef0a7ea"; - sha256 = "10bwbw2fhmyhscm135jd4qc091xzqb155y2bbn7ms35jrwvaz0z4"; + rev = "573e6d1e213de976256c84e1cb2f55665549b828"; + sha256 = "0m54mdxkpx4ds7clydiclq8m41vcf1sg6689r3kyp3q537kmc9k1"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2976,12 +2976,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-11-30"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "b4f857a1d94d05e747951b1e8cb1a6c567396898"; - sha256 = "1z4nkk846dh3c8rj7dliw42vz6fwhj7rf1gwjwa4s7nk8f6xq545"; + rev = "9b3e497cf0c3abcf73d791968a9768a22405fa13"; + sha256 = "14j3w7aqnz62fxkrhyklbip9qpdj0cmfxj3japvxbjksh7iba35b"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3132,12 +3132,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-07-13"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "3bc67579b990d53cdcf2ba9b016995b41d2b26a3"; - sha256 = "1przyjqp6pjgbmiwx378k5dx5p1j18c5f89zqjihr52q0p7x90f0"; + rev = "526aeb1acda9504a4293b2a221700f6441211a7d"; + sha256 = "0nzsn79m3xk338gikz0qk7lqriia0fjfxbw3k9aj5h3kqxw7qgmw"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3396,12 +3396,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-11-28"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "02a9182c66a8347d8328a32d58535dfb9785f6aa"; - sha256 = "0dwi86i6bzzbhblr8whb2bnkra4lv5zm0xvyfjn1s0qj5gs3ammw"; + rev = "d2efdea91ec79e480e51d5149d58daa328633c43"; + sha256 = "1nqx2g2z1gbg907n7vhcgak4bd0qz7na5pl8i3jyk5cc22z0mzfc"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3467,12 +3467,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-29"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "9aa1de666b94ba31a3527f3316a202542bc528c9"; - sha256 = "1c54bk8125a5bjra58h2fkpmcv7p1kgpjdq62rkdhl7ygqvp59r5"; + rev = "d21677e8901577b52b37dadec03030c4e5f4cd53"; + sha256 = "1jlr8yp5vkx3vs5i3cprmhljsnrq54ssj1nqcjgmmak2brhlgrjz"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3586,12 +3586,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-11-12"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "562e3e0e04c092c43a9cddffae4c9a748afb186f"; - sha256 = "0gvr9fwbc22m2rfwz3ficlrk5yk0q4zaaplma4l5zarrxswv9csb"; + rev = "1002bcdea7af06c5a7bfce0536d96bc4b03ab42e"; + sha256 = "0cbw07w65kmp1w2l2k4vbnv10vhpj30ija14mdn8mfbqwbp8pb2j"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4007,12 +4007,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-11-30"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "9fad72569b54f067b6ad0bdafd47ce7b23578b79"; - sha256 = "1cvj59v267av6lh2wzpmqd05pa7fjvfprbs2r7gql6gr992x2s59"; + rev = "25cfbde4c5c01133ec36fbc0fd44d9c7cf99e397"; + sha256 = "02d43j8v5lnwg48x11nzdh270fhia1flbqv682ss391zcl0z2h7q"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4043,24 +4043,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-11-28"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "f7391b5fe9771d788816383ee3c75e0be92022af"; - sha256 = "1xxlpz6y66h8xs8bfl0bq46gkhvdi275vsmrwbac1lwk76v9b8kq"; + rev = "f28b1e7c1eee525adb17c24de3cc15a7fa1a6ef9"; + sha256 = "0b311535cvqybg4m517wm7xpjrc0shi3za56c0v5zs6sjnm0n2vs"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-11-17"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "3b643d7bb4a521e0c9f0fcd00f299b1432441eb8"; - sha256 = "1mq7c382bzd8kwqlx2lljqkd96cr0yz9zha2zyg6vz4l60aa53h3"; + rev = "78cc8984cd5f3afb71f8f053f0a1d4708069f2c8"; + sha256 = "08n243nz39sw6c6ihaz9x64ws1vlj7pp180lrhl3ifqgnaj1ymfb"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4343,24 +4343,24 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-10-11"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "439b4811276a149e3fccb226cc9a43ff2fb0e33b"; - sha256 = "08yhjc5zqvjv8m254d7vrhz3nhm8dr4xckhmd9q0sazp8pjd5b8h"; + rev = "a28c51a6362e3faa17f67749436cb5c8b55dcc6d"; + sha256 = "1hvn8y1mqd853aa2dm7156g4fvwq21qmmkicsl50czq4mf9vgvd1"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-10-21"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "2d8671d6787045bed518dce9c2f82a0ece76ed66"; - sha256 = "1v873y2b52v2sa09ans6rs3f5kylb6izx2ffd9wpdg5y8i9s83s1"; + rev = "12f5468781d2d1d3feb6ad7459de764fc33898fe"; + sha256 = "1lxsg05qv87v2imhsfwa9mqfib4332cvhflivpzkamg1acs6bc9j"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4414,12 +4414,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-11-30"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "2f3e5745ee7a0610ffde2b4331460151d4707724"; - sha256 = "0c0ap6xkncbsvy08897ah4sw4f6s99q9m5jp0i3a0akvw3zpn21n"; + rev = "9a7e5a093a58b2eefcf77f4a84b8d8c274725d0f"; + sha256 = "0pmghzzqjm5bvcmaqfq65rabc0p0n6fc5x3j682glm0fjrnlgzj9"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4450,12 +4450,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-08-20"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "kkharji"; repo = "lspsaga.nvim"; - rev = "9ec569a49aa7ff265764081acff9e5da839c13fe"; - sha256 = "1h4r63na7n18pnfbl0n3x7pkfm1pd01zz2h0py6pxd1az6il9dng"; + rev = "5faeec9f2508d2d49a66c0ac0d191096b4e3fa81"; + sha256 = "1bw71db69na2sriv9q167z9bgkir4nwny1bdfv9z606bmng4hhzc"; }; meta.homepage = "https://github.com/kkharji/lspsaga.nvim/"; }; @@ -4486,12 +4486,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-11-27"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "3fa5c8d938e4ed9dcfd3e07d13b587cba4f87e7d"; - sha256 = "0pf4z4c4iaqzh40gsc4gs55kl6821sjhyp0x8pjahl2spqxm3nn3"; + rev = "5ce70a08442e97ac55ce14e71dd7d151ea5f4d8e"; + sha256 = "1fncj4l72pwhwx9drqplm432zjg76y4clyw2kdpivs6nvghisjfv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4607,12 +4607,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-11-22"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "d00abe8169993b95f52ff64fbfe685f353fd1c4f"; - sha256 = "1vq968253hj82bix9gs7r48dxzfhsrjdlx0ssmbv97g96qd46ai7"; + rev = "6402c79d73c07ad19374dc7b4f9d4bdfc2f57f42"; + sha256 = "0iqc4l9qdr1y3nbkzijcp2c1in8r1ybqvbjl9p92x6zdvmxff2jr"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4967,12 +4967,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2022-11-30"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "681e89d58d46a7c63ee091fee32220373dda1072"; - sha256 = "000inylrbyyfc1lg1ajmi1rb2jrcisglgc44gk3cf9iv7v1515dd"; + rev = "a292a8a4927278c4c9e7653cf0a37cd40c17d0fb"; + sha256 = "1j2n4k02b5648ayarqdcw312ynd9j50gm3l5ish6fav6k4ipngq6"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -4991,36 +4991,36 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-29"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "dbed20332724909b26b5b1a083303654a6c15c20"; - sha256 = "1v5x0g49wpfm9qnqdyj27m2bnx7jr2j6hq91fhkqyy13y76qjq2w"; + rev = "f353ec5ac10a9e581c92dc0f937025c54e216022"; + sha256 = "1wmy5hncm1lz5r99vcspg95435yyg0jdzm2kjca79nsmqp613ffl"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-11-24"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "a09d6ed9eacd0b81c0f8641757e60f7bb0e27f6e"; - sha256 = "1pqz1bz5nwdrm4x0p38xhabyb089spvp5khhl154k5mi6fsws219"; + rev = "902f674b9e8a703fad9dafdda9d8f7c88ecf689f"; + sha256 = "12zxmyhk06xiyr5sahqip9pf6f5zyvr46yb6a4ayzdk81k8wmdky"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-11-28"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "74e14e3c885f0caf64004d1c1e75dcbef96e10e5"; - sha256 = "1sdv73v5wzqvfbmrlj6vmwpvgyy9afw6nji5nc1wmhw74cwq2r3a"; + rev = "19bc8377e61482f36703a3e1651aef206af88086"; + sha256 = "0599ljv4f8vsk3h4rpisqj69c4sgjw51rpv8nz7s9nbn43crcqy1"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5075,12 +5075,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-11-29"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "5a536bc033d2ac1ef49ec4c875fd9811cceccb68"; - sha256 = "08gx5y34abpfmcmhhlmb44hi380cfyapbki32pv9xspq56ng8xpn"; + rev = "a79bf5969e27a3f1f1478c9b05c187815f2b2390"; + sha256 = "1a8w2f5s50j4zzwkshxmj48lch7vd680hmmq3scl4q0knvjdyd9h"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5135,12 +5135,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-12-01"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "a2559f07be901638d555c0d29d8ea22c81553653"; - sha256 = "177pf0ywxqmxr7472yvrmk579k5vgh5770d1j00r1d3k8yjsnqp4"; + rev = "d9bd5b05983ccfa349ff2692a5adb17b227088b5"; + sha256 = "05iqzzmxvzb0s6v68pl2wjc643bwhd1mc3r2mrywkj99n8k6mn3k"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5267,24 +5267,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2021-10-03"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "ceeab164880ad90e73ab1be31dc3932777b9ef20"; - sha256 = "178rd4zi8lspsq7qy5ag5gnqr87hivv92pcgqszbriqkga30srpc"; + rev = "fdebcbfbefdf26f73cd31ec849df784075dbd21f"; + sha256 = "0zgr4zvhxl3myx9a8pypxbv3f6i7xygzdd4cfi80c4nm3j83j1hk"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-11-28"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "dce9cddbccc479dad170270d18f2057a637a0297"; - sha256 = "0fkgp5hd0wgcpr0pnpk8m1k3xf08p0mfahkch41z16mlach8gjwn"; + rev = "0903c4886535d97e6e62f710ab97119d2e09aa0b"; + sha256 = "1s9rrqii367bgi31gnir8vnjhw5wvnxlsyzv6q9myix5zjq5kkml"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5327,12 +5327,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-11-29"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "5ca31af06078d6188de7db1369c2b40d1b606d58"; - sha256 = "1a3n5341fcvjlkp3lv5x50a81z30zaxxw427dvkpjb7bp93rb8h4"; + rev = "e013b6ebbad0fab34013be6f073da38c53c9e1dc"; + sha256 = "1pxnj2m7v8m943xs24hspggwhwyv0nla96d38mh1r8bllhh367k8"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5399,12 +5399,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-11-30"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "d4254b19e914e6278582d4555c57eb3d2abd9590"; - sha256 = "03f7m0v5mgpwwvy1qgijiiyvrfzk5n75a1nj5snl0vl8ivancmcs"; + rev = "b3d2ebdb75cf1fa4290822b43dc31f61bd0023f8"; + sha256 = "01ri9sk5p67lkv1jf6zia8l87prrsccyz2862pk7brsmyaja22kw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5447,12 +5447,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-11-28"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "99f696339266c22e7313d6a85a95bd538c3fc226"; - sha256 = "1pv3hfaxd7yifx0n9643wcb9skrqrkzx5x545x944y23xvwvv9di"; + rev = "9fa996123031b4cad100bd5afad04384a622c8a7"; + sha256 = "0js7snmg9223d54iayadlm3bjn54fs3mzqck26cpn4fa5m1nc295"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5483,12 +5483,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-11-22"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "448fa92e7f3838e3b5adbce58b55c5f97a6d2cec"; - sha256 = "0b5byaa8l3yhxhcivp62mpcnwr8ix7k98w68ifhlh5ynfk20zf1j"; + rev = "3389264042e4590ed32ce26d7e47b17ec4e6e6d5"; + sha256 = "0l9fcy2ic5n7krngrz0cv8darb2kv3whhv2lvf312cx9xmjspq2f"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-11-28"; + version = "2022-12-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "f0573ea26f29702ad9aa1546e102adb2f5b7ac3a"; - sha256 = "0d5ng7ffamh24bacyr4xgw393cm55x62f3m9cly8rzd38y7glpvi"; + rev = "8f396b7836b9bbda9edd9f655f12ca377ae97676"; + sha256 = "0jbl9ima5q5f0rcjac8p35by96wha3ph2518d1mjbliawfdl23p1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5759,24 +5759,24 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-11-22"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "56887173181ea0915a9931960899d023ea0ae66c"; - sha256 = "132m5p9jkbj324qjjv0d7kgil3jlacz2lqrh0ygsa6hmyyq5gkay"; + rev = "bc4f02545a0ee3b474e30d6654efe41f5a0a1cb5"; + sha256 = "0v0yva74h1gk8piwil0pg5r5w663psrkg42y1sgpbla70i7j12ff"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-11-30"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "cad6ce2e0d4f9c26467712791a70fae9d0b0b6cf"; - sha256 = "122dkvvs7cgmba8l09vhnc6laabyv4qakm3931f4kscn6lb4kyzm"; + rev = "7fb804f504fd0935d65246a1d5ddea73d9ceefc9"; + sha256 = "1fsqpd3idfqf5r95m2w32ajvldvha3844hl1x4hnwmwn26jn3iib"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5795,12 +5795,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-11-30"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "4ea8e66d61c9a7e40c40f4cc6051ebfbf4ce0d38"; - sha256 = "0wbfy0p7n7s8zp154p06n3nmqc5vxrmzz6abasvlisd8s2khk3g1"; + rev = "82e9feb6eb6000cea42b4cddf5b31daf624173bb"; + sha256 = "1f7akw10npsvabgprg4vm23nqxiy679rp2cbyfywkis2hjb4mraw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5855,12 +5855,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-11-29"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "2ef3b269546d751e4fc8c673ffddd6216421f4a1"; - sha256 = "03vdbxqa6z8471l0s65xa55n5hf1c1s59zvx1rn1kgy4h070022w"; + rev = "46e14866fd2876a18772f913c6c14f5545c6034a"; + sha256 = "16gnlbghywq6ksfmbzfgl9mj4d9gywdqkj8i4jsgl6h4qkvp4hb3"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5879,12 +5879,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5e0bd39476d4e224dfe5ea6a6624ea3bb467a8bb"; - sha256 = "11lsa35v6qb1mvnac94i3acc428r6s2zk88i6qp3xz25slmd5773"; + rev = "c7206327096bedf2e213788a60624a84b3b7552d"; + sha256 = "1f310ng3i69mlp429fcq65fqrfigdpmnsixq91qyan964cn1b13r"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5987,12 +5987,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-11-28"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "859056ff7aec327255578c7a98ef02d0cd829f65"; - sha256 = "01sas5rv0j6rsjml9ibi9ygzpihdn6g8vz5rpwv4grkh0n844jkh"; + rev = "b005821516f1f37801a73067afd1cef2dbc4dfe8"; + sha256 = "06y5akjhrnnsdkjxbcci7fxar8qj37qsl5i18xyx4lzzslxf7nvy"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -6023,36 +6023,36 @@ final: prev: nvim-scrollbar = buildVimPluginFrom2Nix { pname = "nvim-scrollbar"; - version = "2022-11-21"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "petertriho"; repo = "nvim-scrollbar"; - rev = "2cb0a0b36a45118e075699bb3a884ab819a85256"; - sha256 = "0hmx3fic2cds609a9f4ik79kb9i6hqs9ir1h6x1kamn4fgm4fqcq"; + rev = "779cf6f5e7ebcd78acf37dff35a240e03f616357"; + sha256 = "0hz9y3q84azi3grzac7i6dazv982g7di7limd1qajx8x3hbbfvyx"; }; meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-11-18"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b10165f3727f519566d69382c4a4830f16375910"; - sha256 = "0ha1hdrw5cakgxnp0n5dzn0w7kbyxfw0y396rndp70mcqanqg34r"; + rev = "f51cd5543c9369dc76a226a1b16068abaf604876"; + sha256 = "1ss4s4m3aqxrqawvlsf6qvg1nk36l3y5vyldm1hzvqa5f6bcm8dv"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-11-24"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "7b98712fdebda8d20375359622e2cb2795f774d8"; - sha256 = "131ji85a14cd7f5gx41q76b2n1gvjbj0whlizpk3c62kz44mpgdp"; + rev = "47def62945611212a242657cc414dac91ca0453a"; + sha256 = "112h9rrfknqb2z0ph0x4fv3pplwrkp1sn1x2saw3bb8r7fjiqzr4"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6071,12 +6071,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-10-20"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "e27cf9f4506e39ba11a162c6c4aa8e5ff8f296f1"; - sha256 = "0f3sy23jac31fgrcbphhdkl6y8iwi79i9c8yi8gsz3m6a3czhkpw"; + rev = "c332c9c0574a531392818baf4020b86ba5575942"; + sha256 = "0xkf01sr7pkm26xq8spns8765gpj7ibpdp4cx9klw6a9fx8sir9q"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -6107,24 +6107,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-11-29"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "829e9f68e10a998198e17bf5b348a6947f9d3c2e"; - sha256 = "1xwm3qcba6a2mxmpcdi81c29y3kxw2srm5yi9jvmzpml6zbwqmqp"; + rev = "f8489c992998e1e1b45aec65bdb9615e5cd59a61"; + sha256 = "0md5xavzksj4lh1vbd24zq29bwgcb7057dw31invc7adm7sfh1wr"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "768532453ac30cbf792b492248a6c3be19b80af1"; - sha256 = "18lamsy039c90ycxh2gz1qi2ba4npkm1j4q2ibyzljml8kznhzg6"; + rev = "440401c506ec9b87cd3824ad17631115ab860cc5"; + sha256 = "1xyb73vavp38mr7lvjbwd9hmqlc4bw41g1wg0fs8fflabjy3bals"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6443,12 +6443,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-11-29"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "dcd2f380bb49ec2dfe208f186236dd366434a4d5"; - sha256 = "01rrangp7lwz75cqqaqfxdzd6j3jq64g816j3bk9p6fqag9pripi"; + rev = "64ae65fea395d8dc461e3884688f340dd43950ba"; + sha256 = "106yxm2gi86w8d1k96fr3wfiqnz8z6kkg1c58fvm9izl82anmbxd"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6672,12 +6672,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2022-06-15"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "af5fae0b43241e9fc3e0442782272728844bec3f"; - sha256 = "05v81i4ialja4wq3rp1fy09zjh7rvwb6pjhig7zg9pfddd015pki"; + rev = "7af25a840d38dc6767c85edd1f35c1f835618071"; + sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -6853,12 +6853,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-11-10"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "2c4f82a8a68b7d3cee7bd345669f2f50bdc6f889"; - sha256 = "1g6jnql1jrdkw6ckb6q1fivcxjkksdqpcy8najxmmw9lv4sksh4k"; + rev = "76bf496da0c5e2c71820d93319e468b84b689be4"; + sha256 = "1sn39ia2n951rj52c596q1sbmzb23224c3zvrmzzrb2ifbfj3f7f"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7383,12 +7383,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2022-11-29"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "4304933853e66060ec03048b2ce3853c39c3886a"; - sha256 = "03yz00x2wqb0b23ddawsciy52ac9q9gz6h3668l9b2srggphnxy2"; + rev = "6238c102d16779aaa505a16200ac50a01c16b5ef"; + sha256 = "0w0yljwf5l19sczb8qrzkhl61w7xhyapj8v182c7h60k7nis1qqx"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -7600,12 +7600,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-02-25"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; - sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; + rev = "35f1661297b4bf8b12324c8d29442b36a5ef64d2"; + sha256 = "1snrjrd0ri5d3kkdv81gvbsv6nccjxqh6zpwkzbz9nh7nhb7dmy2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7709,12 +7709,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-07-22"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "e77e1bf61b4f1ddc7b13c6160b7389df42aba24d"; - sha256 = "00cvap0qp016x09h4wkk6d0b9px7q8dplj8fj5c7j95r15k6z2r7"; + rev = "ced243a049bb6839ff057741de731418879e97e8"; + sha256 = "1q2q2q8rpd8fzf4sa14mjg42m1d97cqxz82xk4vgg3ml3ffgcsly"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -7757,24 +7757,24 @@ final: prev: telescope-dap-nvim = buildVimPluginFrom2Nix { pname = "telescope-dap.nvim"; - version = "2021-03-26"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-dap.nvim"; - rev = "b4134fff5cbaf3b876e6011212ed60646e56f060"; - sha256 = "1fcpw42bwl5iych3hxrrl08s5hm6r6k0qx2savw853f3ff982s38"; + rev = "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c"; + sha256 = "0dkmmg30bxpbz990wgpndfhzql2015knrlmnscgz4cwyd39wwgpm"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-11-30"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "8646e46b8545b9234e87083d124c0a4e4ed47735"; - sha256 = "01q34wrk00yxy4jcr666qmkdkpfib80rjbn921dkqqv2d1nalx9b"; + rev = "cad567e11131a01f2934930c1efc8b1b09a0dc56"; + sha256 = "0d0l47dmvsba5z8dnywmc55s964wzz3f202amxj5msh9jj051ry3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -7793,12 +7793,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2022-11-30"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "7447fe780fed23402a3e0c3a227b549d7506ed38"; - sha256 = "101zcy6fjrpv19cghg464wrizh82b0ny7pc1mmqsfqw48hl37hwn"; + rev = "ae9d95da9ff5669eb8e35f758fbf385b3e2fb7cf"; + sha256 = "1appy9vk69wbm1zzgxhpi42y401rkdbkbl4qpiagnqbwkz2wc6i0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -7974,12 +7974,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-11-28"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3c2e5fb23e9f6ca1aa682ae16bac3319bfe03e38"; - sha256 = "08r7cjmkqw2pzagyhyv185b86pqrvwk2y6b7g6sjbv3izp4q3krk"; + rev = "cabf991b1d3996fa6f3232327fc649bbdf676496"; + sha256 = "04h9hsy6az1hm0bcg8vf8vsj9hqbf0fi3q5fksdjpqpcf2m04j75"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8203,12 +8203,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-11-29"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "58008d1ff7c1105ef702ac5460cb06bdccf278a6"; - sha256 = "16s593j8ikisnf8xhqqrbpadwlf8sxx3fwcnjjjh6wns6gcmkrry"; + rev = "0f7b6a5b6cf232f34cb8f51123a084a6eee96b89"; + sha256 = "0h7msjgg5zg0zza8fasb2km3pcijlb5w69hlb3vfxxb33kjv8104"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8239,12 +8239,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2022-12-01"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "da296173b61330aebfd16129a5bf1263700014f1"; - sha256 = "1wbbxdf2k1vfrnfllms0g5mnsf5bhsipacfwa546sfnc41j360v9"; + rev = "43604d7e1504571c768024e90907dc7b581456a4"; + sha256 = "0k9swbihxjynzkhfg5dgnkm5ajzaq75py4lpxfiql54pvbbllcb5"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8395,12 +8395,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-11-17"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "f8d30320ca277956852fda6db082e231153b8618"; - sha256 = "0y6vqv83f075a3728jrzrzx11wf8a1p3l6rn2irwgxd037b1ql7z"; + rev = "53c53bce3bffa96be2b5f855d7ffb1d1f208eee5"; + sha256 = "1hdx4k9wcn3j9zyaw0d4fg83w7phn59hh7zblqhzd8z61h8kfdpa"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8803,12 +8803,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-11-28"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "25d53a80f4d68932de4b10fc31aa9a393e19b41e"; - sha256 = "169gxfb6lfd29ln0qwx6kch2ndik8bmj7npq9wpblpczg3g5sn4j"; + rev = "5f5e00faad728f12f9ca9d9200208d8a39fd60f4"; + sha256 = "0z3rkdf0k95789x5yqrvkq2jfnl8hc1h4pxbfnhy9hc1l0kxhc9n"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9199,12 +9199,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-11-26"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "aca487d01058c36c245cf35d30913cfb7311eebb"; - sha256 = "1q4nsjzq7cirqbg5kwc3pww4mqai5i53fq9p8cqw0pyi1vzhvc90"; + rev = "ea90c8cf804feea294bae47423a15b733a74b5b7"; + sha256 = "1v6f5ra84sdhrsbqp5vjyhlcjxnykmasbghni600l6ygzlgd2saq"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9271,12 +9271,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2022-11-28"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "0fbe1b695676039b56dd09dcf66dcd23c2a92a47"; - sha256 = "1j0nfhd7nhr0xynvajf85vg27c5rf2xzsmp7gdswx6nvbwgxni8q"; + rev = "b97c8fcdaed5c3915e49f70f7fa7aa148d528428"; + sha256 = "1j3g4rcjy5fr7pbm45bkzsq0kppvrp54wd6dsdzxwd2y1nkrm82l"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -9463,12 +9463,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-10-29"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "87785156a7919f51409f3e6656ea2b3a9e0e8e97"; - sha256 = "0rbrp8cnkngfnvfvrfv2nfs3c7ryyv9zs738xay15nmcgif4by1s"; + rev = "c8034ea7160c0fa9351f9f07f964bb335cdd6187"; + sha256 = "1kbll59gzcrawwgfiv63psciab330id3jc19kmbl3dvbs3m9if8q"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -9991,12 +9991,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-11-23"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "49cc58573e746d02024110d9af99e95994ea4b72"; - sha256 = "09lnf0r3szzqc9ykyq5w1bgx528k0jnhhlwyzcricmrlls67pnsc"; + rev = "5b0b138483de17a8fd8dfcec0b491782c8fbf102"; + sha256 = "1nlr50kv90rafy85cr2k2n7pmr5mvmvqiza7qnk0rzlccdada6ry"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10869,12 +10869,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-11-10"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "e42203b4f0e46a927dd17b28f142fa91661d7163"; - sha256 = "12v2mh049b037b70q5cpkz0dgqi07hsz4sx2ywvqvwmykv5lrpcv"; + rev = "0a8d2dfaedf1e51859317f675cefe8403041e76a"; + sha256 = "03yipczl11q76db7s1a11nmn3k6rw066y4x5jzracfny9f63miw3"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10978,12 +10978,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-11-13"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "55e3330436784fb8ccc35a5cfeb13e48bab9dcd2"; - sha256 = "170ic9lp566x1l0brj2gj2zpbz5wl57df9wbi3zixm3agj56gnh6"; + rev = "db5120dd9887c988de7cd973ddb951e465d413e5"; + sha256 = "047l43z9ak7xrl4p8p8rw5wjakg95b6y2labfp16qq139g3bib0w"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -11254,12 +11254,12 @@ final: prev: vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2022-04-05"; + version = "2022-12-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "7d39576149d17bde3c096fd57e3a2cdae65deaf5"; - sha256 = "0g716c3dvd7068lfgcbxlzn86529kji4zms5n2xgrn3h0vn722zz"; + rev = "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5"; + sha256 = "0x60j6bq9aql9fqq704cg8bc930c7n1jiaczwsn6slwa55c03zmr"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; @@ -11998,12 +11998,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2022-08-26"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "8985da7669bbd73afce85ef0e4a3e1ce2e488595"; - sha256 = "15pvhbk7hkf3z7zsv1bqizqmiw75nvckf3j6njckj5ijx6kzjsnj"; + rev = "1be4e4e5409caccddf5c2f1bbfa16519f4c93de0"; + sha256 = "1l2ax16r0bqxzdmgpz4rlx7zj0g4d8d696ibdzwmr0q6nbkpy4w5"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12575,12 +12575,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-11-13"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "c2dab181185101070b0ad6c33451f4e2f56a446a"; - sha256 = "15581nighr1a82gkn0blkx75l6bz0vfq573nf626dw1qa652nipz"; + rev = "a40cc7a52787e06fd57650e09be490432e3d4717"; + sha256 = "0l98v8lbadz32z7i1d1n0b1ggpvbsc71ni3lqm9hd2xhx9rixps1"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12851,12 +12851,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2022-11-20"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "1d938c6062ccd1d7fe1fcc658f36503e3283c5f6"; - sha256 = "1dgpgaq0hby85zvcl8vm3jfrpbx1dyx1xrd5i9kd3g64nngbblrv"; + rev = "c16b7cfed0c4ec22cc6a7f67dfbdd4d8c4ab1848"; + sha256 = "1l9wcgsj8wrmhcxkw4s82i68954060xafb7jkym3519bx4kq4jxi"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -12923,12 +12923,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-11-14"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "9ac90d328f7863039c6edff0b4b8081349a378e8"; - sha256 = "1j5vmavmgwvwrarc768x1p5ng4bjyb3fdm118z019r0zpcdknpgx"; + rev = "e64864ec2e01ba554c6ee5396e4e77f732433738"; + sha256 = "0sg4ynwr5mw0qpgnvl752d9yslvd8rxl6swz61gnzgg8j3fyhk5f"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -13128,12 +13128,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-11-27"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "01333a47ebe70eac21e4b0016b04e031b9cf7b17"; - sha256 = "0vrmh4ccarz11a2904y3m1n1gp4zl00k5n8jc5231bhv8psdnlj7"; + rev = "7a887028e91b12268fe812028621152dba549b3c"; + sha256 = "0q6qf5572b6v4k4xnf5ra5brkpjclh8r34rrhpidc3xkdmgifyg4"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13152,12 +13152,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2022-03-10"; + version = "2022-12-05"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "63af6e72dd3fa840bffb3ebcb8c96970c02e0913"; - sha256 = "1cvi3bb9kqfwjh3d4biwxgavankj2ljiyss36q8z96czzaz2w40v"; + rev = "fea8bee382b2051b0137fd2cacf0862823ee69b3"; + sha256 = "1iwwy7ay01jkxgq83frr1xq0y3jvvs86paa43mn1ky6gk3q57s80"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -13465,12 +13465,12 @@ final: prev: zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-11-13"; + version = "2022-12-04"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "1d2ebc679eeea8bfddc908e31bbe9e8b0928ef21"; - sha256 = "0inbay3sn8f78wvf1pl785nl0pdiv6m4604d3zh8a27myhw6lr2b"; + rev = "60478c653aa5fbeac3035b71f5800c5c7a2f5361"; + sha256 = "0jkmdr7db8rs3cv9xziy58sx4fikxjz1wyaag4g1r7l5mwsf9zrh"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -13501,12 +13501,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-12-01"; + version = "2022-12-06"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "4d2ed20bda0c07e9473c374826721ac16154698b"; - sha256 = "0xdxfpqlm68s6629h8j3pmpw4p7kfnsxlvbk5k3ii6f2yw0b8fd4"; + rev = "08ef4cb230a16c5f6b8f33ef1bf0c5b3e192905a"; + sha256 = "1xzh1ql0iix33ixkdcrvf80xa9c995b6gq2ag0k9q4ikvmid5lx2"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13525,12 +13525,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-12-01"; + version = "2022-12-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4c95882b5e3d67bf31f2b7ea996e0251966e43eb"; - sha256 = "002r53w9rq13lca4sw34631b526h2wvaf5x9l87kqq0ddm2nwslh"; + rev = "b0e0b05e5aa8156fe9c8f3a3a3804a434394ab65"; + sha256 = "1kakayg4v5fdi1hs1zyv6f9hd9im0f36z4f4bk1yszsgycrcyl1z"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13597,12 +13597,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-11-20"; + version = "2022-12-03"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "77b86d932746179a50246692612e889d1cdd72da"; - sha256 = "11j9nv2n2lgqk5dap89i8irsbwb2l8arilnhv4p5bzi3zv43vy3n"; + rev = "7610f245821e98232e7ee8dcbf3364725807187d"; + sha256 = "1050yycxlinnj0fcpwvb18b6i1ahkm3mwc56qmkspj1glhk64cs9"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 56c9bf213003..1b3a191a9daf 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,23 +115,23 @@ }; clojure = buildGrammar { language = "clojure"; - version = "087bac7"; + version = "8c23e0e"; source = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "087bac78c53fe1387756cd5b8e68a69b3f6d7244"; - hash = "sha256-KiuSAchtqlVlwyBL4rU+p0fPjm52DrNDPq2ETVXOHQU="; + rev = "8c23e0ec078af461ccad43fffbbfc204aa6bc238"; + hash = "sha256-rbR5/f9Cznl4AFybmpKgEcjKBw4GrUVP67tf4UT6/ZE="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; cmake = buildGrammar { language = "cmake"; - version = "6e51463"; + version = "a322653"; source = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "6e51463ef3052dd3b328322c22172eda093727ad"; - hash = "sha256-2xJaDgrCJQ2obGYvhsHk2/2p8lFNwuScjbjdxJihh5I="; + rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; + hash = "sha256-LBd3SMem1dxZr/dOdJdEFTQxI6d+H8uYE46yN02E/6Y="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -249,12 +249,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "f913be9"; + version = "09e316d"; source = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "f913be9bb8689af22114605012693146fbe9ddaa"; - hash = "sha256-EoZDjUyL4dEwE6E9r9KruQ8Kb83bAyyFq7a/NFBdZjU="; + rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; + hash = "sha256-FffwAt9FJurxFJajLTsQe5tLeZty3nSbXBRkgdjNOJ4="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -371,12 +371,12 @@ }; foam = buildGrammar { language = "foam"; - version = "fdb7f14"; + version = "c238f4a"; source = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "fdb7f14b885abfc4df57728c9b2a2f2ad24d3cb7"; - hash = "sha256-E5Fr8185ypZbkaGIDE9lhQ0Vf1Dphx7n5suNkK0AFHU="; + rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"; + hash = "sha256-GCVV7kj+5S12jedyMajw2OcFOJ0Wz8hiDCImh/G1ngg="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; @@ -437,12 +437,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "d3c15bd"; + version = "f838621"; source = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "d3c15bdf0165c89872cc1345c5f8815be3cad9cc"; - hash = "sha256-3ufluVDeCXLksgj68f7MfK+3QrtvLDoc9Xhbh7xz+t0="; + rev = "f838621d00831967a39ac8293cd3c23b0f49252e"; + hash = "sha256-9OulAtUDMP1jKYPOFBfctBVX2TWktkmwPtE3sCh1qD8="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -493,12 +493,12 @@ }; go = buildGrammar { language = "go"; - version = "05900fa"; + version = "e34b8a4"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611"; - hash = "sha256-f885YTswEDH/QfRPUxcLp/1E2zXLKl25R9IyTGKb1eM="; + rev = "e34b8a418c33bba8bdf3375e8e55903dff7c68b9"; + hash = "sha256-Bfp2XsT83x+VPMPB5rHAbSpEkHD7lG0iDq2Yt63Ug8I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -571,12 +571,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "45ce22c"; + version = "0ff887f"; source = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "45ce22c16ec924e34517cf785e23c07952e45893"; - hash = "sha256-SczU8y70mdqDl2iVKTfD8Taq580x31xMswUhoU48yfE="; + rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; + hash = "sha256-L4B2qtGqrtyLHyUMx1p0t4aKncm72dUE+e19Fv5iqUA="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -747,12 +747,12 @@ }; julia = buildGrammar { language = "julia"; - version = "6287135"; + version = "91ba1c3"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "628713553c42f30595a3b0085bb587e9359b986a"; - hash = "sha256-vB9HnWQ+659Itu8cvd0meLbbLzn62/dDroA3vB7ZtIs="; + rev = "91ba1c3c9b50f388d4b67518c04bc9a003ed3475"; + hash = "sha256-NLUVDfZUjvTnbYwxwij+f9WL7qhduEGrfAUKvEZh/QU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -780,12 +780,12 @@ }; latex = buildGrammar { language = "latex"; - version = "8c75e93"; + version = "1ec3941"; source = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6"; - hash = "sha256-zkp4De2eBoOsPZRHHT3mIPVWFPYboTvn6AQ4AkwXhFE="; + rev = "1ec3941b971dccfa36cb1cd6221a2e4a1cd3e250"; + hash = "sha256-m/6GWV797gaJnWVU07RvHjfAeRzGT9GZH3M9HkcjUq0="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -1137,12 +1137,12 @@ }; racket = buildGrammar { language = "racket"; - version = "09cb27a"; + version = "dc9c334"; source = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "09cb27a06415bce529a26774a842f5a80d50d362"; - hash = "sha256-+chEzpHh4eBTEpx2+sFXDMco18zNPFUu5HMQ3dB+LwI="; + rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; + hash = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1214,12 +1214,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0431a2c"; + version = "f7fb205"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9"; - hash = "sha256-DnUq8TwLGPtN1GXw0AV2t+tj7UKrU4kU32rjGoCHMpE="; + rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; + hash = "sha256-Onk8i2vGHySsjg/O3OZvl7OlDpg3b5/7481f+jJMPCU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -1291,13 +1291,14 @@ }; sql = buildGrammar { language = "sql"; - version = "41f1de2"; + version = "54b363b"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "41f1de238b7b4a8cc9e118759881aad8585d36ad"; - hash = "sha256-LORSWO5Ui/Nq1SReERSWZ+BEtxKEJ545LPpA6HbY8Z4="; + rev = "54b363b87c22787f9dcfabb5d8aa221cb65ace42"; + hash = "sha256-ku4t3IyPNIIXVt3RvUoCG+TUbe62m7EFtXLUiAPb+pQ="; }; + generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; supercollider = buildGrammar { @@ -1414,12 +1415,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0ae3828"; + version = "faad909"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ae382803abce0807e90f498105c713b9233e0b2"; - hash = "sha256-we8jkX8Nl9+eGw8c6ZmH5hW7yfzFaNhQ+WDzRvMMx9A="; + rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; + hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1448,12 +1449,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0ae3828"; + version = "faad909"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "0ae382803abce0807e90f498105c713b9233e0b2"; - hash = "sha256-we8jkX8Nl9+eGw8c6ZmH5hW7yfzFaNhQ+WDzRvMMx9A="; + rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; + hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 09c5527cd0ec..6b28ad9201c5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -1,8 +1,6 @@ # tests available at pkgs/test/vim -{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText +{ lib, stdenv, vim, vimPlugins, buildEnv, writeText , runCommand, makeWrapper -, nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub, runtimeShell , python3 , callPackage, makeSetupHook , linkFarm diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 9442044a1697..8de11fd5d59c 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "zee"; @@ -11,6 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; }; + cargoPatches = [ + # fixed upstream but unreleased + ./update-ropey-for-rust-1.65.diff + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -20,7 +25,7 @@ rustPlatform.buildRustPackage rec { # see https://github.com/zee-editor/zee#syntax-highlighting ZEE_DISABLE_GRAMMAR_BUILD=1; - cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + cargoHash = "sha256-fBBjtjM7AnyAL6EOFstL4h6yS+UoLgxck6Mc0tJcXaI="; meta = with lib; { description = "A modern text editor for the terminal written in Rust"; diff --git a/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff new file mode 100644 index 000000000000..edc3f6baa4b7 --- /dev/null +++ b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7159c28..0fa43c2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1248,9 +1248,9 @@ dependencies = [ + + [[package]] + name = "ropey" +-version = "1.4.1" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa0dd9b26e2a102b33d400b7b7d196c81a4014eb96eda90b1c5b48d7215d9633" ++checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064" + dependencies = [ + "smallvec", + "str_indices", +@@ -1408,9 +1408,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + + [[package]] + name = "str_indices" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "adfad63a1b47951101cd667a85b2959a62910cf03f814fff25df89c460b873f8" ++checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0" + + [[package]] + name = "strsim" diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index f08e49283c12..19d0f5242e06 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -56,11 +56,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-sIV3sLFe+ZhDaVcIqiwOmNVHMD2Fvio7OZBUhPLKts4="; + sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 7e48781f5c47..f232400fbfbf 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { ./0001-Disable-autostart.patch ]; - fixupPhase = '' + postInstall = '' mkdir -p $out/etc/xdg/autostart cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart ''; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 50d0e5a012b4..0647ba26dc0e 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.7"; + version = "0.1.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kMomzIViN7ooBsjUfCIk0XRi4WtXtiaHWHT2pECx//k="; + sha256 = "sha256-3J3Xe9LT4bHatU/wWsF0Gq9gGRcSdCzyQnIIfLXE8KA="; }; - cargoSha256 = "sha256-ASBu4p8+/Donmynnyryktc6dXA3yiOb9w5XpmN4PotY="; + cargoSha256 = "sha256-TWpshqvWMRk2A6RvjWWQc7Nu6tOrctUBZmzyjEFKPRw="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 4d0936c0b431..a11e1c517411 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.13.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-cDNaZ3ZYCUWg30Td1hlzzaB46tI7cFZLvgwCAZN72QI="; + hash = "sha256-InKVwB031BLOngcLAa1zRbgoswUb4z5I0FPNMZk9KVI="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 1e7c61dca2bc..b33182dc68a9 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-nFN0F80QZh3SALtG3xe6mH0zbhcLSRtmcHosD6aPvrE="; + sha256 = "sha256-UkgZOBNEeeYkcdp8beePrFmFLa7UWGbQ4dynl8QwnK8="; }; - vendorSha256 = "sha256-Y5nHADLKCaqHIje7vMS3mAwiGx4tHixBzYZM+iHEZb8="; + vendorSha256 = "sha256-af+uO3NEkMt+aZoOa8NWccgtLD0Kggr2ZZwfIxoP3EU="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 772d479ff78a..678b8968aae1 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TH5ksbEVBlOPmqQOtRmoHTDBRkj/KaMsM+Xc7e2ObzY="; + sha256 = "sha256-b3TdhziXPytHitilMBkr6OGaI+CBI3w4qcTIkQtOAjs="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-RcH1J5I9FPQ/Npq4I5lcOsZHzvKyYhxmqOIEYcBXqU0="; + cargoSha256 = "sha256-pdXLuogkz5q4+B/y/alA900OHVGBT8W6BR7I2aH8IaA="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5c9c3ae72701..d4a0484641cb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "108.0.5359.94", - "sha256": "1zmndi4q9x8fyixwl1mp5qyf883x9xafq7ipzf9vk9d8h62521q6", - "sha256bin64": "03s85hf4vxpil27c1kkdicihb42diyyxwfcjji0bq950nl8vpx2d", + "version": "108.0.5359.98", + "sha256": "07jnhd5y7k4zp2ipz052isw7llagxn8l8rbz8x3jkjz3f5wi7dk0", + "sha256bin64": "1hx49932g8abnb5f3a4ly7kjbrkh5bs040dh96zpxvfqx7dn6vrs", "deps": { "gn": { "version": "2022-10-05", diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 98a5b1cf50f8..82ba0cab8e24 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; + sha256 = "1y1xb1ccsprl0xkn4hlh09j8y5xpdn6r860xlrmk12wfk2xrfbfy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index d6ca151e7a6a..3fce464f4447 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-cL1QV0D8m8rqSDuQgsYBPY7n5K2dy9s9c8VRx65+SV0="; + sha256 = "sha256-Wwm9YN/gPsb4AU+JFUDrJQbuK5AEqzX5/D64/6tOtkw="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index b1d486c51801..ebaca441c338 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-U0VcLxI5hSVqU9N+99/qOjueKi6EdVMT2dTyZUSpNXw="; + sha256 = "sha256-AsUgjGoDoT/GN+Z2tXd0KjVFcVI1KF3nVRsLDWkY9HM="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index b386aeb7421c..590abb80acef 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -1,48 +1,31 @@ { lib -, gitpython -, buildPythonApplication -, emoji , fetchFromGitHub -, filetype -, ipython -, junit-xml -, lxml -, mock -, netaddr -, pytestCheckHook -, radish-bdd -, semver +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.2.11"; + version = "1.3.34"; + format = "setuptools"; src = fetchFromGitHub { - owner = "eerkunt"; - repo = pname; - rev = version; - sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; + owner = "terraform-compliance"; + repo = "cli"; + rev = "refs/tags/${version}"; + sha256 = "sha256-1TFLpBwkpMMdiJJfVvDXlJg4SXWQ8VV605wMFGU+InQ="; }; postPatch = '' substituteInPlace setup.py \ - --replace "IPython==7.16.1" "IPython" + --replace "IPython==7.16.1" "IPython" \ + --replace "diskcache==5.1.0" "diskcache>=5.1.0" ''; - checkInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - "test_which_success" - "test_readable_plan_file_is_not_json" - ]; - - propagatedBuildInputs = [ - gitpython + propagatedBuildInputs = with python3.pkgs; [ + diskcache emoji filetype + gitpython ipython junit-xml lxml @@ -52,9 +35,23 @@ buildPythonApplication rec { semver ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + "test_which_success" + "test_readable_plan_file_is_not_json" + ]; + + pythonImportsCheck = [ + "terraform_compliance" + ]; + meta = with lib; { description = "BDD test framework for terraform"; - homepage = "https://github.com/eerkunt/terraform-compliance"; + homepage = "https://github.com/terraform-compliance/cli"; + changelog = "https://github.com/terraform-compliance/cli/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 578b2fa49a0d..fddb9cc57ed0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { - "hash": "sha256-YdXnw0j2PSuT2BoQQUxyomH+dycjy6Fed7+xVuOwJhk=", + "hash": "sha256-4f29+7irL+6uNTEFnUu46LGz4aBDwortClCZ0+EDZ4Q=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.193.0", + "rev": "v1.193.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -349,11 +349,11 @@ "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=" }, "elasticsearch": { - "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", + "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", "owner": "phillbaker", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.6", + "rev": "v2.0.7", "spdx": "MPL-2.0", "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, @@ -743,13 +743,13 @@ "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" }, "mongodbatlas": { - "hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=", + "hash": "sha256-QMwsVD1RZwL9DPF0gnio4quqUa1b4G0SK73yd6BYnG4=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.6.0", + "rev": "v1.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=" + "vendorHash": "sha256-WO8B5tiDYQTbKbqWfjjgyMLCmclhE0r2XNRTQ2uyu7s=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -770,13 +770,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-wTQmqe7oicD7MOZdKgRHlz4Vs8dQqEUjnrKU/1pldRI=", + "hash": "sha256-nN4KXXSYp4HWxImfgd/C/ykQi02EIpq4mb20EpKboaE=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.8.0", + "rev": "v3.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CIiRPwzlx5WWyRmg2tXEB+yp05ZbN5mLBGuFxm0h//4=" + "vendorHash": "sha256-WuGf6gMOOCTwUTzbinyT7yNM3S8ddHY5aS5VTAEf5Js=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -843,13 +843,13 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=", + "hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.0.2", + "rev": "v1.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=" + "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, "openstack": { "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", @@ -879,11 +879,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=", + "hash": "sha256-G1YRp6ScdlPnV8cCC05TKToJk+iLx2l28x7Lv4GS2/k=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.23.0", + "rev": "v0.24.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -969,13 +969,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-0NQRAv05GuVRAkZd580TINEur/G+c0jUmMtyMv05+PY=", + "hash": "sha256-2991jDjOlyJuVcgzTmfKfMt4NfLc1QP7TY9mw+5Z5aM=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.7.1", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=" + "vendorHash": "sha256-YlZSM3duS2QEZo5j+WvCw5KFPbY+NadYonylpB8Zw+o=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1104,13 +1104,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", + "hash": "sha256-y9v+13/u91tpRwyI/oLHsd7oUUj0OGFJkqzbk2z8MxU=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.39.0", + "rev": "v0.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=" + "vendorHash": "sha256-Z2pIUAe2Beq5Hi7HBxNenFEtAFhJFMPi3k2qiifN+Jg=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index b15f60afe016..437f5813a3ac 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.41.0"; + version = "0.42.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1if7Z+4Lr5eevf1NUJn//pcVU3Ts/FznDd/604aJO/c="; + sha256 = "sha256-CK2+leFJuNQqX1t34LLTJ6eVEUFdZSb/0E3XTf3S9gQ="; }; vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA="; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 8bb4dc5ad80d..bc4f1959eaac 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-UN1nxzcoaUrqmFAJ6LQ+Ro6Ywn/mG7J+MEJIUbpBiK4="; + sha256 = "sha256-PBCTVws5N42q68rKcMLW7GgZvdsQgmdlsKMpJ5bCF00="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-QSR8nSKSKaFyFC6yik3f44mdNvSBgE4bFIGttuJ5oRM="; + vendorSha256 = "sha256-5Po8TRCE6VP+RcaIJImYjElTMHHS/2JwbrHreeWLxio="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ca89b0d5fcf3..1df0aee84219 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -75,7 +75,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.3.4"; + version = "4.4.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -84,7 +84,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0x18m48k6abpbfgavjad5sg3mf3j0kfmyayyvkqxr31viw8kq6m5"; + sha256 = "0c30kxgp48ha1xv3l59ry21n2c536ax8a15cfk2n1r5n1ns2pfq0"; }; postPatch = '' diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4bfe3efec121..297520dcb923 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-XndTMPO1lN6bsjeHbvrZ+i4VwaKoUOcWOfbVQ2E7/eo="; + hash = "sha256-t1JIkUjSEshSm3Zi5Ck8IOmTv2tC0dUYyJvlKua/BcI="; }; - vendorSha256 = "sha256-ZxA05K5zKmQIm2R525DNXpGXqwM33j3PCuPN5d2qcj8="; + vendorSha256 = "sha256-UdzWD8I8ulPBXdF5wZQ7hQoVO9Bnj18Gw5t4wqolSPA="; doCheck = false; diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 23b1977308c0..a6e1909a2880 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "zk"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-30Vw6RGREg/ULS+eNExulHNOsOssMjXE+/tuRBQ17kI="; + sha256 = "sha256-F56jbYVbKegy38MIaEZvmeqp++bz37wFnHswkXt45t0="; }; vendorSha256 = "sha256-11GzI3aEhKKTiULoWq9uIc66E3YCrW/HJQUYXRhCaek="; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index b648c04577e0..c7877f96e843 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo="; + hash = "sha256-BkxEg4vQ943QyDo9V1hG2XimguGn8XpO9aIz5si0PKU="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 05ec95d006bd..da5e6366fb61 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -4,11 +4,10 @@ , fetchFromGitHub , addOpenGLRunpath , docutils -, perl +, meson +, ninja , pkg-config , python3 -, wafHook -, which , ffmpeg , freefont_ttf , freetype @@ -19,6 +18,7 @@ , libuchardet , libiconv , CoreFoundation, Cocoa, CoreAudio, MediaPlayer +, xcbuild , waylandSupport ? stdenv.isLinux , wayland @@ -97,42 +97,38 @@ in stdenv.mkDerivation rec { patchShebangs version.* ./TOOLS/ ''; - NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " - + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext "; - # These flags are not supported and cause the build - # to fail, even when cross compilation itself works. - dontAddWafCrossFlags = true; + mesonFlags = let + inherit (lib) mesonOption mesonBool mesonEnable; + in [ + (mesonOption "default_library" "shared") + (mesonBool "libmpv" true) + (mesonEnable "libarchive" archiveSupport) + (mesonEnable "manpage-build" true) + (mesonEnable "cdda" cddaSupport) + (mesonEnable "dvbin" dvbinSupport) + (mesonEnable "dvdnav" dvdnavSupport) + (mesonEnable "openal" openalSupport) + (mesonEnable "sdl2" sdl2Support) + # Disable whilst Swift isn't supported + (mesonEnable "swift-build" swiftSupport) + (mesonEnable "macos-cocoa-cb" swiftSupport) + ]; - wafConfigureFlags = [ - "--enable-libmpv-shared" - "--enable-manpage-build" - "--disable-libmpv-static" - "--disable-static-build" - "--disable-build-date" # Purity - (lib.enableFeature archiveSupport "libarchive") - (lib.enableFeature cddaSupport "cdda") - (lib.enableFeature dvdnavSupport "dvdnav") - (lib.enableFeature javascriptSupport "javascript") - (lib.enableFeature openalSupport "openal") - (lib.enableFeature sdl2Support "sdl2") - (lib.enableFeature sixelSupport "sixel") - (lib.enableFeature vaapiSupport "vaapi") - (lib.enableFeature waylandSupport "wayland") - (lib.enableFeature dvbinSupport "dvbin") - ] # Disable whilst Swift isn't supported - ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; + mesonAutoFeatures = "auto"; nativeBuildInputs = [ addOpenGLRunpath docutils # for rst2man - perl + meson + ninja pkg-config python3 - wafHook - which - ] ++ lib.optionals swiftSupport [ swift ] - ++ lib.optionals waylandSupport [ wayland-scanner ]; + ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals swiftSupport [ swift ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ ffmpeg @@ -175,10 +171,10 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; - enableParallelBuilding = true; - postBuild = lib.optionalString stdenv.isDarwin '' + pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + popd ''; postInstall = '' @@ -186,16 +182,13 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - cp TOOLS/mpv_identify.sh $out/bin - cp TOOLS/umpv $out/bin + cp ../TOOLS/mpv_identify.sh $out/bin + cp ../TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop - - substituteInPlace $out/lib/pkgconfig/mpv.pc \ - --replace "$out/include" "$dev/include" '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r build/mpv.app $out/Applications + cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. @@ -227,6 +220,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 70219f995387..614f2591b516 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -12,23 +12,24 @@ , gtksourceview5 , libadwaita , libpanel +, vte-gtk4 }: stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WLjXeTtg5DlZbENWYC6lHj6ccU1HGLN+v7xl5sXXvE0="; + sha256 = "sha256-cW6n00EPe7eFuqT2Vk27Ax0fxjz9kWSlYuS2oIj0mXY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-/Z0vp9Fn49+PhXwtt4Z0on4CghU1Hnu4gWcjzAWeCFk="; + sha256 = "sha256-y0njqlzAx1M7iC8bZrKlKACSiYnSRaHOrcAxs3bFF30="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { gtksourceview5 libadwaita libpanel + vte-gtk4 ]; meta = with lib; { diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index e7552f434848..39b02a47141a 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -44,12 +44,13 @@ stdenv.mkDerivation ({ phases = [ "buildPhase" ]; buildPhase = '' - echo "------------------------------------------------------------" >>$out - echo " WARNING: the existence of this path is not guaranteed." >>$out - echo " It is an internal implementation detail for pkgs.mkShell." >>$out - echo "------------------------------------------------------------" >>$out - echo >> $out - # Record all build inputs as runtime dependencies - export >> $out + { echo "------------------------------------------------------------"; + echo " WARNING: the existence of this path is not guaranteed."; + echo " It is an internal implementation detail for pkgs.mkShell."; + echo "------------------------------------------------------------"; + echo; + # Record all build inputs as runtime dependencies + export; + } >> "$out" ''; } // rest) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 473a91f9ce07..ea150c2fe85d 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -186,7 +186,10 @@ in '' set +e EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS=$(sed -n "s/^cargo:rustc-link-arg=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS_BINS=$(sed -n "s/^cargo:rustc-link-arg-bins=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_ARGS_LIB=$(sed -n "s/^cargo:rustc-link-arg-lib=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') + EXTRA_LINK_LIBS=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) # We want to read part of every line that has cargo:rustc-env= prefix and diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 39f7d53f6f75..7f98701b5409 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -17,6 +17,8 @@ build_lib() { -L dependency=target/deps \ --cap-lints allow \ $LINK \ + $EXTRA_LINK_ARGS \ + $EXTRA_LINK_ARGS_LIB \ $LIB_RUSTC_OPTS \ $BUILD_OUT_DIR \ $EXTRA_BUILD \ @@ -47,6 +49,8 @@ build_bin() { --out-dir target/bin \ -L dependency=target/deps \ $LINK \ + $EXTRA_LINK_ARGS \ + $EXTRA_LINK_ARGS_BINS \ $EXTRA_LIB \ --cap-lints allow \ $BUILD_OUT_DIR \ @@ -94,7 +98,7 @@ setup_link_paths() { done fi done - echo "$EXTRA_LINK" | while read i; do + echo "$EXTRA_LINK_LIBS" | while read i; do if [[ ! -z "$i" ]]; then for library in $i; do echo "-l $library" >> target/link diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 1de2e9afc0f9..0ecd3f85c693 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchzip }: +{ lib, fetchzip, stdenvNoCC }: -let +stdenvNoCC.mkDerivation rec { + pname = "carlito"; version = "20130920"; -in fetchzip { - name = "carlito-${version}"; - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + src = fetchzip { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; + sha256 = "sha256-OGDO5WoF7OmiRdLRRrIXMzg276Pgeq1L3Offcl0W2jg="; + }; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + installPhase = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype - cp -v *.ttf $out/share/fonts/truetype + cp -v $src/*.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; - sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv"; - meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. @@ -25,7 +24,7 @@ in fetchzip { longDescription = '' Carlito is a free font that is metric-compatible with the Microsoft Calibri font. The font is designed by Łukasz Dziedzic - of the tyPoland foundry and based his Lato font. + of the tyPoland foundry and based upon his Lato font. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 80c887f58913..82f422146ac7 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "6.6.96"; + version = "7.0.96"; in fetchFromGitHub { name = "material-design-icons-${version}"; owner = "Templarian"; @@ -9,17 +9,19 @@ in fetchFromGitHub { rev = "v${version}"; postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} - cp fonts/*.eot $out/share/fonts/eot/ - cp fonts/*.ttf $out/share/fonts/truetype/ - cp fonts/*.woff $out/share/fonts/woff/ - cp fonts/*.woff2 $out/share/fonts/woff2/ + mv $out/fonts/*.eot $out/share/fonts/eot/ + mv $out/fonts/*.ttf $out/share/fonts/truetype/ + mv $out/fonts/*.woff $out/share/fonts/woff/ + mv $out/fonts/*.woff2 $out/share/fonts/woff2/ + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; - sha256 = "sha256-rfDb9meTF0Y0kiCQd11SgnntQnw34Ti/IXn35xaPO1M="; + sha256 = "sha256-l60LRXLwLh+7Ls3kMTJ5eDTVpVMcqtshMv/ehIk8fCk="; meta = with lib; { - description = "4600+ Material Design Icons from the Community"; + description = "7000+ Material Design Icons from the Community"; longDescription = '' Material Design Icons' growing icon collection allows designers and developers targeting various platforms to download icons in the format, diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a92bfec486c1..bbd994d61363 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202211240054"; + version = "202212010055"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "1887d855ed4b4b92999d3afecf71f43358029369"; - sha256 = "sha256-WozqLA/akUF7T0LyR/nQkTxuZPNCpYarOQG5zQwGAMk="; + rev = "350625ecfeec1300d541cc618fddb1922d5d2365"; + sha256 = "sha256-EnqINoG6nB1m1K7mp0UBW3K2MDuaE7Z84wfCJBFwweU="; }; installPhase = '' diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index fab1c48578fb..490c4fa068f3 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20221203023403/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221206154838/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-I8gLWwwuXZkgc5zZ9QVkSarugcNWLFIz2mU1d4QqJRU="; + hash = "sha256-lusYlmTL71VTGSJFssuIZVu7xJMuZQ7wj2rMtO1lhZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 6c6113e6be92..532159cd7060 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = "feedback"; rev = version; - sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg="; + sha256 = "sha256-vZTc6n7SHtHTCmC/RsCibVHcj67ksbghDosHBZfOIHM="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch index 20676937e0a7..cc56b7e0d035 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch @@ -1,17 +1,20 @@ diff --git a/src/MainWindow.vala b/src/MainWindow.vala -index 6fee9d3..b0eb28c 100644 +index 14b0701..13638a5 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala -@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { +@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { + AppStream.PoolFlags.LOAD_FLATPAK | + AppStream.PoolFlags.RESOLVE_ADDONS + ); ++ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); + #else + appstream_pool.clear_metadata_locations (); + // flatpak's appstream files exists only inside they sandbox +@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow { + foreach (var app in app_entries) { + appstream_pool.add_metadata_location (appdata_dir.printf (app)); + } ++ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); #endif - } -+#if HAS_APPSTREAM_0_15 -+ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO); -+#else -+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/"); -+#endif -+ - // flatpak's appstream files exists only inside they sandbox - unowned var appdata_dir = "/var/lib/flatpak/app/%s/current/active/files/share/appdata"; - foreach (var app in app_entries) { + try { diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 7f6e2ce6ace8..1bad4bba76e8 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.8"; + version = "1.18.9"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-H3mAIwUBVHnnfYxkFTC8VOyZRlfVxSceAXLrcRg0ahI="; + sha256 = "sha256-++fwm5aso9tvrq8YDai7Yyho7ASXMeNV/2FpUZfA4+o="; }; strictDeps = true; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 95abb373272c..820469ab8f15 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 60100a5ecc16..a8de9fe43ffc 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 68a0a9fa7007..5b7e87b0ef3a 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 37c3a6a3de3a..1381b0995a76 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -4,8 +4,7 @@ , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false -# disabled by default since openjfx11 depends on python2 (EOL) -, enableJavaFX ? false, openjfx +, enableJavaFX ? openjfx.meta.available, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index f67c18289134..1bbb4e42dbc5 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,26 +1,36 @@ { stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python2, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby , openjdk11-bootstrap }: let major = "11"; - update = ".0.3"; + update = ".0.11"; build = "1"; repover = "${major}${update}+${build}"; gradle_ = (gradle_4.override { java = openjdk11-bootstrap; }); + NIX_CFLAGS_COMPILE = [ + # avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + # glib-2.62 deprecations + # -fcommon: gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + "-fcommon" + ]; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz"; - sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; + url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; + sha256 = "sha256-mbEALUxuwbtlGeZ2Xsm3m3aNDdthLYWd6QHmdkAILxc="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -34,8 +44,7 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + inherit NIX_CFLAGS_COMPILE; buildPhase = '' runHook preBuild @@ -67,8 +76,7 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; - x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; + x86_64-linux = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa8="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -91,11 +99,7 @@ in makePackage { cp -r build/modular-sdk $out ''; - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; + inherit NIX_CFLAGS_COMPILE; stripDebugList = [ "." ]; @@ -105,6 +109,9 @@ in makePackage { new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done + + # Remove licenses, otherwise they may conflict with the ones included in the openjdk + rm -rf $out/modules_legal/* ''; disallowedReferences = [ openjdk11-bootstrap ]; @@ -119,6 +126,6 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 4ffe8abd47b9..d2903c685a90 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -72,7 +72,6 @@ let # Downloaded AWT jars differ by platform. outputHash = { x86_64-linux = "0hmyr5nnjgwyw3fcwqf0crqg9lny27jfirycg3xmkzbcrwqd6qkw"; - i686-linux = "0hx69p2z96p7jbyq4r20jykkb8gx6r8q2cj7m30pldlsw3650bqx"; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -121,6 +120,6 @@ in makePackage { license = licenses.gpl2; description = "The next-generation Java client toolkit"; maintainers = with maintainers; [ abbradar ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/development/embedded/jtag-remote-server/default.nix index bcfba506a002..4a2c9c3df3d2 100644 --- a/pkgs/development/embedded/jtag-remote-server/default.nix +++ b/pkgs/development/embedded/jtag-remote-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jtag-remote-server"; - version = "unstable-2022-06-09"; + version = "1.2"; src = fetchFromGitHub { owner = "jiegec"; repo = pname; - rev = "917d8d298423ba1aa6e75aa92e009b7f27f74a57"; - hash = "sha256-Jy0OyRgn9SYpjP3HYWPvRirfxXk4/vMYvZuI3XpPtBw="; + rev = "v${version}"; + hash = "sha256-qtgO0BO2hvWi/E2RzGTTuQynKbh7/OLeoLcm60dqro8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index bdfca31d7f7f..e716f809de8b 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation ({ postInstall = '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + ln -s $out/lib/erlang/bin/escript $out/bin/escript ${postInstall} ''; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 6ea49852a40e..1ac48d7f0575 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -1,17 +1,9 @@ { callPackage, lib, stdenv, fetchurl, ... }@_args: let - hash = "sha256-MSBENMUl+F5k9manZvYjRDY3YWsYToZSQU9hmhJ8Xvc="; - base = callPackage ./generic.nix (_args // { version = "8.2.0"; - phpAttrsOverrides = attrs: attrs // { - src = fetchurl { - url = "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz"; - inherit hash; - }; - }; - inherit hash; + hash = "sha256-G/T8pmP5PZ4LSQm9bq4Fg6HOOD5/Bd8Sbyjycvof1Ro="; }); in diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 903dae38ac12..0c58d067f7e1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -157,10 +157,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ="; + sha256 = "sha256-gzjwwiIthH6QTJVTaRVdwb7u7YBujV7wSwDvR4cji/0="; inherit (darwin) configd; inherit passthruFun; }; @@ -170,10 +170,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA="; + sha256 = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI="; inherit (darwin) configd; inherit passthruFun; }; @@ -195,10 +195,10 @@ in { sourceVersion = { major = "3"; minor = "11"; - patch = "0"; + patch = "1"; suffix = ""; }; - sha256 = "sha256-pX3ILXc1hhe6ZbmEHO4eO0QfOGw3id3AZ27KB38pUcM="; + sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 4feefd2be02a..dc9e93b0450f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DDgt7NjTNiqSq8+yC7bjlpKvWt36ybRCGByx07N4hC8="; + sha256 = "sha256-DJEX/BoiabAQKRKyXuefCoJouFKZ3sAnCQDsHmNC/t8="; fetchSubmodules = true; }; - cargoSha256 = "sha256-xYOSMWPGLI6xnYhAZDM+MvD/zI0hsoqie86SUGn2EDI="; + cargoSha256 = "sha256-L+VozBK1RJGg2F51Aeau8jH1XM5IfR7qkhb7iXmQXE4="; cargoBuildFlags = [ "--package wasmtime-cli" diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index ac10472e014e..3dc3bb5dacdc 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,16 +1,11 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom , wafHook -, withQt4 ? true, qt4 ? null -, withQt5 ? false, qt5 ? null }: - -# I haven't found an XOR operator in nix... -assert withQt4 || withQt5; -assert !(withQt4 && withQt5); +, withQt5 ? true, qt5 ? null +}: stdenv.mkDerivation rec { pname = "suil"; version = "0.10.6"; - name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; @@ -19,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] - ++ (lib.optionals withQt4 [ qt4 ]) - ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); dontWrapQtApps = true; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 0692c5ef7abb..19ad8053c19f 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.51"; + version = "0.2.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-10SDOl0XoALdSxJWHDLDkvX7rArUQKXjjXfAECFy/Vw="; + sha256 = "sha256-tFweXB610Ua8+x05rg+rOqh9QPhXjpvvzGf8EVVIHks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index ad7a7e5473e9..a3b43e9377e1 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -1,21 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, texinfo, pcre2 -, enablePython ? false, python ? null, swig, libxml2, ncurses +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, writeShellScript +, pkg-config +, texinfo +, pcre2 +, swig +, libxml2 +, ncurses +, enablePython ? false +, python ? null }: let isPython3 = enablePython && python.pythonAtLeast "3"; in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; + sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE="; fetchSubmodules = true; }; + postPatch = let + printVersion = writeShellScript "print-version" '' + echo ${lib.escapeShellArg version} + ''; + in '' + # avoid git dependency + cp ${printVersion} build-aux/git-version-gen + ''; + + preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' + # prevent configure picking up stack_size from distutils.sysconfig + export PYTHON_EXTRA_LDFLAGS=" " + ''; + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] ++ lib.optional enablePython swig; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 61f758b7c4a9..45a34971c8f0 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -87,28 +87,24 @@ let x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; - mipsel-linux = "./Configure linux-mips32"; - mips64el-linux = - if stdenv.hostPlatform.isMips64n64 - then "./Configure linux64-mips64" - else if stdenv.hostPlatform.isMips64n32 - then "./Configure linux-mips64" - else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 - then "./Configure BSD-x86_64" - else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 - then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" else if stdenv.hostPlatform.isBSD - then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW then "./Configure mingw${lib.optionalString (stdenv.hostPlatform.parsed.cpu.bits != 32) (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux - then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" + then if stdenv.hostPlatform.isx86_64 then "./Configure linux-x86_64" + else if stdenv.hostPlatform.isMips32 then "./Configure linux-mips32" + else if stdenv.hostPlatform.isMips64n32 then "./Configure linux-mips64" + else if stdenv.hostPlatform.isMips64n64 then "./Configure linux64-mips64" + else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" else diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index d22f59271fec..451e856c4e01 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.28"; + version = "1.3.29"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RkOP+et8wFb44NLqkizXB68U0NRKKvhDl4PyQWz2m6A="; + sha256 = "sha256-MKrZP81PrpOsVhS+kAjcd1Eumhq7F4HWWbFnypZttuY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index caf3e7a63f0d..761453739e29 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -1,17 +1,24 @@ {lib, stdenv, fetchurl, zlib, ocaml, findlib}: let - param = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.10"; - url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; - sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; + common = { patches = []; postPatchInit = '' cp META-zip META-camlzip echo 'directory="../zip"' >> META-camlzip ''; + }; + param = + if lib.versionAtLeast ocaml.version "4.07" + then common // { + version = "1.11"; + url = "https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz"; + sha256 = "sha256-/7vF3j4cE9wOWScjdtIy0u3pGzJ1UQY9R/3bdPHV7Tc="; + } else if lib.versionAtLeast ocaml.version "4.02" + then common // { + version = "1.10"; + url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; + sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; } else { version = "1.05"; download_id = "1037"; @@ -25,7 +32,7 @@ let in stdenv.mkDerivation { - pname = "camlzip"; + pname = "ocaml${ocaml.version}-camlzip"; version = param.version; src = fetchurl { diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6253c43d60c6..5333d2e29fa1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-siODqRqji2u+EJag/wTXCZG4LATNxggpMtqMHZAfQ9o="; + hash = "sha256-6+3lZygQEezEbGIMbB6NINjVDkgt5sYO2FV5wpienuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 70737dcca796..97cbd60db1ab 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jJVXGBK8wWXEGvCzOTicHUh9jH35d1ARIxkLwn/ctjM="; + hash = "sha256-IGIEmM9eZ5T+op3ctGr72oy/cU48+OHaFJaZ8DRTY38="; }; propagatedBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SMB library"; homepage = "https://github.com/skelsec/aiosmb"; + changelog = "https://github.com/skelsec/aiosmb/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index f8f155a64156..6f3319e8375f 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ttq9V+Bhmbeit3OBUquIlLW7HQeCe2+KE/QkuvLJMjE="; + hash = "sha256-16/hocVfd2RI8qQ9Qt7EM/gGfyGpWabyZhtfwOscqQY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 7081f426c66f..0c81edc1cc22 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-dzD73jmbeQQY/IjF6XRdOcDIhR2lzeA2XQdipssiT00="; + hash = "sha256-LUrLO9BFbpB2p6PtTZPdpLsGHPh088aPHIyoxgv4dGg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index e4f5f8758b1c..863a2fd5417f 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps="; + hash = "sha256-JHGkQmxt/29GRnVS/GLU1g5Yc+q6voKNOh3n3LfcfcY="; }; propagatedBuildInputs = [ @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Socks4/5 client and server library"; homepage = "https://github.com/skelsec/asysocks"; + changelog = "https://github.com/skelsec/asysocks/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/btrfsutil/default.nix b/pkgs/development/python-modules/btrfsutil/default.nix new file mode 100644 index 000000000000..d529ec09c705 --- /dev/null +++ b/pkgs/development/python-modules/btrfsutil/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, btrfs-progs +}: +buildPythonPackage { + pname = "btrfsutil"; + inherit (btrfs-progs) version src; + format = "setuptools"; + + buildInputs = [ btrfs-progs ]; + + preConfigure = '' + cd libbtrfsutil/python + ''; + + # No tests + doCheck = false; + pythonImportsCheck = [ "btrfsutil" ]; + + meta = with lib; { + description = "Library for managing Btrfs filesystems"; + homepage = "https://btrfs.wiki.kernel.org/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ raskin lopsided98 ]; + }; +} diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 5b8a75c7c123..741ed3791368 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; src = fetchPypi { inherit version pname; - sha256 = "f095cd90c312eecec647de2ff49f3ef4cfc30e3935731d21315380f331bdd095"; + sha256 = "e19f961480b14b55d03d4d4aaa766d46131bdf2ea8a79b47d20037dfd980201a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9afd28132e15..5ccf2e257438 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-7tn/OdPNUnbF2T0wASCBfuTZ0zI1j8GY5kh0QwbzS+8="; + hash = "sha256-CGYX8IzVBqhF0IenTFKtx79J81X6UGkvm/XvFovnHYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 88d472a9de7a..1a8a3f2b871e 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.27"; + version = "9.2.28"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-PP8TdAiyqdcgJNz5jYjAFcuv42ca0zfLwL289XKDqk4="; + hash = "sha256-t3TO1rHf5iA+9WW3Adi37fL7XjRUZFPowUWchX9eEVI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index d80b703522dc..d1abca2b6e53 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.10.27"; + version = "22.12.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pzVzCEkndbesX3tzuuPqtpEmCd5/bSuQmJ2J2IPFRMk="; + hash = "sha256-/XV0dwCkp1kOrXepEaPPEWefBphGB6rQPeTWmo3cHPY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 7ee4c0999b4e..14401f7e53fd 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.9.29"; + version = "2022.12.7"; format = "wheel"; disable = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-VZ7heZnA9ScoSB3PaxsM+Ml0PmjF46GMtFp5knR4aak="; + hash = "sha256-fLdsEqJe9l24WrB0PfkHVz0DAnozYx8X0mflmOuxkfc="; }; propagatedBuildInputs = [ @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "A clean customizable documentation theme for Sphinx"; homepage = "https://github.com/pradyunsg/furo"; + changelog = "https://github.com/pradyunsg/furo/blob/${version}/docs/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; }; diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index 0df84510efd4..3b62893e149f 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -7,12 +7,14 @@ buildPythonPackage rec { pname = "gamble"; - version = "0.10"; - disabled = pythonOlder "3.6"; + version = "0.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1lb5x076blnnz2hj7k92pyq0drbjwsls6pmnabpvyvs4ddhz5w9w"; + hash = "sha256-zsEBqhKidgO1e0lpKhw+LY75I2Df+IefNLaSkBBFKFU="; }; checkInputs = [ @@ -26,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of gambling classes/tools"; homepage = "https://github.com/jpetrucciani/gamble"; + changelog = "https://github.com/jpetrucciani/gamble/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index b45eb0ce1201..9b785a61c907 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.13.2"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a0R8CefN6gtIYqtNdCW9QKJulsbDnH6dFuUfTp8jUnA="; + hash = "sha256-hJgEFRr65eGuV0xx/4leyBZzdd9jt/SEKm3MApzHCGA="; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; + changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 7fbc6ad0bb51..2fb93c8a73d1 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qr2RiIFl1njOOhoblub93foMQ63xpgp9Wj5p0SoLoHw="; + hash = "sha256-bxFBWi6cx7TeeofMP59XVRX9aDpCP2N5lAkUpWYW1wU="; }; propagatedBuildInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Logging API client library"; homepage = "https://github.com/googleapis/python-logging"; + changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 8272416b29f2..2704b357004c 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.23.0"; + version = "3.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1RHzpCRYU2dUxZLa+zzopHd+xfnq7eWF6HDIkVk+2NY="; + hash = "sha256-Ko/9gfcR7BBX+U60vlWgdh4d1xptUJRRyWmAGq6a4/E="; }; propagatedBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Spanner API client library"; homepage = "https://github.com/googleapis/python-spanner"; + changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index ab64a78c103f..a2543ae227bd 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; + hash = "sha256-drzmlHfU2ut3o7JASvFbEcf6OVtWa8kAyzpeDV5iGlc="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "General simulation data file format"; homepage = "https://github.com/glotzerlab/gsd"; + changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 35133847139c..c38746299c5d 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XznXohg0O2UU8G4iUODEE+tOgU3eaqv0hdrLaqMcqrA="; + hash = "sha256-znb5wWuIzLeSNQFCIkpZr6jmn3Rj89NBcUjL6JLvx8s="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; + changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 0e80ef1da88b..0054d8916362 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.16.6"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-x8a2W64zLDi8r7d8B7GYCwWtSAB3BH+Sprbw+Xr7mH4="; + hash = "sha256-nR7ZKKpqiCrQbXsS+znmNht1OvcYL6hSQxHMcJ+/yKA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 72892a109539..2f9e2d0c4b08 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { disabledTests = [ # timming sensitive "test_dummy_verify" - ] - # These tests fail because they don't expect support for algorithms provided through libxcrypt - ++ lib.optionals stdenv.isDarwin [ + "test_encrypt_cost_timing" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests fail because they don't expect support for algorithms provided through libxcrypt "test_82_crypt_support" ]; diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 41c514d2ca63..09c624bbdc1d 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "psrpcore"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jborean93"; repo = pname; - rev = "v${version}"; - hash = "sha256-f1NGE+wSgi8yqBicZZRfUqzinsqazuIaoAje2y+dK1w="; + rev = "refs/tags/v${version}"; + hash = "sha256-uX99BsQn1Ckl+2Lt4I0EMZLTKeDrX0mtSc9w5aFpvxQ="; }; propagatedBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the PowerShell Remoting Protocol (PSRP)"; homepage = "https://github.com/jborean93/psrpcore"; + changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index d95af8651f34..223024fe6451 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.1.0"; pname = "pytest-random-order"; src = fetchPypi { inherit pname version; - sha256 = "6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52"; + sha256 = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU="; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 88670ec9f7a5..b928c2a4549e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.27"; + version = "9.2.28"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-r46rTS9MOMUUWRwGF3pohV+1bPL03VmoILEjEKfr04o="; + hash = "sha256-fDsJqilxIt/LApXVrTm3JyOrZ6BR0+IbnFux/huF2ZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index af842c6c9559..e275e4303174 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.24.1"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KUOGbGQd1ffXNkQiW8yeUxValCOAfd8nBv9nnk9giVU="; + hash = "sha256-jBA3exH/qzEaKZeumvgKD0tKnDptZdlv1KykyUHs8Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index b296f5dc168d..31938569ca5a 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs="; + rev = "refs/tags/v${version}"; + hash = "sha256-9U+GhkwBr+f3yEe7McOxqPRUuTp9vP+3WT5wZ92n32w="; }; nativeBuildInputs = [ @@ -45,12 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' - ''; - pythonImportsCheck = [ "rstcheck_core" ]; @@ -58,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for checking syntax of reStructuredText"; homepage = "https://github.com/rstcheck/rstcheck-core"; + changelog = "https://github.com/rstcheck/rstcheck-core/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index a3789b97088a..2f2ee962e89a 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.0"; + version = "6.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rstcheck"; repo = pname; - rev = "v${version}"; - hash = "sha256-dw/KggiZpKaFZMcTIaSBUhR4oQsZI3iSmEj9Sy80wTs="; + rev = "refs/tags/v${version}"; + hash = "sha256-6TpDzk0GjIn9AnWadwHoYRc3SNi9nBAM7GyKm338wH8="; }; nativeBuildInputs = [ @@ -47,12 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' - ''; - pythonImportsCheck = [ "rstcheck" ]; @@ -65,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; homepage = "https://github.com/myint/rstcheck"; + changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ staccato ]; }; diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index d73b60906cc5..563f20f6f7d0 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "strenum"; - version = "0.4.8"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irgeek"; repo = "StrEnum"; - rev = "v${version}"; - hash = "sha256-S64YfF+cbefXRWoeJK99ZPTiO9DUcDaT77hVQd7pKDk="; + rev = "refs/tags/v${version}"; + hash = "sha256-tElXpwyjrgTw9eHqGPgXakY+G9JXkBQYG7jSZSjv6P0="; }; postPatch = '' @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "MOdule for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; + changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python2-modules/TurboCheetah/default.nix b/pkgs/development/python2-modules/TurboCheetah/default.nix deleted file mode 100644 index 717b2b5f2780..000000000000 --- a/pkgs/development/python2-modules/TurboCheetah/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cheetah -, nose -}: - -buildPythonPackage rec { - pname = "TurboCheetah"; - version = "1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c"; - }; - - propagatedBuildInputs = [ cheetah ]; - - checkInputs = [ nose ]; - - meta = { - description = "TurboGears plugin to support use of Cheetah templates"; - homepage = "http://docs.turbogears.org/TurboCheetah"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/cheetah/default.nix b/pkgs/development/python2-modules/cheetah/default.nix deleted file mode 100644 index 1cee46fa7252..000000000000 --- a/pkgs/development/python2-modules/cheetah/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, markdown -, isPy3k -, TurboCheetah -}: - -buildPythonPackage rec { - pname = "cheetah"; - version = "2.4.4"; - - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; - }; - - propagatedBuildInputs = [ markdown ]; - - doCheck = false; # Circular dependency - - checkInputs = [ - TurboCheetah - ]; - - meta = { - homepage = "http://www.cheetahtemplate.org/"; - description = "A template engine and code generation tool"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/construct/default.nix b/pkgs/development/python2-modules/construct/default.nix deleted file mode 100644 index 5bbbd1501453..000000000000 --- a/pkgs/development/python2-modules/construct/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub -, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml -}: - -buildPythonPackage rec { - pname = "construct"; - version = "2.10.54"; - - # no tests in PyPI tarball - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; - }; - - checkInputs = [ pytestCheckHook enum34 numpy ]; - - # these have dependencies that are broken on Python 2 - disabledTestPaths = [ - "tests/gallery/test_gallery.py" - "tests/test_benchmarks.py" - "tests/test_compiler.py" - ]; - - disabledTests = [ - "test_benchmarks" - "test_timestamp" - ] ++ lib.optionals stdenv.isDarwin [ - "test_multiprocessing" - ]; - - meta = with lib; { - description = "Powerful declarative parser (and builder) for binary data"; - homepage = "https://construct.readthedocs.org/"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python2-modules/httpretty/default.nix b/pkgs/development/python2-modules/httpretty/default.nix deleted file mode 100644 index 92ed5c6616e0..000000000000 --- a/pkgs/development/python2-modules/httpretty/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, tornado -, requests -, httplib2 -, sure -, nose -, nose-exclude -, coverage -, rednose -, nose-randomly -, six -, mock -}: - -buildPythonPackage rec { - pname = "httpretty"; - version = "0.9.7"; - - # drop this for version > 0.9.7 - # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 - doCheck = lib.versionAtLeast version "0.9.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; - }; - - propagatedBuildInputs = [ six ]; - - checkInputs = [ nose sure coverage mock rednose - # Following not declared in setup.py - nose-randomly requests tornado httplib2 nose-exclude - ]; - - __darwinAllowLocalNetworking = true; - - # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_streaming_responses" - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" - ]; - - meta = with lib; { - homepage = "https://httpretty.readthedocs.org/"; - description = "HTTP client request mocking tool"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/markdown/default.nix b/pkgs/development/python2-modules/markdown/default.nix deleted file mode 100644 index 13ed2f1744a2..000000000000 --- a/pkgs/development/python2-modules/markdown/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, nose -, pyyaml -, pythonOlder -, importlib-metadata -}: - -buildPythonPackage rec { - pname = "Markdown"; - version = "3.1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; - }; - - propagatedBuildInputs = [ - setuptools - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - checkInputs = [ nose pyyaml ]; - - meta = { - description = "A Python implementation of John Gruber's Markdown with Extension support"; - homepage = "https://github.com/Python-Markdown/markdown"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/mutagen/default.nix b/pkgs/development/python2-modules/mutagen/default.nix deleted file mode 100644 index 7f2e9f452b4d..000000000000 --- a/pkgs/development/python2-modules/mutagen/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs -}: - -buildPythonPackage rec { - pname = "mutagen"; - version = "1.43.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9"; - }; - - propagatedBuildInputs = [ setuptools ]; - checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis - ]; - LC_ALL = "en_US.UTF-8"; - - meta = with lib; { - description = "Python multimedia tagging library"; - homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix deleted file mode 100644 index 0bb01ef6812a..000000000000 --- a/pkgs/development/python2-modules/numpy/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchPypi -, python -, buildPythonPackage -, gfortran -, pytest -, blas -, lapack -, writeTextFile -, isPyPy -, cython -, setuptools - }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -let - cfg = writeTextFile { - name = "site.cfg"; - text = (lib.generators.toINI {} { - ${blas.implementation} = { - include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - runtime_library_dirs = "${blas}/lib:${lapack}/lib"; - libraries = "lapack,lapacke,blas,cblas"; - }; - lapack = { - include_dirs = "${lib.getDev lapack}/include"; - library_dirs = "${lapack}/lib"; - runtime_library_dirs = "${lapack}/lib"; - }; - blas = { - include_dirs = "${lib.getDev blas}/include"; - library_dirs = "${blas}/lib"; - runtime_library_dirs = "${blas}/lib"; - }; - }); - }; -in buildPythonPackage rec { - pname = "numpy"; - version = "1.16.6"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; - }; - - nativeBuildInputs = [ gfortran pytest cython setuptools ]; - buildInputs = [ blas lapack ]; - - patches = lib.optionals python.hasDistutilsCxxPatch [ - # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 - # Patching of numpy.distutils is needed to prevent it from undoing the - # patch to distutils. - ./numpy-distutils-C++.patch - ]; - - preConfigure = '' - sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) - ''; - - preBuild = '' - ln -s ${cfg} site.cfg - ''; - - enableParallelBuilding = true; - - doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - - checkPhase = '' - runHook preCheck - pushd "$out" - ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' - popd - runHook postCheck - ''; - - passthru = { - # just for backwards compatibility - blas = blas.provider; - blasImplementation = blas.implementation; - inherit cfg; - }; - - # Disable test - # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; - - meta = { - description = "Scientific tools for Python"; - homepage = "https://numpy.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch b/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch deleted file mode 100644 index b2626ea26e5b..000000000000 --- a/pkgs/development/python2-modules/numpy/numpy-distutils-C++.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py ---- a/numpy/distutils/unixccompiler.py -+++ b/numpy/distutils/unixccompiler.py -@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - if opt not in llink_s: - self.linker_so = llink_s.split() + opt.split() - -- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -- - # gcc style automatic dependencies, outputs a makefile (-MF) that lists - # all headers needed by a c file as a side effect of compilation (-MMD) - if getattr(self, '_auto_depends', False): -@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts - deps = [] - - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -- extra_postargs, display = display) -+ if self.detect_language(src) == 'c++': -+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ else: -+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + -+ extra_postargs, display = display) -+ - except DistutilsExecError: - msg = str(get_exception()) - raise CompileError(msg) diff --git a/pkgs/development/python2-modules/pillow/default.nix b/pkgs/development/python2-modules/pillow/default.nix deleted file mode 100644 index 61242c894a89..000000000000 --- a/pkgs/development/python2-modules/pillow/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k -, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook -}@args: - -import ./generic.nix (rec { - pname = "Pillow"; - version = "6.2.2"; - - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; - }; - - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "The friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; - knownVulnerabilities = [ - "CVE-2020-10177" - "CVE-2020-10378" - "CVE-2020-10379" - "CVE-2020-10994" - "CVE-2020-11538" - "CVE-2020-35653" - "CVE-2020-35654" - "CVE-2020-35655" - "CVE-2021-25289" - "CVE-2021-25290" - "CVE-2021-25291" - "CVE-2021-25292" - "CVE-2021-25293" - "CVE-2021-27921" - "CVE-2021-27922" - "CVE-2021-27923" - ]; - }; -} // args ) diff --git a/pkgs/development/python2-modules/pillow/generic.nix b/pkgs/development/python2-modules/pillow/generic.nix deleted file mode 100644 index 3e33f1a8aa0f..000000000000 --- a/pkgs/development/python2-modules/pillow/generic.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ pname -, version -, disabled -, src -, meta -, ... -}@args: - -with args; - -buildPythonPackage rec { - inherit pname version src meta; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ - "test_grab" - "test_grabclipboard" - "test_save" - - # pillow-simd - "test_roundtrip" - "test_basic" - ] ++ lib.optionals (lib.versions.major version == "6") [ - # RuntimeError: Error setting from dictionary - "test_custom_metadata" - ]; - - propagatedBuildInputs = [ olefile ] - ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - '' + lib.optionalString stdenv.isDarwin '' - # Remove impurities - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; -} diff --git a/pkgs/development/python2-modules/prettytable/default.nix b/pkgs/development/python2-modules/prettytable/default.nix deleted file mode 100644 index 8191e9b5f579..000000000000 --- a/pkgs/development/python2-modules/prettytable/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, glibcLocales -, setuptools-scm -, wcwidth -}: - -buildPythonPackage rec { - pname = "prettytable"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ wcwidth ]; - - preCheck = '' - export LANG="en_US.UTF-8" - ''; - - # no test no longer available in pypi package - doCheck = false; - pythonImportsCheck = [ "prettytable" ]; - - meta = with lib; { - description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = "http://code.google.com/p/prettytable/"; - license = licenses.bsd3; - }; - -} diff --git a/pkgs/development/python2-modules/pyyaml/default.nix b/pkgs/development/python2-modules/pyyaml/default.nix deleted file mode 100644 index 3edfae90e668..000000000000 --- a/pkgs/development/python2-modules/pyyaml/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cython -, libyaml -, isPy27 -, python -}: - -buildPythonPackage rec { - pname = "PyYAML"; - version = "5.4.1.1"; - - src = fetchFromGitHub { - owner = "yaml"; - repo = "pyyaml"; - rev = version; - sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; - }; - - nativeBuildInputs = [ cython ]; - - buildInputs = [ libyaml ]; - - checkPhase = '' - runHook preCheck - PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all - runHook postCheck - ''; - - pythonImportsCheck = [ "yaml" ]; - - meta = with lib; { - description = "The next generation YAML parser and emitter for Python"; - homepage = "https://github.com/yaml/pyyaml"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/qpid-python/default.nix b/pkgs/development/python2-modules/qpid-python/default.nix deleted file mode 100644 index e22b3215e81f..000000000000 --- a/pkgs/development/python2-modules/qpid-python/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, isPy3k -}: - -buildPythonPackage rec { - pname = "qpid-python"; - version = "0.32"; - disabled = isPy3k; - - src = fetchurl { - url = "http://www.us.apache.org/dist/qpid/${version}/${pname}-${version}.tar.gz"; - sha256 = "09hdfjgk8z4s3dr8ym2r6xn97j1f9mkb2743pr6zd0bnj01vhsv4"; - }; - - # needs a broker running and then ./qpid-python-test - doCheck = false; - - meta = with lib; { - homepage = "https://qpid.apache.org/"; - description = "Python client implementation and AMQP conformance tests for Apache Qpid"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index ff7462091069..2100b72c9878 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "smatch"; - version = "1.72"; + version = "1.73"; src = fetchFromGitHub { owner = "error27"; repo = "smatch"; rev = version; - sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM="; + sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A semantic analysis tool for C"; - homepage = "http://smatch.sourceforge.net/"; + homepage = "https://sparse.docs.kernel.org/"; maintainers = with maintainers; [ marsam ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix new file mode 100644 index 000000000000..55e152e22ab4 --- /dev/null +++ b/pkgs/development/tools/bbin/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, babashka +, graalvm17-ce +}: + +stdenvNoCC.mkDerivation rec { + pname = "bbin"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "babashka"; + repo = "bbin"; + rev = "v${version}"; + sha256 = "sha256-Oo6YF+uxcUG26Pz1X5uzPE/Hsx0UToOErZ2oUiKuZyI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D bbin $out/bin/bbin + mkdir -p $out/share + cp -r docs $out/share/docs + wrapProgram $out/bin/bbin \ + --prefix PATH : "${lib.makeBinPath [ babashka graalvm17-ce ]}" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/babashka/bbin"; + description = "Install any Babashka script or project with one command"; + license = licenses.mit; + inherit (babashka.meta) platforms; + maintainers = with maintainers; [ sohalt ]; + }; +} diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index b94a376ebb34..69320cc217e7 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -81,14 +81,13 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = let - muonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; - muonConditionFlag = condition: flag: - "-D${condition}=${lib.boolToString flag}"; + muonBool = lib.mesonBool; + muonEnable = lib.mesonEnable; + cmdlineForMuon = lib.concatStringsSep " " [ - (muonConditionFlag "static" stdenv.targetPlatform.isStatic) - (muonFeatureFlag "docs" buildDocs) - (muonFeatureFlag "samurai" embedSamurai) + (muonBool "static" stdenv.targetPlatform.isStatic) + (muonEnable "docs" buildDocs) + (muonEnable "samurai" embedSamurai) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 5e3801628e7c..a944550f0792 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "castxml"; - version = "0.4.8"; + version = "0.5.0"; src = fetchFromGitHub { owner = "CastXML"; repo = "CastXML"; rev = "v${finalAttrs.version}"; - hash = "sha256-9IdQWNbk28OdpxVU1t4d1sGvjc62GeWUueYGDKRfOy4="; + hash = "sha256-NJ6DIZWab9KayFALHON9GfYg6sQOf71SbtfV+3TYKLQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index e5a26b75aa03..5b5b87b0392f 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-SeVLQ05vPywSOnOEhJhQXYhdptmIhvYbbf9SX5eVzik="; + sha256 = "sha256-1qYTYAXNMM3umRFpWoij8VU3rhBI4QWePa5Uaz2Y4Ik="; }; - cargoSha256 = "sha256-jp84LqFuK6Du2mWmgvadD7p8n/zcLKAKBOMQiERTKBI="; + cargoSha256 = "sha256-il7n8uxeXPKCBpRv3rqZZzqWjfpy558YNKBs9qOJ2oI="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 0148cbb7f97c..175f2b016e33 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CyWOXyJ9c7gf+WznU1SLX7tEM1f95015w9ePVwZ7GJU="; + sha256 = "sha256-enPnj4/p83hQkVv821MGyGipgEmVo12IZzy/3y8UprQ="; }; - vendorSha256 = "sha256-UYFw9srf4FcF2XGIfsJQsRapEwcOHql59rKeKUnXPLo="; + vendorSha256 = "sha256-U3zslBDVz5nvhNgcn5L84hSUolf7XFCuh7zMZxyW/gQ="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 4b10b3f8dd9a..6dad28bbdc05 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.37.0"; + version = "1.38.0"; inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; @@ -221,6 +221,16 @@ lib.makeScope pkgs.newScope (self: { getFunctorFn ( [ + # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). + (self: super: lib.attrsets.mapAttrs + ( + name: value: + if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name + then null + else value + ) + super) + ( self: super: { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index b0607e261601..a2c30400a60d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -1204,6 +1204,9 @@ "autobahn": [ "setuptools" ], + "autoflake": [ + "hatchling" + ], "autograd": [ "setuptools" ], @@ -1262,6 +1265,27 @@ "poetry-core", "setuptools" ], + "aws-cdk-asset-awscli-v1": [ + "setuptools" + ], + "aws-cdk-asset-kubectl-v20": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent": [ + "setuptools" + ], + "aws-cdk-asset-node-proxy-agent-v5": [ + "setuptools" + ], + "aws-cdk-aws-batch-alpha": [ + "setuptools" + ], + "aws-cdk-aws-lambda-python-alpha": [ + "setuptools" + ], + "aws-cdk-lib": [ + "setuptools" + ], "aws-error-utils": [ "poetry" ], @@ -1280,6 +1304,9 @@ "awscli-cwlogs": [ "setuptools" ], + "awscli-local": [ + "setuptools" + ], "awscrt": [ "setuptools" ], @@ -2995,6 +3022,9 @@ "construct": [ "setuptools" ], + "constructs": [ + "setuptools" + ], "consul": [ "setuptools" ], @@ -3707,6 +3737,9 @@ "django-4": [ "setuptools" ], + "django-admin-sortable2": [ + "setuptools" + ], "django-allauth": [ "setuptools" ], @@ -3763,6 +3796,9 @@ "django-cors-headers": [ "setuptools" ], + "django-countries": [ + "setuptools" + ], "django-crispy-forms": [ "setuptools" ], @@ -3850,6 +3886,9 @@ "django-modelcluster": [ "setuptools" ], + "django-modeltranslation": [ + "setuptools" + ], "django-mptt": [ "setuptools" ], @@ -4706,6 +4745,9 @@ "fabric": [ "setuptools" ], + "fabric2": [ + "setuptools" + ], "fabulous": [ "setuptools" ], @@ -7168,6 +7210,9 @@ "pbr", "setuptools" ], + "jsii": [ + "setuptools" + ], "jsmin": [ "setuptools" ], @@ -8882,6 +8927,15 @@ "mypy-boto3-sqs": [ "setuptools" ], + "mypy-boto3-ssm": [ + "setuptools" + ], + "mypy-boto3-stepfunctions": [ + "setuptools" + ], + "mypy-boto3-sts": [ + "setuptools" + ], "mypy-extensions": [ "setuptools" ], @@ -8983,7 +9037,11 @@ "setuptools" ], "nbclient": [ - "setuptools" + "setuptools", + { + "buildSystem": "hatchling", + "from": "0.7.1" + } ], "nbconflux": [ "setuptools" @@ -9521,6 +9579,9 @@ "openapi-core": [ "setuptools" ], + "openapi-python-client": [ + "poetry-core" + ], "openapi-schema-validator": [ "poetry-core", "setuptools" @@ -12038,7 +12099,8 @@ "setuptools" ], "pymssql": [ - "cython" + "cython", + "setuptools" ], "pymsteams": [ "setuptools" @@ -12771,6 +12833,9 @@ "pyssim": [ "setuptools" ], + "pystac": [ + "setuptools" + ], "pystache": [ "setuptools" ], @@ -12932,6 +12997,9 @@ "setuptools", "setuptools-scm" ], + "pytest-docker": [ + "setuptools" + ], "pytest-doctestplus": [ "setuptools", "setuptools-scm" @@ -13640,6 +13708,9 @@ "python-uinput": [ "setuptools" ], + "python-ulid": [ + "setuptools" + ], "python-unshare": [ "setuptools" ], @@ -15995,6 +16066,9 @@ "streamlabswater": [ "setuptools" ], + "streamlink": [ + "setuptools" + ], "streamz": [ "setuptools" ], @@ -16702,6 +16776,9 @@ "tornado": [ "setuptools" ], + "tornado-utils": [ + "setuptools" + ], "torpy": [ "setuptools" ], @@ -16982,6 +17059,9 @@ "flit-core", "setuptools" ], + "types-aioboto3": [ + "setuptools" + ], "types-aiobotocore": [ "setuptools" ], @@ -16994,6 +17074,9 @@ "types-aiobotocore-elbv2": [ "setuptools" ], + "types-aiobotocore-resourcegroupstaggingapi": [ + "setuptools" + ], "types-aiobotocore-ssm": [ "setuptools" ], @@ -17039,9 +17122,15 @@ "types-markdown": [ "setuptools" ], + "types-pkg-resources": [ + "setuptools" + ], "types-protobuf": [ "setuptools" ], + "types-python-dateutil": [ + "setuptools" + ], "types-pytz": [ "setuptools" ], @@ -17060,6 +17149,9 @@ "types-setuptools": [ "setuptools" ], + "types-six": [ + "setuptools" + ], "types-tabulate": [ "setuptools" ], diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index a19095230826..cff0b459d64b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -59,9 +59,6 @@ let in lib.composeManyExtensions [ - # normalize all the names - (self: super: poetryLib.normalizePackageSet super) - # NixOps (self: super: lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super) @@ -639,6 +636,7 @@ lib.composeManyExtensions [ fiona = super.fiona.overridePythonAttrs ( old: { + format = "setuptools"; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal ]; nativeBuildInputs = [ pkgs.gdal # for gdal-config @@ -1395,6 +1393,7 @@ lib.composeManyExtensions [ "3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ="; "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; + "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; }.${version} or ( lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash ); @@ -1771,7 +1770,7 @@ lib.composeManyExtensions [ pymssql = super.pymssql.overridePythonAttrs (old: { buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.openssl ]; + ++ [ pkgs.openssl pkgs.libkrb5 ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.freetds ]; }); @@ -2399,6 +2398,7 @@ lib.composeManyExtensions [ let # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 getRepoHash = version: { + "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; "0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a"; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index b06f345d71f3..13b61e1d694d 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-k8FUdQDgtR6g/LRCT45RYVUImEKCneQh9BG6P4y1SME="; + sha256 = "sha256-5Vr7qE6AFesvBkOpgStxI26m8rbQ8pXOXvNxbcX/ilc="; }; - vendorSha256 = "sha256-ZchgruaQOokgCh+6qkVr/d+PVflh/lKd10Ty+bMBEH0="; + vendorSha256 = "sha256-D8ITrzEwas/UElfsXBG2BfHGFcFsxzWFar2ehgLwy5U="; excludedPackages = [ "tests" ]; diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index 1ecfd6e2bfe2..89fc4e87438a 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; - rev = "v${version}"; - hash = "sha256-JA/kU+2cpNKY2umA3NXwsqbfOMv9t6I7GlMYhiA6GTg"; + rev = "refs/tags/v${version}"; + hash = "sha256-dpPPhA5bVLiG9DsJ3RnO9RpCd0j4u5f//x/OTdlC+GQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index dcf13834a51f..5afee4e069ce 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.132"; + version = "0.0.165"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0UcZBGD1l2hP8VH0tdNKY/SiXVTPLL0/eZpOwYnUgPs="; + sha256 = "sha256-McbLVoYujMNFoZg4rOZW1GNzUYymZHEohNEntOnaP1M="; }; - cargoSha256 = "sha256-DlSSzFf2AludfAKrXSsI/V0K2ZjCy/ehZd3ULe3fjK4="; + cargoSha256 = "sha256-2YczpduILH3gSXCEG2w2n1yG4bqox4MMViZJcEFNRtw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 4229f762bbcf..88b99889f1ba 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-T8Hhody0jMmZb6/xMkSvKCv4STZPbcrf/UB3APspYDM="; + sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; }; cargoPatches = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-2Reqj+WP6OoaB/3Z5llZP4c5ToVmMNX0Fe0IqDwcg2E="; + cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch index e084538ca924..ea8b67085fd2 100644 --- a/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch @@ -1,6 +1,6 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -183,6 +183,7 @@ dependencies = [ +@@ -207,6 +207,7 @@ dependencies = [ "toml_edit", "twox-hash", "url", @@ -8,32 +8,33 @@ ] [[package]] -@@ -1039,6 +1040,12 @@ version = "0.1.0" +@@ -1093,6 +1094,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" -+version = "0.3.22" ++version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + [[package]] name = "ppv-lite86" - version = "0.2.15" -@@ -1902,4 +1909,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" + version = "0.2.16" +@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" dependencies = [ "cc", "libc", + "pkg-config", ] -diff --git a/Cargo.toml b/Cargo.toml -index bf2a896..35cbf7c 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -80,3 +80,5 @@ toml_edit = "0.9" +@@ -80,6 +80,8 @@ toml_edit = "0.15" twox-hash = "1.6" # Url parsing url = "2.2" -+ ++# Use pkg-config feature of zstd +zstd = { version = "*", features = ["pkg-config"] } + + [dev-dependencies] + # Filesystems - Filesystem fixtures and assertions for testing diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index b6a6c2f53539..99d3eb61e43f 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -1,27 +1,26 @@ -{ lib, rustPlatform, fetchCrate, stdenv, CoreFoundation, CoreServices }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.14"; + version = "0.7.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-urbyWNbmj2qEO4JJ/waRXGRJ9L5KgwsRB5Wh9yib8zc="; + src = fetchFromGitHub { + owner = "regexident"; + repo = pname; + rev = version; + sha256 = "sha256-IBvSuyr3ERfPIivw6sEJSRta07Awmwd47cV1iKmvt8A="; }; - cargoSha256 = "sha256-3OxO+j5UuPEg9xNmN+kIqpdq6fVnFpgx5xCaMNue52g="; + cargoSha256 = "sha256-zX3lBNQVWBrVQh+02TDUqU7Xmbd7hBOzJxD7cSNTNR0="; buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; - # the crate version doesn't include all the files required to run tests - doCheck = false; - meta = with lib; { description = "A cargo plugin for showing a tree-like overview of a crate's modules"; homepage = "https://github.com/regexident/cargo-modules"; + changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda rvarago ]; }; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 30aa56aa29f2..61dc0d655fbb 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "11.1.0"; + version = "11.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-WQUWAE8PR3FxTmWxoXmi6nsiyfbmLaIzOBJhC/8QYQw="; + sha256 = "sha256-ml+LqfnDld+I3G6+LaPJOeZa+swCtuu0ndW0yJraSxs="; }; - cargoSha256 = "sha256-GirS6Tu5gkNPVGAKzfFkyi3tTlu3RRzp/PWHhPbmKdI="; + cargoSha256 = "sha256-0exatgmksg07KQO/3s9BD4uIZRHwjytQPtaRv+JydPc="; nativeBuildInputs = [ cmake installShellFiles pkg-config ronn ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f9ec10f34301..8021ab2e6319 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-10-31"; - cargoSha256 = "sha256-yehukhYwNhFqHUYmIe0P/LPgRHvyj1/DFCl2yzBkB8Q="; + version = "2022-12-05"; + cargoSha256 = "sha256-lD52qI6LX5ORBWknCC4gAWQG8FPlNhOj6xQo1eXpO30="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-D0YwkSqwtD08twtCtN5q0a8S0Y26kgDWg1ruRNEQEOw="; + sha256 = "sha256-2Syd2jVpY0UIfsYlmzvWICZTDVRG4UchcbRlNhuJSpM="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index df451e863481..7883e8841b0a 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,17 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv, testers, sqlx-cli }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, pkg-config +, openssl +, SystemConfiguration +, CoreFoundation +, Security +, libiconv +, testers +, sqlx-cli +}: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -11,6 +24,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pQlrKjhOJfjNEmLxqnFmmBY1naheZUsaq2tGdLKGxjg="; }; + patches = [ + # https://github.com/launchbadge/sqlx/pull/2228 + (fetchpatch { + name = "fix-rust-1.65-compile.patch"; + url = "https://github.com/launchbadge/sqlx/commit/2fdf85b212332647dc4ac47e087df946151feedf.patch"; + hash = "sha256-5BCuIwmECe9qQrdYll7T+UOGwuTBolWEhKNE7GcZqJw="; + }) + ]; + cargoSha256 = "sha256-AbA8L7rkyZfKW0vvjyrcW5eU6jGD+zAqIcEUOJmeqJs="; doCheck = false; diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/development/tools/tarmac/default.nix new file mode 100644 index 000000000000..15e5ecfe10a8 --- /dev/null +++ b/pkgs/development/tools/tarmac/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl_1_1 +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "tarmac"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "Roblox"; + repo = "tarmac"; + rev = "v${version}"; + sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU="; + }; + + cargoSha256 = "sha256-QnpowYv/TBXjPHK8z6KAzN3gSsfNOf9POybqsyugeWc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl_1_1 + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + meta = with lib; { + description = "Resource compiler and asset manager for Roblox"; + longDescription = '' + Tarmac is a resource compiler and asset manager for Roblox projects. + It helps enable hermetic place builds when used with tools like Rojo. + ''; + homepage = "https://github.com/Roblox/tarmac"; + downloadPage = "https://github.com/Roblox/tarmac/releases/tag/v${version}"; + changelog = "https://github.com/Roblox/tarmac/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index b8db2d4aac43..9e4d2caabc30 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; license = licenses.gpl2Only; maintainers = with maintainers; [ matthuszagh wegank ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index a26e71522e5f..8e33b84b364e 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-mhfRrmZkeQWbYlgDEsjiUSOALXc6tI8eK81rjLYSXwk="; + sha256 = "sha256-3uyMwW8v2rPguXbPKy8IyQxroNaNS6rrXEcgRP91fdU="; }; vendorSha256 = null; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 809ed7a146d0..bfcdb9c4c55d 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : +{ lib, stdenv, fetchgit, which, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python3 } : stdenv.mkDerivation rec { pname = "tennix"; - version = "1.1"; - src = fetchurl { - url = "https://icculus.org/tennix/downloads/tennix-${version}.tar.gz"; - sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; + version = "1.3.1"; + + src = fetchgit { + url = git://repo.or.cz/tennix.git; + rev = "refs/tags/tennix-${version}"; + sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; }; - buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + nativeBuildInputs = [ which ]; - patches = [ ./fix_FTBFS.patch ]; + buildInputs = [ python3 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; - preConfigure = '' - makeFlags="PREFIX=$out" - installFlags="PREFIX=$out install" + configurePhase = '' + ./configure --prefix $out ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index d97dbf0eb262..d2d7c6218ae7 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24558"; + version = "22.43.24595.35"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-/hiDJLtEOLbnFjT697yLie5E7819fZM3xricPwe4xN0="; + sha256 = "sha256-CWiWkv3CmHhXAk2M92voeQ06ximSOnT9hgIA4rIxWmM="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 71f2272e3b52..3463e3688c09 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }: +{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unar, ffmpeg, nixosTests }: let runtimeProgDeps = [ ffmpeg - unrar + unar ]; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 88dcfdcb7080..f0039a509c15 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -63,9 +63,9 @@ let } else rec { python = scons.python.withPackages (ps: with ps; [ - pyyaml + setuptools typing - cheetah + cheetah3 ]); scons = sconsPackages.scons_3_1_2; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index fb6dcdeecde8..d6e2f20ecdbe 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -18,7 +18,7 @@ , withDevdoc ? false , doxygen , dblatex # Extra developer documentation -, withNcurses +, withNcurses ? false , ncurses # Extra ncurses utilities. Needed for debugging and monitoring. , withTsm ? false , tsm-client # Tivoli Storage Manager Backup Client from IBM @@ -45,7 +45,7 @@ stdenv.mkDerivation { bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - buildInputs = [ libkrb5 ncurses ]; + buildInputs = [ libkrb5 ] ++ optional withNcurses ncurses; patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional withTsm ./tsmbac.patch; @@ -84,7 +84,7 @@ stdenv.mkDerivation { "--disable-fuse-client" "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl" ${optionalString withTsm "--enable-tivoli-tsm"} - ${optionalString withNcurses "--disable-gtx"} + ${optionalString (!withNcurses) "--disable-gtx"} "--disable-linux-d_splice-alias-extra-iput" ) '' + optionalString withTsm '' diff --git a/pkgs/servers/search/zinc/default.nix b/pkgs/servers/search/zinc/default.nix new file mode 100644 index 000000000000..c9a7a256d76c --- /dev/null +++ b/pkgs/servers/search/zinc/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, buildNpmPackage +}: +let + version = "0.3.5"; + src = fetchFromGitHub { + owner = "zinclabs"; + repo = "zinc"; + rev = "v${version}"; + sha256 = "sha256-qu3foI5Rnt2sf+B+roJOwUNvOfawKmcKq7UrmviQsHA="; + }; + + webui = buildNpmPackage { + inherit src version; + pname = "zinc-ui"; + + sourceRoot = "source/web"; + + npmDepsHash = "sha256-Ao/kDryui4thurqap/d/+82z058HoF2ZJSVKQqVwfVg="; + + CYPRESS_INSTALL_BINARY = 0; # cypress tries to download binaries otherwise + + installPhase = '' + mkdir -p $out/share + mv dist $out/share/zinc-ui + ''; + }; +in +buildGoModule rec { + pname = "zinc"; + inherit src version; + + preBuild = '' + cp -r ${webui}/share/zinc-ui web/dist + ''; + + vendorSha256 = "sha256-akjb0cxHbITKS26c+7lVSHWO/KRoQVVKzAOra+tdAD8="; + subPackages = [ "cmd/zinc" ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/zinclabs/zinc/pkg/meta.Version=${version}" + ]; + + meta = with lib; { + description = "A lightweight alternative to elasticsearch that requires minimal resources, written in Go"; + homepage = "https://github.com/zinclabs/zinc"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index f9ac080a7fd6..7da5c489ded4 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.22.4"; + version = "2.22.6"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-SMuposSGpmJgfAXYu3YhYJWN7zxyxtAAuRI1IBibq5c="; + sha256 = "sha256-B3ojd6Xd5qk6KL5JAnrp52XeW0xJ7z9VJQRPjVmPgv0="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 3cd302c6bf75..6b2710b7ba28 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.32.3"; + version = "1.34.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-mM9+qumB7pbP1LIN3ZJRNYHywwASKL4jmsmz5jQGRtg="; + sha256 = "sha256-ngcFoEDec/6I9gWpJ767ju2OvZfS4RhlSbK//xXIFxs="; }; - vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE="; + vendorSha256 = "sha256-nSllDi6G4QAGyuoGduDhI0vaVuN2//eg+gXRSZ3ERiQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 5f064beaab9b..60eb9a22a829 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.9.5"; + version = "2.9.6"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-o8SFR6xPh6oc6vr9xhSyOnkJTxFv142BovmvAURY3SY="; + sha256 = "sha256-T1yJT45bCjGizS6bqkzc6EF9uhJ3dhXsSc5X3di6SJ4="; stripRoot = false; }; - vendorSha256 = "sha256-/+cyh0hFPc+Mu1tmlLDU/v0w6N1czqLVDBbEJT907wE="; + vendorSha256 = "sha256-g/UL+cUenWW94afWIGFU2fBSpo48YcUIUaX/1M5vhNk="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix new file mode 100644 index 000000000000..dd60980e3290 --- /dev/null +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -0,0 +1,100 @@ +{ python3 +, fetchFromGitHub +, fetchpatch +, nixosTests + +, plugins ? ps: [] +}: + +let + py = python3.override { + packageOverrides = final: prev: { + django = final.django_4; + drf-nested-routers = prev.drf-nested-routers.overridePythonAttrs (oldAttrs: { + patches = [ + # all for django 4 compat + (fetchpatch { + url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff"; + hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI="; + }) + (fetchpatch { + url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff"; + hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU="; + }) + (fetchpatch { + url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff"; + hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0="; + }) + ]; + }); + }; + }; + +in py.pkgs.buildPythonApplication rec { + pname = "peering-manager"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI="; + }; + + patches = [ + ./redis-unix-sock.patch + ]; + + format = "other"; + + propagatedBuildInputs = with py.pkgs; [ + django + djangorestframework + django-cacheops + django-debug-toolbar + django-filter + django-postgresql-netfields + django-prometheus + django-rq + django-tables2 + django-taggit + drf-spectacular + jinja2 + markdown + napalm + packaging + psycopg2 + pynetbox + pyyaml + requests + tzdata + ] ++ plugins py.pkgs; + + buildPhase = '' + runHook preBuild + cp peering_manager/configuration{.example,}.py + python3 manage.py collectstatic --no-input + rm -f peering_manager/configuration.py + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt/peering-manager + cp -r . $out/opt/peering-manager + chmod +x $out/opt/peering-manager/manage.py + makeWrapper $out/opt/peering-manager/manage.py $out/bin/peering-manager \ + --prefix PYTHONPATH : "$PYTHONPATH" + runHook postInstall + ''; + + passthru = { + # PYTHONPATH of all dependencies used by the package + python = py; + pythonPath = py.pkgs.makePythonPath propagatedBuildInputs; + + tests = { + inherit (nixosTests) peering-manager; + }; + }; +} diff --git a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch new file mode 100644 index 000000000000..5db0d0dd0125 --- /dev/null +++ b/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch @@ -0,0 +1,47 @@ +commit 1e64a7f6ca456249305f6a3c90f9acf84af194db +Author: Yureka +Date: Tue Nov 29 14:03:08 2022 +0100 + + support unix sockets for redis connections + +diff --git a/peering_manager/settings.py b/peering_manager/settings.py +index 739d6ff..b5edf4d 100644 +--- a/peering_manager/settings.py ++++ b/peering_manager/settings.py +@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "") + TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0) + TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300) + TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False) ++TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "") + if "DEFAULT_TIMEOUT" in TASKS_REDIS: + warnings.warn( + "DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead." +@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "") + CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0) + CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300) + CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False) ++CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "") + + if CACHING_REDIS_USING_SENTINEL: + CACHEOPS_SENTINEL = { +@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL: + "service_name": CACHING_REDIS_SENTINEL_SERVICE, + "db": CACHING_REDIS_DATABASE, + } ++elif CACHING_REDIS_UNIX_SOCKET_PATH != "": ++ CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}" + else: + REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://" + if CACHING_REDIS_PASSWORD: +@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL: + "SOCKET_TIMEOUT": None, + "CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT}, + } ++elif TASKS_REDIS_UNIX_SOCKET_PATH != "": ++ RQ_PARAMS = { ++ "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH, ++ "DB": TASKS_REDIS_DATABASE, ++ } + else: + RQ_PARAMS = { + "HOST": TASKS_REDIS_HOST, diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 855061ef3e2d..d882890bba78 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.62.2"; + version = "0.62.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n3ZkSsyaNreIohCrGYQUnRAnher1VqbV8vQKA20bnPs="; + sha256 = "sha256-rDj/yerLY7EN/jeAh/xaUX04LqGqijajSZLFhjiyuSg="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorSha256 = "sha256-FJtyCUzp/osfXtNRWH/gK7PGoe4gd23YxBxbF4o1qos="; + vendorSha256 = "sha256-MUNXMdzLVgbFtVo1CRCnZfpZl8Ze2R98mx7Y9QreLRw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index c697bb4f20f7..f17a805531c7 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -28,12 +28,12 @@ let in stdenv.mkDerivation rec { - version = "2.7.7"; + version = "2.7.8"; pname = "dar"; src = fetchzip { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-643hU28Vl0QaqdKoKdQ1Z/j5drE59/jw5xkVO/g+MSw="; + sha256 = "sha256-W/6kSkIaeHumE2yGGbU4Z2lk1d2toQ1AM012TUI1EZw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 8f1571d1aee6..5f0f7177d9ae 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.82"; + version = "1.0.84"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-NN36gg2rUZgAxyMoYhMc7IbWgQLrPvuWERDF7JVsFfw="; + hash = "sha256-ygIAw270Px5nRrSrsD3yLBRFBKGwzdxXzQ6udS9g2ZI="; }; patches = [ diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ee1bea9c29ef..e01ee2a8cf47 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,11 +1,10 @@ { lib, stdenv, fetchurl -, pkg-config, python3, sphinx +, pkg-config, sphinx , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs , gitUpdater , udevSupport ? true -, enablePython ? true }: stdenv.mkDerivation rec { @@ -19,13 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals enablePython [ - python3 python3.pkgs.setuptools ] ++ [ sphinx ]; - buildInputs = [ acl attr e2fsprogs libuuid lzo python3 udev zlib zstd ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo udev zlib zstd ]; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally @@ -35,18 +32,17 @@ stdenv.mkDerivation rec { install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; - configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ - "--disable-backtrace" - ] ++ lib.optionals (!enablePython) [ + configureFlags = [ + # Built separately, see python3Packages.btrfsutil "--disable-python" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "--disable-backtrace" ] ++ lib.optionals (!udevSupport) [ "--disable-libudev" ]; makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; - installFlags = lib.optionals enablePython [ "install_python" ]; - enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 0594d1c30658..b4405f81fb6b 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-NM6+1Etf7pOOSKNuxGIUlAbtZwixof7wNgkPoMwPn7w="; + hash = "sha256-Ui0L03KLePqLvxWaJm+qGQ8q+S8Sz0jwtLhIORNWeAk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-anxDfls5MTfvklIDst+Ocduzc8ds5pD3WDaDUtF6R+g="; + hash = "sha256-o4MKnJycyzlFfE1YyByyjn/XENheLw4tdVXtgzVxDJM="; }; postPatch = '' diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 27268bead2aa..57c7a35e0b94 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "6.0.1"; + version = "7.0.0"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "sha256-YH4sIEOTPBbzsEMvHyphOsf12ZZRKsRPMlZ4emMMTrw="; + hash = "sha256-egAt2XypPFxsOuo8RsIXTmFdmBUe+eZh3p3vlnnx8wo="; }; - cargoSha256 = "sha256-c7uEb64epjzU3pmHRr69FoxFGCN+1WVMLm8LsBwQ50o="; + cargoHash = "sha256-GbJU31UBdRai2JLEdx9sPh6rJWnU4RlDL8DooI9MCUg="; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 6dd0e7a6e7cb..2795210101c3 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -7,7 +7,10 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; - rev = "v${version}"; + # On the next release, go back to `rev = "v${version}";` + # The 8.5.3 release appears to have been mysteriously re-tagged: + # https://github.com/sharkdp/fd/issues/1184 + rev = "f6e74407e80a5563a9e4d0530371aed281e05838"; sha256 = "sha256-7QQHLw+isXtr1FDQr4aiUhvOjJUPbaxFGDwukiWBG9g="; }; diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index b86a6a992e18..b7318c119dac 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.0"; + version = "5.13.1"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-PUGxrGHjebCxtN7Q0N/crqOHTeunWqy3wmWTGqCFYTw="; + hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8="; }; udevRules = fetchurl { diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/tools/misc/lemmy-help/default.nix index 1bc07257a2fd..1d5415a79d19 100644 --- a/pkgs/tools/misc/lemmy-help/default.nix +++ b/pkgs/tools/misc/lemmy-help/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "lemmy-help"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "numToStr"; repo = "lemmy-help"; rev = "v${version}"; - sha256 = "sha256-VY8sGxS8wwrezTe4ht9xdr4iE2n9fNSNhfCeGDJL5Lo="; + sha256 = "sha256-gsYVrqPcabLCMYN3Gmr6CXTCKKFAy2rDCxmcRwR1Iic="; }; buildFeatures = [ "cli" ]; - cargoSha256 = "sha256-yj14kg41EqOco0gx79n8xhf8cyotZ1Mxj2AbNV9TImU="; + cargoSha256 = "sha256-iyMEzxCTxJ/CP3UEnLc4SN5zhIjCLGUl4OOk0u0bCJc="; meta = with lib; { description = "A CLI for generating vim help docs from emmylua comments"; @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec { `lemmy-help` is an emmylua parser as well as a CLI which takes that parsed tree and converts it into vim help docs. ''; homepage = "https://github.com/numToStr/lemmy-help"; + changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${version}"; license = with licenses; [ mit ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/tools/misc/plocate/default.nix index 468b2ca7842b..f767d31f6b97 100644 --- a/pkgs/tools/misc/plocate/default.nix +++ b/pkgs/tools/misc/plocate/default.nix @@ -2,6 +2,7 @@ , stdenv , lib , fetchgit +, fetchpatch , pkg-config , meson , ninja @@ -14,14 +15,23 @@ let in stdenv.mkDerivation rec { pname = "plocate"; - version = "1.1.16"; + version = "1.1.17"; src = fetchgit { url = "https://git.sesse.net/plocate"; rev = version; - sha256 = "sha256-rwvzDr3leve8BQ30+c3l1+q/7+u7FhPQ7iFcvbx/HjM="; + sha256 = "sha256-EcWzvbY8ey5asEJxUeSl10ozApgg+wL5o8NCNw7/W7k="; }; + patches = [ + # fix redefinition error + (fetchpatch { + url = "https://git.sesse.net/?p=plocate;a=patch;h=0125004cd28c5f9124632b594e51dde73af1691c"; + revert = true; + sha256 = "sha256-1TDpxIdpDZQ0IZ/wGG91RVZDrpMpWkvhRF8oE0CJWIY="; + }) + ]; + postPatch = '' sed -i meson.build \ -e '/mkdir\.sh/d' diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix index bae9465c7cb8..3caba8f2cfc7 100644 --- a/pkgs/tools/misc/popsicle/default.nix +++ b/pkgs/tools/misc/popsicle/default.nix @@ -1,73 +1,54 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub -, rustc -, cargo , rustPlatform -, pkg-config -, dbus , glib -, cairo -, pango -, atk -, lib +, pkg-config , gdk-pixbuf , gtk3 +, wrapGAppsHook }: -rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { +stdenv.mkDerivation rec { pname = "popsicle"; - version = "unstable-2021-12-20"; + version = "1.3.1"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "b02ebf5f2e6c18777453ca9a144d69689a6fa901"; - sha256 = "03ilhvnr4mwy7b8bipp616h16m2ilxzxz2zjpkzy3afwvh9bz1mx"; + rev = version; + sha256 = "sha256-NqzuZmVabQ5WHOlBEsJhL/5Yet3TMSuo/gofSabCjTY="; }; - cargoSha256 = "1c54wxyrfxk5chnjhxw6vaznm7ff9dkx1rxlgp417jfygiwijjs4"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "sha256-k2M1c9kk1blE0ZKjstDQANdbUzI4oS1Ho5P+sR4cRtg="; + }; - nativeBuildInputs = [ gtk3 pkg-config ]; + nativeBuildInputs = [ + glib + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; buildInputs = [ - gtk3 - dbus - glib - cairo - pango - atk gdk-pixbuf + gtk3 ]; - # Use the stdenv default phases (./configure; make) instead of the - # ones from buildRustPackage. - configurePhase = "configurePhase"; - buildPhase = "buildPhase"; - checkPhase = "checkPhase"; - installPhase = "installPhase"; - - postPatch = '' - # Have to do this here instead of in preConfigure because - # cargoDepsCopy gets unset after postPatch. - configureFlagsArray+=("RUST_VENDORED_SOURCES=$cargoDepsCopy") - ''; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "DESTDIR=${placeholder "out"}" + "prefix=$(out)" ]; - postInstall = '' - # install man page, icon, etc... - mv $out/usr/local/* $out - rm -rf $out/usr - ''; - meta = with lib; { description = "Multiple USB File Flasher"; homepage = "https://github.com/pop-os/popsicle"; - maintainers = with maintainers; [ _13r0ck ]; + changelog = "https://github.com/pop-os/popsicle/releases/tag/${version}"; + maintainers = with maintainers; [ _13r0ck figsoda ]; license = licenses.mit; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 575ae895ea72..ffd467f08393 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.6.0"; + version = "5.6.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-3vCOrNzVFH2xx9egBx86MnOOEl6ZpAc+lYVu8vkHTJc="; + sha256 = "sha256-89dW4XILS+nlGgRRePyrSFVb1QR5KQL5OmHJAeyjrZw="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index fff80b4fc1ae..78f5c2fb8f06 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.56.8"; + version = "1.56.9"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-ARqWLm2EEqeV3/VxjSRTXoXywrmQLLGxHab4H6+JMpg="; + hash = "sha256-mZUmQoGfTc8nwzcAMIewB7usO5vfBZNCtZEOfYkYgvY="; }; vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU="; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index cacc770052fa..713465814422 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tio"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${version}"; - hash = "sha256-BjA9Zl6JcgDxTj4KPiWItSq9XuX9FJkpZnhdMBGZQpQ="; + hash = "sha256-cRwjg0+p+1u+tdG+skqGWzxwM375P4aUsF4JVGgCXOI="; }; nativeBuildInputs = [ meson ninja pkg-config inih bash-completion ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index b393269127f4..3b8677273d7b 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.2.1"; + version = "10.2.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - sha256 = "sha256-ljjbTqFhDDHqyA+UzqxICAM9YI1U0fI6J864o9ee6kg="; + sha256 = "sha256-TDuTrtVqEy0g13zdWHz2+cQhMEMSbvameBkJUcyTfGw="; }; - cargoSha256 = "sha256-PezSEd2/98us2KPNPTmVIuPlWcRIWF7TUuT/m4df1Fs="; + cargoSha256 = "sha256-4uq4lksfgTI+x7E/p27gs0Zh0NQq3kIBB9KVD2tvmtQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/tools/misc/tz/default.nix index 30e2fa3ece21..9027ef20bc7f 100644 --- a/pkgs/tools/misc/tz/default.nix +++ b/pkgs/tools/misc/tz/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tz"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "oz"; repo = "tz"; rev = "v${version}"; - sha256 = "sha256-D0rakLZ+swrDwBMcr+EJPgaYsQTWob50QteW1PoIdNk="; + sha256 = "sha256-fl+Q6HNMSIo6E5SMBkTr6/hJN9akfJRBwSPaq7FcYDY="; }; - vendorSha256 = "sha256-PGsj7pLtd+xpy9Dhv6qJX5sHin4YAOdXaYj4QCSFte4="; + vendorSha256 = "sha256-lcCra4LyebkmelvBs0Dd2mn6R64Q5MaUWc5AP8V9pec="; meta = with lib; { description = "A time zone helper"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index cc9099877c1e..77d8de4294b0 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.1"; + version = "9.6.2"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4yikcuAhrVzWYsNOI546tA94Eho7QDCyBCmpaQ2tLW8="; + sha256 = "sha256-MaIvxO2bvLGrZmBLXZk2vgW1NtyoVKRxXEZALEwI/lY="; }; - vendorSha256 = "sha256-i/80caEjr5kZAK30sXF9dKh+jAi3msntfB/BUqpGuRY="; + vendorSha256 = "sha256-X+DxN0DAyZ/z8YRRjuezegcPHa6SJ3/XXPYP+1Apmjw="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 1facde5bc792..b7ae9f00996a 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,28 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, gettext }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, gettext +}: -let - pypkgs = python3Packages; - -in -pypkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "linkchecker"; - version = "10.2.0"; + version = "10.2.1"; format = "pyproject"; - disabled = pypkgs.pythonOlder "3.7"; - src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v" + version; - hash = "sha256-wMiKS14fX5mkY1OwxQPFKm7i4WMFQKg3tdZZqD0g0Rw="; + rev = "refs/tags/v${version}"; + hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ + gettext + ]; - propagatedBuildInputs = with pypkgs; [ + propagatedBuildInputs = with python3.pkgs; [ argcomplete beautifulsoup4 configargparse @@ -33,24 +34,32 @@ pypkgs.buildPythonApplication rec { requests ]; - checkInputs = with pypkgs; [ + checkInputs = with python3.pkgs; [ parameterized - pytest + pytestCheckHook ]; - # test_timeit2 is flakey, and depends sleep being precise to the milisecond - checkPhase = lib.optionalString stdenv.isDarwin '' - # network tests fails on darwin - rm tests/test_network.py tests/checker/test_http*.py tests/checker/test_content_allows_robots.py tests/checker/test_noproxy.py - '' + '' - pytest --ignore=tests/checker/{test_telnet,telnetserver}.py \ - -k 'not TestLoginUrl and not test_timeit2' - ''; + disabledTests = [ + # test_timeit2 is flakey, and depends sleep being precise to the milisecond + "TestLoginUrl" + "test_timeit2" + ]; + + disabledTestPaths = [ + "tests/checker/telnetserver.py" + "tests/checker/test_telnet.py" + ] ++ lib.optionals stdenv.isDarwin [ + "tests/checker/test_content_allows_robots.py" + "tests/checker/test_http*.py" + "tests/checker/test_noproxy.py" + "tests/test_network.py" + ]; meta = with lib; { description = "Check websites for broken links"; homepage = "https://linkcheck.github.io/linkchecker/"; - license = licenses.gpl2; + changelog = "https://github.com/linkchecker/linkchecker/releases/tag/v${version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg tweber ]; }; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 68e72171eca4..61f84e5d76e9 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,14 +1,13 @@ { fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpg-error, libassuan, qtbase, wrapQtAppsHook -, ncurses, gtk2, gcr, libcap, libsecret +, ncurses, gtk2, gcr, libcap +, withLibsecret ? true, libsecret , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: -with lib; - -assert isList enabledFlavors && enabledFlavors != []; +assert lib.isList enabledFlavors && enabledFlavors != []; let pinentryMkDerivation = @@ -18,11 +17,10 @@ let enableFeaturePinentry = f: let - info = flavorInfo.${f}; flag = flavorInfo.${f}.flag or null; in - optionalString (flag != null) - (enableFeature (elem f enabledFlavors) ("pinentry-" + flag)); + lib.optionalString (flag != null) + (lib.enableFeature (lib.elem f enabledFlavors) ("pinentry-" + flag)); flavorInfo = { curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; @@ -45,17 +43,18 @@ pinentryMkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; - buildInputs = [ libgpg-error libassuan libsecret ] + ++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; + buildInputs = [ libgpg-error libassuan ] + ++ lib.optional withLibsecret libsecret ++ lib.optional (!stdenv.isDarwin) libcap - ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; + ++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; dontWrapGApps = true; dontWrapQtApps = true; patches = [ ./autoconf-ar.patch - ] ++ optionals (elem "gtk2" enabledFlavors) [ + ] ++ lib.optionals (lib.elem "gtk2" enabledFlavors) [ (fetchpatch { url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; @@ -63,23 +62,23 @@ pinentryMkDerivation rec { ]; configureFlags = [ - (withFeature (libcap != null) "libcap") - (enableFeature (libsecret != null) "libsecret") - ] ++ (map enableFeaturePinentry (attrNames flavorInfo)); + (lib.withFeature (libcap != null) "libcap") + (lib.enableFeature withLibsecret "libsecret") + ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo)); postInstall = - concatStrings (flip map enabledFlavors (f: + lib.concatStrings (lib.flip map enabledFlavors (f: let binary = "pinentry-" + flavorInfo.${f}.bin; in '' moveToOutput bin/${binary} ${placeholder f} ln -sf ${placeholder f}/bin/${binary} ${placeholder f}/bin/pinentry - '' + optionalString (f == "gnome3") '' + '' + lib.optionalString (f == "gnome3") '' wrapGApp ${placeholder f}/bin/${binary} - '' + optionalString (f == "qt") '' + '' + lib.optionalString (f == "qt") '' wrapQtApp ${placeholder f}/bin/${binary} '')) + '' - ln -sf ${placeholder (head enabledFlavors)}/bin/pinentry-${flavorInfo.${head enabledFlavors}.bin} $out/bin/pinentry + ln -sf ${placeholder (lib.head enabledFlavors)}/bin/pinentry-${flavorInfo.${lib.head enabledFlavors}.bin} $out/bin/pinentry ''; outputs = [ "out" ] ++ enabledFlavors; diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index ffcab3a41877..1a66d7aea0dd 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "teler"; - version = "1.2.2"; + version = "2.0.0-dev.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "sha256-i4106PtoCJt5CY9ahczZYe9GufBkaZS+9Peh0IY9r1M="; + hash = "sha256-GlpQBmJ7HSKPFieM7E5NOnqGlUjQv9Ywe6XF5QIi+c4="; }; - vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE="; + vendorHash = "sha256-g2YBMyLDGQZKxDBcZ1mca16jxODnJzcmMfFivBn6SdE="; ldflags = [ - "-s" "-w" "-X ktbs.dev/teler/common.Version=${version}" + "-s" + "-w" + "-X ktbs.dev/teler/common.Version=${version}" ]; # test require internet access @@ -31,6 +33,7 @@ buildGoModule rec { we collect and provide by the community. ''; homepage = "https://github.com/kitabisa/teler"; + changelog = "https://github.com/kitabisa/teler/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 63b2f911a53a..a7147911a865 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-584v0271zb14ctgjpELodUpPDKfFS2DvzbdcEqH5j48="; + sha256 = "sha256-9jVx0j7dltAkoiRTJry5o2+sLPia71psBaOwhS0pLJk="; }; nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/tools/security/uncover/default.nix index 177e46b423a4..fdfa3c108057 100644 --- a/pkgs/tools/security/uncover/default.nix +++ b/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "0.0.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-bYSqfxjJGue+7gPr8XgkcPF7UUuKWmLuQO07KCJp4jY="; + hash = "sha256-N2560u3rkLhB9wL48hLzrw8NksXruGQuvjQGvVFOxsk="; }; - vendorSha256 = "sha256-FG0pqzSoqT/KjTOjXidAGjSABMFWgChJJYOhBfyzM7w="; + vendorSha256 = "sha256-71tXOm444xmRuOkw7Sa1T0afrZowvhreiwIxwlAeK6A="; meta = with lib; { description = "API wrapper to search for exposed hosts"; @@ -25,6 +25,7 @@ buildGoModule rec { Currently, it supports shodan,shodan-internetdb, censys, and fofa search API. ''; homepage = "https://github.com/projectdiscovery/uncover"; + changelog = "https://github.com/projectdiscovery/uncover/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/vaultwarden/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix index 4353303a9160..0a80c1079532 100644 --- a/pkgs/tools/security/vaultwarden/vault.nix +++ b/pkgs/tools/security/vaultwarden/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vaultwarden-vault"; - version = "2022.6.2"; + version = "2022.11.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "sha256-IG/eCBTUa7eKeaelqxCWO+rrXJUuBanhsYwklftxdOE="; + sha256 = "sha256-nd32Q0uTsnrdVPDe1Yglvkg2QcwgLR+x0dFvKSD8o8I="; }; buildCommand = '' diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 3d7774c029ad..6fa5e64e3023 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -2,20 +2,22 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, testers +, d2 }: buildGoModule rec { pname = "d2"; - version = "0.0.13"; + version = "0.1.0"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2abGQmgwqxWFk7NScdgfEjRYZF2rw8kxTKRwcl2LRg0="; + hash = "sha256-QRgHmQOrw1ZdZffjVnqY3epNkVvCNtR06fyQgKVXoRk="; }; - vendorSha256 = "sha256-/BEl4UqOL4Ux7I2eubNH2YGGl4DxntpI5WN9ggvYu80="; + vendorHash = "sha256-SO3ZeAJu4XOPDlJ2gUSYFPNG8RcOHfCsn2RKPT+FZy4="; ldflags = [ "-s" @@ -29,7 +31,9 @@ buildGoModule rec { installManPage ci/release/template/man/d2.1 ''; - subPackages = [ "cmd/d2" ]; + subPackages = [ "." ]; + + passthru.tests.version = testers.testVersion { package = d2; }; meta = with lib; { description = "A modern diagram scripting language that turns text to diagrams"; diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 87238a50f560..17b2bb3521b1 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -1,29 +1,29 @@ { lib , stdenv , fetchFromGitHub +, cairo +, libxkbcommon , meson , ninja , pkg-config -, cairo -, libxkbcommon +, scdoc , wayland , wayland-protocols , wayland-scanner -, buildDocs ? true, scdoc +, buildDocs ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slurp"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; - rev = "v${version}"; - sha256 = "sha256-5ZB34rqLyZmfjT/clxNRDmF0qgITFZ5xt/gIEXQzvQE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; }; - strictDeps = true; nativeBuildInputs = [ meson ninja @@ -38,13 +38,16 @@ stdenv.mkDerivation rec { wayland-protocols ]; - mesonFlags = lib.optional buildDocs "-Dman-pages=enabled"; + strictDeps = true; + + mesonFlags = [ (lib.mesonEnable "man-pages" buildDocs) ]; meta = with lib; { - description = "Select a region in a Wayland compositor"; homepage = "https://github.com/emersion/slurp"; + description = "Select a region in a Wayland compositor"; + changelog = "https://github.com/emersion/slurp/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ buffet ]; - platforms = platforms.linux; + inherit (wayland.meta) platforms; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4fb49b2807b..8f0c9d331371 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1640,7 +1640,7 @@ with pkgs; fetchPypi annexremote drivelib - GitPython + gitpython tenacity humanfriendly; }; @@ -2788,9 +2788,7 @@ with pkgs; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { - openjdk11 = openjdk11.override { enableJavaFX = true; }; - }; + bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; bic = callPackage ../development/interpreters/bic { }; @@ -5974,6 +5972,8 @@ with pkgs; artim-dark = callPackage ../data/themes/artim-dark {}; + bbin = callPackage ../development/tools/bbin {}; + bore = callPackage ../tools/networking/bore { inherit (darwin) Libsystem; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -13363,6 +13363,8 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; + zinc = callPackage ../servers/search/zinc { }; + zkfuse = callPackage ../tools/filesystems/zkfuse { }; zpaq = callPackage ../tools/archivers/zpaq { }; @@ -15316,9 +15318,7 @@ with pkgs; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -18095,6 +18095,10 @@ with pkgs; taoup = callPackage ../tools/misc/taoup { }; + tarmac = callPackage ../development/tools/tarmac { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; @@ -22782,15 +22786,6 @@ with pkgs; suil = callPackage ../development/libraries/audio/suil { }; - suil-qt5 = suil.override { - withQt4 = false; - withQt5 = true; - }; - suil-qt4 = suil.override { - withQt4 = true; - withQt5 = false; - }; - sundials = callPackage ../development/libraries/sundials { python = python3; }; @@ -23748,6 +23743,8 @@ with pkgs; hyp = callPackage ../servers/http/hyp { }; + peering-manager = callPackage ../servers/web-apps/peering-manager { }; + podgrab = callPackage ../servers/misc/podgrab { }; portunus = callPackage ../servers/portunus { }; @@ -27548,7 +27545,6 @@ with pkgs; audacity = callPackage ../applications/audio/audacity { inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; - suil = suil-qt5; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -28936,7 +28932,7 @@ with pkgs; freecad = libsForQt5.callPackage ../applications/graphics/freecad { boost = python3Packages.boost; inherit (python3Packages) - GitPython + gitpython matplotlib pivy ply diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 266c47548ac0..1ccfa77283c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1430,7 +1430,7 @@ self: super: with self; { btrfs = callPackage ../development/python-modules/btrfs { }; - btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; }); + btrfsutil = callPackage ../development/python-modules/btrfsutil { }; btsocket = callPackage ../development/python-modules/btsocket { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 773f8d860f0a..507935b0d5c2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -17,12 +17,8 @@ with self; with super; { chardet = callPackage ../development/python2-modules/chardet { }; - cheetah = callPackage ../development/python2-modules/cheetah { }; - configparser = callPackage ../development/python2-modules/configparser { }; - construct = callPackage ../development/python2-modules/construct { }; - contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; coverage = callPackage ../development/python2-modules/coverage { }; @@ -37,8 +33,6 @@ with self; with super; { gtkme = callPackage ../development/python2-modules/gtkme { }; - httpretty = callPackage ../development/python2-modules/httpretty { }; - hypothesis = callPackage ../development/python2-modules/hypothesis { }; idna = callPackage ../development/python2-modules/idna { }; @@ -51,31 +45,18 @@ with self; with super; { inherit (pkgs) marisa; }; - markdown = callPackage ../development/python2-modules/markdown { }; - markupsafe = callPackage ../development/python2-modules/markupsafe { }; mock = callPackage ../development/python2-modules/mock { }; more-itertools = callPackage ../development/python2-modules/more-itertools { }; - mutagen = callPackage ../development/python2-modules/mutagen { }; - - numpy = callPackage ../development/python2-modules/numpy { }; - packaging = callPackage ../development/python2-modules/packaging { }; - pillow = callPackage ../development/python2-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - }; - pip = callPackage ../development/python2-modules/pip { }; pluggy = callPackage ../development/python2-modules/pluggy { }; - prettytable = callPackage ../development/python2-modules/prettytable { }; - protobuf = callPackage ../development/python2-modules/protobuf { disabled = isPyPy; protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 @@ -113,10 +94,6 @@ with self; with super; { pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; - pyyaml = callPackage ../development/python2-modules/pyyaml { }; - - qpid-python = callPackage ../development/python2-modules/qpid-python { }; - recoll = disabled super.recoll; rivet = disabled super.rivet; @@ -137,8 +114,6 @@ with self; with super; { sphinx = callPackage ../development/python2-modules/sphinx { }; - TurboCheetah = callPackage ../development/python2-modules/TurboCheetah { }; - typing = callPackage ../development/python2-modules/typing { }; zeek = disabled super.zeek;