diff --git a/lib/licenses.nix b/lib/licenses.nix index b1da1541c21d..fb7b6c2e837f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -670,7 +670,7 @@ lib.mapAttrs mkLicense ({ # Intel's license, seems free iasl = { spdxId = "Intel-ACPI"; - fullName = "iASL"; + fullName = "Intel ACPI Software License Agreement"; url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; @@ -889,7 +889,7 @@ lib.mapAttrs mkLicense ({ spdxId = "MIT"; fullName = "MIT License"; }; - # https://spdx.org/licenses/MIT-feh.html + mit-feh = { spdxId = "MIT-feh"; fullName = "feh License"; @@ -1097,7 +1097,7 @@ lib.mapAttrs mkLicense ({ }; purdueBsd = { - fullName = " Purdue BSD-Style License"; # also know as lsof license + fullName = "Purdue BSD-Style License"; # also known as lsof license url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5db8d13fd656..60ab3903eb82 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8832,6 +8832,13 @@ name = "Luna Perego"; keys = [ { fingerprint = "09E4 B981 9B93 5B0C 0B91 1274 0578 7332 9217 08FF"; } ]; }; + hustlerone = { + email = "nine-ball@tutanota.com"; + matrix = "@hustlerone:matrix.org"; + github = "hustlerone"; + name = "Hustler One"; + githubId = 167621692; + }; huyngo = { email = "huyngo@disroot.org"; github = "Huy-Ngo"; @@ -11192,7 +11199,7 @@ name = "kintrix"; }; kinzoku = { - email = "kinzokudev4869@gmail.com"; + email = "kinzoku@the-nebula.xyz"; github = "kinzoku-dev"; githubId = 140647311; name = "Ayman Hamza"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 5eeafdbe99e5..a5fc0ff324ab 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -464,6 +464,8 @@ - `programs.vim.defaultEditor` now only works if `programs.vim.enable` is enabled. +- `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured. + - The `indi-full` package no longer contains non-free drivers. To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers. E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}` diff --git a/nixos/modules/hardware/usb-storage.nix b/nixos/modules/hardware/usb-storage.nix index 8d145ce51c00..32c1707b2716 100644 --- a/nixos/modules/hardware/usb-storage.nix +++ b/nixos/modules/hardware/usb-storage.nix @@ -1,8 +1,9 @@ { config, lib, pkgs, ... }: + { - options.hardware.usbStorage.manageStartStop = lib.mkOption { + options.hardware.usbStorage.manageShutdown = lib.mkOption { type = lib.types.bool; - default = true; + default = false; description = '' Enable this option to gracefully spin-down external storage during shutdown. If you suspect improper head parking after poweroff, install `smartmontools` and check @@ -10,9 +11,11 @@ ''; }; - config = lib.mkIf config.hardware.usbStorage.manageStartStop { + config = lib.mkIf config.hardware.usbStorage.manageShutdown { services.udev.extraRules = '' - ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage", ATTR{manage_system_start_stop}="1" + ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage|uas", ATTR{manage_shutdown}="1" ''; }; + + imports = [(lib.mkRenamedOptionModule [ "hardware" "usbStorage" "manageStartStop" ] [ "hardware" "usbStorage" "manageShutdown" ])]; } diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix index f0905c3af129..79f7239df9e5 100644 --- a/nixos/modules/services/matrix/mautrix-meta.nix +++ b/nixos/modules/services/matrix/mautrix-meta.nix @@ -69,11 +69,6 @@ in { appservice = { id = ""; - database = { - type = "sqlite3-fk-wal"; - uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate"; - }; - bot = { username = ""; }; @@ -83,37 +78,43 @@ in { address = "http://${config.settings.appservice.hostname}:${toString config.settings.appservice.port}"; }; - meta = { - mode = ""; + bridge = { + permissions = {}; }; - bridge = { - # Enable encryption by default to make the bridge more secure - encryption = { - allow = true; - default = true; - require = true; + database = { + type = "sqlite3-fk-wal"; + uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate"; + }; - # Recommended options from mautrix documentation - # for additional security. - delete_keys = { - dont_store_outbound = true; - ratchet_on_decrypt = true; - delete_fully_used_on_decrypt = true; - delete_prev_on_new_session = true; - delete_on_device_delete = true; - periodically_delete_expired = true; - delete_outdated_inbound = true; - }; + # Enable encryption by default to make the bridge more secure + encryption = { + allow = true; + default = true; + require = true; - verification_levels = { - receive = "cross-signed-tofu"; - send = "cross-signed-tofu"; - share = "cross-signed-tofu"; - }; + # Recommended options from mautrix documentation + # for additional security. + delete_keys = { + dont_store_outbound = true; + ratchet_on_decrypt = true; + delete_fully_used_on_decrypt = true; + delete_prev_on_new_session = true; + delete_on_device_delete = true; + periodically_delete_expired = true; + delete_outdated_inbound = true; }; - permissions = {}; + # TODO: This effectively disables encryption. But this is the value provided when a <0.4 config is migrated. Changing it will corrupt the database. + # https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L24 + # If you wish to encrypt the local database you should set this to an environment variable substitution and reset the bridge or somehow migrate the DB. + pickle_key = "mautrix.bridge.e2ee"; + + verification_levels = { + receive = "cross-signed-tofu"; + send = "cross-signed-tofu"; + share = "cross-signed-tofu"; + }; }; logging = { @@ -124,6 +125,10 @@ in { time_format = " "; }; }; + + network = { + mode = ""; + }; }; defaultText = '' { @@ -261,7 +266,7 @@ in { description = '' Configuration of multiple `mautrix-meta` instances. `services.mautrix-meta.instances.facebook` and `services.mautrix-meta.instances.instagram` - come preconfigured with meta.mode, appservice.id, bot username, display name and avatar. + come preconfigured with network.mode, appservice.id, bot username, display name and avatar. ''; example = '' @@ -283,7 +288,7 @@ in { messenger = { enable = true; settings = { - meta.mode = "messenger"; + network.mode = "messenger"; homeserver.domain = "example.com"; appservice = { id = "messenger"; @@ -313,9 +318,9 @@ in { ''; } { - assertion = builtins.elem cfg.settings.meta.mode [ "facebook" "facebook-tor" "messenger" "instagram" ]; + assertion = builtins.elem cfg.settings.network.mode [ "facebook" "facebook-tor" "messenger" "instagram" ]; message = '' - The option `services.mautrix-meta.instances.${name}.settings.meta.mode` has to be set + The option `services.mautrix-meta.instances.${name}.settings.network.mode` has to be set to one of: facebook, facebook-tor, messenger, instagram. This configures the mode of the bridge. ''; @@ -338,6 +343,24 @@ in { The option `services.mautrix-meta.instances.${name}.settings.appservice.bot.username` has to be set. ''; } + { + assertion = !(cfg.settings ? bridge.disable_xma); + message = '' + The option `bridge.disable_xma` has been moved to `network.disable_xma_always`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference. + ''; + } + { + assertion = !(cfg.settings ? bridge.displayname_template); + message = '' + The option `bridge.displayname_template` has been moved to `network.displayname_template`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference. + ''; + } + { + assertion = !(cfg.settings ? meta); + message = '' + The options in `meta` have been moved to `network`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference. + ''; + } ]) enabledInstances)); users.users = lib.mapAttrs' (name: cfg: lib.nameValuePair "mautrix-meta-${name}" { @@ -518,11 +541,7 @@ in { in { instagram = { settings = { - meta.mode = mkDefault "instagram"; - - bridge = { - username_template = mkDefault "instagram_{{.}}"; - }; + network.mode = mkDefault "instagram"; appservice = { id = mkDefault "instagram"; @@ -532,16 +551,13 @@ in { displayname = mkDefault "Instagram bridge bot"; avatar = mkDefault "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv"; }; + username_template = mkDefault "instagram_{{.}}"; }; }; }; facebook = { settings = { - meta.mode = mkDefault "facebook"; - - bridge = { - username_template = mkDefault "facebook_{{.}}"; - }; + network.mode = mkDefault "facebook"; appservice = { id = mkDefault "facebook"; @@ -551,6 +567,7 @@ in { displayname = mkDefault "Facebook bridge bot"; avatar = mkDefault "mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak"; }; + username_template = mkDefault "facebook_{{.}}"; }; }; }; @@ -558,5 +575,5 @@ in { } ]; - meta.maintainers = with lib.maintainers; [ rutherther ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index c0ead07066ec..37a991674dae 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -177,6 +177,18 @@ in SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db"; SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny"; }; + postStart = '' + for i in $(seq 300); do + if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then + echo "Scrutiny is ready (port is open)" + exit 0 + fi + echo "Waiting for Scrutiny to open port..." + sleep 0.2 + done + echo "Timeout waiting for Scrutiny to open port" >&2 + exit 1 + ''; serviceConfig = { DynamicUser = true; ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}"; diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix index bb3916ed4599..3b64f580aaf4 100644 --- a/nixos/modules/system/boot/unl0kr.nix +++ b/nixos/modules/system/boot/unl0kr.nix @@ -1,27 +1,85 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.boot.initrd.unl0kr; + settingsFormat = pkgs.formats.ini { }; in { options.boot.initrd.unl0kr = { enable = lib.mkEnableOption "unl0kr in initrd" // { + description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.''; + }; + + allowVendorDrivers = lib.mkEnableOption "load optional drivers" // { + description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)''; + }; + + settings = lib.mkOption { description = '' - Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS. + Configuration for `unl0kr`. + + See `unl0kr.conf(5)` for supported values. + + Alternatively, visit `https://gitlab.com/postmarketOS/buffybox/-/blob/unl0kr-2.0.0/unl0kr.conf` ''; + + example = lib.literalExpression '' + { + general.animations = true; + theme = { + default = "pmos-dark"; + alternate = "pmos-light"; + }; + } + ''; + default = { }; + type = lib.types.submodule { freeformType = settingsFormat.type; }; }; }; config = lib.mkIf cfg.enable { - meta.maintainers = []; + meta.maintainers = with lib.maintainers; [ hustlerone ]; assertions = [ { assertion = cfg.enable -> config.boot.initrd.systemd.enable; message = "boot.initrd.unl0kr is only supported with boot.initrd.systemd."; } + { + assertion = !config.boot.plymouth.enable; + message = "unl0kr will not work if plymouth is enabled."; + } + { + assertion = !config.hardware.amdgpu.initrd.enable; + message = "unl0kr has issues with video drivers that are loaded on stage 1."; + } ]; + boot.initrd.availableKernelModules = + lib.optionals cfg.enable [ + "hid-multitouch" + "hid-generic" + "usbhid" + + "i2c-designware-core" + "i2c-designware-platform" + "i2c-hid-acpi" + + "usbtouchscreen" + "evdev" + ] + ++ lib.optionals cfg.allowVendorDrivers [ + "intel_lpss_pci" + "elo" + "wacom" + ]; + boot.initrd.systemd = { + contents."/etc/unl0kr.conf".source = settingsFormat.generate "unl0kr.conf" cfg.settings; storePaths = with pkgs; [ "${pkgs.gnugrep}/bin/grep" libinput @@ -42,9 +100,7 @@ in "systemd-vconsole-setup.service" "udev.service" ]; - before = [ - "shutdown.target" - ]; + before = [ "shutdown.target" ]; script = '' # This script acts as a Password Agent: https://systemd.io/PASSWORD_AGENTS/ @@ -56,7 +112,7 @@ in do for file in `ls $DIR/ask.*`; do socket="$(cat "$file" | ${pkgs.gnugrep}/bin/grep "Socket=" | cut -d= -f2)" - ${pkgs.unl0kr}/bin/unl0kr | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket" + ${pkgs.unl0kr}/bin/unl0kr -v -C "/etc/unl0kr.conf" | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket" done done ''; diff --git a/pkgs/applications/misc/inochi2d/creator-dub-lock.json b/pkgs/applications/misc/inochi2d/creator-dub-lock.json index e0d3b23ad0c2..bfcfd17331cc 100644 --- a/pkgs/applications/misc/inochi2d/creator-dub-lock.json +++ b/pkgs/applications/misc/inochi2d/creator-dub-lock.json @@ -21,8 +21,8 @@ "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs" }, "diet-ng": { - "version": "1.8.1", - "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv" + "version": "1.8.2", + "sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv" }, "dportals": { "version": "0.1.0", @@ -37,12 +37,12 @@ "sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w" }, "eventcore": { - "version": "0.9.30", - "sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq" + "version": "0.9.34", + "sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw" }, "facetrack-d": { - "version": "0.7.8", - "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0" + "version": "0.8.0", + "sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i" }, "fghj": { "version": "1.0.2", @@ -65,24 +65,16 @@ "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h" }, "inmath": { - "version": "1.0.6", - "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" + "version": "1.3.0", + "sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6" }, "inochi2d": { - "version": "0.8.4", - "sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y" + "version": "0.8.6", + "sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70" }, "kra-d": { - "version": "0.5.5", - "sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz" - }, - "libasync": { - "version": "0.8.6", - "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj" - }, - "memutils": { - "version": "1.0.10", - "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" + "version": "0.5.6", + "sha256": "1lp3mf39qfxn6cayznc4nkk24smnd2m5sg8skl9pnd4x85is6zdr" }, "mir-algorithm": { "version": "3.22.1", @@ -100,9 +92,13 @@ "version": "2.2.19", "sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb" }, + "numem": { + "version": "0.11.3", + "sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm" + }, "openssl": { - "version": "3.3.3", - "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" + "version": "3.3.4", + "sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy" }, "openssl-static": { "version": "1.0.5+3.0.8", @@ -133,8 +129,8 @@ "sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd" }, "vibe-core": { - "version": "2.8.4", - "sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm" + "version": "2.9.3", + "sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi" }, "vibe-d": { "version": "0.9.8", diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index a88c58d38555..cb17167d513b 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -22,13 +22,13 @@ in inochi-creator = mkGeneric rec { pname = "inochi-creator"; appname = "Inochi Creator"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "Inochi2D"; repo = "inochi-creator"; rev = "v${version}"; - hash = "sha256-qrSHyvFE55xRbcA79lngOHJOdv54rNlUTHlxT9jjPEY="; + hash = "sha256-9d3j5ZL6rGOjN1GUpCIfbjby0mNMvOK7BJbHYgwLY2k="; }; dubLock = ./creator-dub-lock.json; @@ -54,15 +54,21 @@ in inochi-session = mkGeneric rec { pname = "inochi-session"; appname = "Inochi Session"; - version = "0.8.4"; + version = "0.8.7"; src = fetchFromGitHub { owner = "Inochi2D"; repo = "inochi-session"; rev = "v${version}"; - hash = "sha256-BRA5qODHhyHBeZYT5MQwcFmr/zVokfO5SrbcbQa6w7w="; + hash = "sha256-FcgzTCpD+L50MsPP90kfL6h6DEUtiYkUV1xKww1pQfg="; }; + patches = [ + # Dynamically load Lua to get around the linker error on aarch64-linux. + # https://github.com/Inochi2D/inochi-session/pull/60 + ./session-dynamic-lua.patch + ]; + dubLock = ./session-dub-lock.json; preFixup = '' @@ -72,8 +78,8 @@ in dontStrip = true; # symbol lookup error: undefined symbol: , version meta = { - # darwin has slightly different build steps, aarch fails to build because of some lua related error - broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; + # darwin has slightly different build steps + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; description = "An application that allows streaming with Inochi2D puppets"; }; diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 3e55f97f8b2d..0a08ebbaae73 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -14,6 +14,7 @@ freetype, SDL2, zenity, + luajit_2_1, libGL, builderArgs, @@ -99,7 +100,7 @@ buildDubPackage ( . gentl.sh # Use the fake git to generate version info - dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta + dub build --skip-registry=all --compiler=ldc2 --build=release --config=update-version ''; # Use the "barebones" configuration so that we don't include the mascot and icon files in out build @@ -128,7 +129,12 @@ buildDubPackage ( # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ --prefix PATH : ${lib.makeBinPath [ zenity ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + luajit_2_1 + ] + } ''; meta = { diff --git a/pkgs/applications/misc/inochi2d/session-dub-lock.json b/pkgs/applications/misc/inochi2d/session-dub-lock.json index e66d7cebe7e9..b069e6d90055 100644 --- a/pkgs/applications/misc/inochi2d/session-dub-lock.json +++ b/pkgs/applications/misc/inochi2d/session-dub-lock.json @@ -21,8 +21,8 @@ "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs" }, "diet-ng": { - "version": "1.8.1", - "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv" + "version": "1.8.2", + "sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv" }, "dportals": { "version": "0.1.0", @@ -33,12 +33,12 @@ "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb" }, "eventcore": { - "version": "0.9.30", - "sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq" + "version": "0.9.34", + "sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw" }, "facetrack-d": { - "version": "0.7.8", - "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0" + "version": "0.8.0", + "sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i" }, "fghj": { "version": "1.0.2", @@ -61,29 +61,21 @@ "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h" }, "inmath": { - "version": "1.0.6", - "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" + "version": "1.3.0", + "sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6" }, "inochi2d": { - "version": "0.8.4", - "sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y" + "version": "0.8.6", + "sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70" }, "inui": { - "version": "1.2.1", - "sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx" - }, - "libasync": { - "version": "0.8.6", - "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj" + "version": "1.2.2", + "sha256": "1gh7ngva2ijz5gx9hrqn9rzzx5vvpf6l12r98wklzxwb9v5hmj69" }, "lumars": { "version": "1.6.1", "sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9" }, - "memutils": { - "version": "1.0.10", - "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" - }, "mir-algorithm": { "version": "3.22.1", "sha256": "1bvvf3dm26x1h10pg1s4kyhxiyrmd96kk2lmchyady39crpjj5cf" @@ -96,9 +88,13 @@ "version": "1.0.1", "sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6" }, + "numem": { + "version": "0.11.3", + "sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm" + }, "openssl": { - "version": "3.3.3", - "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" + "version": "3.3.4", + "sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy" }, "openssl-static": { "version": "1.0.5+3.0.8", @@ -125,8 +121,8 @@ "sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd" }, "vibe-core": { - "version": "2.8.4", - "sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm" + "version": "2.9.3", + "sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi" }, "vibe-d": { "version": "0.9.8", diff --git a/pkgs/applications/misc/inochi2d/session-dynamic-lua.patch b/pkgs/applications/misc/inochi2d/session-dynamic-lua.patch new file mode 100644 index 000000000000..628859481580 --- /dev/null +++ b/pkgs/applications/misc/inochi2d/session-dynamic-lua.patch @@ -0,0 +1,98 @@ +diff --git a/dub.sdl b/dub.sdl +index 50c0da1..87936a4 100644 +--- a/dub.sdl ++++ b/dub.sdl +@@ -32,6 +32,9 @@ configuration "barebones" { + targetType "executable" + + dependency "dportals" version="~>0.1.0" ++ ++ subConfiguration "lumars" "lua51-dynamic" ++ versions "LUA_51" + } + + +@@ -51,6 +54,9 @@ configuration "linux-full" { + versions "InBranding" + + dependency "dportals" version="~>0.1.0" ++ ++ subConfiguration "lumars" "lua51-dynamic" ++ versions "LUA_51" + } + + configuration "osx-full" { +@@ -84,6 +90,9 @@ configuration "linux-nightly" { + versions "InNightly" + + dependency "dportals" version="~>0.1.0" ++ ++ subConfiguration "lumars" "lua51-dynamic" ++ versions "LUA_51" + } + + // macOS nightly build +diff --git a/source/session/plugins/package.d b/source/session/plugins/package.d +index 965c64f..7cfbb0b 100644 +--- a/source/session/plugins/package.d ++++ b/source/session/plugins/package.d +@@ -14,9 +14,9 @@ import lumars; + import session.log; + import std.file; + import std.path; ++import std.exception; + + private { +- bool couldLoadLua = true; + LuaState* state; + LuaTable apiTable; + +@@ -34,13 +34,17 @@ Plugin[] insPlugins; + Initializes Lua support + */ + void insLuaInit() { +- // LuaSupport support = loadLua(); +- +- // if (support == LuaSupport.noLibrary || support == LuaSupport.badLibrary) { +- // couldLoadLua = false; +- // insLogWarn("Could not load Lua support..."); +- // } else insLogInfo("Lua support initialized."); +- insLogInfo("Lua support initialized. (Statically linked for now)"); ++ version(linux){ ++ LuaSupport support = loadLua("libluajit-5.1.so.2"); ++ if(support == LuaSupport.noLibrary){ ++ support = loadLua(); ++ } ++ enforce(support != LuaSupport.noLibrary, "Could not find Lua support...!"); ++ enforce(support != LuaSupport.badLibrary, "Bad Lua library found!"); ++ insLogInfo("Lua support initialized."); ++ } else { ++ insLogInfo("Lua support initialized. (Statically linked)"); ++ } + + // Create Lua state + state = new LuaState(luaL_newstate()); +@@ -56,6 +60,9 @@ void insLuaInit() { + void insLuaUnload() { + lua_close(state.handle()); + destroy(state); ++ version(linux){ ++ unloadLua(); ++ } + } + + void insSavePluginState() { +@@ -111,13 +118,6 @@ void insEnumeratePlugins() { + insSavePluginState(); + } + +-/** +- Gets whether Lua support is loaded. +-*/ +-bool insHasLua() { +- return couldLoadLua; +-} +- + /** + Gets string of value + */ diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index afff0cd68368..6af515865dbf 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.29.6"; + version = "0.29.7"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M="; + hash = "sha256-4GjCV/Z9al7Hrj7Ik/EvmLy5jPCsU/3Ti9HwOjzPKYc="; }; postPatch = '' diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix deleted file mode 100644 index 64faccf6811c..000000000000 --- a/pkgs/applications/misc/sioyek/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, installShellFiles -, fetchFromGitHub -, fetchurl -, freetype -, gumbo -, harfbuzz -, jbig2dec -, mujs -, mupdf -, openjpeg -, qt3d -, qtbase -, qmake -, wrapQtAppsHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sioyek"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "ahrm"; - repo = "sioyek"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; - }; - - patches = [ - # Fixed compatibility with mupdf-0.23.0 - # https://github.com/ahrm/sioyek/issues/804 - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226"; - hash = "sha256-sEqhpk7/h6g/fIhbu5LgpKKnbnIFLInrTP1k+/GhrXE="; - }) - ]; - - buildInputs = [ - gumbo - harfbuzz - jbig2dec - mujs - mupdf - openjpeg - qt3d - qtbase - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; - - nativeBuildInputs = [ - installShellFiles - qmake - wrapQtAppsHook - ]; - - qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ]; - - postPatch = '' - substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \ - --replace "-lmupdf-third" "" - substituteInPlace pdf_viewer/main.cpp \ - --replace "/usr/share/sioyek" "$out/share" \ - --replace "/etc/sioyek" "$out/etc" - ''; - - postInstall = if stdenv.hostPlatform.isDarwin then '' - cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders - cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/ - cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/ - cp pdf_viewer/keys.config sioyek.app/Contents/MacOS/ - cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/ - cp tutorial.pdf sioyek.app/Contents/MacOS/ - - mkdir -p $out/Applications $out/bin - cp -r sioyek.app $out/Applications - ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek - '' else '' - install -Dm644 tutorial.pdf $out/share/tutorial.pdf - cp -r pdf_viewer/shaders $out/share/ - install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config - installManPage resources/sioyek.1 - ''; - - meta = with lib; { - homepage = "https://sioyek.info/"; - description = "PDF viewer designed for research papers and technical books"; - mainProgram = "sioyek"; - changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ podocarp ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index d6770a85138e..232677f9ffab 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,63 +1,85 @@ -{ stdenv -, lib -, fetchFromGitHub -, nix-update-script -, cmake -, pkg-config -, fribidi -, harfbuzz -, libwebp -, mpg123 -, SDL2 -, the-foundation -, AppKit -, zip -, enableTUI ? false, ncurses, sealcurses +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + fribidi, + harfbuzz, + libogg, + libwebp, + mpg123, + opusfile, + SDL2, + the-foundation, + AppKit, + zip, + enableTUI ? false, + ncurses, + sealcurses, }: stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.6"; + version = "1.18.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZF2HMfEI0LpvJrnB9MN8sQQDyBl/mRsI7pt6lfN4wdU="; + hash = "sha256-iIUWF93RZheW4uf3zgs1jqDjQnn0nFH7GOMaLBR0w0o="; }; - nativeBuildInputs = [ cmake pkg-config zip ]; - - buildInputs = [ the-foundation ] - ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] - ++ lib.optionals enableTUI [ ncurses sealcurses ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; - - cmakeFlags = lib.optionals enableTUI [ - "-DENABLE_TUI=YES" - "-DENABLE_MPG123=NO" - "-DENABLE_WEBP=NO" - "-DENABLE_FRIBIDI=NO" - "-DENABLE_HARFBUZZ=NO" - "-DENABLE_POPUP_MENUS=NO" - "-DENABLE_IDLE_SLEEP=NO" - "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + nativeBuildInputs = [ + cmake + pkg-config + zip ]; - installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) '' - mkdir -p $out/Applications - mv Lagrange.app $out/Applications - ''; + buildInputs = + [ + the-foundation + fribidi + harfbuzz + libogg + libwebp + mpg123 + opusfile + SDL2 + ] + ++ lib.optionals enableTUI [ + ncurses + sealcurses + ] + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TUI" enableTUI) + (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share") + ]; + + installPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv Lagrange.app $out/Applications + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) '' + # https://github.com/skyjake/lagrange/issues/610 + make install + install -d $out/share/lagrange + ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr + ''; passthru = { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Beautiful Gemini Client"; homepage = "https://gmi.skyjake.fi/lagrange/"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix index b4607b50fbf3..1a91767ae1d2 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-V7cUXzXvixONqL71f8hpJbGS+PyJgz+8LSwOlmXm+Po="; + hash = "sha256-RpYlUYGqOtF9R1Fr+Smu7XMWN+Y+P3RnagjBRNnA8/8="; }; - vendorHash = "sha256-xhpE+KDEf36kAw1HVm3WhiOwyWkFxkD5S+3mx0Sytv4="; + vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/by-name/bu/buf/package.nix similarity index 84% rename from pkgs/development/tools/buf/default.nix rename to pkgs/by-name/bu/buf/package.nix index 95fa7c96c2bf..5f8bfc30ebb8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.42.0"; + version = "1.44.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU="; + hash = "sha256-I0Y9gsNqCFLR2Bkt55HyER6wznTNoZW5345zUmuOFXQ="; }; - vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo="; + vendorHash = "sha256-4ykve9X//ckYPDkq76i0ojOiyzjrPJ/J2z7mA5giWKE="; patches = [ # Skip a test that requires networking to be available to work. @@ -40,6 +40,10 @@ buildGoModule rec { ]; preCheck = '' + # For WebAssembly runtime tests + GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \ + ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix + # The tests need access to some of the built utilities export PATH="$PATH:$GOPATH/bin" ''; diff --git a/pkgs/development/tools/buf/skip_broken_tests.patch b/pkgs/by-name/bu/buf/skip_broken_tests.patch similarity index 100% rename from pkgs/development/tools/buf/skip_broken_tests.patch rename to pkgs/by-name/bu/buf/skip_broken_tests.patch diff --git a/pkgs/by-name/lo/loco-cli/Cargo.lock b/pkgs/by-name/lo/loco-cli/Cargo.lock deleted file mode 100644 index 4412103734fb..000000000000 --- a/pkgs/by-name/lo/loco-cli/Cargo.lock +++ /dev/null @@ -1,1606 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.52.0", -] - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.5.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "insta" -version = "1.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "regex", - "serde", - "similar", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "loco-cli" -version = "0.2.6" -dependencies = [ - "cfg-if", - "clap", - "eyre", - "fs_extra", - "git2", - "ignore", - "insta", - "lazy_static", - "rand", - "regex", - "requestty", - "serde", - "serde_regex", - "serde_yaml", - "tracing", - "tracing-subscriber", - "tree-fs", - "trycmd", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_pipe" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "requestty" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa883a1f3e288e65187f653e6ba2e84fdf810fe02f4c8074f9c723d1aa26e2ae" -dependencies = [ - "requestty-ui", - "shell-words", - "smallvec", - "tempfile", - "winsplit", -] - -[[package]] -name = "requestty-ui" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7549bab39cf982b629b68e7ec191a5574e85086e95c0ebe514c02d3b42ffe225" -dependencies = [ - "bitflags 1.3.2", - "crossterm", - "once_cell", - "textwrap", - "unicode-segmentation", -] - -[[package]] -name = "rustix" -version = "0.38.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_regex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" -dependencies = [ - "regex", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "similar" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - -[[package]] -name = "snapbox" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84" -dependencies = [ - "anstream", - "anstyle", - "content_inspector", - "dunce", - "filetime", - "libc", - "normalize-line-endings", - "os_pipe", - "similar", - "snapbox-macros", - "tempfile", - "wait-timeout", - "walkdir", - "windows-sys 0.52.0", -] - -[[package]] -name = "snapbox-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" -dependencies = [ - "anstream", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tree-fs" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bcfe8bf2a763a3dcdf343c6ec09e69aeb46b6b8feea2415204f59ccbb42362" -dependencies = [ - "rand", - "serde", - "serde_yaml", - "thiserror", -] - -[[package]] -name = "trycmd" -version = "0.14.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41014f614932fff67cd3b780e0eb0ecb14e698a831a0e555ef2a5137be968d5" -dependencies = [ - "glob", - "humantime", - "humantime-serde", - "rayon", - "serde", - "shlex", - "snapbox", - "toml_edit", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winsplit" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab703352da6a72f35c39a533526393725640575bb211f61987a2748323ad956" diff --git a/pkgs/by-name/lo/loco-cli/package.nix b/pkgs/by-name/lo/loco-cli/package.nix index 94df46452fe5..453877f87782 100644 --- a/pkgs/by-name/lo/loco-cli/package.nix +++ b/pkgs/by-name/lo/loco-cli/package.nix @@ -1,30 +1,28 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchCrate, +}: rustPlatform.buildRustPackage rec { pname = "loco-cli"; - version = "0.2.6"; + version = "0.2.9"; - src = fetchFromGitHub { - owner = "loco-rs"; - repo = "loco"; - rev = "51e0362"; - hash = "sha256-ZiAl+Ru2ggLy7RRqQySwKRbWtGesR7ZgREIpHKrJ00Q="; - sparseCheckout = [ "loco-cli" ]; + src = fetchCrate { + inherit pname version; + hash = "sha256-AhL+k5XEf8m1pyOECTlPwALUG/ELJeACfV2kulxlzaA="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-BtunTti1cPbG1Qiv39tLdbXHM413UzsCckyqL5CJEUA="; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + #Skip trycmd integration tests + checkFlags = [ "--skip=cli_tests" ]; - sourceRoot = "${src.name}/loco-cli"; - - meta = with lib; { - mainProgram = "loco"; + meta = { description = "Loco CLI is a powerful command-line tool designed to streamline the process of generating Loco websites"; homepage = "https://loco.rs"; changelog = "https://github.com/loco-rs/loco/blob/master/CHANGELOG.md"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ sebrut ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sebrut ]; + mainProgram = "loco"; }; } diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index bf9ed2523006..29ca66cdf80e 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -46,7 +46,7 @@ buildGoModule rec { homepage = "https://github.com/mautrix/meta"; description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ rutherther eyjhb ]; + maintainers = with lib.maintainers; [ eyjhb ]; mainProgram = "mautrix-meta"; }; } diff --git a/pkgs/by-name/mi/mission-center/Cargo.lock b/pkgs/by-name/mi/mission-center/Cargo.lock index 32d323310e39..2cf6007b7293 100644 --- a/pkgs/by-name/mi/mission-center/Cargo.lock +++ b/pkgs/by-name/mi/mission-center/Cargo.lock @@ -667,7 +667,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.6.0" +version = "0.6.1" dependencies = [ "dbus", "errno-sys", diff --git a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock index 420af7d5c167..37053b5ba954 100644 --- a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock +++ b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock @@ -25,9 +25,9 @@ checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" [[package]] name = "app-rummage" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c015066de1a3af6e3582d1c4bf19f481fe7536e495c30fae84ec63cb08f90622" +checksum = "1321031f83546d8c1c81840700838c47e1fbf8eba93c393f2821573624b296f0" dependencies = [ "log", "nix", @@ -399,7 +399,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "app-rummage", diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix index b5ec03ec85e6..f7176e411c54 100644 --- a/pkgs/by-name/mi/mission-center/package.nix +++ b/pkgs/by-name/mi/mission-center/package.nix @@ -38,8 +38,20 @@ wayland, vulkan-loader, + + versionCheckHook, }: +# UPDATE PROCESS: +# 1) Get the nvtop commit hash (`source-url` in `nvtop.json`): +# https://gitlab.com/mission-center-devs/mission-center/-/blob/v/src/sys_info_v2/gatherer/3rdparty/nvtop/nvtop.json?ref_type=tags +# 2) Update the version of the main derivation +# 3) Get the main `Cargo.lock` and copy it to `Cargo.lock`: +# https://gitlab.com/mission-center-devs/mission-center/-/blob/v/Cargo.lock?ref_type=tags +# 4) Get the gatherer `Cargo.lock` and copy it to `gatherer-Cargo.lock`: +# https://gitlab.com/mission-center-devs/mission-center/-/blob/v/src/sys_info_v2/gatherer/Cargo.lock?ref_type=tags +# 5) Refresh both the `nvtop` and `src` hashes + let nvtop = fetchFromGitHub { owner = "Syllo"; @@ -50,13 +62,13 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-MHCQHQFMd+YFgwY+k5iVZG08UeYBvEhrZGhHmzR+cLc="; + hash = "sha256-1/cbU5yH6VlfFXCAO3m2CCZwCrqls8WZQf2eplfS6Rs="; }; cargoDeps = symlinkJoin { @@ -133,6 +145,12 @@ stdenv.mkDerivation rec { patchShebangs data/hwdb/generate_hwdb.py ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}"; + doInstallCheck = true; + meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index a024ddd8f9c2..58e111777542 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -49,7 +49,10 @@ buildGoModule rec { description = "Configuration framework for Kubernetes applications"; license = licenses.mit; homepage = "https://github.com/mykso/myks"; - maintainers = [ maintainers.kbudde ]; + maintainers = [ + maintainers.kbudde + maintainers.zebradil + ]; mainProgram = "myks"; }; } diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 1ee721828e19..abb37b0239b8 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -1,42 +1,49 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, libsixel -, stdenv -, nix-update-script -, testers -, presenterm +{ + lib, + fetchFromGitHub, + rustPlatform, + libsixel, + stdenv, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; rev = "refs/tags/v${version}"; - hash = "sha256-sMhowTXPzZcIOV4Ny9NzvgXGsZSPBJGDg9JvuoZoSUc="; + hash = "sha256-BFL0Y6v1v15WLSvA5i+l47bR9+1qDHPWSMMuEaLdhPY="; }; buildInputs = [ libsixel ]; - cargoHash = "sha256-2aHJnGSuP0TEBMxF1zljbEyk1g6ECTpnByyH8jaj78s="; + cargoHash = "sha256-IC72l1xbH/AdCHdcgY8ODv6+YZUmT5NYVisP9oIMpGA="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib buildFeatures = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "sixel" ]; + checkFlags = [ + # failed to load .tmpEeeeaQ: No such file or directory (os error 2) + "--skip=external_snippet" + ]; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = presenterm; - command = "presenterm --version"; - }; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Terminal based slideshow tool"; changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}"; diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 5df3689928c1..68b0e7d4fd38 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.116"; + version = "1.16.127"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-H89ge4b8Xm6YJXQSiPA/FBnlbekAG0Vobr2EQ4459q4="; + hash = "sha256-VsS9RXbcu6aV7b+Bk3lB+x6/X/HxN5EoypFCn4qKNEk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix index 92819bafa25e..be33fe3bf74b 100644 --- a/pkgs/by-name/se/seilfahrt/package.nix +++ b/pkgs/by-name/se/seilfahrt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "seilfahrt"; - version = "1.0.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Nerdbergev"; repo = "seilfahrt"; rev = "v${version}"; - hash = "sha256-2nbBG/LIx1JDUzxyASvM/5hAI2JbBRDuv8Jub+yTwdA="; + hash = "sha256-eQcRS3xyqdtjRki+EPnHIaqUJufniFJCh5qU2Za9kyg="; }; vendorHash = "sha256-JU77EFk8SWgZkN4DEtkKS2MsBH16my4j9X/NJC/r6mI="; diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix new file mode 100644 index 000000000000..954e7ef197e0 --- /dev/null +++ b/pkgs/by-name/si/sioyek/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + installShellFiles, + fetchFromGitHub, + freetype, + nix-update-script, + gumbo, + harfbuzz, + jbig2dec, + mujs, + mupdf, + openjpeg, + qt6, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sioyek"; + version = "2.0.0-unstable-2024-09-29"; + + src = fetchFromGitHub { + owner = "ahrm"; + repo = "sioyek"; + rev = "965499f0acbb1faf4b443b6bca30e7078f944b52"; + hash = "sha256-MOqWitXnYn8efk2LSeAOhmpcxGn6hbvjXbNTXEDdxIM="; + }; + + buildInputs = [ + gumbo + harfbuzz + jbig2dec + mujs + mupdf + openjpeg + qt6.qt3d + qt6.qtbase + qt6.qtspeech + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; + + nativeBuildInputs = [ + installShellFiles + qt6.qmake + qt6.wrapQtAppsHook + ]; + + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ]; + + postPatch = '' + substituteInPlace pdf_viewer_build_config.pro \ + --replace-fail "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \ + --replace-fail "-lmupdf-third" "" + substituteInPlace pdf_viewer/main.cpp \ + --replace-fail "/usr/share/sioyek" "$out/share" \ + --replace-fail "/etc/sioyek" "$out/etc" + ''; + + postInstall = + if stdenv.isDarwin then + '' + cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders + cp pdf_viewer/{prefs,prefs_user,keys,key_user}.config tutorial.pdf sioyek.app/Contents/MacOS/ + + mkdir -p $out/Applications $out/bin + cp -r sioyek.app $out/Applications + ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek + '' + else + '' + install -Dm644 tutorial.pdf $out/share/tutorial.pdf + cp -r pdf_viewer/shaders $out/share/ + install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config + installManPage resources/sioyek.1 + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch=development" + ]; + }; + + meta = with lib; { + homepage = "https://sioyek.info/"; + description = "PDF viewer designed for research papers and technical books"; + mainProgram = "sioyek"; + changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + podocarp + stephen-huan + xyven1 + ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix index c6106ebd6126..ada91ae6bc42 100644 --- a/pkgs/by-name/st/starpls-bin/package.nix +++ b/pkgs/by-name/st/starpls-bin/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoPatchelfHook }: stdenv.mkDerivation (finalAttrs: { pname = "starpls-bin"; @@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isElf [ + autoPatchelfHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isElf [ + stdenv.cc.cc.lib + ]; + installPhase = '' install -D $src $out/bin/starpls ''; diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 1d3fc9df8dcc..d70eed9a2f11 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; rev = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-sfCElufK80BU8I6pbdCJ+IlAPhSOt9MOYDy3E2hg5/A="; + hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q="; fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl gperf python3Packages.setuptools ]; diff --git a/pkgs/by-name/to/tomlq/package.nix b/pkgs/by-name/to/tomlq/package.nix new file mode 100644 index 000000000000..67dd3a2db966 --- /dev/null +++ b/pkgs/by-name/to/tomlq/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "tomlq"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "cryptaliagy"; + repo = "tomlq"; + rev = "refs/tags/${version}"; + hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4="; + }; + + cargoHash = "sha256-/cepTVJoBM1LYZkFpH9UCvE74cSszHDaeThsZksQ1P8="; + + meta = { + description = "Tool for getting data from TOML files on the command line"; + homepage = "https://github.com/cryptaliagy/tomlq"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kinzoku ]; + mainProgram = "tq"; + }; +} diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index dec1e9f26d39..d15f21ed772b 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.9.4"; + version = "24.10.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-y7IVEDbXYiNi9/SIlbmrkZ5SxrLzYe3Yy8LkP+wID3w="; + hash = "sha256-UOjR23VfOc65584JQtO+LF2Pp1JER8nIOA64hRnd5UA="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/by-name/un/unl0kr/package.nix b/pkgs/by-name/un/unl0kr/package.nix index 4f3589bd5973..8bedd9fc689f 100644 --- a/pkgs/by-name/un/unl0kr/package.nix +++ b/pkgs/by-name/un/unl0kr/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "unl0kr"; homepage = "https://gitlab.com/cherrypicker/unl0kr"; license = licenses.gpl3Plus; - maintainers = []; + maintainers = with maintainers; [ hustlerone ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 3f2d74eabd8c..1bf147df8373 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-xCybcDRswxRHiPf0ultIahxSPqn0YonmR4Kah38wJuw="; + hash = "sha256-W5qZHPNfRe9RmsmRzA8xGPvLl6JCoVJ59N87p2ZnXGo="; }; - cargoHash = "sha256-6CDzOxvktJc6AnFOm6OJp3cD2bZ0XCY5HLIoEmP59es="; + cargoHash = "sha256-ofmTDO11hqr95vSKRtJgMZL2BeA4AkCRNLknzr4n88I="; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 12fc8f228b7f..20a34aef75d4 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll +{ lib, stdenv, callPackage, fetchFromGitHub, fetchpatch, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname , openssl, glucose, minisat, abc-verifier, z3, python3 , certifyBooks ? true @@ -33,12 +33,25 @@ in stdenv.mkDerivation rec { # $IPASIR_SHARED_LIBRARY environment variable. libipasir = callPackage ./libipasirglucose4 { }; - patches = [(substituteAll { - src = ./0001-Fix-some-paths-for-Nix-build.patch; - libipasir = "${libipasir}/lib/${libipasir.libname}"; - libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; - libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; - })]; + patches = [ + (substituteAll { + src = ./0001-Fix-some-paths-for-Nix-build.patch; + libipasir = "${libipasir}/lib/${libipasir.libname}"; + libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; + libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + (fetchpatch { + name = "fix-fastnumio-on-newer-sbcl.patch"; + url = "https://github.com/acl2-devel/acl2-devel/commit/84f5a6cd4a1aaf204e8bae3eab4c21e8c061f469.patch"; + hash = "sha256-VA9giXZMb/Ob8ablxfbBAaZ2+2PGcv7WtooXwKDgT08="; + }) + ]; + + # We need the timestamps on the source tree to be stable for certification to + # work properly, so reset them here as necessary after patching + postPatch = '' + find . -type f -newer "$src" -execdir touch -r "$src" {} + + ''; nativeBuildInputs = lib.optional certifyBooks makeWrapper; @@ -112,7 +125,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Interpreter and a prover for a Lisp dialect"; + description = "Interpreter and prover for a Lisp dialect"; mainProgram = "acl2"; longDescription = '' ACL2 is a logic and programming language in which you can model computer diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index ab9a107cd47e..4d9c34d728d1 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -48,13 +48,13 @@ assert lib.assertMsg (withOpenLDAPAsHDBModule -> withOpenLDAP) '' stdenv.mkDerivation { pname = "heimdal"; - version = "7.8.0-unstable-2023-11-29"; + version = "7.8.0-unstable-2024-09-10"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "3253c49544eacb33d5ad2f6f919b0696e5aab794"; - hash = "sha256-uljzQBzXrZCZjcIWfioqHN8YsbUUNy14Vo+A3vZIXzM="; + rev = "fd2d434dd375c402d803e6f948cfc6e257d3facc"; + hash = "sha256-WA3lo3eD05l7zKuKEVxudMmiG7OvjK/calaUzPQ2pWs="; }; outputs = [ "out" "dev" "man" "info" ]; diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index d3021995ff8f..bebfd35327d9 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -1,41 +1,55 @@ -{ lib -, stdenv -, fetchFromGitea -, cmake -, pkg-config -, curl -, libunistring -, openssl -, pcre -, zlib +{ + lib, + stdenv, + fetchFromGitea, + cmake, + pkg-config, + curl, + libunistring, + openssl, + pcre, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; + hash = "sha256-hrwnY8m4xW8Sr2RunwD5VB+gnYUtZxXyGoiO3N23qGM="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ curl libunistring openssl pcre zlib ]; + buildInputs = [ + curl + libunistring + openssl + pcre + zlib + ]; + + cmakeFlags = [ + (lib.cmakeFeature "UNISTRING_DIR" "${libunistring}") + ]; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \ --replace '="''${prefix}//' '="/' ''; - meta = with lib; { + meta = { description = "Opinionated C11 library for low-level functionality"; homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; - license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix index 86773cfd4c27..d737d48a23c8 100644 --- a/pkgs/development/python-modules/airgradient/default.nix +++ b/pkgs/development/python-modules/airgradient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "airgradient"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "airgradienthq"; repo = "python-airgradient"; rev = "refs/tags/v${version}"; - hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o="; + hash = "sha256-al0DLsub3xLU1BWLNn0cMI87O0mcQJ0Y4Boj2Xwk1r0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 63b2ed18e41c..76ad62960875 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.4.0"; + version = "0.40.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-task"; rev = "refs/tags/${version}"; - hash = "sha256-zSPv+eMGSsGXKtgi9r4EiGY1ZURXeJXWBKvR2GnfP8I="; + hash = "sha256-r5rBY4g4S4VaifGCK3bGx6arjPoGZI9th2T9LDC5wfI="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 8664d4b23665..abd89713aa05 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.4"; + version = "2.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qEK4hqZ7oFY6NHFVJ3z9yPtnAggjNmG8urnyip34zWA="; + hash = "sha256-lDTNLWpyLJSenp4ivQtZWH9pAlvTc1blxwY18bNwNtg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 368f51341d4d..4c8f04cbd511 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-sFtfjDhG3dEMD49GxEVlYm338M3E4xoH5chIvlRVOQg="; + hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 72c97923f1de..66ada4405dbb 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "8.1.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pubnub"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-c6NSwDl0rV5t9dELuVVbRiLXYzxcYhiLc6yV4QoErTs="; + hash = "sha256-v3tFbq2YvQJRvRu9+8yzWLkFo+7AMsJDlqjMK2Q/FAE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index 535b6d253727..0880a5b11d75 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rokam"; repo = "sunweg"; rev = "refs/tags/${version}"; - hash = "sha256-/pniECgavRiQdKzNtPINNhOijUW/uhPEOQJtjfr46ps="; + hash = "sha256-T67eH5WjS7J2pcNjq9psNmD4MwMfH+HRvk9llqI3FoQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index de3625a17b15..6615bcb71a50 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -2,16 +2,17 @@ , fetchFromGitHub , installShellFiles , lib +, stdenv }: buildGoModule rec { pname = "devbox"; - version = "0.13.0"; + version = "0.13.3"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-gTJotzg7ot9C7NVDiauVJHpkSXBwaK7arjtnwUGFqgE="; + hash = "sha256-A1dl5bQ7+Qe+MxzplQ2duGqWwgZYHd6M2MQUPPFlx14="; }; ldflags = [ @@ -20,6 +21,8 @@ buildGoModule rec { "-X go.jetpack.io/devbox/internal/build.Version=${version}" ]; + subPackages = [ "cmd/devbox" ]; + # integration tests want file system access doCheck = false; @@ -27,7 +30,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd devbox \ --bash <($out/bin/devbox completion bash) \ --fish <($out/bin/devbox completion fish) \ diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index b5da3fdb7f0d..ace033d6a114 100644 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix @@ -50,6 +50,6 @@ rustPlatform.buildRustPackage rec { asl20 # or mit ]; - maintainers = with maintainers; [ kevincox ]; + maintainers = with maintainers; [ clevor ]; }; } diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index dfb77094fbfc..91c05e53024d 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -11,12 +11,12 @@ buildRubyGem rec { version = "3.3.1"; source.sha256 = "sha256-xixLYzDIvX3D+vbe9SccST37TnyZx/YjePLPjagHsOU="; - erubis = buildRubyGem rec { + erubi = buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; - gemName = "erubis"; - version = "2.7.0"; - source.sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + gemName = "erubi"; + version = "1.13.0"; + source.sha256 = "fca61b47daefd865d0fb50d168634f27ad40181867445badf6427c459c33cd62"; }; thor = buildRubyGem rec { @@ -35,7 +35,7 @@ buildRubyGem rec { source.sha256 = "04xr4cavnzxlk926pkji7b5yiqy4qsd3gdvv8mg6jliq6sczg9gk"; }; - propagatedBuildInputs = [ erubis thor xdg ]; + propagatedBuildInputs = [ erubi thor xdg ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 70402b22df7f..85b24d174536 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ="; + hash = "sha256-MYilhVUaf5+gsRNv3tJm5UL8mH2T49r8jLPkd4vHRTw="; }; - cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g="; + cargoHash = "sha256-RP86Wk4rsM6MBH6zAiZ5JqQhkm0HCEMFrUj9ULqB978="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 49dc5786ab0a..c36ec7c947b1 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "cloudflare-warp"; - version = "2024.6.497"; + version = "2024.9.346"; suffix = { aarch64-linux = "arm64"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}-1_${suffix}.deb"; + url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb"; hash = { - aarch64-linux = "sha256-j0D1VcPCJpp0yoK6GjuKKwTVNEqKgr9+6X1AfBbsXAg="; - x86_64-linux = "sha256-y+1TQ/QzzjkorSscB2+QBYR81IowKWcgSoUm1Nz9Gts="; + aarch64-linux = "sha256-dgu/OiQPT7bkPnhrDArQg2lDAcOyhzZ5nJrjS2dqpFo="; + x86_64-linux = "sha256-KwxLF7LWB49M+kZPJ9M4OcDSF1f3MX4S0dTtTkzQVRQ="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index 1d5fbf4c341c..fedef1f3c691 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "veeso"; repo = "termscp"; rev = "refs/tags/v${version}"; - hash = "sha256-XK0bH5ru248tSlD3Sdxb07O6i335dfTFvxDzKdc/3GQ="; + hash = "sha256-/WYhwt/GAULX/UY1GyqzauaMRlVuvAwwS0DNfYB7aD4="; }; - cargoHash = "sha256-DzKxVqE0GMmpkxLH3raASgha9qGGs4kaUdSaviUwvdM="; + cargoHash = "sha256-OqrJpVb9EF22OGP5SOIfEUg66+T96qcN3GH+fs72+7A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/tools/security/apachetomcatscanner/default.nix index 224924721620..ea0cdd2db5ab 100644 --- a/pkgs/tools/security/apachetomcatscanner/default.nix +++ b/pkgs/tools/security/apachetomcatscanner/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "apachetomcatscanner"; - version = "3.5"; - format = "setuptools"; + version = "3.7.2"; + pyproject = true; src = fetchFromGitHub { owner = "p0dalirius"; repo = "ApacheTomcatScanner"; rev = "refs/tags/${version}"; - hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao="; + hash = "sha256-mzpJq0er13wcekTac3j4cnRokHh6Q0seM8vwZsM2tN8="; }; # Posted a PR for discussion upstream that can be followed: @@ -21,6 +21,8 @@ python3.pkgs.buildPythonApplication rec { sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py ''; + build-system = with python3.pkgs; [ setuptools ]; + propagatedBuildInputs = with python3.pkgs; [ requests sectools @@ -39,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "ApacheTomcatScanner"; homepage = "https://github.com/p0dalirius/ApacheTomcatScanner"; changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}"; - license = with licenses; [ gpl2Only ]; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 25f004d99074..4cd86b660d73 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "kubescape"; - version = "3.0.17"; + version = "3.0.18"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; rev = "refs/tags/v${version}"; - hash = "sha256-xErgJPtf89Zmjn2lyRSuVmHT692xzupxWuBsu547+E0="; + hash = "sha256-4HBKvykeFFYg+/86ophmpIWELX8zkbvYEYgmISD3bbY="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-i3KvZt7DpQ7kiWe+g4k2sHqI3ypxKiwrLhOe/sg3FMs="; + vendorHash = "sha256-QcCCY7BdDhZeLSOIYNnAet7uvcGlju4qb/j/GYwu2vE="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 186144a3b1a9..e7161e433970 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,57 +1,67 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.6) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - cms_scanner (0.13.9) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bigdecimal (3.1.8) + cms_scanner (0.14.3) ethon (>= 0.14, < 0.17) get_process_mem (~> 0.2.5) - nokogiri (>= 1.11.4, < 1.16.0) - opt_parse_validator (~> 1.9.5) - public_suffix (>= 4.0.3, < 5.1.0) + nokogiri (~> 1.16) + opt_parse_validator (~> 1.10.0) + public_suffix (>= 4.0.3, < 6.1) ruby-progressbar (>= 1.10, < 1.14) sys-proctable (>= 1.2.2, < 1.4.0) typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + drb (2.2.1) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.16.3) + ffi (1.17.0) get_process_mem (0.2.7) ffi (~> 1.0) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) - mini_portile2 (2.8.5) - minitest (5.20.0) - nokogiri (1.15.5) + logger (1.6.1) + mini_portile2 (2.8.7) + minitest (5.25.1) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - opt_parse_validator (1.9.5) - activesupport (>= 5.2, < 6.2.0) + opt_parse_validator (1.10.0) + activesupport (>= 5.2, < 7.3.0) addressable (>= 2.5, < 2.9) - public_suffix (5.0.4) - racc (1.7.3) + public_suffix (6.0.1) + racc (1.8.1) ruby-progressbar (1.13.0) + securerandom (0.3.1) sys-proctable (1.3.0) ffi (~> 1.1) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webrick (1.8.1) - wpscan (3.8.25) - cms_scanner (~> 0.13.9) + webrick (1.8.2) + wpscan (3.8.27) + cms_scanner (~> 0.14.3) xmlrpc (0.3.3) webrick yajl-ruby (1.4.3) - zeitwerk (2.6.12) PLATFORMS ruby @@ -60,4 +70,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 2.4.22 + 2.5.16 diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index abe19a29bf8f..df1c097baea7 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "6.1.7.6"; + version = "7.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + type = "gem"; + }; + version = "3.1.8"; }; cms_scanner = { dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,20 +47,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3vdkkd04r31d503z5v0480xlq1fhiw77icbk5s17y6dwfacydy"; + sha256 = "1bkmxxxz0q8brfivm7li1hmk2yrdl8wpi25qi4c2rhzfk361ass3"; type = "gem"; }; - version = "0.13.9"; + version = "0.14.3"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.4"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; ethon = { dependencies = ["ffi"]; @@ -58,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; get_process_mem = { dependencies = ["ffi"]; @@ -80,30 +120,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; + }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.20.0"; + version = "5.25.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.7"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -122,30 +172,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jzmn3h9sr7bhjj1fdfvh4yzvqx7d3vsbwbqrf718dh427ifqs9c"; + sha256 = "0x2pn1c8h5sn3j5x05n2l1wnd56vp28jzg8pap1dj7ddmhlv12p4"; type = "gem"; }; - version = "1.9.5"; + version = "1.10.0"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.1"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; ruby-progressbar = { groups = ["default"]; @@ -157,6 +207,16 @@ }; version = "1.13.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; sys-proctable = { dependencies = ["ffi"]; groups = ["default"]; @@ -195,10 +255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; type = "gem"; }; - version = "1.8.1"; + version = "1.8.2"; }; wpscan = { dependencies = ["cms_scanner"]; @@ -206,10 +266,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x04asq0aznbm6m79jlsv7mjbhq755759s4bi3qbyrv5rwpy7hji"; + sha256 = "14d2kp01fnbm88ny6wvzr1v8za2mv4wvx8k0iz8cb5z15nlldk78"; type = "gem"; }; - version = "3.8.25"; + version = "3.8.27"; }; xmlrpc = { dependencies = ["webrick"]; @@ -232,14 +292,4 @@ }; version = "1.4.3"; }; - zeitwerk = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; - type = "gem"; - }; - version = "2.6.12"; - }; } diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index 3d7339bf56b6..a04859cc1089 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -13,7 +13,11 @@ }: let - pyEnv = python3.withPackages(ps: [ ps.setuptools ]); + pyEnv = python3.withPackages(ps: [ + ps.setuptools + ps.packaging + ps.distutils + ]); telnet = runCommand "inetutils-telnet" { } @@ -53,7 +57,7 @@ stdenv.mkDerivation rec { pythonPath = [ python3.pkgs.setuptools ]; nativeBuildInputs = [ help2man makeWrapper python3.pkgs.wrapPython ]; - propagatedBuildInputs = [ python3 which ]; + propagatedBuildInputs = [ pyEnv which ]; installTargets = [ "install-mnexec" "install-manpages" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9884796a343e..acffb059ab04 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1237,6 +1237,7 @@ mapAliases { pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28 pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 + playwright = lib.warn "'playwright' will reference playwright-driver in 25.05. Reference 'python3Packages.playwright' for the python test launcher" python3Packages.toPythonApplication python3Packages.playwright; # Added 2024-10-04 pleroma-otp = pleroma; # Added 2021-07-10 pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f528236a494..2e9088d7dacd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -351,8 +351,6 @@ with pkgs; brev-cli = callPackage ../development/misc/brev-cli { }; - buf = callPackage ../development/tools/buf { }; - cbfmt = callPackage ../development/tools/cbfmt { }; circumflex = callPackage ../applications/networking/circumflex { }; @@ -11248,8 +11246,6 @@ with pkgs; playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; - playwright = with python3Packages; toPythonApplication playwright; - playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core; playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test; @@ -32508,8 +32504,6 @@ with pkgs; sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; - siproxd = callPackage ../applications/networking/siproxd { }; sish = callPackage ../tools/networking/sish { };