diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d034aa8c725c..5e52235019c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6571,6 +6571,11 @@ githubId = 541748; name = "Felipe Espinoza"; }; + feathecutie = { + name = "feathecutie"; + github = "feathecutie"; + githubId = 53912746; + }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 7aae7e107fee..82d27449c915 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -68,6 +68,8 @@ - [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika). +- [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey). + - [Improved File Manager](https://github.com/misterunknown/ifm), or IFM, a single-file web-based file manager. - [OpenGFW](https://github.com/apernet/OpenGFW), an implementation of the Great Firewall on Linux. Available as [services.opengfw](#opt-services.opengfw.enable). diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index b5fe0a3bd1ce..9505c60d4f63 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -302,7 +302,6 @@ in trusted-users = mkOption { type = types.listOf types.str; - default = [ "root" ]; example = [ "root" "alice" "@wheel" ]; description = '' A list of names of users that have additional rights when @@ -376,6 +375,7 @@ in environment.etc."nix/nix.conf".source = nixConf; nix.settings = { trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + trusted-users = [ "root" ]; substituters = mkAfter [ "https://cache.nixos.org/" ]; system-features = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 31bd31bca024..508647d66b36 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1438,6 +1438,7 @@ ./services/web-apps/meme-bingo-web.nix ./services/web-apps/microbin.nix ./services/web-apps/miniflux.nix + ./services/web-apps/misskey.nix ./services/web-apps/monica.nix ./services/web-apps/moodle.nix ./services/web-apps/movim.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 913b6fc204dd..7e5aec053df9 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -125,7 +125,7 @@ with lib; ''; # allow nix-copy to live system - nix.settings.trusted-users = [ "root" "nixos" ]; + nix.settings.trusted-users = [ "nixos" ]; # Install less voices for speechd to save some space services.speechd.package = pkgs.speechd.override { diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index 786e26cf98f7..bf8414e1e108 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -123,7 +123,7 @@ in max-free = cfg.max-free; - trusted-users = [ "root" user ]; + trusted-users = [ user ]; }; services = { diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix new file mode 100644 index 000000000000..8a5c4bd92766 --- /dev/null +++ b/nixos/modules/services/web-apps/misskey.nix @@ -0,0 +1,418 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.misskey; + settingsFormat = pkgs.formats.yaml { }; + redisType = lib.types.submodule { + freeformType = lib.types.attrsOf settingsFormat.type; + options = { + host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = "The Redis host."; + }; + port = lib.mkOption { + type = lib.types.port; + default = 6379; + description = "The Redis port."; + }; + }; + }; + settings = lib.mkOption { + description = '' + Configuration for Misskey, see + [`example.yml`](https://github.com/misskey-dev/misskey/blob/develop/.config/example.yml) + for all supported options. + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf settingsFormat.type; + options = { + url = lib.mkOption { + type = lib.types.str; + example = "https://example.tld/"; + description = '' + The final user-facing URL. Do not change after running Misskey for the first time. + + This needs to match up with the configured reverse proxy and is automatically configured when using `services.misskey.reverseProxy`. + ''; + }; + port = lib.mkOption { + type = lib.types.port; + default = 3000; + description = "The port your Misskey server should listen on."; + }; + socket = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/path/to/misskey.sock"; + description = "The UNIX socket your Misskey server should listen on."; + }; + chmodSocket = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "777"; + description = "The file access mode of the UNIX socket."; + }; + db = lib.mkOption { + description = "Database settings."; + type = lib.types.submodule { + options = { + host = lib.mkOption { + type = lib.types.str; + default = "/var/run/postgresql"; + example = "localhost"; + description = "The PostgreSQL host."; + }; + port = lib.mkOption { + type = lib.types.port; + default = 5432; + description = "The PostgreSQL port."; + }; + db = lib.mkOption { + type = lib.types.str; + default = "misskey"; + description = "The database name."; + }; + user = lib.mkOption { + type = lib.types.str; + default = "misskey"; + description = "The user used for database authentication."; + }; + pass = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "The password used for database authentication."; + }; + disableCache = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to disable caching queries."; + }; + extra = lib.mkOption { + type = lib.types.nullOr (lib.types.attrsOf settingsFormat.type); + default = null; + example = { + ssl = true; + }; + description = "Extra connection options."; + }; + }; + }; + default = { }; + }; + redis = lib.mkOption { + type = redisType; + default = { }; + description = "`ioredis` options. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference."; + }; + redisForPubsub = lib.mkOption { + type = lib.types.nullOr redisType; + default = null; + description = "`ioredis` options for pubsub. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference."; + }; + redisForJobQueue = lib.mkOption { + type = lib.types.nullOr redisType; + default = null; + description = "`ioredis` options for the job queue. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference."; + }; + redisForTimelines = lib.mkOption { + type = lib.types.nullOr redisType; + default = null; + description = "`ioredis` options for timelines. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference."; + }; + meilisearch = lib.mkOption { + description = "Meilisearch connection options."; + type = lib.types.nullOr ( + lib.types.submodule { + options = { + host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = "The Meilisearch host."; + }; + port = lib.mkOption { + type = lib.types.port; + default = 7700; + description = "The Meilisearch port."; + }; + apiKey = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "The Meilisearch API key."; + }; + ssl = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to connect via SSL."; + }; + index = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Meilisearch index to use."; + }; + scope = lib.mkOption { + type = lib.types.enum [ + "local" + "global" + ]; + default = "local"; + description = "The search scope."; + }; + }; + } + ); + default = null; + }; + id = lib.mkOption { + type = lib.types.enum [ + "aid" + "aidx" + "meid" + "ulid" + "objectid" + ]; + default = "aidx"; + description = "The ID generation method to use. Do not change after starting Misskey for the first time."; + }; + }; + }; + }; +in + +{ + options = { + services.misskey = { + enable = lib.mkEnableOption "misskey"; + package = lib.mkPackageOption pkgs "misskey" { }; + inherit settings; + database = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Create the PostgreSQL database locally. Sets `services.misskey.settings.db.{db,host,port,user,pass}`."; + }; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = "The path to a file containing the database password. Sets `services.misskey.settings.db.pass`."; + }; + }; + redis = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Create and use a local Redis instance. Sets `services.misskey.settings.redis.host`."; + }; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = "The path to a file containing the Redis password. Sets `services.misskey.settings.redis.pass`."; + }; + }; + meilisearch = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Create and use a local Meilisearch instance. Sets `services.misskey.settings.meilisearch.{host,port,ssl}`."; + }; + keyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = "The path to a file containing the Meilisearch API key. Sets `services.misskey.settings.meilisearch.apiKey`."; + }; + }; + reverseProxy = { + enable = lib.mkEnableOption "a HTTP reverse proxy for Misskey"; + webserver = lib.mkOption { + type = lib.types.attrTag { + nginx = lib.mkOption { + type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix); + default = { }; + description = '' + Extra configuration for the nginx virtual host of Misskey. + Set to `{ }` to use the default configuration. + ''; + }; + caddy = lib.mkOption { + type = lib.types.submodule ( + import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; } + ); + default = { }; + description = '' + Extra configuration for the caddy virtual host of Misskey. + Set to `{ }` to use the default configuration. + ''; + }; + }; + description = "The webserver to use as the reverse proxy."; + }; + host = lib.mkOption { + type = lib.types.nullOr lib.types.str; + description = '' + The fully qualified domain name to bind to. Sets `services.misskey.settings.url`. + + This is required when using `services.misskey.reverseProxy.enable = true`. + ''; + example = "misskey.example.com"; + default = null; + }; + ssl = lib.mkOption { + type = lib.types.nullOr lib.types.bool; + description = '' + Whether to enable SSL for the reverse proxy. Sets `services.misskey.settings.url`. + + This is required when using `services.misskey.reverseProxy.enable = true`. + ''; + example = true; + default = null; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + cfg.reverseProxy.enable -> ((cfg.reverseProxy.host != null) && (cfg.reverseProxy.ssl != null)); + message = "`services.misskey.reverseProxy.enable` requires `services.misskey.reverseProxy.host` and `services.misskey.reverseProxy.ssl` to be set."; + } + ]; + + services.misskey.settings = lib.mkMerge [ + (lib.mkIf cfg.database.createLocally { + db = { + db = lib.mkDefault "misskey"; + # Use unix socket instead of localhost to allow PostgreSQL peer authentication, + # required for `services.postgresql.ensureUsers` + host = lib.mkDefault "/var/run/postgresql"; + port = lib.mkDefault config.services.postgresql.settings.port; + user = lib.mkDefault "misskey"; + pass = lib.mkDefault null; + }; + }) + (lib.mkIf (cfg.database.passwordFile != null) { db.pass = lib.mkDefault "@DATABASE_PASSWORD@"; }) + (lib.mkIf cfg.redis.createLocally { redis.host = lib.mkDefault "localhost"; }) + (lib.mkIf (cfg.redis.passwordFile != null) { redis.pass = lib.mkDefault "@REDIS_PASSWORD@"; }) + (lib.mkIf cfg.meilisearch.createLocally { + meilisearch = { + host = lib.mkDefault "localhost"; + port = lib.mkDefault config.services.meilisearch.listenPort; + ssl = lib.mkDefault false; + }; + }) + (lib.mkIf (cfg.meilisearch.keyFile != null) { + meilisearch.apiKey = lib.mkDefault "@MEILISEARCH_KEY@"; + }) + (lib.mkIf cfg.reverseProxy.enable { + url = lib.mkDefault "${ + if cfg.reverseProxy.ssl then "https" else "http" + }://${cfg.reverseProxy.host}"; + }) + ]; + + systemd.services.misskey = { + after = [ + "network-online.target" + "postgresql.service" + ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + MISSKEY_CONFIG_YML = "/run/misskey/default.yml"; + }; + preStart = + '' + install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml + '' + + (lib.optionalString (cfg.database.passwordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml + '') + + (lib.optionalString (cfg.redis.passwordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml + '') + + (lib.optionalString (cfg.meilisearch.keyFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml + ''); + serviceConfig = { + ExecStart = "${cfg.package}/bin/misskey migrateandstart"; + RuntimeDirectory = "misskey"; + RuntimeDirectoryMode = "700"; + StateDirectory = "misskey"; + StateDirectoryMode = "700"; + TimeoutSec = 60; + DynamicUser = true; + User = "misskey"; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK"; + }; + }; + + services.postgresql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ "misskey" ]; + ensureUsers = [ + { + name = "misskey"; + ensureDBOwnership = true; + } + ]; + }; + + services.redis.servers = lib.mkIf cfg.redis.createLocally { + misskey = { + enable = true; + port = cfg.settings.redis.port; + }; + }; + + services.meilisearch = lib.mkIf cfg.meilisearch.createLocally { enable = true; }; + + services.caddy = lib.mkIf (cfg.reverseProxy.enable && cfg.reverseProxy.webserver ? caddy) { + enable = true; + virtualHosts.${cfg.settings.url} = lib.mkMerge [ + cfg.reverseProxy.webserver.caddy + { + hostName = lib.mkDefault cfg.settings.url; + extraConfig = '' + reverse_proxy localhost:${toString cfg.settings.port} + ''; + } + ]; + }; + + services.nginx = lib.mkIf (cfg.reverseProxy.enable && cfg.reverseProxy.webserver ? nginx) { + enable = true; + virtualHosts.${cfg.reverseProxy.host} = lib.mkMerge [ + cfg.reverseProxy.webserver.nginx + { + locations."/" = { + proxyPass = lib.mkDefault "http://localhost:${toString cfg.settings.port}"; + proxyWebsockets = lib.mkDefault true; + recommendedProxySettings = lib.mkDefault true; + }; + } + (lib.mkIf (cfg.reverseProxy.ssl != null) { forceSSL = lib.mkDefault cfg.reverseProxy.ssl; }) + ]; + }; + }; + + meta = { + maintainers = [ lib.maintainers.feathecutie ]; + }; +} diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index e174edefea68..be5151a4ae52 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -48,6 +48,7 @@ class BootSpec: toplevel: str specialisations: dict[str, "BootSpec"] sortKey: str # noqa: N815 + devicetree: str | None = None # noqa: N815 initrdSecrets: str | None = None # noqa: N815 @dataclass @@ -85,6 +86,7 @@ class DiskEntry: kernel_params: str | None machine_id: str | None sort_key: str + devicetree: str | None @classmethod def from_path(cls: Type["DiskEntry"], path: Path) -> "DiskEntry": @@ -109,7 +111,9 @@ class DiskEntry: initrd=entry_map["initrd"], kernel_params=entry_map.get("options"), machine_id=entry_map.get("machine-id"), - sort_key=entry_map.get("sort_key", "nixos")) + sort_key=entry_map.get("sort_key", "nixos"), + devicetree=entry_map.get("devicetree"), + ) return disk_entry def write(self, sorted_first: str) -> None: @@ -128,7 +132,8 @@ class DiskEntry: f"initrd {self.initrd}", f"options {self.kernel_params}" if self.kernel_params is not None else None, f"machine-id {self.machine_id}" if self.machine_id is not None else None, - f"sort-key {default_sort_key if self.default else self.sort_key}" + f"sort-key {default_sort_key if self.default else self.sort_key}", + f"devicetree {self.devicetree}" if self.devicetree is not None else None, ] f.write("\n".join(filter(None, boot_entry))) @@ -236,10 +241,12 @@ def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec: specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()} systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {}) sortKey = systemdBootExtension.get('sortKey', 'nixos') + devicetree = systemdBootExtension.get('devicetree') return BootSpec( **bootspec_json['org.nixos.bootspec.v1'], specialisations=specialisations, - sortKey=sortKey + sortKey=sortKey, + devicetree=devicetree, ) @@ -264,6 +271,7 @@ def write_entry(profile: str | None, bootspec = bootspec.specialisations[specialisation] kernel = copy_from_file(bootspec.kernel) initrd = copy_from_file(bootspec.initrd) + devicetree = copy_from_file(bootspec.devicetree) if bootspec.devicetree is not None else None title = "{name}{profile}{specialisation}".format( name=DISTRO_NAME, @@ -306,6 +314,7 @@ def write_entry(profile: str | None, machine_id=machine_id, description=f"Generation {generation} {bootspec.label}, built on {build_date}", sort_key=bootspec.sortKey, + devicetree=devicetree, default=current ).write(sorted_first) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 5a87a7443e24..ca6f2315353a 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -191,6 +191,15 @@ in { ''; }; + installDeviceTree = mkOption { + default = with config.hardware.deviceTree; enable && name != null; + defaultText = ''with config.hardware.deviceTree; enable && name != null''; + description = '' + Install the devicetree blob specified by `config.hardware.deviceTree.name` + to the ESP and instruct systemd-boot to pass this DTB to linux. + ''; + }; + extraInstallCommands = mkOption { default = ""; example = '' @@ -369,6 +378,10 @@ in { assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } + { + assertion = cfg.installDeviceTree -> config.hardware.deviceTree.enable -> config.hardware.deviceTree.name != null; + message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set"; + } ] ++ concatMap (filename: [ { assertion = !(hasInfix "/" filename); @@ -426,6 +439,7 @@ in { boot.bootspec.extensions."org.nixos.systemd-boot" = { inherit (config.boot.loader.systemd-boot) sortKey; + devicetree = lib.mkIf cfg.installDeviceTree "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}"; }; system = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 423ae872155b..79750287ae73 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -584,6 +584,7 @@ in { miracle-wm = runTest ./miracle-wm.nix; miriway = handleTest ./miriway.nix {}; misc = handleTest ./misc.nix {}; + misskey = handleTest ./misskey.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; mobilizon = handleTest ./mobilizon.nix {}; mod_perl = handleTest ./mod_perl.nix {}; diff --git a/nixos/tests/misskey.nix b/nixos/tests/misskey.nix new file mode 100644 index 000000000000..1a450c518aae --- /dev/null +++ b/nixos/tests/misskey.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ( + { lib, ... }: + let + port = 61812; + in + { + name = "misskey"; + + meta.maintainers = [ lib.maintainers.feathecutie ]; + + nodes.machine = { + services.misskey = { + enable = true; + settings = { + url = "http://misskey.local"; + inherit port; + }; + database.createLocally = true; + redis.createLocally = true; + }; + }; + + testScript = '' + machine.wait_for_unit("misskey.service") + machine.wait_for_open_port(${toString port}) + machine.succeed("curl --fail http://localhost:${toString port}/") + ''; + } +) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index ca6464614d4d..a9f42900addd 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -172,10 +172,23 @@ rec { imports = [ common ]; specialisation.something.configuration = { boot.loader.systemd-boot.sortKey = "something"; + + # Since qemu will dynamically create a devicetree blob when starting + # up, it is not straight forward to create an export of that devicetree + # blob without knowing before-hand all the flags we would pass to qemu + # (we would then be able to use `dumpdtb`). Thus, the following config + # will not boot, but it does allow us to assert that the boot entry has + # the correct contents. + boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64; + hardware.deviceTree.name = "dummy.dtb"; + hardware.deviceTree.package = lib.mkForce (pkgs.runCommand "dummy-devicetree-package" { } '' + mkdir -p $out + cp ${pkgs.emptyFile} $out/dummy.dtb + ''); }; }; - testScript = '' + testScript = { nodes, ... }: '' machine.start() machine.wait_for_unit("multi-user.target") @@ -188,6 +201,10 @@ rec { machine.succeed( "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" ) + '' + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 '' + machine.succeed( + "grep 'devicetree .*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) ''; }; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index e9c011490ae4..756c14b417be 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-07-27", + "date": "2024-08-05", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-07-27", + "date": "2024-08-05", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c69beb943dd8..8f2e5d2ab256 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,24 +65,24 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-07-26"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "f20a0425b33c1704133bdef5ec10c4e94f6efdc6"; - sha256 = "0mqxhrc3bhw98dxqji3qpm7z1aqsi9zdlsm5mj9qkc1qn37af4m3"; + rev = "4a5e07185b37d3132e5541d8fa42aa874b774476"; + sha256 = "0hddx5yip9r5asm21gwrcflnlhpj07f3sp90157alnmsvmsjbcwb"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-30"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c1dc30666c957815b012ae67e8e61de6b48ecf86"; - sha256 = "17hrsjxyr9f59h790gvwk8gmp7zzfjjsnvb5a5lpqa0q4yxq3fzv"; + rev = "ac6e91f72c43ea5b7734daca160f8072b6e98799"; + sha256 = "1hg44rg94bv1wblpghff8m4zkkprmfsjmcvm7azismpf3f71hcdx"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -197,12 +197,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-07-24"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "b5f1990bd06dd376e46a906d383d1b8dc436b3fd"; - sha256 = "0x6lycyy5184cq5ppw9a9923d208mxa0qchpiyjbyxlh0d5hlfm8"; + rev = "10ad367e4b523ccb4fe2953078d0affcddb1f1a7"; + sha256 = "1gwzjrmr0sf7nhlpviscnnsz2lfjyrxk14bgp1yfx297sb529acj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-07-25"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6eb8cee613518fb065d23a81d01eeb42365d59c1"; - sha256 = "1cnd2wp67r71wkxf90hwiw0x9i27ap57wxihngasvnqn2swslm31"; + rev = "a86e7a0ecaf09fdb0b58ca09f34cd1e2b2b1fd75"; + sha256 = "0yidgx3z5dims64gdzvln8rji7qqbaxrg9jwbxa7w7vqhy3s7b99"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "28c3ff61930700f66e6865179cfade5dc78b5d1f"; - sha256 = "1k4f9fkp5c6i2fhsjlxipdwgmqp6ifqvwgnjhicsn404b6ywgdxs"; + rev = "f15e9ec6789c8ddb95da39f346489b26ed6193ff"; + sha256 = "0xmx1qffkl3dbqbaawdgnjs1cxdc60v0035q569bqldghfv6pv9h"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: Vundle-vim = buildVimPlugin { pname = "Vundle.vim"; - version = "2023-08-19"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "VundleVim"; repo = "Vundle.vim"; - rev = "0765c5c4f485fa111f190e2d7dd89ec9f5b3f554"; - sha256 = "0km5kpv9zgnaw1dyxhcksll2snl95mb4sahj0ffx5id7x5j4sqkc"; + rev = "5548a1a937d4e72606520c7484cd384e6c76b565"; + sha256 = "0lfhsxp9h235rdj0wsn5fnwqmyjcciwqvv1l8ibfg75icmgjlwhf"; }; meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; @@ -943,12 +943,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "d5553e7e0fc83a7296847ef8009b9b93a4191cdb"; - sha256 = "18vqz7iiz8xqzbwmsxylhkm4j0f64dyqzxz0j17fsirysj29rvf5"; + rev = "a6e692fadbe385b28ba8e98b67747a7e2f381f91"; + sha256 = "1nlnh4ikr8mnk87694hyblrpmisc06bx1yiqrp6mv409vcafbw1j"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1064,12 +1064,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-07-05"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "8d86d4b5dec2e35392d53a82602d4f2b12e3f014"; - sha256 = "0nf2qzzix3ddgal217bhphwr29qssz797nxl53y2i98rvxdajljn"; + rev = "49c0737fd76303f1294206f898680c6b9b174260"; + sha256 = "17aghspa3mdyqdxxz8726wv6kxf82bwqrp3mff4j4klmb1wxc6ja"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1124,12 +1124,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-07-27"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "89cb656606a2f47ae9f814530c961be4cdb6e117"; - sha256 = "06621y5ak8dzq1g6wcg32vbgirjn9qz8zml6l3k5irry83h1ayx4"; + rev = "be43be136eeab321c8cb201bf72c7db44d97b15f"; + sha256 = "04amnhxbdydl5x7h4vvirj2xj4kgv61gjqxkpc0ryk0v2w3zvdxv"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1172,12 +1172,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-07-27"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "f45b52f8f87792e8659526f23261ffe278a54be5"; - sha256 = "1ddp41ydclihz2mgcxdv5dq0b4hng46az50hqwfr8ilvv7i3nwbk"; + rev = "d337e02b140d909345441392de47a42d283747c1"; + sha256 = "02bm6kfqds02y95qqcxhy54wlw1ra6zg0p5m6x4900178r37bfw9"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1352,12 +1352,12 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-04-21"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "448ad2a159c5f2540f6c9738f3bb9e6f15a41734"; - sha256 = "19anlq6kjlbmhzr2sqqykxfksflkfij10kj82cxlj47r7nqzjgpf"; + rev = "2253f970e54320dbd76fd6bb4f5a0bf2436ce232"; + sha256 = "0yw83r4y774vldvycqa7knvvwmn0fpdjka4lvdfrz1m9laawpybc"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1604,12 +1604,12 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-07-24"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "18bbd723a45b3f84bad8be58b86d8433e53f81c6"; - sha256 = "0h5d16591x553vkj62l1s5cq7mklmcnpp1rj1kw7zfgnhgfn64cc"; + rev = "61d86ffc5863833aa30c6098f95a1e56670a6c64"; + sha256 = "1f629agggkxsdfp7gmw8j60q7szd9lvrazyy8d35avyn0npmp64n"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; @@ -1951,12 +1951,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPlugin { pname = "cmp-nvim-ultisnips"; - version = "2024-06-01"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "404401792ec62d51ca2e8c279a81996082c2f937"; - sha256 = "004f53rj8037zgxf9jkkyszhsykmgdvy4mc003k7cpxsypv2gz3a"; + rev = "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49"; + sha256 = "0p9jm8p1pcymahlak40bazvi6m32njn286d768pyqr342l0cw2bk"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -2179,12 +2179,12 @@ final: prev: cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-07-25"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "e55066223f56f864775832325d2f325ec9b083c9"; - sha256 = "19n9l2xcn0sis5bs0rw9p4ivgfhsm830mjfs32r0wdn1pnm320xh"; + rev = "f9bcbf6d73c065b95cdf891195e825d918412a3f"; + sha256 = "0v6rss8sgzig08x23x329alpyixx510m5mf3b4v8g6nsv06ldxn0"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2275,12 +2275,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-07-15"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ebe2a2058ed85d3884f8010a53bac25edbf9675c"; - sha256 = "0yva1z27zqb7qm4zfvni7kp9yy4zjk9hfs3h8rjf7vjldk6l8xmx"; + rev = "ae1a5576936f78ae46a51964db1b2293b40ff27f"; + sha256 = "09m4zrs33msjc0ifqh5xk4pzlm8ws5xd3043k1xfvaw6m3ic18d2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2323,12 +2323,12 @@ final: prev: codesnap-nvim = buildVimPlugin { pname = "codesnap.nvim"; - version = "2024-07-10"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; - rev = "06d8e345e7be43a5b2bd67a86a3993da91c59781"; - sha256 = "1r3z9q3a6jfz08dz9brnizn68izl8p3b5xmbj7cima1l7xik0i4j"; + rev = "c2924bf6c9a2c2c03318fae9b7fe0706412b9d9c"; + sha256 = "0xvixdcplkmysxfrlfz3sjkhzh4bswgk86jvrpvhq1c4kvyg53lp"; }; meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; @@ -2756,12 +2756,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-07-25"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a8f1f05fae1d0b74dd07d61a1f8eb023a67a3af4"; - sha256 = "1p7j85zl77d9m2kfqjmlbcgsvazyf90b4rv2p9x41ac0ydr8hsa9"; + rev = "1c924d5a9ea3496c4e1a02d0d51388ba809f8468"; + sha256 = "1aig0p82q7sy3291671msh6yk945dnxczw6qg59n5w98aw8848cp"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2852,12 +2852,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-07-27"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "f4551361685342cddea419c96eaa04fecb36ac57"; - sha256 = "00qz8b1cjn20fnfjb3i9302s7sb9558v43xmjyvh2r8aw5xyj32j"; + rev = "59feb56373c368c3d865fb8fc744e7484250a30f"; + sha256 = "14svzd0kpfycfbnksiizjsl6v150cl4v83010jlfckylcg75h63f"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2900,12 +2900,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-07-11"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "2f918996d0429b2923f01a51bf8ef88a659800f7"; - sha256 = "1wgqriibf56961zk3nk629abc7wpybdasxr20y6n11kiwwi407g4"; + rev = "07b3b4fd4b807c77b65f57d3d6a484a74a76bb00"; + sha256 = "0j8yv53595m05725qlal4h3j28ld6g870ra0bkrrbar4a6nq2w30"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3008,24 +3008,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "8c920ec6f190c5c77287f802884bc2004799d062"; - sha256 = "1df2ifhrjjg9fl2vvfkky63l1vy8qw6ijlk2md6l95fnym4vapx5"; + rev = "fcc579be1f11d24b56d4d0180bd6ca8a8b919cdb"; + sha256 = "0ps0ki7k3354dj6zspjmf8390jymp9949nr66fzp7cwvmyqvn5f3"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-07-03"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "dc1efcf37e8c415ca686a4b6faaeae801ffc7ab4"; - sha256 = "1pvqxbyiccq5y9m0v23prkfi5b5p09xbn6ygckv7ppi7gb63hr2k"; + rev = "0289c480eda61e53665e1765d7a0580e937a8ace"; + sha256 = "0ph1v14y6fnp3mskqhr3c58hfhbp0xwdhdnq1aifavq6bkqv791b"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3491,12 +3491,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-07-14"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "1e3210cb48ba14cf154c88c59702dafb321c79db"; - sha256 = "0h6ga4zhmb11xrjisavv8qg71vpz7564h1lrc6j7m4hmzp0mkv89"; + rev = "fe560e3c6c878a682f437d8adff34f5f8a53876d"; + sha256 = "1zmsw26jn1q9a5bbpzhg3di483qsy2dj2gvwcmwgaks5dp6p3p60"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3612,12 +3612,12 @@ final: prev: eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; - version = "2023-09-16"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "c540d58bf52aa979d4cca639c60387ae0c0ccf88"; - sha256 = "1hd9ph3f56y01gd9ipbd5lw4ips6n9wcr4c9snc60c49z6xammlk"; + rev = "2ee9e64d4c8133da1131edf0e64641e32dd16396"; + sha256 = "057hkbd5ab1xm2x47b0wvd4qafwinlwhwixqbl6dgdnhbi8my6d0"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3756,12 +3756,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-30"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "c6e37476ab3b58cf01ababfe80ec9335798e70e5"; - sha256 = "0mcfm4ya7kwr6yj0wfwylqqhiv9hx7m45dpfsra7zzjs2xjpcplq"; + rev = "bb70728c13c305ff35193586d5f6ce68668af063"; + sha256 = "0vfghlqaj9hy5q4hcjvyksqb45dfyvwmlz3ns63jmwn25hbzs9h3"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -4033,24 +4033,24 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-07-26"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "769b6636af07ea4587e6c06067d8fe9fb0629390"; - sha256 = "1q64s38vjsifc99vaa8la48wr9wd4w1gsmb2zgskpygha8fsgr1q"; + rev = "73bdec9ac5da578376bdc5a705ea80a19baa4942"; + sha256 = "1b4izbp8vc2mfa8qahlkna15j66dmsmv7r7g8y3q656hgnc2lwig"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-07-19"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "f7c7b44764a601e621432b98c85709c9a53a7be8"; - sha256 = "11fq1c9lgkgzxxg70qd6jy8735dvbfcq9gc5bsn9xwy9yjjy03il"; + rev = "6f28c8c7bb551161a0315a76488522204f39c1f4"; + sha256 = "1dbinqfsdi7sqbdb39cis74xk44vc51j3gzqwjcms9dkwbh8sbcy"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4129,12 +4129,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-05-28"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "408d5487d908dfe5d48e5645d8b27ddcc16b11e0"; - sha256 = "0m7rg9yn08c9c57dpyxqlswk19mgl8r8krwqhjj3l3n93mbxqym0"; + rev = "50543e3993f4b996eea01ff5ccc8fe2a354c5388"; + sha256 = "1bn45k9w3g93srmr7dwymq90av5zx1zr21kki7fq3xpc5c9vmrwf"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4225,12 +4225,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-07-25"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a"; - sha256 = "07q5mh82p9y6h047xifj0fpan6ny6cb56y4ghymrvq1ziahi0xcw"; + rev = "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2"; + sha256 = "0yx3vs0fc0qlgy9f2dndbaxpaw0izja5nxnv3zdwkn7nwknxnmfa"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4261,12 +4261,12 @@ final: prev: gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2024-04-10"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "f9e82b70425dc0726ee173ecddf176ffa364e30d"; - sha256 = "1z4vvrxddhncfnr14a7kqc2k6gwknx8ydvs6n4my0nkz9jxh3v6s"; + rev = "ad6c328d6460763ca6a338183f7f1bd54137ce80"; + sha256 = "1apvzg1l694vd9q9ip0d11yh7wkylz543smcwkwqpz6q8vs4qbb2"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -4285,12 +4285,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-07-16"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "033344ddfa3cd5cfd55037903264b2bb86691619"; - sha256 = "15i8699kw32liq82632ngc1bfr1vasy8f8wag7im1kin9s8bw5c3"; + rev = "e66c3240d26936428cd0f320dc5ffa1eb01538b8"; + sha256 = "1vgzi24a518dn1x2lp4fysfdy62nj0rykl3s5iww75ckfssvxlic"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4405,12 +4405,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-07-26"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "6eb9d2a0621d6e2090de39c6f3305031d7029b93"; - sha256 = "0dld4cbdn0y227ldrd3n2rhw1b3zm8ds84rkgxw3qqwndgh42qdl"; + rev = "3e491ca05c50f87d02543adb010aed9dfb1e12c1"; + sha256 = "0vl0c5dl2fg90mly0qpranf9a22iisgswx856rjzlz0jan6pxsvr"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4465,12 +4465,12 @@ final: prev: gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-06-16"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "0ab9d8c7a8b4cd26338ca0c816c4ca1a48f9d5d6"; - sha256 = "0il0rkj3yskfy591phdvyd8kdc14303m1g58hygvdd46ccsxj8kw"; + rev = "e9f1616bc00a994e7e135297876df1143bf1efc6"; + sha256 = "1qbdbfpzrd2pc2d1j0yklhl7d9907wx2w54vwvd2cqwa91hm7dhm"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; @@ -4501,12 +4501,12 @@ final: prev: guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-07-21"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "29344aa846c793982c6fe29eee85137e3ca2c38b"; - sha256 = "0bzglcfls8973zsip9jcfhqid0kjp1s0b03s5bdl3wqza5sac29m"; + rev = "14a8e35993c4513da1c93719234de09e7d3a91a2"; + sha256 = "1ycvq5yp08ald5g16vdbyfqlx9kscl5syl2hwp6czn6644cdgasq"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4549,12 +4549,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-21"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9688bc77bf9e8e2ad97cf0f9b7701407aa2b31c2"; - sha256 = "1paddg7v3akc4s2l1br4gfwvbg1gxzgajaqman3fi56pl7lw5xy1"; + rev = "86363dea69e00cbc48f02579cb6108b283876548"; + sha256 = "0gdhm1acq83r6b0jylxlwa7ifvxa98ywl27z7bhad0gb11rnmpma"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4895,12 +4895,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-07-07"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "61c76515cfc3cdac8123ece9e9761b20c3dc1315"; - sha256 = "1alr35537j9agj7x58fmar3di5nc7hv6rmnlqyk9js512lmfr8pz"; + rev = "6fb2b84a739d92b781bba5f59f2678ea047332a9"; + sha256 = "1x5c2fmp3n7xvxq76r1na8zmbz0y92bsi0vnkvixa1wgirra5nym"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5401,12 +5401,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-07-23"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "39f263d03812f557d34e00f0d64263a0b9cb9dd5"; - sha256 = "1q8gjggxdikkm0gifvzdsnqa7qh45hixnglccvvvkzd44jxxi1y8"; + rev = "539a4f5944edb58ed3fbf72416396fd4014fbd3c"; + sha256 = "1qqhg570sbwcfbxaax89r608rgqdvi4jpi96mjlhrwxqmhlgxxvf"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5437,24 +5437,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-07-25"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "3b1d76ee9cd5a12a8f7a42f0e91124332860205c"; - sha256 = "081ihmjqvc862hw8z2rgbj22hvm26fpigvm99f7f90si6swp1w29"; + rev = "c6bfb191f1161fbabace1f36f578a20ac6c7642c"; + sha256 = "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-07-26"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "543bbbba4e7b54222362f312e1d2e3dac1eaae75"; - sha256 = "0s85jl37znfc281fncsqrlrasbb121hzfqz89xi5ld46303rqzn6"; + rev = "c89be94fe96dc5eaba67ad9371263bc1eac75044"; + sha256 = "1mq197p33ywp9cz2h38zx37nmgnqa0azz7c0c2s7n6mjxr6ych8h"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5737,12 +5737,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-04-03"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "3612642b0e2eb85015838df5dcfbacb61f15db98"; - sha256 = "1pizkn16ma7yfsy19g06f6l6zkqwsjkmzybqhhhp18xbbyj7m8cc"; + rev = "0d1b6e3317ff64719e8e6a4f534eebeddae70582"; + sha256 = "01g3xqn981k20a9qa2jz89vkj55hagzd75avq5zs8c0jzdlm1g2f"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5868,12 +5868,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-06-11"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2"; - sha256 = "1zgc53kdc10k7pa67svjw9bndazblmjw1lrsmdprggsxvcd1x2n8"; + rev = "a751b92b5d765a99fe3a42b9e51c046f81385e15"; + sha256 = "0k112zrw3zjxx9m8pcpmv644vl25sv0mpa4hjx75q76i53yyhz54"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5916,12 +5916,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-28"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "ce0a05ab4e2839e1c48d072c5236cce846a387bc"; - sha256 = "17q4b9hlnj7cnijw8xcn0g3fk8q3c8smz6l125hlwzlak23b716d"; + rev = "7552e6504ee95a9c8cfc6db53e389122ded46cd4"; + sha256 = "12gf4q7nmw0psj8m2hx55a0nlxafzvlabf9g4644ay1p74hj07ij"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -6037,12 +6037,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-07-17"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "316cafc79490f8b79c288bbe6638838d6d68e227"; - sha256 = "0ysiy6q8m57nz8lk6x4phf544lxsdn1g5xi17xvax30dinazwx54"; + rev = "d0ccc97b5c988fb28e5033abdf7b832b9dfaf897"; + sha256 = "0mln2ll82gkw0icswgf6ya5g6ndr4d1cn0lfx06gz00xp0h1fh2p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -6050,12 +6050,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-07-25"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6"; - sha256 = "1lmbd9zjc8l3210j3aq2vbqnbijydvdv8a4a85ml8f6xkzs98wz7"; + rev = "62360f061d45177dda8afc1b0fd1327328540301"; + sha256 = "0q722qxwcsvs6bp5f3hvagsdz71l2ffd5g9yhsjjqy452lqynjai"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6110,12 +6110,12 @@ final: prev: material-vim = buildVimPlugin { pname = "material.vim"; - version = "2024-03-04"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "07e70d5d675fadb1e81191b2d990b2a72edccf0d"; - sha256 = "1rv7hp3gvzvvvh2vifz8r9g12srbldysgnydljp71qs3pwbqpp2v"; + rev = "cecac931e8bd9e3d2cbb7c1e24ddb98887176f68"; + sha256 = "15yaahzva9vg87s2pbipwrkk2f0w7mjxwzmyrr8wb5f8rncxx01f"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -6206,12 +6206,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-07-26"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e24ec1fcf885990fec1a993fe8304a033fd1806d"; - sha256 = "10r0yl3gcvpa4bjb9f9r4wszf1nhf2mgarlgw4y270jvslgm2iwg"; + rev = "af673d8523c5c2c5ff0a53b1e42a296ca358dcc7"; + sha256 = "0rky24war90avndgm9fji0f20d24bgyc3s1spgw5lw443wh9vizl"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6242,12 +6242,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-07-10"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "0fa1e682e35d46cd1a0102cedd05b0283e41d18d"; - sha256 = "0cflg2g4alhqhfcwz14k4d634lw482xx201k3ppfgx47g45gk40s"; + rev = "faf013f7ee254f52b88f57b088f650150409cb24"; + sha256 = "0s5yxgr2xsr7n25fh588g6hr83ps5b53blg88156lxg5rjkj460i"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6638,12 +6638,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-07-27"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "fa73db350690ede9ed0dab1a3d803d7d0406aa0e"; - sha256 = "0lj79zykph3bmck0hw7bajvwkijy82k1r86xlvcx2ml1xfa39vw0"; + rev = "17a3367bc4751859cd50e05f38fea0b7a4b7ed42"; + sha256 = "1vrqiz4cy2fzx61js80dz1ns2lxfm927wmybi613azrxkhz7jy66"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6686,24 +6686,24 @@ final: prev: neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-07-25"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "3d7718451514e068ae15c0fe3f6cf94ecf7fd0a4"; - sha256 = "1bvybczfypaj74s9v8zb5qqnynanihkwiq5fy4g04q98yllajl9f"; + rev = "b3b38589b39038dc12c2f5a59a828ed43439363a"; + sha256 = "07ci4sy7i7ni5cc03p89ffp73n02pl7xy2ssrc0909vk4ngbwwxb"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPlugin { pname = "neogen"; - version = "2024-07-23"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "4a2f68d3eae0018b04132f1d4590e51484043354"; - sha256 = "0bd6dy1fv2b18ckdvp6drlxgsdg6v5a1jwvcjwwi412ivj2jnc08"; + rev = "4b22542b96712a5a901fa909b7dc749251ae1625"; + sha256 = "1258d2qqnf0qc07fj18601wfanwccpb8jmvz8nv3vw5fn6pj0l76"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; @@ -6782,36 +6782,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-07-25"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "1985f2d6f152622b0066f48ba8e39d157635dd38"; - sha256 = "0r9v7djqhafnb638j5q49c9ff0b9ynsrijsxhk4zx6xrizl91jil"; + rev = "e5e797e6eddcb6efb1d2c3fc2612b31ad9a76cef"; + sha256 = "0439h307zphrz67s3mvcjwk2ixn1vrxas62lrcp2v07w8gln59m1"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-07-16"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "2fe2780d539b961ef240f7907802754556ba7bb8"; - sha256 = "015y8g8kcaj65f9vr02hqqj59wdgrpj8cbsshd6klipa3yk2x42c"; + rev = "ddb2556644cae922699a239bbb0fe16e25b084b7"; + sha256 = "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-07-05"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "a7f5953dbfbe7069568f2d0ed23a9709a56725ab"; - sha256 = "012jvfkmi2x28h1bpx83mbn836h576fl09zv8a25xnran78m8qwq"; + rev = "532dcc8cea4287c4cad6bb77532989a8217cfc7b"; + sha256 = "1kcy17jccbhc4ha81fcxcch60hdlwzywd88ghx8r0j18m2wngb95"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6952,12 +6952,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-07-23"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "41cf5e59ca132a5cad599867de3f154429e5c148"; - sha256 = "18gd2ai0fnj4wvxqhik4j19fvg0ss3cwnrqx12djwpmf078cs6p0"; + rev = "f71d2494726c529c5d5c43813b24b3dd91ade981"; + sha256 = "04k5g7m1vab11362grl1c755zkdw16xz92dpl4a39h5py6wgfzp3"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -6989,12 +6989,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-07-21"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "2ba3ed5f053694e5c831922b58abec412b22539a"; - sha256 = "1czk8m62ww8vw397dk6cz18426ibbgv56qybh34vnl9s5pqkxddd"; + rev = "dc8884ba9ed12433f4d2f13a6cc127a6339b4825"; + sha256 = "1mkw66jwlqiyzf971ygxks0r9zlddqfjfw5v5vyr1qvbfs049mm2"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -7157,12 +7157,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-06-17"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "7cc48ba642a6acb96f377054cc4439c6a135fb5d"; - sha256 = "0dlc2zd5qwak5gwv1pv1arbpj56scnaz4n1my50i97rvj4yf3vmh"; + rev = "b3e6246c07d3d4f06075f33aea896affd25f0de9"; + sha256 = "0v75jp4rr35fnm4ksdgskpdvjay86y28c5ibbfjckn4zajf7w8nz"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; @@ -7373,12 +7373,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-07-25"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "46fdb3cd2dfed2b640fe3885f1fe83d91f5b0302"; - sha256 = "07sbrr6c41dclgrqgfd1bxrzb5zjxxacmpy1qddhkv86qjn3r4rj"; + rev = "4ba23d18fb321f45700025945f159d2fe06506b4"; + sha256 = "16n286r7l9j5kwz8cp50xvxch72w2jfi09sw91gy4djdf1qh7v0p"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7445,12 +7445,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-07-26"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "a8594ef3dabb484adabc0ebbf5800be1b807c9e7"; - sha256 = "0gvay7gq5579iwsqd30lh38l4vyzxn5wmsprg10dpq9j3ghs4rma"; + rev = "cfa65d86e21eeb60544d5e823f6db43941322a53"; + sha256 = "1hdlrgvllsqhmdd2wnmr529pz1vq1cd6jayp7zfxk8hik154q3v4"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7541,12 +7541,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-07-22"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "85b9f5686991a8b98c4980747f484ce155c959d0"; - sha256 = "1kvz89x58yh10dab890bw9w6kpg9jx27b9zwljylcdkf72gp4sdj"; + rev = "c40c5116c4c091f4da620abcd9c58bd5ee4b8497"; + sha256 = "1wry827rk2j5kj8a2mch9dqcb4ky0ggh5x3n76yg96p8mxgglypi"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7661,12 +7661,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-07-16"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d818fd0624205b34e14888358037fb6f5dc51234"; - sha256 = "18yjwihrr4ykq2h8yv67550358bmxi6maqvrhhbvxf402r01zkld"; + rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; + sha256 = "0fk7s6apvq4r9h82jqm5azf1zg9aklyycgh7ivnb98bw9a0ivjim"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7781,12 +7781,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-07-17"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f"; - sha256 = "144npibr7gi5vxlmzpzmwj9x3x10698c6x121j7lcbrz56a0g380"; + rev = "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a"; + sha256 = "12bxs0dh6h1rkb45xb0cb7fccgm1an96yy28rcf2jddsfhgfzw32"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7937,12 +7937,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-30"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "a8f6952cb1ff7bde864a34c502f1a42c360a6662"; - sha256 = "1ib95qqgk0vvn9yfag8sh0dxrl4nmxy8q87ikn50ivm7nmf2bl54"; + rev = "a411550ef85cae467b889ba7d1a96bd78332d90e"; + sha256 = "0m5kh6a7ywrkrsmy3cj4z2bdkb54pm3rl8rs1haj041zp6sa6y03"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -7985,12 +7985,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-07-12"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7"; - sha256 = "10178jwv5mzq4lgxpspyfvjrylxix6gpm0pcy98h8gisxz8kv0yh"; + rev = "be5c8d49e0f5c01978aed2314ec47fa8eae759ca"; + sha256 = "11lb2ayr0l5mdhg69vmx3ks7yixljyhw81fd3dij9z2drw344z5h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -8104,12 +8104,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-07-26"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "f95d371c1a274f60392edfd8ea5121b42dca736e"; - sha256 = "0h93s14vqrwg7gkqji1pc3p3h72niy1hdjd387mz5j62h7k6h74h"; + rev = "e6528f4613c8db2e04be908eb2b5886d63f62a98"; + sha256 = "0b4p41kv6m0hi1rh2z0711s8mklrnjsdddx9fgvmjm2ajh3qcfh3"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8440,12 +8440,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-07-08"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "9a28f926d3371b7ef02243cbbb653a0478d06e31"; - sha256 = "156v7by8hyzrc4r1h0nrpjpb5hd4hdplysm1j4dkbzzgb478gj33"; + rev = "ba7fb777edff6c1fbbeffd343e113af64c04e90a"; + sha256 = "024kndjny8h8669d63796c8fnksb3vi86w20bfplxi4vbsz4syhn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -8512,24 +8512,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-07-27"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "82ba116bbd0cc5f0482783d67ea969595e2b381b"; - sha256 = "0wkvzasa2bhy2wymc7v419nlz5wdsf96scnd2c3ksxgrfjq42jsc"; + rev = "48d0e82f9434691cc50d970898142a8c084a49d6"; + sha256 = "1j59d696dn87bqllawn2l0n0092f20ih99a69sgjaqw31fz4cq3h"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "2b4881286ad73c9ece7e5e4da130b2e4726c09fc"; - sha256 = "0phg5vmgaiig8y15gnlklvrsfafrldsa3g84ahd0927a4yb52rw0"; + rev = "d7353a6b72008b38aa873ace49aa97bea257941b"; + sha256 = "151yrgddjaym52jwc65z036m8jncf7ndfycdj899xc2raw3qac5s"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -8584,12 +8584,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-06-05"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "34867c69838078df7d6919b130c0541c0b400c47"; - sha256 = "0c8f2y8glhsbd2nbb0iwjly8f07mjy55z3j53l0p360dgj23kmpw"; + rev = "d45a1150580745a1905d74185b544af3ea6f709d"; + sha256 = "0gbb4hdwypffrxk2g7h09f7rd050g9knbzlwnr55sals5xhf1ngc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8632,12 +8632,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-07-12"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "1b5f2838099f283857729e820cc05e2b19df7a2c"; - sha256 = "0z7n03dgbz6gsjsnncdd6xvfl8phhk2a3gg08m3w7zd1v0w3c1d5"; + rev = "4cc3ba9303c0708b81fd681786a4835fd31518ac"; + sha256 = "00v2rxfrj8xjgrk41hz6kan66358byxccyyz6nxyjxa4f0bd77c4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8656,12 +8656,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "a2af6aa13a2ad3ad361d562a319a91bcd68c43a4"; - sha256 = "12q6cinxavsspc3xpir5dd6nxl7r3pqw7krpnv4i79ji1imsfq26"; + rev = "3722e3d1fb5fe1896a104eb489e8f8651260b520"; + sha256 = "1hb7qm3z5m20m4lyq57pb8jmydsssmj0zfpsi2nry0skyfaqrrad"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8740,12 +8740,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-07-26"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "c87db615d1bcf298848a25571a659283595c62c1"; - sha256 = "0sapas3br40vx5xbfxsps2acfhyi3w1njpi22bfjrgwg079bsdaq"; + rev = "14e0427bef6c55da0d63f9a313fd9941be3a2479"; + sha256 = "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8788,12 +8788,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-23"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "71c972fbd218723a3c15afcb70421f67340f5a6d"; - sha256 = "0cap7h95qkf34bq2abjl4l6ai28c1lwqc7g1qplga72hd1c1l48z"; + rev = "fcca212c2e966fc3dec1d4baf888e670631d25d1"; + sha256 = "1lr5zll5662x4clzkf4a6ak2izgwla53vf5vsabcpdhm862qc7i0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8885,12 +8885,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-07-05"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "f90c110a4944d8d520229d6c6bd8040bfca31a63"; - sha256 = "1ikpqmf0wng8sn37g4ci0xf0wxb1jldzdz6kw63lgg5k1qy1m3lq"; + rev = "c825a3490dc3f6fb413607ed2602c1280a127756"; + sha256 = "01wzw4cykgq8mwg4yi5smfcpkg0q1zvbvmbdk0gyck3cg09s9mfs"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8969,12 +8969,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-24"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "ab24c847538f3c36cbc0da33210cb3eba32e69b9"; - sha256 = "15mvvi0l6cxjyy74rdkpnb1hpv21204slz11vp8g89pfvis4h38d"; + rev = "de02a0cfbe3484accb73025b6dd71b2cc4ae3eff"; + sha256 = "05jj52dz4436cygy5iqhayma24bnafbchjz172cdcm0bivnh7vdg"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -9319,12 +9319,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2024-06-25"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "2a566f03eb06859298eff837f3a6686dfa5304a5"; - sha256 = "XLcyRB4ow5nPoQ0S29bx0utV9Z/wogg7c3rozYSqlWE="; + rev = "6772d3a6aa98f6e68b53fd7d4dfd7762bf3ae3bf"; + sha256 = "0g7vp64x7ip46n44q2j3d8xprs8slkwj85ar3x09ki5d4mp1kzjb"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; @@ -9403,12 +9403,12 @@ final: prev: promise-async = buildVimPlugin { pname = "promise-async"; - version = "2024-06-10"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "promise-async"; - rev = "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2"; - sha256 = "11v2jqjil6l1i9rl93pcdn0b8nk8f0zg10fk3p3q4z641c8m8xjf"; + rev = "119e8961014c9bfaf1487bf3c2a393d254f337e2"; + sha256 = "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"; }; meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; @@ -9560,11 +9560,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-07-25"; + version = "2024-07-29"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "960cce4eba798748baff3892a62f2c2b210fb76b"; - sha256 = "0zc59s3sviskzjym9pxjirahjy92mb2amx2maili2sy5x9b7r46f"; + rev = "a727bd368e70808125b7cf589328cc595faf3d5a"; + sha256 = "1x5bw1kb1nqbz07jjj07bp3vqcr2h9sn61xrr86v3im37akzlg2f"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9643,12 +9643,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-07-26"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "274fdd505ea19a10d14b7564b6d293408845091b"; - sha256 = "0qwj904137qmiwzbyx73h45hhdi4yb5164a40jdysxz50nkch8fb"; + rev = "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8"; + sha256 = "102h8gcf86540bzs0dgis25x3w9ap0an1v75hskj3y2pbyr7hyvk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9871,12 +9871,12 @@ final: prev: scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2024-03-31"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "86a0f5b594b08b2ad65f470ffdee81654942b6ac"; - sha256 = "1fx4n8hvjm1yhbrf0dnh8pln4xr8sqkw0x1c9ij4rfd7iq67a5zh"; + rev = "5e3f5ead970317b2f276d38dc031cb4bc5742cd4"; + sha256 = "0l4xkjbw42vwmj3j7dgca3pwlv78dsscbxrdz1jz0i381s2inar6"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -10003,12 +10003,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2024-07-06"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "21bf127e51a2d92069283c6094fc48080ecaddfb"; - sha256 = "0asrpgalvjsp8bwcc802a2q1qbsaz2c9hk71w1k9p01zy651yy08"; + rev = "0ce899109de52c9af1c78abeab945b74dd81904f"; + sha256 = "1xgwcrs2f4wj1scj08a7zrg8jbm2c8ic9yk0jamh82sjxv8cqhdj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -10052,12 +10052,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-07-26"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "209c136a5bee236094245196986ce94920dd3fdf"; - sha256 = "1iwmadjdp0h8j32dh16qz95mhphs095h5q2jbr7r88i5gdhhfn3r"; + rev = "dbd4d7212d6e9d180ab4197a52cee2ba31b2b749"; + sha256 = "124f84x62aa49jj1bkwadgqzakc2mllc7vpmcixb8dzsmhqwhdkh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10268,12 +10268,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-07-19"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "dfd979d34d29e49478562f599609a12ae3b15fd4"; - sha256 = "0h882vg2qq66lnr6cz8kdh3f3sfzjf58c2phwvzy5wl933wh41sl"; + rev = "cab1e6331a170403d227a31b5e63759214c37a8d"; + sha256 = "0wy9v1cw4dhmvgnp6g3vrlm6wjmhkz8md6n38qf5ma7brz63qidi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -10401,12 +10401,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-06-15"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "d6f7f5437c5404d958b88bb73e0721b1c0e09223"; - sha256 = "0qv4prxfgzn740jjhscafi7dgiirm1w4h2f4ph74j7x28yk94dlk"; + rev = "93d8bcda516fc86e11c03f9ef577bae9a72fba0e"; + sha256 = "0cc0v0jfdgw9pd27l2kn5fargpcgw6vp3qlg0vbyknizhy1a6326"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10570,12 +10570,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-07-11"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "8d0216f543c07a89897d1021213793ea7d8991a1"; - sha256 = "0pkf6z7dfahb1f286sabilj942161z442kl2fbgdgmd20v6ljy82"; + rev = "43d61e7418c062c18b67b2136fcc564426f08db2"; + sha256 = "1snhf1shnqc4ybx19f1vf1jz09vwsjn5flqbjq1g65nm03m176kk"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10679,12 +10679,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-07-24"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "1690b19ea62a8c9fef68a2c35896910338a1dfe5"; - sha256 = "0w0z2wxcskxqkikml7667qx8pqnm3ggrvf3r1gwkg7rkvwnacm3j"; + rev = "bc087d88defc0a63df3cd9284c2ecf4fcae42ce9"; + sha256 = "0hr777yshkvkyj4bvlpz8iz3zv53lh6v84bfdkvkfz8dnsn6vhk7"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -10788,12 +10788,12 @@ final: prev: telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; - version = "2024-05-18"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "0819a790dc95336ce2a954513434a76bb76c41c7"; - sha256 = "06njpa3i8wp73snjgih04ba6mny2m7inkfivl9pic1izcp4r61a6"; + rev = "b305a2c4f5de45f93b94e1a72078edd6d62e8cc1"; + sha256 = "0q8h2njyh3fgasvxdhz40cmjns4n8ip3xgdl188kpaf6gk0vwnnv"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -10812,24 +10812,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-07-21"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "8574946bf6d0d820d7f600f3db808f5900a2ae23"; - sha256 = "145jssc1agd8cw49p3l781lsphym74gn3kjlfl35c6j7bhkhmyvc"; + rev = "a46780830b576049c675680650f773bedfa8677a"; + sha256 = "0z0brmjymb0gcfmmlyiiq9ixd4hvf93h856g0g2hl37b19n2mdax"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-07-26"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "cef01dee8bd07540216c4e4bf429565a86f68d6d"; - sha256 = "0wx1kmdxpfy6iyypq4pjig4bsq8vmjkzvax4l23mwz4h9nr7kj84"; + rev = "25d01edae8a2d74bcaa706c003b2712bce1e3301"; + sha256 = "01c9j4z8ihksr4cz3fhdk78bc392sybk3nhm254x95cbkzmdrfky"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10885,12 +10885,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; - version = "2024-06-09"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "8ad632f793fd437865f99af5684f78300dac93fb"; - sha256 = "17spr5qii62g49w5ha9awyya8iqdj6gpv3bbs76pykg0rnyz4mix"; + rev = "649b662a8f476fd2c0289570764459e95ebaa3f3"; + sha256 = "1zg6iyk2n883rpk3v5g8vi5izg89hxrjwlnjfkkk6hkxbggd551a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -10909,12 +10909,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-07-21"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "836c9690b1ec6b09d0eebc43e2f2b88561191648"; - sha256 = "1ydvlvvr0ph1qd8lad41gw8dcm769wsa65gyy1ybsys92yzlbn2q"; + rev = "284fcbcf67a39df45288582625689db2d2ae400d"; + sha256 = "0mikidw4n6dg3vxa7vfakqvjkbhih8hj4qscwpf051l7dkbmf0lj"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11054,24 +11054,24 @@ final: prev: telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; - version = "2023-02-08"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; - sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; + rev = "76386e0f8ea417f69ed42751d2008471a88e5ff8"; + sha256 = "025lmm6mhzjj3d1ph05cd51xmk5jkn7whdhd8mx4gz6k4s6894n7"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-07-26"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "10b8a82b042caf50b78e619d92caf0910211973d"; - sha256 = "0i6znzbcv5m87nakhqdqn5cfkghdhbfww5avd0x8m25a2lkgl77g"; + rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; + sha256 = "16lnbb8cazvfb69vg71gcj8f60dkmms0vnpc00z0c3fjyg6wd50p"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11138,12 +11138,12 @@ final: prev: terminus = buildVimPlugin { pname = "terminus"; - version = "2023-10-08"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "wincent"; repo = "terminus"; - rev = "51350e786d4bfcfc476abb015a3f90db3f81231f"; - sha256 = "0lvz87y22dc4jd6982r0k2d0bgyfwwjmcrcim78vvy6ymi58gmgw"; + rev = "47247474350e3c2cae12220ef06bed975b7be2dc"; + sha256 = "0bhjzvszzcn1whwxxzrc0fhxnbh06ah1v5wjmxkxy679vvgs68vr"; }; meta.homepage = "https://github.com/wincent/terminus/"; }; @@ -11198,12 +11198,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-07-25"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "629d4a2f8377505ebc75a275d6319202c0b74385"; - sha256 = "15dcf2rpgc0hpnjd9n5qy5i98nabn3nk5j4y7r3zhdiap675y24k"; + rev = "e898cfd46fa6cde0e83abb624a16e67d2ffc6457"; + sha256 = "0njcxdyn9x73s4axq01mrxi297xn1qldvnaws6wrbx1j4dyjx0yq"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -11282,12 +11282,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-06-17"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "da618e075f42793400c3ee1e59ef3ebada2cb23c"; - sha256 = "00jbds0fg8aqdfq2swjlch22x6j2ispmj5q11jqgp0h99xdxmvr1"; + rev = "65ee9d6e6308afcd7d602e1320f727c5be63a947"; + sha256 = "063bcqwxlk18ygmr34jqnl0f0yhwy2zjkj4z8x7nl8bc07x2vnln"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -11572,12 +11572,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-07-24"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "0a501a22b587cc98531fcb617bf8cda29cb2dc11"; - sha256 = "1c58y7w6wils78lqf3csgghdkhh5249zgri3n9cicdm8f499zgl6"; + rev = "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3"; + sha256 = "1g1mpgkjxla0lhdsn6z81zcm66zf56zps6na3f6r36jn2ii1rm18"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11620,12 +11620,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-07-26"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "f5595763db4bc931f851a8139009009a1ffd04b1"; - sha256 = "1937mziylksh6fnisk0hq07d4570fyimhj0czf6pm10dxm19d74a"; + rev = "f63cfbeadb199bf5426e24457e20d869ccc4e1b9"; + sha256 = "187hrd6pp1pa9p8vd3r271x5yanjvj94149pih8hqld07ian6ai5"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12796,12 +12796,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-07-27"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "7204845f9c4bbd60a77ae40375661819b764020b"; - sha256 = "0cyin1p0n8m3qlhz3w7c60sh8x4pwpza5ff6zmkrgf1r75ksqy7c"; + rev = "c3ab458fb7c94c2fc4baae4e2cd5601eec9d27bc"; + sha256 = "0kjawhzipwqk8cwbna5frh1mvj026affp1bky2crifvx981zls00"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -13300,12 +13300,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-07-25"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "83cd74b03d1b2a7122334e277b7a3a188686a59c"; - sha256 = "04s4zhnls4v0dj7njg8mr73ln5kiv48whrbf865kq71kfvmjcjqd"; + rev = "dd7a1cf09d034ffa063bedfef4f13891eff06f3a"; + sha256 = "0w3p2vxc3rk1zc4ka4yhv9rxpn57c5x5a82w0257sawhxy0jqbji"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13552,12 +13552,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2024-07-18"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "e1576c481d3102d7d30e131c73d15c4baac2cfa2"; - sha256 = "0v9piz33p336rk9lar4ghlphwxan71ibsxdrbc20b4r1vhfcivpf"; + rev = "1653be93f32ea529a03eac04ed2bfe46533ac8e8"; + sha256 = "1pv7g2ggjilvgjfnkldp07wdwfv4z3j46qb0pfnf53xn71qk25w9"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -14118,12 +14118,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-07-18"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "3143de2ee5b784d99e5322fd3382823ce8eb845c"; - sha256 = "1fykswvc2qparxzyvyikm7px6z5k1nppp40jwx1zlmc2q11sjpjf"; + rev = "b6952c89dde3687202cd397db37dc96344a444e0"; + sha256 = "1mr9pdzvd1fd30wwgz72i8xsi76rycib1xnc8gin0ns6x6795xa7"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14346,12 +14346,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-07-20"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "6b7aabde99c409a3c04e1a7d80bbd1b0000c4158"; - sha256 = "0zz9g1wbz6391ilr7xdpknn132p9vx7nyn6pp89jg8h6jr8f44lv"; + rev = "356254d6388298017589114a8eff15d20def90aa"; + sha256 = "0pkca4bm0cskwka45l6rn2mfy6cqmab8hs2cay2dlfi9h52w72jc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -15811,12 +15811,12 @@ final: prev: vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; - version = "2024-06-16"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "673e686c46149d947283620847ea64deb2a0be6c"; - sha256 = "08j897l9gpna5x969mgc137vy8ajdq7i8mvz2xwiaf5x13b8db4c"; + rev = "7d20a1e9faa9cdbffab67b4ab0fede3d4e4ceb97"; + sha256 = "1bf767vdv0xb8vz70sh9rwq49zs5gp9lnhbkm5l2zqyz3f3vg5a0"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; @@ -15883,12 +15883,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-07-18"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "45136447fa9a4543512d2f604c255692c5754e3a"; - sha256 = "0c8ii0kfmkpwglg0sw7iyqhvxvl48igmdq2dd2hgfq37q29dcvfb"; + rev = "4a76fb65b4255258b3530eea77be24d4d5cc4a4e"; + sha256 = "0af3k752br47s1xiwf3gssq0wxim2hd5j4a50zbns0rz69sn84r5"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16124,12 +16124,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-25"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "34aab77f7a63f20a623df45684156915f6182a55"; - sha256 = "0bvziqnnaimwrrjmz8k701ki4gdvlhvjkj4fxnb77ab8rc0sp13h"; + rev = "75b64f23c923d34b56e47846a026210feb57146a"; + sha256 = "0pz2gh1qhakbshpgsnc6rqvk8wg9n2sdchnkgklpm1s8qfibkhyj"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16688,12 +16688,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-05-03"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "96d3400598a95957062e42820cdeaa6ab22cba72"; - sha256 = "1q6wy7mzi4lqjy37l4rbnjbvy7a0cmm2cccd07ywfd2cx31m26w0"; + rev = "121a95905452c59c04f04e9055aa246913650e2c"; + sha256 = "0wbm85adrjqljk1jfad4kydbr5aiv7hq39fs41ka4vr0hxbqd33f"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -16856,12 +16856,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-07-24"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "5b98bc8cf8341bf18c553cdfe71a711f900009ab"; - sha256 = "1z1hhdvnw6ny87hz9xpl66nb9lz2ggw9dwqr4gv01b38wpkwysm8"; + rev = "6dfbe470866c9ddc41288c4463a1389bfa6efa74"; + sha256 = "1h8cy8dkfzs3j72ygvcl2hlv71jp0q7h4gz2k1krsqngxk355s45"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16881,12 +16881,12 @@ final: prev: vimux = buildVimPlugin { pname = "vimux"; - version = "2024-06-03"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "fa35410805b82ffabc29e3cb5cdf3ad0b8dc402d"; - sha256 = "0i47x15nzvy6xdgx8kfdbm000c33svanglnn77ilxrv19kjy6j3v"; + rev = "c4ffa0b992798f3362b27642088dccb251aaef1e"; + sha256 = "1n8xlym81442ak4r442k9prc69a2y92nwid2kbynj2v05r8fa0sx"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -16965,12 +16965,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-07-15"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "3ba16d763097cecc75eb93761f4a981467acfc23"; - sha256 = "0fnp6gsrs9zxgxkjnknkppx8zjrkw1gqrnjs2p3lmg8783hndjyn"; + rev = "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e"; + sha256 = "0v4izydhq4jc6jaw7a38d0w2mlw93jdijaql7y2hk8fp44sn51q1"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -17049,12 +17049,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-07-24"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "574f3a3075aa7013160bef3e44489454ce768ba7"; - sha256 = "1q0dyrx8scpgaibi65dfl3d0zq4wpjgz9kkjacwqwsaziiyjxf1i"; + rev = "d58c97290d75ac594198a4647cbbb0c5094ce9c6"; + sha256 = "1x1279d19gkn27zx6rqj1c5bmpbqawz8zmadld0k5l4h43m8wz2s"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17242,12 +17242,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-07-27"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "3a556935ed83de2a9e5a9c81446c7983b9248f9a"; - sha256 = "1nmg6mnp7xj9zwss3qyhjrqw60cxivj5v8rs1g48l0ls9yqmlrz1"; + rev = "54ad21d33c329c4dfa33a327257dcdc1048ba586"; + sha256 = "0qka292h4a68mfqk630j9p7skgxqnb998d60p0w1h0508lz66ahz"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -17398,12 +17398,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-07-25"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "10eda02ea4faa7d1f94e77a3410a4ae91c25c5f5"; - sha256 = "1isl44p5z8ynmc7v75154wxc3xkk7i351k4164br6gpm49dwlvp3"; + rev = "ba5f4153a5dad99505baba936bd0373534400ac3"; + sha256 = "0wfs4zff1q1dxblj9imfbvbkxywc193kg2kmfrfqqfg9x24ih47r"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17518,12 +17518,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-07-27"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "7c5aa0a71d1d782d1cc80b130603b7e6bf8d2fd9"; - sha256 = "1yz6mrq591bq6wjihglaj9p9jhpibwb361n0kf68glb2qv70aiw0"; + rev = "967d8b27811f3b2a2ac3fd2de27e5a4992dc0770"; + sha256 = "19ah7rxbrjl92vqa195labbc8kphq3nh4cc84i6n5cykhzv4jskw"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17554,14 +17554,14 @@ final: prev: render-markdown = buildVimPlugin { pname = "render-markdown"; - version = "2024-07-27"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; - repo = "markdown.nvim"; - rev = "b75f681d675e21b5a09909997e9fffa6313c946e"; - sha256 = "1g129sl3v13i2lnrvhagpf5nc99yi3wxy41x5797il06w08cis2j"; + repo = "render-markdown.nvim"; + rev = "af67ac5f95bc7a31e5d2aba5527c2ed14fb8be2c"; + sha256 = "115xfcn9d6v7rim780xhf7a2dx5cx7wbca1lsgy45msm4x9i18ar"; }; - meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/"; + meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; restore-view-vim = buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index bf55c4b71f64..4c995c70da18 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -191,17 +191,6 @@ }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; - bqn = buildGrammar { - language = "bpn"; - version = "0.0.0+rev=8c62b74"; - src = fetchFromGitHub { - owner = "shnarazk"; - repo = "tree-sitter-bqn"; - rev = "8c62b746924398304c8fa1aa18393c3124d1e50d"; - hash = "sha256-jK0zn7DWzy2yfYOX1ZBoGOC7QBrcp4PHWnaOKaDL9ws="; - }; - meta.homepage = "https://github.com/shnarazk/tree-sitter-bqn"; - }; c = buildGrammar { language = "c"; version = "0.0.0+rev=be23d2c"; @@ -370,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=07f2f15"; + version = "0.0.0+rev=7c97acb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "07f2f157d484a27dc91c04cc116f94f6fd4fc654"; - hash = "sha256-GWiSQzMHtXd0EESjC1a0l0O8Q7zx3gjvNy8YZw/U/Bk="; + rev = "7c97acb8398734d790c86210c53c320df61ff66b"; + hash = "sha256-E5bXdBfCE1lP5GngZBZ4qn9kKPQYVDvdvE5UPMoUsas="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -392,12 +381,12 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=750dde9"; + version = "0.0.0+rev=ac58458"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"; - hash = "sha256-Epw1QW4WS1le8OdQI0soO0VaDOgNveh7WTL4sol/cQU="; + rev = "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"; + hash = "sha256-+6+9x+5pyjv252X3XzpN2CnrUXVzMvaCrCPVhhjEELo="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; @@ -933,12 +922,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=bbe2fe3"; + version = "0.0.0+rev=1f55029"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "bbe2fe3be4b87e06a613e685250f473d2267f430"; - hash = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI="; + rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c"; + hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -999,12 +988,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=3912291"; + version = "0.0.0+rev=105ee34"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "391229139d9f79879ccc84cb271889c9240c28a1"; - hash = "sha256-AtA6249CHaOYQGgYfaECFESmJi9Wq+iFC58rHSh5x9M="; + rev = "105ee343682b7eee86b38ec6858a269e16474a72"; + hash = "sha256-HYb3TXMSC+Zfss+vqgdSxsB35tqPmc6GNMWuFof9e5g="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1110,12 +1099,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=80517ca"; + version = "0.0.0+rev=81dbfa4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "80517ca13317fb8591503c0d99f2ad76e8979a72"; - hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8="; + rev = "81dbfa44a2e0f9e36d16f449fc792020e2f38426"; + hash = "sha256-uhCBhS68J6gxWxv/Ehk6OOo3/UMakf9Rrr3JnYAUD/s="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1176,23 +1165,23 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=e061995"; + version = "0.0.0+rev=5ae6c7c"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8"; - hash = "sha256-zwPIO75l3OBmuWX1ABZNA6ZulJUtSsp3Xs7+dcnxLCo="; + rev = "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5"; + hash = "sha256-C1U0vyW237XB8eFNYcn7/FBsGlCLuIQoUSlFV8K5TsM="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=ad705af"; + version = "0.0.0+rev=fba6ed8"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "ad705af8c44c737bdb965fc081329c50716d2d03"; - hash = "sha256-Pdk7wGaTtQHola+Ek5a7pLBfRUEJfgx+nSunh7/c13I="; + rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08"; + hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -1363,12 +1352,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=379fbe3"; + version = "0.0.0+rev=6648ac1"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"; - hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8="; + rev = "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"; + hash = "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1396,12 +1385,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=c9cb850"; + version = "0.0.0+rev=8d9d372"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "c9cb8504b81684375e7beb8907517dbd6947a1be"; - hash = "sha256-fuEKCtCzaWOp0gKrsPMOW9oGOXnM2Qb652Nhn1lc1eA="; + rev = "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5"; + hash = "sha256-uaoFBA8rLhlzmDQ9sCbBU5KRSb63k1DSa6VvmioRSNw="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1440,12 +1429,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=f074e14"; + version = "0.0.0+rev=efe5afd"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "f074e142ade9cdc292346d0484be27f9ebdbc4ea"; - hash = "sha256-t6P+5RW426enWVFB/SPFHIIhXqshjKzmKQpOWfu0eQg="; + rev = "efe5afdbb59b70214e6d70db5197dc945d5b213e"; + hash = "sha256-4sFqboyE94yvkZYKw5wgQjdVkNaIGLif3qB8GMCEBE0="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1608,12 +1597,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=821f7bd"; + version = "0.0.0+rev=0d5a05e"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "821f7bdf9d922822302a0170c2f157e36ffb7a94"; - hash = "sha256-oaq1b/yBH+EOQZ8IW7j2f1nz66RFjXT45IGXz7B8pnY="; + rev = "0d5a05e543af2de60cdb5e71f0f5888c95ab936f"; + hash = "sha256-B5BoHezwfUW156S5ixOGukjX+qFGLmS0WqxpT0MVNG8="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1741,12 +1730,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=0fdada1"; + version = "0.0.0+rev=68d3b79"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"; - hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4="; + rev = "68d3b7999ad89d31690461884270e5658e0a22c4"; + hash = "sha256-EMkhmAGi2NPTeliGZyWo/UtYJnNJAkp04/LMs4DDF8s="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1887,12 +1876,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=7581cbf"; + version = "0.0.0+rev=3a21d9c"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "7581cbf8fb793bce94d0241c89fe49b01b1477f9"; - hash = "sha256-iBr2KbfJWohjHXlFUGvVMg3xUAy78zPk2Kr3UsqXtUs="; + rev = "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"; + hash = "sha256-cBF3wvAl5PJCzjlTn1wx9+Q81xsitKW3+TwD0yAoWM4="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -1988,12 +1977,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=804d86f"; + version = "0.0.0+rev=fc15514"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad"; - hash = "sha256-W+v+Gj1KViIF+8wd9auy448hyxz0Uam5FpIpdjCzF/k="; + rev = "fc15514b2f1dbba9c58528d15a3708f89eda6a01"; + hash = "sha256-StVnRNM0HPevLSRDIDr+Sakjo+NqXYWPPUFjI29Cowo="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2021,24 +2010,24 @@ }; problog = buildGrammar { language = "problog"; - version = "0.0.0+rev=d8bc22c"; + version = "0.0.0+rev=93c69d2"; src = fetchFromGitHub { owner = "foxyseta"; repo = "tree-sitter-prolog"; - rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; - hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; }; location = "grammars/problog"; meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; prolog = buildGrammar { language = "prolog"; - version = "0.0.0+rev=d8bc22c"; + version = "0.0.0+rev=93c69d2"; src = fetchFromGitHub { owner = "foxyseta"; repo = "tree-sitter-prolog"; - rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; - hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; }; location = "grammars/prolog"; meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; @@ -2308,6 +2297,17 @@ }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; + rescript = buildGrammar { + language = "rescript"; + version = "0.0.0+rev=4606cd8"; + src = fetchFromGitHub { + owner = "rescript-lang"; + repo = "tree-sitter-rescript"; + rev = "4606cd81c4c31d1d02390fee530858323410a74c"; + hash = "sha256-md3fgW+h99va2Rwxzub7nrsEe64fC52g6NPCaXGAaxg="; + }; + meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript"; + }; rnoweb = buildGrammar { language = "rnoweb"; version = "0.0.0+rev=1a74dc0"; @@ -2343,12 +2343,12 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=6ea64b6"; + version = "0.0.0+rev=ef46edd"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "6ea64b6434a45472bd87b0772fd84a017de0a557"; - hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M="; + rev = "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"; + hash = "sha256-H76cnMlBT1Z/9WXAdoVslImkyy38uCqum9qEnH+Ics8="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2443,12 +2443,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=ea77a4d"; + version = "0.0.0+rev=d84b43d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8"; - hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg="; + rev = "d84b43d75d65bbc4ba57166ce17555f32c0b8983"; + hash = "sha256-KcFntOBXADBu7nSFQ5XVY6/nfSl2uLJfhsfVFFjudd8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2555,12 +2555,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=a966446"; + version = "0.0.0+rev=b817500"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "a9664463580473e92d8f5e29fa06fb1be88752af"; - hash = "sha256-0SY6dOofB+zv4xa7oXabEoUZd5NUV1NHhB+Jx6m137I="; + rev = "b8175006d9c8120d41cf40a4ef3711bbbbc08973"; + hash = "sha256-idQB8Wqw7lvU192y7+UgFvcwlmY71/mu9jJ4hRc4ud4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2654,12 +2654,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=b3dc8cc"; + version = "0.0.0+rev=769bb83"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "b3dc8cc5c266effd7bcfde01aa086b83927f2eda"; - hash = "sha256-GtOE80hjFsyFEVkpuxbpNt9vCHrbw2+WnQgyCKAU0jQ="; + rev = "769bb834feb2947f2c706d82830b0a05958727de"; + hash = "sha256-Rqvk1dBEBAnQV/51MUSzgzX0J/pecwA5o8SBOfrvu+I="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2913,12 +2913,12 @@ }; typespec = buildGrammar { language = "typespec"; - version = "0.0.0+rev=28821d0"; + version = "0.0.0+rev=0ee0554"; src = fetchFromGitHub { owner = "happenslol"; repo = "tree-sitter-typespec"; - rev = "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"; - hash = "sha256-MzUcz6vnsakszAMJtTOajniFC72sCREdrMhS/zDa3Ng="; + rev = "0ee05546d73d8eb64635ed8125de6f35c77759fe"; + hash = "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0="; }; meta.homepage = "https://github.com/happenslol/tree-sitter-typespec"; }; @@ -3069,12 +3069,12 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=b448ca6"; + version = "0.0.0+rev=f3cd62d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "b448ca63f972ade12c373c808acdd2bf972937db"; - hash = "sha256-wQQSeDzcSY9qNVgeDhrELS1x1UoilRa7iHML9qSgchY="; + rev = "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"; + hash = "sha256-KVaTJKU7r7zk57Fn9zl5s34oq8tsLkSRV3VHM6Q6F+s="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; @@ -3089,6 +3089,17 @@ }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; + vrl = buildGrammar { + language = "vrl"; + version = "0.0.0+rev=274b3ce"; + src = fetchFromGitHub { + owner = "belltoy"; + repo = "tree-sitter-vrl"; + rev = "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"; + hash = "sha256-R+wuG8UkvGA11uTiiUAdzzgjRv1ik4W+qh3YwIREUd4="; + }; + meta.homepage = "https://github.com/belltoy/tree-sitter-vrl"; + }; vue = buildGrammar { language = "vue"; version = "0.0.0+rev=22bdfa6"; @@ -3135,12 +3146,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=cd7e653"; + version = "0.0.0+rev=c52f0b0"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "cd7e6534fd9a22e3e9a7a85feecf4e35461e47cb"; - hash = "sha256-/Lvo0YbdSaIoRFSm74kBQRM1sQTO3t9+OrxFK4/KyEo="; + rev = "c52f0b07786603df17ad0197f6cef680f312eb2c"; + hash = "sha256-0MyRMippVOdb0RzyJQhPwX7GlWzFV9Z+/mghYuUW7NU="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 133200a982cc..d164c69acb0c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1241,7 +1241,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-J9L9j8iyeZQRMjiVqdI7V7BOAkZaiLGOtKDpgq2wyi0="; + cargoHash = "sha256-D7KUJ8q521WWgUqBBOgepGJ3NQ4DdKr+Bg/4k3Lf+mw="; preCheck = '' mkdir tests/tmp/ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 72051a629fbd..65b013afa937 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1625,8 +1625,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.22.1"; - hash = "sha256-zi+Rcy63AUqDnVZCbPuljs+aBHsyOTHgbiJ+h9dB9us="; + version = "0.23.0"; + hash = "sha256-eqS/xYK7yh7MvPAl61o1ZJ9wH9amqngJupU+puDq9xs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 29419af7dd74..e16bd97c2cd7 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.267"; + version = "0.268"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-H3idND2cC0KSGa9EIEVN2diticfM9r6FwRqQYkWmEM0="; + hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index b9fd5ea28ba9..01836f583066 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -3,8 +3,8 @@ , fetchFromGitHub , stdenv , installShellFiles -, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform -, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform +, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , withTcp ? true }: diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ffb329129d8e..98146e6bfdf3 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd flavours \ --zsh <($out/bin/flavours --completions zsh) \ --fish <($out/bin/flavours --completions fish) \ diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 8591b749a406..d2abfc02ba77 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "genact"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/genact --print-manpage > genact.1 installManPage genact.1 diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index a37f965dd530..f896b4518790 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec { "--skip=watcher::tests::the_gauntlet" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd inlyne \ - --bash <($out/bin/inlyne --gen-completions bash) \ - --fish <($out/bin/inlyne --gen-completions fish) \ - --zsh <($out/bin/inlyne --gen-completions zsh) + --bash completions/inlyne.bash \ + --fish completions/inlyne.fish \ + --zsh completions/_inlyne ''; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index f2e217404eb4..9bc7c7cbe34a 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ --bash <($out/bin/leetcode completions bash) \ --fish <($out/bin/leetcode completions fish) \ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index fc808bb609db..b3cbfce55e22 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.07.23-8"; + version = "2024.07.29-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-6RQodQh4p8v6xFW/GUzR0AHNpgB1AxBB7q+FW4hYo/Q="; + hash = "sha256-cAoG/4vuA664+JcLTUdlLMMRggAznqHh3NA0Pk8RcFc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 5099dd93c3c4..9e572ff22c73 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "128.0.3-1", + "packageVersion": "128.0.3-2", "source": { - "rev": "128.0.3-1", - "sha256": "0pp36q4rcsiyv9b09jfgfrl1k3vqp5bh08c9iq0r2v8is5rbcdz5" + "rev": "128.0.3-2", + "sha256": "1g1biavphqykj0zvi1brakrncj1h4gqhs1cy5mxlp4w4p7ahpv6d" }, "settings": { "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f52622591763..59803dabdf27 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.11.7"; + version = "2.12.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-/gbclPcYSDobwftFi0CECgBp6PNqxHW9svP3A5y8eEY="; + hash = "sha256-l2J7inrV82ej8baoY3FTcGeusN5e6WNEZMtzOdE8/WY="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-y6B//zal2OyzZ1slC+x3vxHasFTM+xD+/6Sd2AFHFgY="; + vendorHash = "sha256-abhoGqxM+2wiWPjZaGMDQnD9r60+E0aXTrH7J5r5prk="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 8e207f66169a..387fa3e4700b 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , libpcap +, libxkbcommon , openssl , stdenv , alsa-lib @@ -62,7 +63,7 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/sniffnet \ - --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]} + --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon ]} ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index aecc19f0aa16..49d4a0a67ad2 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage Documentation/git-absorb.1 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd git-absorb \ --bash <($out/bin/git-absorb --gen-completions bash) \ --fish <($out/bin/git-absorb --gen-completions fish) \ diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index 98d1a8f8e144..35a71c30444f 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/jj util mangen > ./jj.1 installManPage ./jj.1 diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix index 506179dbf35c..7b7cf4911c90 100644 --- a/pkgs/applications/virtualization/youki/default.nix +++ b/pkgs/applications/virtualization/youki/default.nix @@ -6,6 +6,7 @@ , dbus , libseccomp , systemd +, stdenv }: rustPlatform.buildRustPackage rec { @@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus libseccomp systemd ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd youki \ --bash <($out/bin/youki completion -s bash) \ --fish <($out/bin/youki completion -s fish) \ diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 7319c2fa22a8..aa057f69e06b 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "ab-av1"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ab-av1 \ --bash <($out/bin/ab-av1 print-completions bash) \ --fish <($out/bin/ab-av1 print-completions fish) \ diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 644ef2e284ca..ab33df30035a 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sg \ --bash <($out/bin/sg completions bash) \ --fish <($out/bin/sg completions fish) \ diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index e369f4e8dd6a..6fca674f435a 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage { # to nix-daemon to import NARs, which is not possible in the build sandbox. doCheck = false; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' if [[ -f $out/bin/attic ]]; then installShellCompletion --cmd attic \ --bash <($out/bin/attic gen-completions bash) \ diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index b72baf6e46b5..fe4803bd3eeb 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_x11_primary" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do installShellCompletion --cmd $cmd \ --bash <($out/bin/$cmd completions bash) \ diff --git a/pkgs/by-name/cl/cloudlens/package.nix b/pkgs/by-name/cl/cloudlens/package.nix new file mode 100644 index 000000000000..9fbda0466749 --- /dev/null +++ b/pkgs/by-name/cl/cloudlens/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, autoPatchelfHook +, xclip +, +}: + +buildGoModule rec { + pname = "cloudlens"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "one2nc"; + repo = "cloudlens"; + rev = "v${version}"; + hash = "sha256-b0i9xaIm42RKWzzZdSAmapbmZDmTpCa4IxVsM9eSMqM="; + }; + + vendorHash = "sha256-7TxtM0O3wlfq0PF5FGn4i+Ph7dWRIcyLjFgnnKITLGM="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/one2nc/cloudlens/cmd.version=v${version}" + "-X=github.com/one2nc/cloudlens/cmd.commit=${src.rev}" + "-X=github.com/one2nc/cloudlens/cmd.date=1970-01-01T00:00:00Z" + ]; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ xclip ]; + + #Some tests require internet access + doCheck = false; + + meta = { + description = "K9s like CLI for AWS and GCP"; + homepage = "https://github.com/one2nc/cloudlens"; + license = lib.licenses.apsl20; + maintainers = with lib.maintainers; [ ByteSudoer ]; + mainProgram = "cloudlens"; + }; +} diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index fce36f682c3d..825731d4d1b4 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ] ); - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd berg \ --bash <($out/bin/berg completion bash) \ --fish <($out/bin/berg completion fish) \ diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index db6ba129e219..3b65c23a9a0a 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitea -, fetchpatch , cmake , intltool , libdeltachat @@ -12,26 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; rev = "v${finalAttrs.version}"; - hash = "sha256-tqcQmFmF8Z9smVMfaXOmXQ3Uw41bUcU4iUi8fxBlg8U="; + hash = "sha256-OQrTxxmiBiAc9il1O5aEl9iN3fCfoxSAwJDfrASCPxs="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "0001-deltatouch-Fix-localisation.patch"; - url = "https://codeberg.org/lk108/deltatouch/commit/dcfdd8a0fca5fff10d0383f77f4c0cbea302de00.patch"; - hash = "sha256-RRjHG/xKtj757ZP2SY0GtWwh66kkTWoICV1vDkFAw3k="; - }) - ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook intltool @@ -76,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - changelog = "https://codeberg.org/lk108/deltatouch/src/commit/${finalAttrs.src.rev}/CHANGELOG"; + changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.rev}/CHANGELOG"; description = "Messaging app for Ubuntu Touch, powered by Delta Chat core"; longDescription = '' DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core. diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index ad626b57903a..970d4458077a 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { # Tests currently fail due to *many* duplicate definition errors doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd diesel \ --bash <($out/bin/diesel completions bash) \ --fish <($out/bin/diesel completions fish) \ diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix index fad1d8719971..1e755c629338 100644 --- a/pkgs/by-name/el/elf2nucleus/package.nix +++ b/pkgs/by-name/el/elf2nucleus/package.nix @@ -4,6 +4,7 @@ , lib , micronucleus , rustPlatform +, stdenv }: rustPlatform.buildRustPackage rec { @@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ micronucleus ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd elf2nucleus \ --bash <($out/bin/elf2nucleus --completions bash) \ --fish <($out/bin/elf2nucleus --completions fish) \ diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 8a87e0d46097..585d072dae42 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -2,6 +2,7 @@ , installShellFiles , rustPlatform , fetchFromGitLab +, stdenv }: let @@ -25,7 +26,8 @@ rustPlatform.buildRustPackage { installShellFiles ]; - postInstall = "installShellCompletion --cmd ${pname} " + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( + "installShellCompletion --cmd ${pname} " + builtins.concatStringsSep " " (builtins.map @@ -35,7 +37,8 @@ rustPlatform.buildRustPackage { "fish" "zsh" ] - ); + ) + ); meta = { description = "Task runner with DAG-based parallelism"; diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix index 590791630669..5a271432a0cc 100644 --- a/pkgs/by-name/hi/himalaya/package.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -5,8 +5,8 @@ , pkg-config , darwin , installShellFiles -, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform -, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform +, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , notmuch , gpgme , buildNoDefaultFeatures ? false diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index 08f5429fbb5c..e24a3cd93e8f 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Foundation ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd joshuto \ --bash <($out/bin/joshuto completions bash) \ --zsh <($out/bin/joshuto completions zsh) \ diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/by-name/js/json2tsv/package.nix similarity index 87% rename from pkgs/development/tools/json2tsv/default.nix rename to pkgs/by-name/js/json2tsv/package.nix index 49d0812eba44..36d9d6edfa75 100644 --- a/pkgs/development/tools/json2tsv/default.nix +++ b/pkgs/by-name/js/json2tsv/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "json2tsv"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz"; - hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o="; + hash = "sha256-ET5aeuspXn+BNfIxytkACR+Zrr1smDFvdh03fptQ/YQ="; }; postPatch = '' diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index fcbb89c8e339..f92e80bc2b3f 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -42,38 +42,38 @@ rustPlatform.buildRustPackage rec { # https://github.com/MaaAssistantArknights/maa-cli/pull/126 buildNoDefaultFeatures = true; - buildFeatures = [ - "git2" - "core_installer" - ]; + buildFeatures = [ "git2" ]; cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 - postInstall = '' - mkdir -p $out/share/maa-assistant-arknights/ - ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/ - ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/ - mv $out/bin/maa $out/share/maa-assistant-arknights/ + postInstall = + '' + mkdir -p $out/share/maa-assistant-arknights/ + ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/ + ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/ + mv $out/bin/maa $out/share/maa-assistant-arknights/ - makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \ - --prefix PATH : "${ - lib.makeBinPath [ - android-tools - git - ] - }" + makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \ + --prefix PATH : "${ + lib.makeBinPath [ + android-tools + git + ] + }" - installShellCompletion --cmd maa \ - --bash <($out/bin/maa complete bash) \ - --fish <($out/bin/maa complete fish) \ - --zsh <($out/bin/maa complete zsh) + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd maa \ + --bash <($out/bin/maa complete bash) \ + --fish <($out/bin/maa complete fish) \ + --zsh <($out/bin/maa complete zsh) - mkdir -p manpage - $out/bin/maa mangen --path manpage - installManPage manpage/* - ''; + mkdir -p manpage + $out/bin/maa mangen --path manpage + installManPage manpage/* + ''; meta = with lib; { description = "Simple CLI for MAA by Rust"; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 29ccfb28358c..f9e6f089bab1 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-07-21"; + version = "0.9.5-unstable-2024-08-05"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "837a58208711722e1762098c2a0244c2d8409864"; - hash = "sha256-SSW/+wLnZKlldVIBXMqDvXuwyK1LxcfON6ZTKLxY68U="; + rev = "dd386d12a94252364b5e0706ec719c390faf90b8"; + hash = "sha256-pgTtRNifyziioY+GN4BQFVFHlKKK1Da5XioLUnGRGpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix new file mode 100644 index 000000000000..1c364e7c3a5f --- /dev/null +++ b/pkgs/by-name/mi/misskey/package.nix @@ -0,0 +1,125 @@ +{ + stdenv, + lib, + nixosTests, + fetchFromGitHub, + nodejs, + pnpm, + makeWrapper, + python3, + bash, + jemalloc, + ffmpeg-headless, + writeShellScript, + ... +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "misskey"; + + version = "2024.5.0"; + + src = fetchFromGitHub { + owner = "misskey-dev"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-nKf+SfuF6MQtNO53E6vN9CMDvQzKMv3PrD6gs9Qa86w="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeWrapper + python3 + ]; + + # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-A1JBLa6lIw5tXFuD2L3vvkH6pHS5rlwt8vU2+UUQYdg="; + }; + + buildPhase = '' + runHook preBuild + + # https://github.com/NixOS/nixpkgs/pull/296697/files#r1617546739 + ( + cd node_modules/.pnpm/node_modules/v-code-diff + pnpm run postinstall + ) + + # https://github.com/NixOS/nixpkgs/pull/296697/files#r1617595593 + export npm_config_nodedir=${nodejs} + ( + cd node_modules/.pnpm/node_modules/re2 + pnpm run rebuild + ) + ( + cd node_modules/.pnpm/node_modules/sharp + pnpm run install + ) + + pnpm build + + runHook postBuild + ''; + + installPhase = + let + checkEnvVarScript = writeShellScript "misskey-check-env-var" '' + if [[ -z $MISSKEY_CONFIG_YML ]]; then + echo "MISSKEY_CONFIG_YML must be set to the location of the Misskey config file." + exit 1 + fi + ''; + in + '' + runHook preInstall + + mkdir -p $out/data + cp -r . $out/data + + # Set up symlink for use at runtime + # TODO: Find a better solution for this (potentially patch Misskey to make this configurable?) + # Line that would need to be patched: https://github.com/misskey-dev/misskey/blob/9849aab40283cbde2184e74d4795aec8ef8ccba3/packages/backend/src/core/InternalStorageService.ts#L18 + # Otherwise, maybe somehow bindmount a writable directory into /data/files. + ln -s /var/lib/misskey $out/data/files + + makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \ + --run "${checkEnvVarScript} || exit" \ + --chdir $out/data \ + --add-flags run \ + --set-default NODE_ENV production \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs + pnpm + bash + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + jemalloc + ffmpeg-headless + stdenv.cc.cc.lib + ] + } + + runHook postInstall + ''; + + passthru = { + inherit (finalAttrs) pnpmDeps; + tests.misskey = nixosTests.misskey; + }; + + meta = { + description = "🌎 An interplanetary microblogging platform 🚀"; + homepage = "https://misskey-hub.net/"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.feathecutie ]; + platforms = lib.platforms.unix; + mainProgram = "misskey"; + }; +}) diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index ec095dab0286..4b7076a8e03e 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -5,8 +5,8 @@ , pkg-config , darwin , installShellFiles -, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform -, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform +, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , notmuch , buildNoDefaultFeatures ? false , buildFeatures ? [] diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index dc762e3362d1..ad5144f84c47 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-Q8ZUc3fNfWeijPLUtgwkU2rv7SWSfi7Q1QOlt14O3nE= "; + hash = "sha256-z/BtMe+CRS9l8WTG6CUjuDNCerYO41KKPUSESNz69SY="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-nkJksj1FAOMqEDQS1k++E2izv9TT3PkoZLxzHIcHzvA="; + npmDepsHash = "sha256-ODt5OIcSQNW6LGG6uE3d1Itn2oyXhzg45jjXxILE0vM="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -103,6 +103,7 @@ python3.pkgs.buildPythonApplication rec { pymysql pypandoc pypdf + python-dotenv python-jose python-multipart python-pptx diff --git a/pkgs/by-name/pa/pace/package.nix b/pkgs/by-name/pa/pace/package.nix index 738077648c1b..a90ce66f537e 100644 --- a/pkgs/by-name/pa/pace/package.nix +++ b/pkgs/by-name/pa/pace/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + stdenv, }: let version = "0.15.2"; in @@ -21,7 +22,7 @@ in nativeBuildInputs = [installShellFiles]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pace \ --bash <($out/bin/pace setup completions bash) \ --fish <($out/bin/pace setup completions fish) \ diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b3f92a51507a..485ef4d156da 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { "--skip=task::task_graph::test::test_multi_env_defaults_ambigu" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pixi \ --bash <($out/bin/pixi completion --shell bash) \ --fish <($out/bin/pixi completion --shell fish) \ diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index d2b117138e73..7a66f379965f 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -1,30 +1,33 @@ -{ lib -, cmake -, fetchFromGitHub -, primesieve -, stdenv +{ + lib, + cmake, + fetchFromGitHub, + gitUpdater, + primesieve, + stdenv, }: stdenv.mkDerivation (finalAttrs: { pname = "primecount"; - version = "7.13"; + version = "7.14"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${finalAttrs.version}"; - hash = "sha256-VjsJjG2pSnDMVg3lY3cmpdnASeqClPjHUGY5wqupf2w="; + hash = "sha256-N4eENwYuf8ZR1JQyFtoWl6H3ITpGZVaOMEU3gx0f9yQ="; }; - outputs = [ "out" "dev" "lib" "man" ]; - - nativeBuildInputs = [ - cmake + outputs = [ + "out" + "dev" + "lib" + "man" ]; - buildInputs = [ - primesieve - ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ primesieve ]; strictDeps = true; @@ -36,6 +39,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_TESTS" true) ]; + passthru = { + tests = { + inherit primesieve; # dependency + }; + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = { homepage = "https://github.com/kimwalisch/primecount"; description = "Fast prime counting function implementations"; diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index b5e2da37022d..16b7bfe8801c 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -1,22 +1,29 @@ -{ lib -, cmake -, fetchFromGitHub -, stdenv -, primecount +{ + lib, + cmake, + fetchFromGitHub, + gitUpdater, + stdenv, + primecount, }: stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.3"; + version = "12.4"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M="; + hash = "sha256-3iVQsksnyw9KFBTYsmyZ6YxYICVq1GzOzemDBpqpU3M="; }; - outputs = [ "out" "dev" "lib" "man" ]; + outputs = [ + "out" + "dev" + "lib" + "man" + ]; nativeBuildInputs = [ cmake ]; @@ -26,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { inherit primecount; # dependent }; + updateScript = gitUpdater { rev-prefix = "v"; }; }; meta = { @@ -42,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.bsd2; mainProgram = "primesieve"; - maintainers = lib.teams.sage.members ++ - (with lib.maintainers; [ abbradar AndersonTorres ]); + maintainers = lib.teams.sage.members; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index fb317e6b332b..ffdf0ac82538 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , asciidoctor @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { # Built by ./build.rs using `asciidoctor` installManPage ./target/*/release/build/qrtool*/out/*.? + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd qrtool \ --bash <($out/bin/qrtool --generate-completion bash) \ --fish <($out/bin/qrtool --generate-completion fish) \ diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/by-name/re/rectangle/package.nix similarity index 78% rename from pkgs/os-specific/darwin/rectangle/default.nix rename to pkgs/by-name/re/rectangle/package.nix index fbf13963e49e..ae93928bc0ae 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenvNoCC -, fetchurl -, undmg -, gitUpdater +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + gitUpdater, }: stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.80"; + version = "0.81"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-CmYhMnEhn3UK82RXuT1KQhAoK/0ewcUU6h73el2Lpw8="; + hash = "sha256-oZZz6bsgG+4leQNq2C+nLaAO/Yk+OkS6BnlMQHjlK9E="; }; sourceRoot = "."; @@ -37,8 +38,10 @@ stdenvNoCC.mkDerivation rec { homepage = "https://rectangleapp.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.darwin; - maintainers = with maintainers; [ Intuinewin wegank ]; + maintainers = with maintainers; [ + Intuinewin + wegank + ]; license = licenses.mit; }; } - diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 25958a05d8c8..da5b97c8ef47 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # Tests depend on additional infrastructure to be running locally doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ${meta.mainProgram} \ --bash <($out/bin/${meta.mainProgram} generate-completions bash) \ --fish <($out/bin/${meta.mainProgram} generate-completions fish) \ diff --git a/pkgs/by-name/rf/rfdump/package.nix b/pkgs/by-name/rf/rfdump/package.nix new file mode 100644 index 000000000000..de56661d8e0f --- /dev/null +++ b/pkgs/by-name/rf/rfdump/package.nix @@ -0,0 +1,77 @@ +{ + autoreconfHook, + expat, + fetchpatch, + fetchurl, + glib, + gtk3-x11, + lib, + pkg-config, + stdenv, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "rfdump"; + version = "1.6"; + + src = fetchurl { + url = "https://www.rfdump.org/dl/rfdump-${version}.tar.bz2"; + hash = "sha256-fbEmh7i3ug5GCeyJ2wT45bbDq0ZEOv8yH+MOJwzER4U="; + }; + + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/01_fix_desktop_file.patch"; + hash = "sha256-r6BR+eAg963GjcFvV6/1heW7uKi8tmi7j8LyxtpcgYk="; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/03_fix-format-security-errors.patch"; + hash = "sha256-rQKvFeSQ09P46lhvlov51Oej0HurlR++5Yv4kCLn9J8="; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/02_configure.in-preserve-CFLAGS.patch"; + hash = "sha256-4+Yj5I019ZkHbtE3s67miAlMeuV8aZdc9RzJrySLmgM="; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/04_gcc10.patch"; + hash = "sha256-LTsBkdwvmZ11+gwfe/XaapxzLaEVu7CdtCw8mqJcXr4="; + }) + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/05_gtk3.patch"; + hash = "sha256-1y/JFePfnQMMVwqLYgUQyP/SNZRMHgV+cHjbHP6szQs="; + }) + ]; + + postPatch = '' + substituteInPlace src/main.c --replace-fail "/usr/share/rfdump/rfdump.ui" "$out/share/rfdump/rfdump.ui" + substituteInPlace src/Makefile.am --replace-fail "/usr/share/pixmaps" "$out/share/pixmaps" + substituteInPlace src/tagtypes.c --replace-fail "/usr/share/rfdump/rfd_types.xml" "$out/share/rfdump/rfd_types.xml" + ''; + + configureFlags = [ "PREFIX=$out" ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + expat + glib + gtk3-x11 + zlib + ]; + + makeFlags = [ "LIBS=-lexpat" ]; + + meta = { + description = "Tool to detect RFID-Tags and show their meta information"; + homepage = "https://www.rfdump.org/"; + changelog = "https://salsa.debian.org/pkg-security-team/rfdump/-/blob/debian/master/ChangeLog"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "rfdump"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 2410fa0cc230..43eadd2c3940 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # in "checkPhase", hence fails in sandbox of "nix". doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sn0int \ --bash <($out/bin/sn0int completions bash) \ --fish <($out/bin/sn0int completions fish) \ diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index b4a56dda78c9..aa7bcd58936d 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec { Libsystem ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd solana \ --bash <($out/bin/solana completion --shell bash) \ --fish <($out/bin/solana completion --shell fish) \ diff --git a/pkgs/by-name/sq/sqlite-vec/package.nix b/pkgs/by-name/sq/sqlite-vec/package.nix new file mode 100644 index 000000000000..cb89114d7feb --- /dev/null +++ b/pkgs/by-name/sq/sqlite-vec/package.nix @@ -0,0 +1,46 @@ +{ + lib, + gettext, + fetchFromGitHub, + sqlite, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sqlite-vec"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "asg017"; + repo = "sqlite-vec"; + rev = "v${finalAttrs.version}"; + hash = "sha256-h5gCKyeEAgmXCpOpXVDzoZEtv7Yiq7GtgImuoF9uBm0="; + }; + + nativeBuildInputs = [ gettext ]; + + buildInputs = [ sqlite ]; + + makeFlags = [ + "loadable" + "static" + ]; + installPhase = '' + runHook preInstall + + install -Dm444 -t "$out/lib" \ + "dist/libsqlite_vec0${stdenv.hostPlatform.extensions.staticLibrary}" \ + "dist/vec0${stdenv.hostPlatform.extensions.sharedLibrary}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Vector search SQLite extension that runs anywhere"; + homepage = "https://github.com/asg017/sqlite-vec"; + changelog = "https://github.com/asg017/sqlite-vec/releases/tag/${finalAttrs.src.rev}"; + license = licenses.mit; + maintainers = [ maintainers.anmonteiro ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 21949c94f30d..c5e8ac3f29e5 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, stdenv }: rustPlatform.buildRustPackage rec { @@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-MSN0xQj6IfOjI0qQqVBaGhh0BQJa4z24El2rGLlFBSM="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd steamguard \ --bash <($out/bin/steamguard completion --shell bash) \ --fish <($out/bin/steamguard completion --shell fish) \ diff --git a/pkgs/by-name/vi/villain/package.nix b/pkgs/by-name/vi/villain/package.nix new file mode 100644 index 000000000000..35db4e3d3b7f --- /dev/null +++ b/pkgs/by-name/vi/villain/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + python3, + python3Packages, + makeWrapper, +}: + +python3Packages.buildPythonApplication rec { + pname = "villain"; + version = "2.1.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "t3l3machus"; + repo = "Villain"; + rev = "v${version}"; + hash = "sha256-8MOpbyw4HEJMcv84bNkNLBSZfEmIm3RDSUi0s62t9ko="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dependencies = with python3Packages; [ + gnureadline + netifaces + pycryptodomex + pyperclip + requests + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/villain} + rm README.md requirements.txt LICENSE.md + cp -a * $out/share/villain/ + makeWrapper ${python3}/bin/python $out/bin/villain \ + --add-flags "$out/share/villain/Villain.py" \ + --prefix PYTHONPATH : ${python3Packages.makePythonPath dependencies} + runHook postInstall + ''; + + meta = { + description = "High level stage 0/1 C2 framework that can handle multiple TCP socket & HoaxShell-based reverse shells"; + homepage = "https://github.com/t3l3machus/Villain"; + license = lib.licenses.cc-by-nc-nd-40; + mainProgram = "villain"; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/vs/vscode-runner/package.nix b/pkgs/by-name/vs/vscode-runner/package.nix new file mode 100644 index 000000000000..24a3a23826f2 --- /dev/null +++ b/pkgs/by-name/vs/vscode-runner/package.nix @@ -0,0 +1,55 @@ +{ + lib, + fetchFromGitHub, + buildDartApplication, + kdePackages, + nix-update-script, +}: + +let + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "Merrit"; + repo = "vscode-runner"; + rev = "v${version}"; + hash = "sha256-mDhwydAFlDcpbpmh+I2zjjuC+/5hmygFkpHSZGEpuLs="; + }; +in +buildDartApplication { + pname = "vscode-runner"; + inherit version src; + + vendorHash = "sha256-jS4jH00uxZIX81sZQIi+s42ofmXpD4/tPMRV2heaM2U="; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + dartEntryPoints = { + "bin/vscode_runner" = "bin/vscode_runner.dart"; + }; + + postInstall = '' + substituteInPlace ./package/codes.merritt.vscode_runner.service \ + --replace-fail "Exec=" "Exec=$out/bin/vscode_runner" + install -D \ + ./package/codes.merritt.vscode_runner.service \ + $out/share/dbus-1/services/codes.merritt.vscode_runner.service + + install -D \ + ./package/plasma-runner-vscode_runner.desktop \ + $out/share/krunner/dbusplugins/plasma-runner-vscode_runner.desktop + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "KRunner plugin for quickly opening recent VSCode workspaces"; + homepage = "https://github.com/Merrit/vscode-runner"; + changelog = "https://github.com/Merrit/vscode-runner/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.pinage404 ]; + mainProgram = "vscode_runner"; + inherit (kdePackages.krunner.meta) platforms; + }; +} diff --git a/pkgs/by-name/vs/vscode-runner/pubspec.lock.json b/pkgs/by-name/vs/vscode-runner/pubspec.lock.json new file mode 100644 index 000000000000..e2d6592c0ae9 --- /dev/null +++ b/pkgs/by-name/vs/vscode-runner/pubspec.lock.json @@ -0,0 +1,557 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "krunner": { + "dependency": "direct main", + "description": { + "name": "krunner", + "sha256": "b027c8405c45d3f16b35037e0209665b0bdc9b975537f1216640ee8e1f839d31", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "lints": { + "dependency": "direct dev", + "description": { + "name": "lints", + "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.14.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sqlite3": { + "dependency": "direct main", + "description": { + "name": "sqlite3", + "sha256": "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.3" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xdg_directories": { + "dependency": "direct main", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.3.0 <4.0.0" + } +} diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 41aec58d70f0..349048008769 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "1.16.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-A5HmNKRiHwo7aPrhQWHjPZUT29zaxCN6z4SR8jR9jOg="; + hash = "sha256-Sn6SOHrsp1ZgsPntc2+cmlAEPVBUrYv1vKLKAQvT9m4="; }; vendorHash = null; diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 08960e07be13..31994978aed3 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.68"; + version = "0.1.69"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-NeiG8o5Le549kYILw9vA1EmQ1PcHjCAdwQAnKdYNMwk="; + hash = "sha256-Bw+TO9u0o+GHqVLPR7M4hFl1lMPa+tVDCeTEUoBBgcU="; }; executable = "ys"; diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 5072c9cace26..83100ef1b940 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.8.1"; + version = "2024.8.6"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-QxiqUjaUYRVi8BQZyNUmtmKnLfNO+LpFQBazTINmwVg="; + hash = "sha256-6FUfJryL9nuZwSNzzIftIHNDbDQ35TKQh40PS0ux9mM="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 1b78c12351d0..a168d805772b 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -13597,7 +13597,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.146.4" +version = "0.146.5" dependencies = [ "activity_indicator", "anyhow", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 353eb4e7f89e..da892f56950f 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.146.4"; + version = "0.146.5"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-U/PTPmZjhmsY9MVH7/SbooyTCR7ATHTWswv0IOokIu4="; + hash = "sha256-rHdvANczB2ccLOCNh1ZgkkknCNbTaPPODT72WjuOezs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index e1c2203660ce..3a90debe24cb 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { RUSTONIG_SYSTEM_LIBONIG = true; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd zola \ --bash <($out/bin/zola completion bash) \ --fish <($out/bin/zola completion fish) \ diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index f48600263447..e71cc124451d 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gorm"; - version = "1.3.1"; + version = "1.4.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-W+NgbvLjt1PpDiauhzWFaU1/CUhmDACQz+GoyRUyWB8="; + sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo="; }; nativeBuildInputs = [ make wrapGNUstepAppsHook ]; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 3d3e7593d05f..afd610110ba8 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,44 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, pcre2, neko, mbedtls_2, Security }: - +{ + lib, + stdenv, + fetchFromGitHub, + coreutils, + ocaml-ng, + zlib, + pcre, + pcre2, + neko, + mbedtls_2, + Security, +}: let - ocamlDependencies = version: - if lib.versionAtLeast version "4.3" - then with ocaml-ng.ocamlPackages_4_14; [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - dune_3 - luv - extlib - ] else with ocaml-ng.ocamlPackages_4_10; [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - dune_3 - luv - extlib-1-7-7 - ]; + ocamlDependencies = + version: + if lib.versionAtLeast version "4.3" then + with ocaml-ng.ocamlPackages_4_14; + [ + ocaml + findlib + sedlex + xml-light + ptmap + camlp5 + sha + dune_3 + luv + extlib + ] + else + with ocaml-ng.ocamlPackages_4_10; + [ + ocaml + findlib + sedlex + xml-light + ptmap + camlp5 + sha + dune_3 + luv + extlib-1-7-7 + ]; defaultPatch = '' substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \ --replace '"neko"' '"${neko}/bin/neko"' ''; - generic = { hash, version, prePatch ? defaultPatch }: + generic = + { + hash, + version, + prePatch ? defaultPatch, + }: stdenv.mkDerivation { pname = "haxe"; inherit version; - buildInputs = [ zlib neko ] - ++ (if lib.versionAtLeast version "4.3" then [pcre2] else [pcre]) + buildInputs = + [ + zlib + neko + ] + ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; @@ -53,7 +78,10 @@ let inherit prePatch; - buildFlags = [ "all" "tools" ]; + buildFlags = [ + "all" + "tools" + ]; installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" @@ -111,12 +139,21 @@ let meta = with lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = "https://haxe.org"; - license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file - maintainers = [ maintainers.marcweber maintainers.locallycompact maintainers.logo ]; + license = with licenses; [ + gpl2Plus + mit + ]; # based on upstream opam file + maintainers = [ + maintainers.marcweber + maintainers.locallycompact + maintainers.logo + maintainers.bwkam + ]; platforms = platforms.linux ++ platforms.darwin; }; }; -in { +in +{ haxe_4_0 = generic { version = "4.0.5"; hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg="; @@ -126,7 +163,7 @@ in { hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY="; }; haxe_4_3 = generic { - version = "4.3.4"; - hash = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; + version = "4.3.5"; + hash = "sha256-vms7FoOL8cDPorHd/EJq8HEHGRX1JfL8EZmDtxW9lOw="; }; } diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 3c4c5d71c0ce..2031c006de6f 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "jrsonnet"; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash zsh fish; do installShellCompletion --cmd jrsonnet \ --$shell <($out/bin/jrsonnet --generate $shell /dev/null) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 6e7e9bd19422..5eb28661e992 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -24,9 +24,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0-rc1".officialRelease.sha256 = "sha256-uaM+CKE+l+ksLtfhVMTLXbLlu+lUZScf+ucBcRENSDM="; "20.0.0-git".gitRelease = { - rev = "62e9f40949ddc52e9660b25ab146bd5d9b39ad88"; - rev-version = "20.0.0-unstable-2024-07-28"; - sha256 = "sha256-MBNhBdY+fLrxUxWACqDLBoEEDCCaHOtbBeM5/f8SEf4="; + rev = "5f7e921fe3b5402127868faf5855a835cf238196"; + rev-version = "20.0.0-unstable-2024-08-04"; + sha256 = "sha256-gW5yPHqmM3sbL9KCt7oXHG8I1ECdKAxNlSZkubve60A="; }; } // llvmVersions; diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index 43083f319ba1..f49533da9de2 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -4,7 +4,8 @@ aresponses, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, + httpx, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -12,26 +13,31 @@ buildPythonPackage rec { pname = "aioweenect"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "eifinger"; - repo = pname; + repo = "aioweenect"; rev = "refs/tags/v${version}"; - hash = "sha256-9CYdOUPCt4TkepVuVJHMZngFHyCLFwVvik1xDnfneEc="; + hash = "sha256-qVhF+gy5qcH/okuncDuzbAUPonkmQo1/QwOjC70IV4w="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov --cov-report term-missing --cov-report xml --cov=aioweenect tests" "" + --replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" "" ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "aiohttp" ]; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + httpx + ]; nativeCheckInputs = [ aresponses @@ -44,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the weenect API"; homepage = "https://github.com/eifinger/aioweenect"; + changelog = "https://github.com/eifinger/aioweenect/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index b54fa310ec9e..b0893ae7ca02 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -59,13 +59,13 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-czDL2b+Jj7mrYZCTfnaZArkOHBaWyTV0BTE2wvykHps="; + hash = "sha256-wzfzuWuNqLAjfAZC38p1iTtJHez/pJ9Ncgeo23o1dMo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eTVT1yowuDsajjceWojdUdX466FKneUt1i5QipBFdp4="; + hash = "sha256-0OE2i29oE6RpJRswQWI8+5dbA6lOWd3nhqe1RGlnjhk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index f7922f5fa01b..b2b2dec74e27 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.6.6"; + version = "10.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-UnMIl+fB5BA0LTurHN2XpMlhvOzvAgveLG+EuQE2WG4="; + hash = "sha256-OWx+YtpZRWTsap4go89yia+DqqAewZq+0cTaoXdDRSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 73085f92bb69..59059586c89b 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.9"; + version = "0.21.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-397YJotA5PxyrOU+xwaOakPHf6Hynd7bdro/HIBDPHo="; + hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM="; }; build-system = [ diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 558c5d3e03ba..507ee3a0135a 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.18.1"; + version = "1.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-ogfshtuHQ1UBNX24gTevWKGsFFaA097oEW3J3fzcXFo="; + hash = "sha256-QSJrzZyqwaHu8as03YIzB7PjUMzCnyADZgcBVnhm6c0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hass-splunk/default.nix b/pkgs/development/python-modules/hass-splunk/default.nix new file mode 100644 index 000000000000..b5183c52b145 --- /dev/null +++ b/pkgs/development/python-modules/hass-splunk/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "hass-splunk"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Bre77"; + repo = "hass_splunk"; + rev = "refs/tags/v${version}"; + hash = "sha256-bgF6gHAA57MiWdmpwilGa+l05/ETKdpyi2naVagkRlc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "hass_splunk" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Async single threaded connector to Splunk HEC using an asyncio session"; + homepage = "https://github.com/Bre77/hass_splunk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix new file mode 100644 index 000000000000..f949eef4cf6b --- /dev/null +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + httpx, + poetry-core, + pydantic, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "llama-cloud"; + version = "0.0.11"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_cloud"; + inherit version; + hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + httpx + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "llama_cloud" ]; + + meta = with lib; { + description = "LlamaIndex Python Client"; + homepage = "https://pypi.org/project/llama-cloud/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 6073a4e60427..c7a1d2e46676 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-E85TXwPjLIIXY8AeJq9CIvOYEXhiJBTThoAToZRugSQ="; + hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index f17ff8e511a6..5d6795dce972 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-PPH3BsPGnGsaqwf8p/qtOVnbFwmAjv1QSRtmnTiwtYA="; + hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 6e8ab30f934a..f6dab9b1f0fb 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -22,6 +22,7 @@ pytest-mock, pytestCheckHook, pythonOlder, + pyvis, pyyaml, requests, spacy, @@ -46,7 +47,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.48.post1"; + version = "0.10.60"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +56,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-O8mHttYMRUzWvhydQsOux7tynhDuMKapsSDJQXL0MRQ="; + hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4="; }; sourceRoot = "${src.name}/${pname}"; @@ -91,6 +92,7 @@ buildPythonPackage rec { openai pandas pillow + pyvis pyyaml requests spacy diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index 5184b9be5502..db3ef8d5b994 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-qeCAm93S5K2IjySVGe3H49M5x05OA/xaQMMGDcQdR6k="; + hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 56b31b8aca55..3700c2bc96ba 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.7"; + version = "0.2.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-SMdEeJ3kZPbiIU1PW3PWBKBI/B5fRwC/wqEZnkLekHY="; + hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index f6eb083b391b..eeef4efe2ed8 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, poetry-core, + llama-cloud, llama-index-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.1.6"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-dLOw6ev500jTBU+fwMZXAxrM65NRwxEWrY1aeuRyn1w="; + hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-cloud + llama-index-core + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index d8680ab104a1..998759b62920 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, + ollama, poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.1.5"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-dWl9lshg2H6AzOkMnqQly9I2kYRY4P6q7gNZcGi6mEQ="; + hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + ollama + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 3c3a3ff12b5c..5a10557cc9cc 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.22"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-cpvy6nBDUXRl4dWFCJUSt32LPOkiM6Z8E41dYhBh7VY="; + hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 76fa73298cd4..963f054cd6ef 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.6"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w="; + hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index e542c0f8a4e6..781e03a06a44 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-xqSYDF6oJgiLKLTe4zZ+2yAiHm0F6w4FAZBJGQEx13I="; + hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 078e7a7b3d59..a07dd4e6f02d 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.11"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-ziP/lUnFJpvcy6Y4h1uSH6qkpYHO+3U+mfg2XIJIeg4="; + hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 47fbc2865917..38bf71e35519 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.10"; + version = "0.2.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-kFUZiE7rtVQQzaTstKOaM2XkKZQ7ydqVR/2xyPdVtt8="; + hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 25ae1155ec92..051fc5745af2 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.5"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-CKSLz0r1tiO/JvpiZgOFcrlUCfe+ZHRgZ9uNOPaSf+U="; + hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index e342450c0e45..6f3761d95fb0 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -1,46 +1,72 @@ { lib, + beautifulsoup4, buildPythonPackage, + defusedxml, docutils, - fetchPypi, + fetchFromGitHub, flit-core, jinja2, markdown-it-py, mdit-py-plugins, + pytest-param-files, + pytest-regressions, + pytestCheckHook, pythonOlder, pyyaml, + sphinx-pytest, + sphinx, typing-extensions, }: buildPythonPackage rec { pname = "myst-docutils"; - version = "3.0.1"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - pname = "myst_docutils"; - inherit version; - hash = "sha256-alQvF0OWNjDck022ORJ1Nl4t1jgzMZKEbJxPHsrmBcI="; + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "MyST-Parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ docutils jinja2 markdown-it-py mdit-py-plugins pyyaml + sphinx typing-extensions ]; + nativeCheckInputs = [ + beautifulsoup4 + defusedxml + pytest-param-files + pytest-regressions + pytestCheckHook + sphinx-pytest + ]; + pythonImportsCheck = [ "myst_parser" ]; + disabledTests = [ + # Tests require linkify + "test_cmdline" + "test_extended_syntaxes" + ]; + meta = with lib; { description = "Extended commonmark compliant parser, with bridges to docutils/sphinx"; homepage = "https://github.com/executablebooks/MyST-Parser"; + changelog = "https://github.com/executablebooks/MyST-Parser/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dpausp ]; - broken = pythonOlder "3.8"; # dependency networkx requires 3.8 }; } diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index f99be6637f60..03635a8017bf 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.23.0"; + version = "5.23.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-IeRPjhjPKr65lUNltERvaHmxHhRJwUfXbyjrnDnBbR8="; + hash = "sha256-0kxeBwdhiDRCA4mkvr/wU07mr4bdvegO8sqghrH7dYg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index ef207caab053..9ca460014822 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-JPGdxkrbDGdehBviXl851J5da10auu8TDQDBnQzK2uk="; + hash = "sha256-hB5ySup7vd01VPyRuNT5d3FufuMvbHF8x5ULOzR1TWY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index a177ae42af16..ac50e8d72183 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -35,6 +35,9 @@ buildPythonPackage { pytestCheckHook ]; + # Tests have issues starting with 0.47b0 + doCheck = false; + pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index bdf9720c6c38..9fba4ade03c0 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, opentelemetry-api, opentelemetry-test-utils, + pytestCheckHook, + pythonOlder, setuptools, wrapt, - pytestCheckHook, }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta + # To avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; @@ -46,8 +46,8 @@ buildPythonPackage rec { passthru.updateScript = opentelemetry-api.updateScript; meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 8eec65073f1c..90b5b440d0d7 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -4,7 +4,7 @@ cogapp, fetchPypi, mock, - nose, + setuptools, pytestCheckHook, pythonOlder, six, @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "paver"; version = "1.3.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +24,13 @@ buildPythonPackage rec { hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; checkInputs = [ cogapp mock - nose pytestCheckHook virtualenv ]; @@ -37,15 +38,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "paver" ]; disabledTestPaths = [ - # Test depends on distutils + # Tests depend on distutils "paver/tests/test_setuputils.py" + "paver/tests/test_doctools.py" + "paver/tests/test_tasks.py" ]; - meta = with lib; { + meta = { description = "Python-based build/distribution/deployment scripting tool"; mainProgram = "paver"; homepage = "https://github.com/paver/paver"; - license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/development/python-modules/refoss-ha/default.nix b/pkgs/development/python-modules/refoss-ha/default.nix new file mode 100644 index 000000000000..e8564038e94e --- /dev/null +++ b/pkgs/development/python-modules/refoss-ha/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "refoss-ha"; + version = "1.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ashionky"; + repo = "refoss_ha"; + rev = "refs/tags/v${version}"; + hash = "sha256-DFP2lEZkjW5L94CnhJS04ydM66gnKzvgpiXOAejs768="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "refoss_ha" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/ashionky/refoss_ha/releases/tag/v${version}"; + description = "Refoss support for Home Assistant"; + homepage = "https://github.com/ashionky/refoss_ha"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix new file mode 100644 index 000000000000..4593f30b8db2 --- /dev/null +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + packaging, + requests, +}: + +buildPythonPackage rec { + pname = "rocketchat-api"; + version = "1.32.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jadolg"; + repo = "rocketchat_API"; + rev = "refs/tags/${version}"; + hash = "sha256-mzcesoBU8sOznAgvi2u8NsUheyLXPZuyIkGghbc556c="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + packaging + requests + ]; + + pythonImportsCheck = [ + "rocketchat_API" + "rocketchat_API.APIExceptions" + "rocketchat_API.APISections" + ]; + + # requires running a Rocket.Chat server + doCheck = false; + + meta = { + description = "Python API wrapper for Rocket.Chat"; + homepage = "https://github.com/jadolg/rocketchat_API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index a10d9b6ff5d9..5d4e946c8518 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-5rlgDnPYTtuVMincG5CgVwNh/IGmZk6ItvzdB/wHmgg="; + hash = "sha256-fq891LX6PukUEfrXplulhnisuPX/RqLAQ/5ty/Fvm9k="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ regex ]; + dependencies = [ regex ]; # loops forever doCheck = !stdenv.isDarwin; @@ -33,9 +33,10 @@ buildPythonPackage rec { meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; - mainProgram = "somajo-tokenizer"; homepage = "https://github.com/tsproisl/SoMaJo"; + changelog = "https://github.com/tsproisl/SoMaJo/blob/v${version}/CHANGES.txt"; license = licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "somajo-tokenizer"; }; } diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix new file mode 100644 index 000000000000..e7ca1728ee10 --- /dev/null +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + pytz, +}: + +buildPythonPackage rec { + pname = "stookwijzer"; + version = "1.4.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fwestenberg"; + repo = "stookwijzer"; + rev = "refs/tags/v${version}"; + hash = "sha256-QXCusmbt40Tg73ozl9nIDgMtQJ152uNhOuFyHn+OEA8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pytz + ]; + + pythonImportsCheck = [ "stookwijzer" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/fwestenberg/stookwijzer/releases/tag/v${version}"; + description = "Python package for the Stookwijzer API"; + homepage = "https://github.com/fwestenberg/stookwijzer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index c77700993780..3f732db0e092 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1204"; + version = "3.0.1205"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-CfgjfAaDOxucq+i+W1dG0DEDPs1jGmqxC9CTwS8LCJc="; + hash = "sha256-xf+UZbiNiCYnQEneetB5Yz9kQe86XY3N7uaGnedEfLQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3425d08e3fdc..a98cf542e9e3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.218"; + version = "3.2.219"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-DF0BvtmtllhtfCgDXfH0zKvfBlGlJuoIyhoo40xvHaM="; + hash = "sha256-PNWOT4vnlruRPoGSPcBy4GPxmuflVbF+UheIpBo14kE="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 16bb018e36dd..6760b4754203 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ --bash <($out/bin/cog generate-completions bash) \ --fish <($out/bin/cog generate-completions fish) \ diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index cbf5c447117d..ca650be0e386 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd espup \ --bash <($out/bin/espup completions bash) \ --fish <($out/bin/espup completions fish) \ diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 7b521856a3e8..9aafdb4e02c1 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd fnm \ --bash <($out/bin/fnm completions --shell bash) \ --fish <($out/bin/fnm completions --shell fish) \ diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 02823914e15a..f6d52a2c54c6 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cargo-asm \ --bash <($out/bin/cargo-asm --bpaf-complete-style-bash) \ --fish <($out/bin/cargo-asm --bpaf-complete-style-fish) \ diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/development/tools/rust/cauwugo/default.nix index 10a3432d4dd4..1f497a270b93 100644 --- a/pkgs/development/tools/rust/cauwugo/default.nix +++ b/pkgs/development/tools/rust/cauwugo/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles }: +{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "cauwugo"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cauwugo \ --bash <($out/bin/cauwugo --bpaf-complete-style-bash) \ --fish <($out/bin/cauwugo --bpaf-complete-style-fish) \ diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 745784fc0304..1283df16fd00 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, stdenv }: rustPlatform.buildRustPackage rec { @@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "go" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd typeshare \ --bash <($out/bin/typeshare completions bash) \ --fish <($out/bin/typeshare completions fish) \ diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index cffe180a92d0..6a031160ffe7 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9L02ox2T+dBRx+mmFpy5Bktsyp3C/havfZoDaNevIMw="; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ --bash <($out/bin/sentry-cli completions bash) \ --fish <($out/bin/sentry-cli completions fish) \ diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index e77cc4ae0c70..c27942538454 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, stdenv }: rustPlatform.buildRustPackage rec { @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd snazy \ --bash <($out/bin/snazy --shell-completion bash) \ --fish <($out/bin/snazy --shell-completion fish) \ diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index 0618d818de3e..03775abeeb51 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -3,6 +3,7 @@ , installShellFiles , rustPlatform , protobuf +, stdenv }: rustPlatform.buildRustPackage rec { @@ -35,7 +36,7 @@ rustPlatform.buildRustPackage rec { "--skip config::tests::toml_example_changed" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tokio-console \ --bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \ --fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \ diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/development/tools/volta/default.nix index e67df485b7f4..15c9c493b797 100644 --- a/pkgs/development/tools/volta/default.nix +++ b/pkgs/development/tools/volta/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { HOME = "$TMPDIR"; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd volta \ --bash <($out/bin/volta completions bash) \ --fish <($out/bin/volta completions fish) \ diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9b801e82cf21..90fcceedbd06 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 32dd8a6a70d2..3283f44d0a64 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.43"; - hash = "sha256-4o8qdAkqFjlRFS2k2zW9weSB1JQ5BFuDdcv26v9qYoA="; + version = "6.6.44"; + hash = "sha256-kRMx0NVZNZ0xcEq+Bg9NkzHgRCnblbamxLKUbzfp6h0="; variant = "lts"; }; mainVariant = { - version = "6.9.12"; - hash = "sha256-ysnu/6q2Zc0b+MNRdjQDLNmmjU+nWKpb/CcPOSSmotM="; + version = "6.10.3"; + hash = "sha256-Nwv7Ms8R6tTBK7oHeRf19S1OFCEJcf/fTXurHs+JI0Y="; variant = "main"; }; @@ -52,7 +52,7 @@ let RCU_FANOUT = freeform "64"; RCU_FANOUT_LEAF = freeform "16"; RCU_BOOST = yes; - RCU_BOOST_DELAY = freeform "0"; + RCU_BOOST_DELAY = freeform "100"; RCU_EXP_KTHREAD = yes; }; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index b1e0e8b05054..3ee78ad57032 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-YxfX9ePwHDORLzE9ZqM90azhzffxnVxZCy5DDYykYF8="; + sha256 = "sha256-wBkPkj8AlZlfLmMx2s2SxuH01Xi4gNYWkGArQ6Ws/YQ="; }; prePatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 29fc59f3765f..f863519dd6c4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3693,7 +3693,8 @@ praw ]; "refoss" = ps: with ps; [ - ]; # missing inputs: refoss-ha + refoss-ha + ]; "rejseplanen" = ps: with ps; [ rjpl ]; @@ -3758,7 +3759,8 @@ vacuum-map-parser-roborock ]; "rocketchat" = ps: with ps; [ - ]; # missing inputs: rocketchat-API + rocketchat-api + ]; "roku" = ps: with ps; [ rokuecp ]; @@ -4244,7 +4246,8 @@ spiderpy ]; "splunk" = ps: with ps; [ - ]; # missing inputs: hass-splunk + hass-splunk + ]; "spotify" = ps: with ps; [ fnv-hash-fast psutil-home-assistant @@ -4304,7 +4307,8 @@ stookalert ]; "stookwijzer" = ps: with ps; [ - ]; # missing inputs: stookwijzer + stookwijzer + ]; "stream" = ps: with ps; [ av numpy_1 @@ -5814,6 +5818,7 @@ "recorder" "recovery_mode" "reddit" + "refoss" "remote" "renault" "renson" @@ -5917,6 +5922,7 @@ "steam_online" "steamist" "stookalert" + "stookwijzer" "stream" "streamlabswater" "stt" diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index e01c923e1cd2..267f1ed38aaa 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { "--skip=validate_printed_urls" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd dufs \ --bash <($out/bin/dufs --completions bash) \ --fish <($out/bin/dufs --completions fish) \ diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index a092473a6a77..6ec9c8c378f2 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-z1JRXmWygYywL9eiAsdmNnuMVNi3/qJ92pyBqnzh06Y="; + sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 5c59a7b5386a..0ef27f2ee560 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd colmena \ --bash <($out/bin/colmena gen-completions bash) \ --zsh <($out/bin/colmena gen-completions zsh) \ diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 48a029dd1b06..83353394e009 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + smartmontools, + makeWrapper, +}: stdenv.mkDerivation rec { pname = "snapraid"; @@ -8,16 +15,26 @@ stdenv.mkDerivation rec { owner = "amadvance"; repo = "snapraid"; rev = "v${version}"; - sha256 = "sha256-pkLooA3JZV/rPlE5+JeJN1QW2xAdNu7c/iFFtT4M4vc="; + hash = "sha256-pkLooA3JZV/rPlE5+JeJN1QW2xAdNu7c/iFFtT4M4vc="; }; VERSION = version; doCheck = !(stdenv.isDarwin && stdenv.isx86_64); - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + makeWrapper + ]; + buildInputs = [ ]; + # SMART is only supported on Linux and requires the smartmontools package + postInstall = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/snapraid \ + --prefix PATH : ${lib.makeBinPath [ smartmontools ]} + ''; + meta = { homepage = "http://www.snapraid.it/"; description = "Backup program for disk arrays"; diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/tools/misc/charasay/default.nix index 20594414daef..5048b9dd655a 100644 --- a/pkgs/tools/misc/charasay/default.nix +++ b/pkgs/tools/misc/charasay/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, stdenv }: rustPlatform.buildRustPackage rec { @@ -23,11 +24,11 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; - postInstall = '' - installShellCompletion --cmd himalaya \ - --bash <($out/bin/chara completion --shell bash) \ - --fish <($out/bin/chara completion --shell fish) \ - --zsh <($out/bin/chara completion --shell zsh) + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd chara \ + --bash <($out/bin/chara completions --shell bash) \ + --fish <($out/bin/chara completions --shell fish) \ + --zsh <($out/bin/chara completions --shell zsh) ''; meta = with lib; { diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index ec8232ffc0fd..5dc48bfaf020 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ which installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd dotter \ --bash <($out/bin/dotter gen-completions --shell bash) \ --fish <($out/bin/dotter gen-completions --shell fish) \ diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index e4a296333569..c15d529279da 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd imdl \ --bash <($out/bin/imdl completions bash) \ --fish <($out/bin/imdl completions fish) \ diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 0bdbd91a1dc6..937f667c2a9a 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { "--skip=validate_printed_urls" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/miniserve --print-manpage >miniserve.1 installManPage miniserve.1 diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 84762c8b7274..0e7175e6365a 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { git commit -m test ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd onefetch \ --bash <($out/bin/onefetch --generate bash) \ --fish <($out/bin/onefetch --generate fish) \ diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index 39c6f2082221..3c0618f3de6f 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { "--skip lock_and_source_profiles" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sheldon \ --bash <($out/bin/sheldon completions --shell bash) \ --zsh <($out/bin/sheldon completions --shell zsh) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index e322e03ed3e2..37d38016b882 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -34,14 +34,14 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' + presetdir=$out/share/starship/presets/ + mkdir -p $presetdir + cp docs/public/presets/toml/*.toml $presetdir + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd starship \ --bash <($out/bin/starship completions bash) \ --fish <($out/bin/starship completions fish) \ --zsh <($out/bin/starship completions zsh) - - presetdir=$out/share/starship/presets/ - mkdir -p $presetdir - cp docs/public/presets/toml/*.toml $presetdir ''; cargoHash = "sha256-yJ32HFaRpujJ9mQa+07b5cQcl1ATO/56dpm1IeKcbzs="; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 8b037912a80d..38e1f0d95c1a 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { "AppKit" ]); - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd topgrade \ --bash <($out/bin/topgrade --gen-completion bash) \ --fish <($out/bin/topgrade --gen-completion fish) \ diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index f9cfdd612761..09cbccb13c77 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles }: +{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "trashy"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - preFixup = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd trash \ --bash <($out/bin/trash completions bash) \ --fish <($out/bin/trash completions fish) \ diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 62ddf4e725e6..65ba3a837474 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec { # Copy the standard library to $out/lib cp -r ${src}/tremor-script/lib/ $out + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tremor \ --bash <($out/bin/tremor completions bash) \ --fish <($out/bin/tremor completions fish) \ diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 213378e41f05..7de3ed1b3b27 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd twm \ --bash <($out/bin/twm --print-bash-completion) \ --zsh <($out/bin/twm --print-zsh-completion) \ diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index ca2ababb464b..105d35349eb9 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec { mandown docs/MANPAGE.md > zellij.1 installManPage zellij.1 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd $pname \ --bash <($out/bin/zellij setup --generate-completion bash) \ --fish <($out/bin/zellij setup --generate-completion fish) \ diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index 77bb8e117e6f..fc0ceebc714e 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # all tests involve networking and are bound fail doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd wormhole-rs \ --bash <($out/bin/wormhole-rs completion bash) \ --fish <($out/bin/wormhole-rs completion fish) \ diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/tools/nix/fh/default.nix index 2a3e1d9e5a4d..6bfce50581f9 100644 --- a/pkgs/tools/nix/fh/default.nix +++ b/pkgs/tools/nix/fh/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; }; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd fh \ --bash <($out/bin/fh completion bash) \ --fish <($out/bin/fh completion fish) \ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 162012378034..db095e59c489 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -14,16 +14,17 @@ , pkg-config , diffutils , glibc ? !stdenv.isDarwin +, darwin }: stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.22.6"; + version = "1.22.10"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-iNaBSnxKMKV4u+X4dvDcq7QIxFGROEV0QrbZEJr5kmw="; + hash = "sha256-D/9nQXwzgLo+odn72WHuCJDjipfWdim2ZdSLTI2VlgE="; }; configureFlags = [ @@ -71,7 +72,8 @@ stdenv.mkDerivation rec { --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\" ''; - buildInputs = [ perl zlib bzip2 xz zstd libmd ]; + buildInputs = [ perl zlib bzip2 xz zstd libmd ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ makeWrapper perl autoreconfHook pkg-config ]; postInstall = diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 60f08b8db6bc..91c1f9b26807 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/nix-template \ --prefix PATH : ${lib.makeBinPath [ nix ]} + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd nix-template \ --bash <($out/bin/nix-template completions bash) \ --fish <($out/bin/nix-template completions fish) \ diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix index 77b6e44c9273..f2d658e0f05d 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "poetry-plugin-up"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "MousaZeidBaker"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-ProwMnkg8LaPvb4aYyO1PR30iMSNE9oyKgCIX4O5j+E="; + rev = "refs/tags/v${version}"; + hash = "sha256-O82oFEU67o0bZVBtkEZsOLtLBkuLHglr/4+Hkd/8Lvc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix index aef7a39de280..4621bb1da5d0 100644 --- a/pkgs/tools/security/bws/default.nix +++ b/pkgs/tools/security/bws/default.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--package" "bws" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd bws \ --bash <($out/bin/bws completions bash) \ --fish <($out/bin/bws completions fish) \ diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index db049b1fa712..9eb65ffef46f 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jwt \ --bash <($out/bin/jwt completion bash) \ --fish <($out/bin/jwt completion fish) \ diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 4f193d4ffccb..ae16b3f00c9a 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share/kbs2 cp -r contrib/ $out/share/kbs2 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd kbs2 \ --bash <($out/bin/kbs2 --completions bash) \ --fish <($out/bin/kbs2 --completions fish) \ diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 39a629cb707c..02f6d0725f90 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -10,6 +10,7 @@ , gtk3 , libxcb , libxkbcommon +, stdenv }: rustPlatform.buildRustPackage rec { @@ -44,7 +45,7 @@ rustPlatform.buildRustPackage rec { libxkbcommon ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout) done diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index e46b742ee127..2de9d9ce9d5e 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm755 -t $out/bin bin/git-credential-rbw + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd rbw \ --bash <($out/bin/rbw gen-completions bash) \ --fish <($out/bin/rbw gen-completions fish) \ diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix index bbe43cb69770..9df5da79e8a6 100644 --- a/pkgs/tools/security/sheesy-cli/default.nix +++ b/pkgs/tools/security/sheesy-cli/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin" "sy" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sy \ --bash <($out/bin/sy completions bash) \ --fish <($out/bin/sy completions fish) \ diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/tools/security/shisho/default.nix index a4635b0363e5..f5a137a84671 100644 --- a/pkgs/tools/security/shisho/default.nix +++ b/pkgs/tools/security/shisho/default.nix @@ -3,6 +3,7 @@ , rustPlatform , installShellFiles , rustfmt +, stdenv }: rustPlatform.buildRustPackage rec { @@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec { rustfmt ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd shisho \ --bash <($out/bin/shisho completion bash) \ --fish <($out/bin/shisho completion fish) \ diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index eda1060320c8..1772f9d1e305 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_words_delete" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ltrs \ --bash <($out/bin/ltrs completions bash) \ --fish <($out/bin/ltrs completions fish) \ diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/tools/text/termbook/default.nix index d16dc05cba53..437016e25ec2 100644 --- a/pkgs/tools/text/termbook/default.nix +++ b/pkgs/tools/text/termbook/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd termbook \ --bash <($out/bin/termbook completions bash) \ --fish <($out/bin/termbook completions fish) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d029fbbc1f6b..c9aea4bf5262 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21072,8 +21072,6 @@ with pkgs; json2hcl = callPackage ../development/tools/json2hcl { }; - json2tsv = callPackage ../development/tools/json2tsv { }; - json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; json-glib = callPackage ../development/libraries/json-glib { }; @@ -27190,8 +27188,6 @@ with pkgs; reap = callPackage ../os-specific/linux/reap { }; - rectangle = callPackage ../os-specific/darwin/rectangle { }; - regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88b11f4be3c7..1e799f5000a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5457,6 +5457,8 @@ self: super: with self; { hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; + hass-splunk = callPackage ../development/python-modules/hass-splunk { }; + hassil = callPackage ../development/python-modules/hassil { }; hatasmota = callPackage ../development/python-modules/hatasmota { }; @@ -7117,6 +7119,8 @@ self: super: with self; { lizard = callPackage ../development/python-modules/lizard { }; + llama-cloud = callPackage ../development/python-modules/llama-cloud { }; + llama-index = callPackage ../development/python-modules/llama-index { }; llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { }; @@ -13488,6 +13492,8 @@ self: super: with self; { reflink = callPackage ../development/python-modules/reflink { }; + refoss-ha = callPackage ../development/python-modules/refoss-ha { }; + regenmaschine = callPackage ../development/python-modules/regenmaschine { }; regex = callPackage ../development/python-modules/regex { }; @@ -13760,6 +13766,8 @@ self: super: with self; { rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; + rocketchat-api = callPackage ../development/python-modules/rocketchat-api { }; + roku = callPackage ../development/python-modules/roku { }; rokuecp = callPackage ../development/python-modules/rokuecp { }; @@ -14982,6 +14990,8 @@ self: super: with self; { stookalert = callPackage ../development/python-modules/stookalert { }; + stookwijzer = callPackage ../development/python-modules/stookwijzer { }; + stopit = callPackage ../development/python-modules/stopit { }; stransi = callPackage ../development/python-modules/stransi { };