diff --git a/flake.nix b/flake.nix index ba2447364a90..f9442d8ea2d2 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { - notDetected = import ./nixos/modules/installer/scan/not-detected.nix; + notDetected = ./nixos/modules/installer/scan/not-detected.nix; }; }; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8c4f46102b1..86cec69705fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5298,6 +5298,16 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + h7x4 = { + name = "h7x4"; + email = "h7x4@nani.wtf"; + matrix = "@h7x4:nani.wtf"; + github = "h7x4"; + githubId = 14929991; + keys = [{ + fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; + }]; + }; hagl = { email = "harald@glie.be"; github = "hagl"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 34d847b01c20..da3e202b76e4 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -121,7 +121,7 @@ with lib.maintainers; { bobby285271 mkg20001 ]; - scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; + scope = "Maintain Cinnamon desktop environment and applications made by the Linux Mint team."; shortName = "Cinnamon"; enableFeatureFreezePing = true; }; @@ -631,6 +631,18 @@ with lib.maintainers; { shortName = "Release"; }; + rocm = { + members = [ + Madouura + Flakebi + ]; + githubTeams = [ + "rocm-maintainers" + ]; + scope = "Maintain ROCm and related packages."; + shortName = "ROCm"; + }; + ruby = { members = [ marsam diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 1efce2db6704..2542f5762fcc 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -993,6 +993,16 @@ signald -d /var/lib/signald/db \ longer accepted. + + + The Syncthing service now only allows absolute paths—starting + with / or ~/—for + services.syncthing.folders.<name>.path. + In a future release other paths will be allowed again and + interpreted relative to + services.syncthing.dataDir. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 10a1240ede03..c4bc7e7db09b 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -307,6 +307,11 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version` are no longer accepted. +- The Syncthing service now only allows absolute paths---starting with `/` or + `~/`---for `services.syncthing.folders..path`. + In a future release other paths will be allowed again and interpreted + relative to `services.syncthing.dataDir`. + ## Other Notable Changes {#sec-release-22.11-notable-changes} diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix index 524199ac409c..08fb91b3994c 100644 --- a/nixos/modules/misc/man-db.nix +++ b/nixos/modules/misc/man-db.nix @@ -52,7 +52,7 @@ in environment.systemPackages = [ cfg.package ]; environment.etc."man_db.conf".text = let - manualCache = pkgs.runCommandLocal "man-cache" { } '' + manualCache = pkgs.runCommand "man-cache" { } '' echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf ${cfg.package}/bin/mandb -C man.conf -psc >/dev/null 2>&1 ''; diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix index 892262d246b7..9ff7df0b15e5 100644 --- a/nixos/modules/services/blockchain/ethereum/erigon.nix +++ b/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -13,13 +13,13 @@ in { services.erigon = { enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier"); - group = mkOption { - type = types.str; - default = "ethereum"; + secretJwtPath = mkOption { + type = types.path; description = lib.mdDoc '' - Group of the user running the lighthouse process. This is used to share the jwt - secret with the execution layer. + Path to the secret jwt used for the http api authentication. ''; + default = ""; + example = "config.age.secrets.ERIGON_JWT.path"; }; settings = mkOption { @@ -64,19 +64,6 @@ in { }; config = mkIf cfg.enable { - users = { - users.erigon = { - name = "erigon"; - group = cfg.group; - description = "Erigon user"; - home = "/var/lib/erigon"; - isSystemUser = true; - }; - groups = mkIf (cfg.group == "ethereum") { - ethereum = {}; - }; - }; - # Default values are the same as in the binary, they are just written here for convenience. services.erigon.settings = { datadir = mkDefault "/var/lib/erigon"; @@ -98,9 +85,9 @@ in { after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile}"; - User = "erigon"; - Group = cfg.group; + LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}"; + ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT"; + DynamicUser = true; Restart = "on-failure"; StateDirectory = "erigon"; CapabilityBoundingSet = ""; diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix index 6002b16785a7..db72c62d3304 100644 --- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix +++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix @@ -57,15 +57,6 @@ in { ''; }; - group = mkOption { - type = types.str; - default = "ethereum"; - description = lib.mdDoc '' - Group of the user running the lighthouse process. This is used to share the jwt - secret with the execution layer. - ''; - }; - execution = { address = mkOption { type = types.str; @@ -221,19 +212,6 @@ in { config = mkIf (cfg.beacon.enable || cfg.validator.enable) { - users = { - users.lighthouse-beacon = { - name = "lighthouse-beacon"; - group = cfg.beacon.group; - description = "Lighthouse beacon node user"; - home = "${cfg.beacon.dataDir}"; - isSystemUser = true; - }; - groups = mkIf (cfg.beacon.group == "ethereum") { - ethereum = {}; - }; - }; - environment.systemPackages = [ pkgs.lighthouse ] ; networking.firewall = mkIf cfg.beacon.enable { @@ -259,14 +237,14 @@ in { --network ${cfg.network} \ --datadir ${cfg.beacon.dataDir}/${cfg.network} \ --execution-endpoint http://${cfg.beacon.execution.address}:${toString cfg.beacon.execution.port} \ - --execution-jwt ${cfg.beacon.execution.jwtPath} \ + --execution-jwt ''${CREDENTIALS_DIRECTORY}/LIGHTHOUSE_JWT \ ${lib.optionalString cfg.beacon.http.enable '' --http --http-address ${cfg.beacon.http.address} --http-port ${toString cfg.beacon.http.port}''} \ ${lib.optionalString cfg.beacon.metrics.enable '' --metrics --metrics-address ${cfg.beacon.metrics.address} --metrics-port ${toString cfg.beacon.metrics.port}''} \ ${cfg.extraArgs} ${cfg.beacon.extraArgs} ''; serviceConfig = { - User = "lighthouse-beacon"; - Group = cfg.beacon.group; + LoadCredential = "LIGHTHOUSE_JWT:${cfg.beacon.execution.jwtPath}"; + DynamicUser = true; Restart = "on-failure"; StateDirectory = "lighthouse-beacon"; NoNewPrivileges = true; diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix index 20dc9b6b447d..9adf792373b5 100644 --- a/nixos/modules/services/misc/languagetool.nix +++ b/nixos/modules/services/misc/languagetool.nix @@ -70,7 +70,7 @@ in { --port ${toString cfg.port} \ ${optionalString cfg.public "--public"} \ ${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \ - "--configuration" ${settingsFormat.generate "languagetool.conf" cfg.settings} + "--config" ${settingsFormat.generate "languagetool.conf" cfg.settings} ''; }; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index ea87e5695f87..adbb25ccb9b6 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -212,10 +212,18 @@ in { }; path = mkOption { - type = types.str; + # TODO for release 23.05: allow relative paths again and set + # working directory to cfg.dataDir + type = types.str // { + check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/"); + description = types.str.description + " starting with / or ~/"; + }; default = name; description = lib.mdDoc '' The path to the folder which should be shared. + Only absolute paths (starting with `/`) and paths relative to + the [user](#opt-services.syncthing.user)'s home directory + (starting with `~/`) are allowed. ''; }; @@ -405,7 +413,8 @@ in { example = "yourUser"; description = mdDoc '' The user to run Syncthing as. - By default, a user named `${defaultUser}` will be created. + By default, a user named `${defaultUser}` will be created whose home + directory is [dataDir](#opt-services.syncthing.dataDir). ''; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 83890e969909..d159d2ade063 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -623,15 +623,15 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - script = let - olderThanDays = toString cfg.mediaAutoRemove.olderThanDays; - in '' - ${cfg.package}/bin/tootctl media remove --days=${olderThanDays} - ${cfg.package}/bin/tootctl preview_cards remove --days=${olderThanDays} - ''; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; - startAt = cfg.mediaAutoRemove.startAt; } // cfgService; + script = let + olderThanDays = toString cfg.mediaAutoRemove.olderThanDays; + in '' + ${cfg.package}/bin/tootctl media remove --days=${olderThanDays} + ${cfg.package}/bin/tootctl preview_cards remove --days=${olderThanDays} + ''; + startAt = cfg.mediaAutoRemove.startAt; }; services.nginx = lib.mkIf cfg.configureNginx { diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 3d79a3b8513b..2c59ee410d5f 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -12,6 +12,7 @@ let extraGSettingsOverrides = cfg.extraGSettingsOverrides; }; + notExcluded = pkg: (!(lib.elem pkg config.environment.cinnamon.excludePackages)); in { @@ -65,10 +66,14 @@ in enable = mkDefault true; # Taken from mint-artwork.gschema.override - theme.name = mkDefault "Mint-X"; - theme.package = mkDefault pkgs.cinnamon.mint-themes; - iconTheme.name = mkDefault "Mint-X-Dark"; - iconTheme.package = mkDefault pkgs.cinnamon.mint-x-icons; + theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) { + name = mkDefault "Mint-X"; + package = mkDefault pkgs.cinnamon.mint-themes; + }; + iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) { + name = mkDefault "Mint-X-Dark"; + package = mkDefault pkgs.cinnamon.mint-x-icons; + }; }; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then @@ -123,11 +128,8 @@ in cinnamon-screensaver = {}; }; - environment.systemPackages = with pkgs.cinnamon // pkgs; [ + environment.systemPackages = with pkgs.cinnamon // pkgs; ([ desktop-file-utils - nixos-artwork.wallpapers.simple-dark-gray - onboard - sound-theme-freedesktop # common-files cinnamon-common @@ -152,24 +154,32 @@ in cinnamon-control-center cinnamon-settings-daemon libgnomekbd - orca # theme gnome.adwaita-icon-theme - hicolor-icon-theme gnome.gnome-themes-extra gtk3.out + + # other + glib # for gsettings + xdg-user-dirs + ] ++ utils.removePackagesByName [ + # accessibility + onboard + orca + + # theme + sound-theme-freedesktop + nixos-artwork.wallpapers.simple-dark-gray mint-artwork mint-themes mint-x-icons mint-y-icons vanilla-dmz + ] config.environment.cinnamon.excludePackages); - # other - glib # for gsettings - shared-mime-info # for update-mime-database - xdg-user-dirs - ]; + xdg.mime.enable = true; + xdg.icons.enable = true; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; @@ -183,7 +193,7 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt5 applications under Pantheon + # Harmonize Qt5 applications under Cinnamon qt5.enable = true; qt5.platformTheme = "gnome"; qt5.style = "adwaita"; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 2ff9acd3e2de..55ff98db5382 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -14,7 +14,7 @@ let # Containers don't have their own kernel or initrd. They boot # directly into stage 2. - ${optionalString (!config.boot.isContainer) '' + ${optionalString config.boot.kernel.enable '' if [ ! -f ${kernelPath} ]; then echo "The bootloader cannot find the proper kernel image." echo "(Expecting ${kernelPath})" diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 8a1630f7e3eb..6783f8ec62ff 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -20,6 +20,9 @@ in ###### interface options = { + boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel.") // { + default = true; + }; boot.kernel.features = mkOption { default = {}; @@ -258,7 +261,7 @@ in ]; }) - (mkIf (!config.boot.isContainer) { + (mkIf config.boot.kernel.enable { system.build = { inherit kernel; }; system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index a7f5044fb9cd..c2e61a77c01e 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -7,6 +7,8 @@ with lib; config = mkIf config.boot.isContainer { # Disable some features that are not useful in a container. + boot.kernel.enable = false; + nix.optimise.automatic = mkDefault false; # the store is host managed powerManagement.enable = mkDefault false; documentation.nixos.enable = mkDefault false; diff --git a/nixos/tests/web-apps/mastodon.nix b/nixos/tests/web-apps/mastodon.nix index 279a1c59169f..05cc727476d6 100644 --- a/nixos/tests/web-apps/mastodon.nix +++ b/nixos/tests/web-apps/mastodon.nix @@ -129,6 +129,9 @@ in ca.wait_for_unit("step-ca.service") ca.wait_for_open_port(8443) + # Check that mastodon-media-auto-remove is scheduled + server.succeed("systemctl status mastodon-media-auto-remove.timer") + server.wait_for_unit("nginx.service") server.wait_for_unit("redis-mastodon.service") server.wait_for_unit("postgresql.service") diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix new file mode 100644 index 000000000000..ac28733c81bc --- /dev/null +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchurl, appimageTools, }: + +let + pname = "youtube-music"; + version = "1.17.0"; + + src = fetchurl { + url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage"; + sha256 = "sha256-3QNmCek6UD0WNaqalIksYWLHGfMgetLRLi8mEM1J39I="; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + install -m 444 \ + -D ${appimageContents}/youtube-music.desktop \ + -t $out/share/applications + substituteInPlace \ + $out/share/applications/youtube-music.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Electron wrapper around YouTube Music"; + homepage = "https://th-ch.github.io/youtube-music/"; + license = licenses.mit; + sourceProvenance = with sourceTypes; [ fromSource ]; + platforms = platforms.linux; + maintainers = [ maintainers.aacebedo ]; + }; +} diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 86b014af2a5c..d656db3c47c8 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hxbeneq1ryTsULRWalgpWRa1aIIyj/QKv5hnYvUUgMg="; + sha256 = "sha256-s5D+Ps5S95AyNh7tt2SnTvUxNHzOothsMZA7NW3x0yM="; fetchSubmodules = true; }; - vendorSha256 = "sha256-VJxsmJxqER+q1rGFy1CI9Wm1+JXTGQiMJwJ+yzjRtAI="; + vendorSha256 = "sha256-ICoThps7c4+9NQPeaASQ88YVbczJD/MgF2ldOmKjgvc="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0aeb0816bef4..2cb093a89f89 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2083,6 +2083,16 @@ let }; }; + redhat.vscode-xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-xml"; + publisher = "redhat"; + version = "0.22.0"; + sha256 = "sha256-7QOw0EVcfa7MFnZAHAsUtDZHXD5AFlW54f1qaN3h+2U="; + }; + meta.license = lib.licenses.epl20; + }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-yaml"; diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/applications/graphics/djv/default.nix index 95a29f243e4a..250ff2b32efa 100644 --- a/pkgs/applications/graphics/djv/default.nix +++ b/pkgs/applications/graphics/djv/default.nix @@ -1,6 +1,7 @@ { stdenv , cmake , fetchFromGitHub +, fetchpatch , lib , alsa-lib , libGL @@ -107,6 +108,25 @@ stdenv.mkDerivation rec { version = djvVersion; src = djvSrc; + patches = [ + # Pull fix ending upstream inclusion for gcc-12+ support: + # https://github.com/darbyjohnston/DJV/pull/477 + (fetchpatch { + name = "gcc-11-limits.patch"; + url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch"; + hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g="; + }) + (fetchpatch { + name = "gcc-11-IO.patch"; + url = "https://github.com/darbyjohnston/DJV/commit/ce79f2d2cb35d03322648323858834bff942c792.patch"; + hash = "sha256-oPbXOnN5Y5QL+bs/bL5eJALu45YHnyTBLQcC8XcJi0c="; + }) + (fetchpatch { + name = "gcc-11-sleep_for.patch"; + url = "https://github.com/darbyjohnston/DJV/commit/6989f43db27f66a7691f6048a2eb3299ef43a92e.patch"; + hash = "sha256-1kiF3VrZiO+FSoR7NHCbduQ8tMq/Uuu6Z+sQII4xBAw="; + }) + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index aa452f8de2c7..3068ecd4c5cf 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-T6OAr6Pl4VmXVSlNHF6kh8jIKs3FSTZsZ+Y4IH3SPTE="; + sha256 = "sha256-eqMIOb9XAgXtoCJABvZkkS/rhHK7jNqabIFwdCgcSJU="; }; buildInputs = [ diff --git a/pkgs/applications/maui/booth.nix b/pkgs/applications/maui/booth.nix new file mode 100644 index 000000000000..0f753832ad14 --- /dev/null +++ b/pkgs/applications/maui/booth.nix @@ -0,0 +1,52 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, kcoreaddons +, ki18n +, kirigami2 +, mauikit +, mauikit-filebrowsing +, qtgraphicaleffects +, qtmultimedia +, qtquickcontrols2 +, gst_all_1 +}: + +mkDerivation { + pname = "booth"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + ki18n + kirigami2 + mauikit + mauikit-filebrowsing + qtgraphicaleffects + qtmultimedia + qtquickcontrols2 + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gstreamer + ]); + + preFixup = '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ) + ''; + + meta = with lib; { + description = "Camera application"; + homepage = "https://invent.kde.org/maui/booth"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ milahu ]; + }; +} diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index 97cc9a92e6de..edb6837deaa3 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -14,7 +14,7 @@ See also `pkgs/applications/kde` as this is what this is based on. # Updates -1. Update the URL in `callPackage ./fetch.sh`. +1. Update the URL in `./fetch.sh`. 2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui` from the top of the Nixpkgs tree. 3. Use `nixpkgs-review wip` to check that everything builds. @@ -67,8 +67,10 @@ let mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-texteditor = callPackage ./mauikit-texteditor.nix { }; + mauiman = callPackage ./mauiman.nix { }; # applications + booth = callPackage ./booth.nix { }; buho = callPackage ./buho.nix { }; clip = callPackage ./clip.nix { }; communicator = callPackage ./communicator.nix { }; diff --git a/pkgs/applications/maui/fetch.sh b/pkgs/applications/maui/fetch.sh index cc163d289e0a..f84a2dc2c231 100644 --- a/pkgs/applications/maui/fetch.sh +++ b/pkgs/applications/maui/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*-2.1.2.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/maui/ -A '*.tar.xz' ) diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix index 76f2f7db5d73..fcba0fbdf547 100644 --- a/pkgs/applications/maui/mauikit.nix +++ b/pkgs/applications/maui/mauikit.nix @@ -6,6 +6,7 @@ , kcoreaddons , ki18n , knotifications +, mauiman , qtbase , qtquickcontrols2 , qtx11extras @@ -24,6 +25,7 @@ mkDerivation { kcoreaddons ki18n knotifications + mauiman qtquickcontrols2 qtx11extras ]; diff --git a/pkgs/applications/maui/mauiman.nix b/pkgs/applications/maui/mauiman.nix new file mode 100644 index 000000000000..9b54d8d479f7 --- /dev/null +++ b/pkgs/applications/maui/mauiman.nix @@ -0,0 +1,27 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, kconfig +, kcoreaddons +, ki18n +, knotifications +, qtbase +, qtquickcontrols2 +, qtx11extras +}: + +mkDerivation { + pname = "mauiman"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauiman"; + description = "Maui Manager Library. Server and public library API"; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index a432814d49ec..cf751af9ef34 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -3,116 +3,148 @@ { fetchurl, mirror }: { - buho = { - version = "2.1.2"; + bonsai = { + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/buho/2.1.2/buho-2.1.2.tar.xz"; - sha256 = "0xc623w1zp0yh929b8h6mf9r4frnfabd30634ba43x4ac12jk7g8"; - name = "buho-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/bonsai/1.0.0/bonsai-2.2.0.tar.xz"; + sha256 = "0gpqdj30brqv9nsiis93w9lad4xn7d301gxncj04pcpybmbksg4r"; + name = "bonsai-2.2.0.tar.xz"; + }; + }; + booth = { + version = "1.0.0"; + src = fetchurl { + url = "${mirror}/stable/maui/booth/1.0.0/booth-1.0.0.tar.xz"; + sha256 = "0cdn3vkbf1mlq32akz86mdyjfrq661h4jrfmp1x62ih63930hix2"; + name = "booth-1.0.0.tar.xz"; + }; + }; + buho = { + version = "2.2.0"; + src = fetchurl { + url = "${mirror}/stable/maui/buho/2.2.0/buho-2.2.0.tar.xz"; + sha256 = "1jj9kygh5b88ksg22969zlsrbgps6z7z2n77g6ldqzvg8mmh2cwr"; + name = "buho-2.2.0.tar.xz"; }; }; clip = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/clip/2.1.2/clip-2.1.2.tar.xz"; - sha256 = "168lz2qi4y56pwfwyzqnhwz4lgh2763w260l860527aw049crv4z"; - name = "clip-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/clip/2.2.0/clip-2.2.0.tar.xz"; + sha256 = "0ggymdscd7c942vvii3mswkq84lkygdcbvpg3s2lhqaqxpivy96z"; + name = "clip-2.2.0.tar.xz"; }; }; communicator = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/2.1.2/communicator-2.1.2.tar.xz"; - sha256 = "0m7axdjpl7s9cz6fcaj4kwr9wdxybwdb76k9rz5yigyy35vigcfi"; - name = "communicator-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/communicator/2.2.0/communicator-2.2.0.tar.xz"; + sha256 = "0njyjzf8w2aamrj1yajjw7551dc72db9m0iv14mnb0gcd9pphni7"; + name = "communicator-2.2.0.tar.xz"; }; }; index-fm = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/index/2.1.2/index-fm-2.1.2.tar.xz"; - sha256 = "1yawnzx51h6yrlnivbwz9d7481k382pzg3jnczrajfjnv7ir29dn"; - name = "index-fm-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/index/2.2.0/index-fm-2.2.0.tar.xz"; + sha256 = "0v39sfdqb21669cx96nd78vprwaxsvg3cpp3lly43n09nv6gkw41"; + name = "index-fm-2.2.0.tar.xz"; }; }; mauikit = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/2.1.2/mauikit-2.1.2.tar.xz"; - sha256 = "1n5p8107lwa4m5gbwlcqmmdlyw15vjaq0dfaz5zal733s6rq2gm7"; - name = "mauikit-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit/2.2.0/mauikit-2.2.0.tar.xz"; + sha256 = "05bvgwl1yfbfrlxhl6ngvkdk34rg4y12fsrddm8f19b6dkvjzxq2"; + name = "mauikit-2.2.0.tar.xz"; }; }; mauikit-accounts = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/2.1.2/mauikit-accounts-2.1.2.tar.xz"; - sha256 = "00nc54gi34r8z6cwa0h8490gd0w01a245rh2g4d9fvbkrybwg7sk"; - name = "mauikit-accounts-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/2.2.0/mauikit-accounts-2.2.0.tar.xz"; + sha256 = "1wc67mhhmxq0dq1g10338zm52kx274yry2ja34kagva3qkbhbb2i"; + name = "mauikit-accounts-2.2.0.tar.xz"; }; }; mauikit-filebrowsing = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/2.1.2/mauikit-filebrowsing-2.1.2.tar.xz"; - sha256 = "09pfjr449mkf27ywmwsvflzq0dgaiprw8b2lcms3m5ad7i6jvvyq"; - name = "mauikit-filebrowsing-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.0/mauikit-filebrowsing-2.2.0.tar.xz"; + sha256 = "1377mgkx1q66jzdlra87airqkmkl9cfj6n5xw1my1nihxcjq9bz1"; + name = "mauikit-filebrowsing-2.2.0.tar.xz"; }; }; mauikit-imagetools = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/2.1.2/mauikit-imagetools-2.1.2.tar.xz"; - sha256 = "1830x8xwyjs7bj0qi63pl1dk5h2qi6f84mki1schviddddq5cv6j"; - name = "mauikit-imagetools-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/2.2.0/mauikit-imagetools-2.2.0.tar.xz"; + sha256 = "07clir651sfi4c9awv0jnq4pck2cfzfv0fdkwcapl6hh0zq9qvpr"; + name = "mauikit-imagetools-2.2.0.tar.xz"; }; }; mauikit-texteditor = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/2.1.2/mauikit-texteditor-2.1.2.tar.xz"; - sha256 = "19z9qry56h2624kdx5xnfjzd3spv5shc87p2m6ix33x9mmrf92p1"; - name = "mauikit-texteditor-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/2.2.0/mauikit-texteditor-2.2.0.tar.xz"; + sha256 = "0x1cblydgqkhcy86x6yd8dipwhy9l5d7xlmk5igh5dllnzvcaicq"; + name = "mauikit-texteditor-2.2.0.tar.xz"; + }; + }; + mauiman = { + version = "1.0.0"; + src = fetchurl { + url = "${mirror}/stable/maui/mauiman/1.0.0/mauiman-1.0.0.tar.xz"; + sha256 = "1risxzgjg684c8zwmwl03ihfrxx44lbb4j43v8z3wnjkq7p44w82"; + name = "mauiman-1.0.0.tar.xz"; }; }; nota = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/nota/2.1.2/nota-2.1.2.tar.xz"; - sha256 = "11z1mw6yhwin3wj19gj9495az4p40yjkwrn0nb6i8h9b0nh44pn7"; - name = "nota-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/nota/2.2.0/nota-2.2.0.tar.xz"; + sha256 = "1nr8craafima1khkcxv47v1868yfwykjzaczlmmqmjha7bm1dlbd"; + name = "nota-2.2.0.tar.xz"; }; }; pix = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/pix/2.1.2/pix-2.1.2.tar.xz"; - sha256 = "0ycpazi267pl4l178i34lwzc0ssjklp0indz79r7mcfpr1vicz1s"; - name = "pix-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/pix/2.2.0/pix-2.2.0.tar.xz"; + sha256 = "0nghp69ax73yf0wybd724a3lgbj7jiiznnmwp67n2ls74q8yrwwy"; + name = "pix-2.2.0.tar.xz"; }; }; shelf = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/2.1.2/shelf-2.1.2.tar.xz"; - sha256 = "0f3781l8wfbpj0irmri0zkp3ia3qlik4aaq3w6qk97xjv24d98xh"; - name = "shelf-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/shelf/2.2.0/shelf-2.2.0.tar.xz"; + sha256 = "028ll3pi4h3jxgilsf4s5ic2rq0z9q8kh9pram9dsjvgz24p7g0c"; + name = "shelf-2.2.0.tar.xz"; }; }; station = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/station/2.1.2/station-2.1.2.tar.xz"; - sha256 = "0lrw7rf8i277nl9bwyx5sc05bswgll00k1jzad1i69rwdfiy9ghg"; - name = "station-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/station/2.2.0/station-2.2.0.tar.xz"; + sha256 = "0za3jh5clkx8xf436vzs83nrsw5fyna4wcy73ihlf3xbra0358v1"; + name = "station-2.2.0.tar.xz"; + }; + }; + strike = { + version = "2.2.0"; + src = fetchurl { + url = "${mirror}/stable/maui/strike/1.0.0/strike-2.2.0.tar.xz"; + sha256 = "159l1i0mi3q5avcg45aq5ixz8wjfryhip61h9gynxr1m77qdpfnc"; + name = "strike-2.2.0.tar.xz"; }; }; vvave = { - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/2.1.2/vvave-2.1.2.tar.xz"; - sha256 = "14b6b034899vyvvhzl2jqifqq715lb26dnw3d5wxzxhdplfd7pdf"; - name = "vvave-2.1.2.tar.xz"; + url = "${mirror}/stable/maui/vvave/2.2.0/vvave-2.2.0.tar.xz"; + sha256 = "0qnwklc875j6g2rg610dmvcizg3m4q80fhjk4c3i1xzn8dybbg5s"; + name = "vvave-2.2.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 1c7840be855a..7e8ea89fe9d1 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-ssvd8gdF5h6EKLY/W+1zbZWcVQqy+UirIS0p0DBQj0E="; + hash = "sha256-U1NmJsh7OuS0/kktmMcIjEaqc1ABtWG0ilSUw0UL8aU="; }; proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c52c7caef868..963028ae321a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -194,7 +194,7 @@ let actions = { profile-manager-window = { name = "Profile Manager"; - exec = "${launcherName} --ProfileManger"; + exec = "${launcherName} --ProfileManager"; }; }; } @@ -220,7 +220,7 @@ let }; profile-manager-window = { name = "Profile Manager"; - exec = "${launcherName} --ProfileManger"; + exec = "${launcherName} --ProfileManager"; }; }; })); diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/applications/networking/cluster/kfctl/default.nix index 52a049ab1bba..2b2909ff6600 100644 --- a/pkgs/applications/networking/cluster/kfctl/default.nix +++ b/pkgs/applications/networking/cluster/kfctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc="; }; - vendorSha256 = "sha256-+6sxXp0LKegZjEFv1CIQ6xYh+hXLn+o9LggRYamCzpI="; + vendorSha256 = null; #vendorSha256 = ""; subPackages = [ "cmd/kfctl" ]; @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://github.com/kubeflow/kfctl"; license = licenses.asl20; maintainers = with maintainers; [ mvnetbiz ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix index a5ad1ea0a773..1712a018cbe2 100644 --- a/pkgs/applications/networking/cluster/kubemqctl/default.nix +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -14,12 +14,13 @@ buildGoModule rec { doCheck = false; # TODO tests are failing - vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74"; + vendorSha256 = null; #vendorSha256 = ""; meta = { homepage = "https://github.com/kubemq-io/kubemqctl"; description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ brianmcgee ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index e0ced9e2a8f8..dbf32808f941 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, lib, ... }: +{ stdenv, fetchFromGitHub, lib, installShellFiles, makeWrapper, kubectl }: stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.13"; + version = "1.6.16"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "sha256-EkOewNInzEEEgMOffYoRaKwhgYuBXgHaCkVgWg2mIDE="; + sha256 = "sha256-kkbhhAaiKP01LR7F5JVMgy6Ujji8JDc+Aaho1vft3XQ="; }; + nativeBuildInputs = [ installShellFiles makeWrapper ]; + installPhase = '' - install -Dm755 kubetail "$out/bin/kubetail" - install -Dm755 completion/kubetail.bash "$out/share/bash-completion/completions/kubetail" - install -Dm755 completion/kubetail.fish "$out/share/fish/vendor_completions.d/kubetail.fish" - install -Dm755 completion/kubetail.zsh "$out/share/zsh/site-functions/_kubetail" + install -Dm755 kubetail "$out/bin/kubetail" + wrapProgram $out/bin/kubetail --prefix PATH : ${lib.makeBinPath [ kubectl ]} + + installShellCompletion completion/kubetail.{bash,fish,zsh} ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 5e6ca3a874eb..d23669bb1f09 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "kuttl"; - version = "0.13.0"; + version = "0.14.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-liuP8ALcPxbU+hZ54KDFj2r2yZpAbVago0IxIv52N3o="; + sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY="; }; vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 029e88fb29a8..a8948246f3f2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -166,13 +166,13 @@ "version": "1.16.0" }, "bitbucket": { - "hash": "sha256-0Sts826Yt6xVVwGpqTC1ZAiNB2+7S6z9rPXDGPNpmOk=", + "hash": "sha256-7Xxu3Q+pAaZdvRvfIFQFx3pfH8N0gk2waoxW//zh2dA=", "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.21.3", + "rev": "v2.21.4", "vendorHash": "sha256-VFh86MFKzgN7LvSYG7TooYapOZOJbDC8sntPzGVaNs8=", - "version": "2.21.3" + "version": "2.21.4" }, "brightbox": { "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", @@ -886,13 +886,13 @@ "version": "1.31.7" }, "opsgenie": { - "hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=", + "hash": "sha256-OTwQ/sF4/xSyJjYy1TvLOr1guGcho+Es9/WkonfVvcg=", "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.16", + "rev": "v0.6.17", "vendorHash": null, - "version": "0.6.16" + "version": "0.6.17" }, "ovh": { "hash": "sha256-QaJZQU6bnjXoTCxfP1NcsPqegFyZ6JwP2QgN7zrE0z0=", @@ -1120,13 +1120,13 @@ "version": "0.13.5" }, "tencentcloud": { - "hash": "sha256-vVwfKzA6qK6VzRRlYPEqL1QPlpiruD8JZRL6oF/u62w=", + "hash": "sha256-ZoNmoeeRnZ/CDAfXRyKxgXcXpjzquncbaS5dpjq16Lw=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.9", + "rev": "v1.78.10", "vendorHash": null, - "version": "1.78.9" + "version": "1.78.10" }, "tfe": { "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", @@ -1284,12 +1284,12 @@ "version": "3.4.0" }, "yandex": { - "hash": "sha256-WdiJD1gt56VDFe2qVKwiYOvneixaGRie6mrxdOCklQY=", + "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.81.0", - "vendorHash": "sha256-n+XARZuMzmxUGxFAseKyiBsKuGDUl8T6LWXzJ+6ZJ/E=", - "version": "0.81.0" + "rev": "v0.82.0", + "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=", + "version": "0.82.0" } } diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index adaf22a8206a..d4f567022c2d 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.22.0"; + version = "3.22.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-idcgBaUOOFsQmId9I8X5ixxGkfrX9NG328DliHNzk6s="; + sha256 = "sha256-Lv4ZX8QXRkicPH69kvUAPcgesGvhQkNiwZiNcFbReSU="; }; - vendorSha256 = "sha256-h3UOFs7pxf9gwVAcjih8Kxr0b+68W1DanYoTpmeirg8="; + vendorSha256 = "sha256-gKsYy3izx8i7nOazBF4w1SPUJT9D2hbjOr6LqonVqno="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a469287ed4d0..8caef5528ba3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,23 +5,20 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.4.2"; + version = "3.5.4"; + format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-mq1xk27mIB1iiCphwMZRVqlIRwlYHihXSowQ9GAkR1U="; + hash = "sha256-KANnZLNNDEo8pVWumFRR/Y67F1eS2JeDeX33nQ5YWlk="; }; postPatch = '' - # Symlink requirements.in because upstream uses `pip-compile` which yields - # python-version dependent requirements - ln -sf requirements.in requirements.txt - - # remove dependency constraints - sed 's/[~<>=].*//' -i requirements.txt + # remove dependency constraints but keep environment constraints + sed 's/[~<>=][^;]*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 @@ -32,7 +29,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; propagatedBuildInputs = with python3Packages; [ - # See https://github.com/Flexget/Flexget/blob/master/requirements.in + # See https://github.com/Flexget/Flexget/blob/master/requirements.txt APScheduler beautifulsoup4 click @@ -55,6 +52,7 @@ python3Packages.buildPythonApplication rec { rich rpyc sqlalchemy + typing-extensions # WebUI requirements cherrypy diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 5482ce12e253..69b0f1642334 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ yusdacra ]; platforms = platforms.linux ++ platforms.darwin; + broken = true; # build fails with go > 1.17 }; } diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix index af9812e8fca4..bebb16740840 100644 --- a/pkgs/applications/networking/ncgopher/default.nix +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ncgopher"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; rev = "v${version}"; - sha256 = "sha256-GLt+ByZzQ9v+PPyebTa8LFqySixXw85RjGZ2e3yLRss="; + sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE="; }; - cargoSha256 = "sha256-VI+BTxgocv434wTr7nBeJRdt12wE53fEeqczE3o3768="; + cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index ec56ed0464ca..2f0ee430b4f9 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -11,16 +11,16 @@ python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.4"; + version = "3.2.6"; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - sha256 = "sha256-swFNFw2a5PXwBkh0FBrCy5u3m5gErq29ZmWhMP7MpmQ="; + sha256 = "sha256-ELpM5hnyHsqTqB0R1JPcbxkw9XR19CnasIYXJCbKBho="; }; - nativeBuildInputs = [ gettext wrapGAppsHook ]; + nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = [ gdk-pixbuf diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index cc749a8a96ea..73c94f7339c6 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.74.3"; + version = "0.75.1"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU="; + sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; }; buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ]; @@ -23,6 +23,7 @@ python3Packages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share) + makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share) makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped) makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index e93f3eaff508..5ed6cec01aa9 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -52,10 +52,6 @@ mkDerivation rec { rust.rustc ]); - cmakeFlags = [ - "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo" - ]; - buildInputs = [ kconfig kcoreaddons diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 7cbf37fcaf8a..835c66c3251f 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -14,13 +14,15 @@ , libGLU , mpfr , proj -, python3 +# build with Python 3.10 fails, because boost <= 1.78 can't find +# pythons with double digits in minor versions, like X.YZ +, python39 , qtxmlpatterns , qwt }: let - python = python3.withPackages (ps: with ps; [ + python = python39.withPackages (ps: with ps; [ numpy ]); boost' = boost.override { diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 99ddd7b24b69..94e698289297 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "CLI for Google Chromecast, Home devices and Cast Groups"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; + broken = true; # build fails with go > 1.17 }; } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 9ad13b8768d6..22178fb74b84 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecs-agent"; - version = "1.65.1"; + version = "1.66.2"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -11,12 +11,15 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "sha256-IsbY2ZQQq8eOhdT/ws1Yu7YlnQOyjhDaIr1knOHB4Yc="; + sha256 = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; }; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; + changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 60bf018fb3fb..198a2a0b71a5 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uxy0/Ngzzh96YZDR9whLVYNnQOlj3wkCEuuJTQjT6GE="; + sha256 = "sha256-az4DllTkGP80Jf0NeaKrBI0zz56chPizJGu97cqXrJ4="; }; - cargoSha256 = "sha256-99J4ucjE0yTPQSdM6PDTWEjBltJdIU6yEDqhgSfOaJU="; + cargoSha256 = "sha256-ghbJBhoU41yJ3qZBaKzEybNuCLdSqoL30+1h9d56b4A="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/data/fonts/hubot-sans/default.nix new file mode 100644 index 000000000000..2458911fda38 --- /dev/null +++ b/pkgs/data/fonts/hubot-sans/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "hubot-sans"; + version = "1.0"; + + src = fetchFromGitHub { + rev = "v" + version; + owner = "github"; + repo = pname; + sha256 = "GOql+V5TH4b3TmhlgnKcx3jzUAO2jm4HRJRNzdIKxgg="; + }; + + installPhase = '' + install -m644 --target $out/share/fonts/truetype/hubot-sans -D $src/dist/hubot-sans.ttf + ''; + + meta = { + description = "A variable font from GitHub"; + homepage = "https://github.com/github/hubot-sans"; + license = lib.licenses.ofl; + longDescription = '' + Hubot Sans is Mona Sans’s robotic sidekick. The typeface is designed with + more geometric accents to lend a technical and idiosyncratic feel—perfect + for headers and pull-quotes. Made together with Degarism. + + Hubot Sans is a variable font. Variable fonts enable different variations + of a typeface to be incorporated into one single file, and are supported + by all major browsers. + ''; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/data/fonts/mona-sans/default.nix new file mode 100644 index 000000000000..b43a01b4fecf --- /dev/null +++ b/pkgs/data/fonts/mona-sans/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "mona-sans"; + version = "1.0"; + + src = fetchFromGitHub { + rev = "v" + version; + owner = "github"; + repo = pname; + sha256 = "iJhbSGNByOvtJd9hEh0g7Ht6eoAJ18jco0oHGqjOiLQ="; + }; + + installPhase = '' + install -m644 --target $out/share/fonts/truetype/mona-sans -D $src/dist/*.ttf + ''; + + meta = { + description = "A variable font from GitHub"; + homepage = "https://github.com/github/mona-sans"; + license = lib.licenses.ofl; + longDescription = '' + A strong and versatile typeface, designed together with Degarism and + inspired by industrial-era grotesques. Mona Sans works well across + product, web, and print. Made to work well together with Mona Sans's + sidekick, Hubot Sans. + + Mona Sans is a variable font. Variable fonts enable different variations + of a typeface to be incorporated into one single file, and are supported + by all major browsers, allowing for performance benefits and granular + design control of the typeface's weight, width, and slant. + ''; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/data/icons/super-tiny-icons/default.nix new file mode 100644 index 000000000000..6a7fcb07bc11 --- /dev/null +++ b/pkgs/data/icons/super-tiny-icons/default.nix @@ -0,0 +1,34 @@ +{ pkgs, lib, stdenvNoCC, fetchFromGitHub, }: + +stdenvNoCC.mkDerivation { + pname = "super-tiny-icons"; + version = "unstable-2022-11-07"; + + src = fetchFromGitHub { + owner = "edent"; + repo = "SuperTinyIcons"; + rev = "b4d5a3be04c99ec0a309ac9e0d0b21207c237c7d"; + sha256 = "670ndAuBrZBr7YOTQm2zHJfpiBC56aPk+ZKMneREEoI="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/SuperTinyIcons + find $src/images -type d -exec cp -r {} $out/share/icons/SuperTinyIcons/ \; + + runHook postInstall + ''; + + meta = with lib; { + description = "Miniscule SVG versions of common logos"; + longDescription = '' + Super Tiny Web Icons are minuscule SVG versions of your favourite logos. + The average size is under 568 bytes! + ''; + homepage = "https://github.com/edent/SuperTinyIcons"; + license = licenses.mit; + maintainers = [ maintainers.h7x4 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index cdc7a978e6bf..f19b666abeab 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -1,18 +1,22 @@ { lib, fetchzip }: -let - version = "41.0"; -in fetchzip rec { - name = "cldr-annotations-${version}"; +fetchzip rec { + pname = "cldr-annotations"; + version = "42.0"; url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; + stripRoot = false; postFetch = '' - mkdir -p $out/share/unicode/cldr - unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*' + mkdir -p $out/share/unicode/cldr/common + mv $out/common/annotations{,Derived} -t $out/share/unicode/cldr/common + + shopt -s extglob dotglob + rm -rf $out/!(share) + shopt -u extglob dotglob ''; - sha256 = "sha256-3dHVZGx3FmR97fzhlTSx/xp6YTAV+sMExl6gpLzl1MY="; + hash = "sha256-9OOd69nBaDSt+ilL3PTGpcQgC60PnHqd8/CYa2LgeI0="; meta = with lib; { description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 10f39ef94b4a..7ab30f8aafea 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -7,12 +7,15 @@ , gtk3 , gtk-mac-integration , glib -, adwaita-icon-theme +, amtk +, tepl , libpeas , libxml2 , gtksourceview4 , gsettings-desktop-schemas , wrapGAppsHook +, gtk-doc +, docbook-xsl-nons , ninja , libsoup , gnome @@ -25,11 +28,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "43.alpha"; + version = "43.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "K3iOqhbYeeOVdGmS/OdmC5WtIpQ5OgHs0t5CzdWW95o="; + url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; + sha256 = "mDg7Sv0/0eoYzcdP7G4SjneFgvOyP1NgGRQT//jw5qY="; }; patches = [ @@ -49,10 +54,13 @@ stdenv.mkDerivation rec { python3 vala wrapGAppsHook + gtk-doc + docbook-xsl-nons ]; buildInputs = [ - adwaita-icon-theme + amtk + tepl glib gsettings-desktop-schemas gspell diff --git a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix index 6e0aa78e6fda..92b216ed2c5e 100644 --- a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix @@ -1,20 +1,43 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit -, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, gettext +, gnome +, packagekit +, polkit +, gtk3 +, systemd +, wrapGAppsHook +, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "gnome-packagekit"; - version = "3.32.0"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; + url = "mirror://gnome/sources/gnome-packagekit/${lib.versions.major version}/gnome-packagekit-${version}.tar.xz"; + sha256 = "zaRVplKpI7LqL3Axa9D92Clve2Lu8/r9nOUMjmbF8ZU="; }; nativeBuildInputs = [ - pkg-config meson ninja gettext wrapGAppsHook desktop-file-utils + pkg-config + meson + ninja + gettext + wrapGAppsHook + desktop-file-utils ]; - buildInputs = [ gtk3 packagekit systemd polkit ]; + buildInputs = [ + gtk3 + packagekit + systemd + polkit + ]; postPatch = '' patchShebangs meson_post_install.sh diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 132811eb3f2a..f395651a0f18 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -214,7 +214,7 @@ in lib.makeScope pkgs.newScope (self: with self; { elm-pages = nodePkgs."elm-pages".overrideAttrs ( old: { - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; # can't use `patches = [ ]` with a nodePkgs derivation; # need to patch in one of the build phases instead. @@ -240,6 +240,10 @@ in lib.makeScope pkgs.newScope (self: with self; { lamdera = callPackage ./packages/lamdera.nix {}; - inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; + elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ old.nodejs.pkgs.node-gyp-build ]; + }); + + inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }) ) diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 8fd8c0ffcce3..bbb39db07b71 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 50b320a26976..dbcee79ef275 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.18.13" = { + "@babel/compat-data-7.20.1" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.18.13"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz"; - sha512 = "5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz"; + sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.18.13" = { + "@babel/generator-7.20.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.13"; + version = "7.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz"; - sha512 = "CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz"; + sha512 = "luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,31 +76,31 @@ let sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.18.9" = { + "@babel/helper-compilation-targets-7.20.0" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.9"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; - sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; + sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.13" = { + "@babel/helper-create-class-features-plugin-7.20.2" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.13"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz"; - sha512 = "hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz"; + sha512 = "k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.18.6" = { + "@babel/helper-create-regexp-features-plugin-7.19.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.18.6"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; - sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"; + sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw=="; }; }; "@babel/helper-environment-visitor-7.18.9" = { @@ -121,13 +121,13 @@ let sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.18.9" = { + "@babel/helper-function-name-7.19.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.18.9"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; - sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; }; "@babel/helper-hoist-variables-7.18.6" = { @@ -157,13 +157,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.9" = { + "@babel/helper-module-transforms-7.20.2" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; - sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; + sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -175,13 +175,13 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.18.9" = { + "@babel/helper-plugin-utils-7.20.2" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; - sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; + sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; }; }; "@babel/helper-remap-async-to-generator-7.18.9" = { @@ -193,31 +193,31 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.9" = { + "@babel/helper-replace-supers-7.19.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.9"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; - sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; + sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; }; }; - "@babel/helper-simple-access-7.18.6" = { + "@babel/helper-simple-access-7.20.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.6"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; + sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { + "@babel/helper-skip-transparent-expression-wrappers-7.20.0" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.18.9"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; - sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"; + sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg=="; }; }; "@babel/helper-split-export-declaration-7.18.6" = { @@ -229,22 +229,22 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.18.10" = { + "@babel/helper-string-parser-7.19.4" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.18.10"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; }; - "@babel/helper-validator-identifier-7.18.6" = { + "@babel/helper-validator-identifier-7.19.1" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.18.6"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; - sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; "@babel/helper-validator-option-7.18.6" = { @@ -256,22 +256,22 @@ let sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.18.11" = { + "@babel/helper-wrap-function-7.19.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.18.11"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz"; - sha512 = "oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"; + sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; }; }; - "@babel/helpers-7.18.9" = { + "@babel/helpers-7.20.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.9"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"; - sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz"; + sha512 = "J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg=="; }; }; "@babel/highlight-7.18.6" = { @@ -283,22 +283,22 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.13" = { + "@babel/parser-7.20.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.13"; + version = "7.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz"; - sha512 = "dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz"; + sha512 = "OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.18.10" = { + "@babel/plugin-proposal-async-generator-functions-7.20.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.18.10"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz"; - sha512 = "1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; + sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -364,13 +364,13 @@ let sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { + "@babel/plugin-proposal-object-rest-spread-7.20.2" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz"; + sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -544,22 +544,22 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.9" = { + "@babel/plugin-transform-block-scoping-7.20.2" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz"; + sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ=="; }; }; - "@babel/plugin-transform-classes-7.18.9" = { + "@babel/plugin-transform-classes-7.20.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.18.9"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; - sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz"; + sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g=="; }; }; "@babel/plugin-transform-computed-properties-7.18.9" = { @@ -571,13 +571,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.13" = { + "@babel/plugin-transform-destructuring-7.20.2" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz"; + sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -643,31 +643,31 @@ let sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.6" = { + "@babel/plugin-transform-modules-amd-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; - sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; + sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.6" = { + "@babel/plugin-transform-modules-commonjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.6"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; - sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; + sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.9" = { + "@babel/plugin-transform-modules-systemjs-7.19.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.9"; + version = "7.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; - sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; + sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; }; }; "@babel/plugin-transform-modules-umd-7.18.6" = { @@ -679,13 +679,13 @@ let sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.19.1" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.18.6"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; - sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz"; + sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw=="; }; }; "@babel/plugin-transform-new-target-7.18.6" = { @@ -706,13 +706,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.18.8" = { + "@babel/plugin-transform-parameters-7.20.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.18.8"; + version = "7.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz"; + sha512 = "oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -760,13 +760,13 @@ let sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.18.9" = { + "@babel/plugin-transform-spread-7.19.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.18.9"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; - sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz"; + sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w=="; }; }; "@babel/plugin-transform-sticky-regex-7.18.6" = { @@ -850,22 +850,22 @@ let sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.18.13" = { + "@babel/traverse-7.20.1" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.13"; + version = "7.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz"; - sha512 = "N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz"; + sha512 = "d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA=="; }; }; - "@babel/types-7.18.13" = { + "@babel/types-7.20.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.13"; + version = "7.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz"; - sha512 = "ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz"; + sha512 = "FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog=="; }; }; "@hapi/address-2.1.4" = { @@ -958,13 +958,13 @@ let sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.15" = { + "@jridgewell/trace-mapping-0.3.17" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.15"; + version = "0.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; - sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; + sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1075,13 +1075,13 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@types/cacheable-request-6.0.2" = { + "@types/cacheable-request-6.0.3" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz"; - sha512 = "B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA=="; + url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; + sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; "@types/configstore-2.1.1" = { @@ -1165,15 +1165,6 @@ let sha512 = "mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA=="; }; }; - "@types/json-buffer-3.0.0" = { - name = "_at_types_slash_json-buffer"; - packageName = "@types/json-buffer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz"; - sha512 = "3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="; - }; - }; "@types/json-schema-7.0.11" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1192,22 +1183,22 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.184" = { + "@types/lodash-4.14.188" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.184"; + version = "4.14.188"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.184.tgz"; - sha512 = "RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.188.tgz"; + sha512 = "zmEmF5OIM3rb7SbLCFYoQhO4dGt2FRM9AMkxvA3LaADOF1n8in/zGJlWji9fmafLoNyz+FoL6FE0SLtGIArD7w=="; }; }; - "@types/minimatch-5.1.0" = { + "@types/minimatch-5.1.2" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; }; "@types/mkdirp-0.5.2" = { @@ -1219,13 +1210,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-18.7.13" = { + "@types/node-18.11.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.7.13"; + version = "18.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.7.13.tgz"; - sha512 = "46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"; + sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; }; }; "@types/node-8.10.66" = { @@ -1300,22 +1291,22 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.0" = { + "@types/uglify-js-3.17.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.0"; + version = "3.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.0.tgz"; - sha512 = "3HO6rm0y+/cqvOyA8xcYLweF0TKXlAxmQASjbOi49Co51A1N4nR4bEwBgRoD9kNM+rqFGArjKr654SLp2CoGmQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz"; + sha512 = "GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g=="; }; }; - "@types/webpack-4.41.32" = { + "@types/webpack-4.41.33" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.32"; + version = "4.41.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz"; - sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz"; + sha512 = "PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -1534,13 +1525,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.8.0" = { + "acorn-8.8.1" = { name = "acorn"; packageName = "acorn"; - version = "8.8.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; - sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; + sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; }; }; "address-1.0.3" = { @@ -1804,13 +1795,13 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-map-0.0.0" = { + "array-map-0.0.1" = { name = "array-map"; packageName = "array-map"; - version = "0.0.0"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; - sha512 = "123XMszMB01QKVptpDQ7x1m1pP5NmJIG1kbl0JSPPRezvwQChxAN0Gvzo7rvR1IZ2tOL2tmiy7kY/KKgnpVVpg=="; + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.1.tgz"; + sha512 = "sxHIeJTGEsRC8/hYkZzdJNNPZ41EXHVys7pqMw1iwE/Kx8/hto0UbDuGQsSJ0ujPovj9qUZl6EOY/EiZ2g3d9Q=="; }; }; "array-reduce-0.0.0" = { @@ -1858,13 +1849,13 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.reduce-1.0.4" = { + "array.prototype.reduce-1.0.5" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz"; - sha512 = "WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; + sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; }; }; "asap-2.0.6" = { @@ -2056,15 +2047,6 @@ let sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; }; }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - }; "babel-plugin-syntax-object-rest-spread-6.13.0" = { name = "babel-plugin-syntax-object-rest-spread"; packageName = "babel-plugin-syntax-object-rest-spread"; @@ -2281,13 +2263,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.20.0" = { + "body-parser-1.20.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; + sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; "bonjour-3.5.0" = { @@ -2416,13 +2398,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.21.3" = { + "browserslist-4.21.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.21.3"; + version = "4.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"; - sha512 = "898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; }; "buffer-4.9.2" = { @@ -2479,6 +2461,15 @@ let sha512 = "9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="; }; }; + "bufferutil-4.0.7" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; + sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; + }; + }; "builtin-status-codes-3.0.0" = { name = "builtin-status-codes"; packageName = "builtin-status-codes"; @@ -2587,13 +2578,13 @@ let sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; - "call-me-maybe-1.0.1" = { + "call-me-maybe-1.0.2" = { name = "call-me-maybe"; packageName = "call-me-maybe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; - sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz"; + sha512 = "HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="; }; }; "caller-callsite-2.0.0" = { @@ -2677,13 +2668,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001382" = { + "caniuse-lite-1.0.30001431" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001382"; + version = "1.0.30001431"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001382.tgz"; - sha512 = "2rtJwDmSZ716Pxm1wCtbPvHtbDWAreTPxXbkc5RkKglow3Ig/4GNGazDI9/BVnXbG/wnv6r3B5FEbkfg9OcTGg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz"; + sha512 = "zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3163,13 +3154,13 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; - "commander-9.4.0" = { + "commander-9.4.1" = { name = "commander"; packageName = "commander"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; - sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz"; + sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; "common-tags-1.8.2" = { @@ -3208,15 +3199,6 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; - "compress-brotli-1.3.8" = { - name = "compress-brotli"; - packageName = "compress-brotli"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz"; - sha512 = "lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ=="; - }; - }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -3334,13 +3316,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convert-source-map-1.8.0" = { + "convert-source-map-1.9.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz"; + sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; }; }; "cookie-0.3.1" = { @@ -3406,13 +3388,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.25.0" = { + "core-js-compat-3.26.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.25.0"; + version = "3.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz"; - sha512 = "extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz"; + sha512 = "piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A=="; }; }; "core-util-is-1.0.2" = { @@ -3847,13 +3829,13 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; - "defaults-1.0.3" = { + "defaults-1.0.4" = { name = "defaults"; packageName = "defaults"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha512 = "s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="; + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz"; + sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; }; }; "defer-to-connect-1.1.3" = { @@ -4225,13 +4207,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.228" = { + "electron-to-chromium-1.4.284" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.228"; + version = "1.4.284"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.228.tgz"; - sha512 = "XfDHCvou7CsDMlFwb0WZ1tWmW48e7Sn7VBRyPfZsZZila9esRsJl1trO+OqDNV97GggFSt0ISbWslKXfQkG//g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; + sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; }; }; "elliptic-6.5.4" = { @@ -4306,13 +4288,13 @@ let sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A=="; }; }; - "elm-solve-deps-wasm-1.0.1" = { + "elm-solve-deps-wasm-1.0.2" = { name = "elm-solve-deps-wasm"; packageName = "elm-solve-deps-wasm"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-solve-deps-wasm/-/elm-solve-deps-wasm-1.0.1.tgz"; - sha512 = "A05XKZKhzM8vWTo8KvNR4g1ICt9iMPOAMfo79OK25c+tQaLSfQ8iMYvW6XgSEd+SgRfM5VSKX4hKEiH6iTiWsg=="; + url = "https://registry.npmjs.org/elm-solve-deps-wasm/-/elm-solve-deps-wasm-1.0.2.tgz"; + sha512 = "qnwo7RO9IO7jd9SLHvIy0rSOEIlc/tNMTE9Cras0kl+b161PVidW4FvXo0MtXU8GAKi/2s/HYvhcnpR/NNQ1zw=="; }; }; "elm-test-0.19.1" = { @@ -4324,22 +4306,22 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; - "elm-test-0.19.1-revision9" = { + "elm-test-0.19.1-revision10" = { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision9"; + version = "0.19.1-revision10"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision9.tgz"; - sha512 = "lvHJbh16sy7oUBBPIEMN+0v6dGDZFmfvwq+V+TnGPk5ZlI64vcykx8E8+zLt/E+Ja42UKMMXXgN1ZHQ1V6Ic2Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision10.tgz"; + sha512 = "33jXpA15alVcYjX+UJOkiOmQIQxjd3c0eeg3960VyhEf8tG8O4g4B5ipMmu6KAllncrSxSQrYzKJnNJM/8ZiCg=="; }; }; - "elm-tooling-1.8.0" = { + "elm-tooling-1.10.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.8.0.tgz"; - sha512 = "IjMvW/VHqxLidlJSAocBGDBmqiZ1NS0lK/UCMRU4ULEEaTVjpSd/9Dv0mH2ok0H0egSTYx19GnrdL4Lq9h+z+A=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.10.0.tgz"; + sha512 = "fMLXs7xHpr6LodtmvVJKepYC6chgSOfe5Hgv8GcFO+Id7O/CuT9+CAfrlzYxvBn91cm6ekWwHFDjPD765v5iBA=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4459,13 +4441,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.20.1" = { + "es-abstract-1.20.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.1"; + version = "1.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; + sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -4702,13 +4684,13 @@ let sha512 = "CDaOBMB9knI6vx9SpIxEMOJ6VBbC2U/tYNILs0qv1YOZc15K9U2EcF06v10F0JX6IYcWnKYZJwIDJspEHLvUaQ=="; }; }; - "express-4.18.1" = { + "express-4.18.2" = { name = "express"; packageName = "express"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; - sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; + url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; + sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; "express-ws-2.0.0" = { @@ -4819,13 +4801,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.11" = { + "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.11"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; - sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"; + sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -5125,13 +5107,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.15.1" = { + "follow-redirects-1.15.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; "for-in-1.0.2" = { @@ -5404,13 +5386,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.2" = { + "get-intrinsic-1.1.3" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6457,13 +6439,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.4" = { + "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.4"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; + sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; "is-color-stop-1.1.0" = { @@ -6475,13 +6457,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.10.0" = { + "is-core-module-2.11.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; - sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; }; "is-data-descriptor-0.1.4" = { @@ -7087,13 +7069,13 @@ let sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; }; - "json-stable-stringify-1.0.1" = { + "json-stable-stringify-1.0.2" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha512 = "i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg=="; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz"; + sha512 = "eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g=="; }; }; "json-stringify-safe-5.0.1" = { @@ -7168,13 +7150,13 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; - "jsonify-0.0.0" = { + "jsonify-0.0.1" = { name = "jsonify"; packageName = "jsonify"; - version = "0.0.0"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha512 = "trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA=="; + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz"; + sha512 = "2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg=="; }; }; "jsprim-1.4.2" = { @@ -7195,13 +7177,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.4.1" = { + "keyv-4.5.2" = { name = "keyv"; packageName = "keyv"; - version = "4.4.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.4.1.tgz"; - sha512 = "PzByhNxfBLnSBW2MZi1DF+W5+qB/7BMpOokewqIvqS8GFtP7xHm2oeGU72Y1fhtfOv/FiEnI4+nyViYDmUChnw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz"; + sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; }; }; "killable-1.0.1" = { @@ -7348,22 +7330,22 @@ let sha512 = "gkD9aSEG9UGglyPcDJqY9YBTUtCLKaBK6ihD2VP1d1X60lTfFspNZNulGBBbUZLkPygy4LySYHyxBpq+VhjObQ=="; }; }; - "loader-utils-1.4.0" = { + "loader-utils-1.4.2" = { name = "loader-utils"; packageName = "loader-utils"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz"; + sha512 = "I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="; }; }; - "loader-utils-2.0.2" = { + "loader-utils-2.0.4" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; - sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; + sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; }; }; "locate-path-2.0.0" = { @@ -7474,13 +7456,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "loglevel-1.8.0" = { + "loglevel-1.8.1" = { name = "loglevel"; packageName = "loglevel"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz"; - sha512 = "G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"; + sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; }; }; "lower-case-2.0.2" = { @@ -7888,13 +7870,13 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "minimist-1.2.6" = { + "minimist-1.2.7" = { name = "minimist"; packageName = "minimist"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; "minipass-2.9.0" = { @@ -8095,13 +8077,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.16.0" = { + "nan-2.17.0" = { name = "nan"; packageName = "nan"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"; - sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; + url = "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"; + sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; }; }; "nanoid-3.3.4" = { @@ -8194,6 +8176,15 @@ let sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; }; }; + "node-gyp-build-4.5.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; + }; + }; "node-libs-browser-2.2.1" = { name = "node-libs-browser"; packageName = "node-libs-browser"; @@ -8446,22 +8437,22 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.entries-1.1.5" = { + "object.entries-1.1.6" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz"; - sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz"; + sha512 = "leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="; }; }; - "object.getownpropertydescriptors-2.1.4" = { + "object.getownpropertydescriptors-2.1.5" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz"; - sha512 = "sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz"; + sha512 = "yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw=="; }; }; "object.pick-1.3.0" = { @@ -8473,13 +8464,13 @@ let sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; - "object.values-1.1.5" = { + "object.values-1.1.6" = { name = "object.values"; packageName = "object.values"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz"; + sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; }; }; "obuf-1.1.2" = { @@ -9220,13 +9211,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.16" = { + "postcss-8.4.19" = { name = "postcss"; packageName = "postcss"; - version = "8.4.16"; + version = "8.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; - sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; + sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; }; }; "postcss-calc-7.0.5" = { @@ -9796,13 +9787,13 @@ let sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; - "qs-6.10.3" = { + "qs-6.11.0" = { name = "qs"; packageName = "qs"; - version = "6.10.3"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; "qs-6.5.1" = { @@ -10093,13 +10084,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-10.0.1" = { + "regenerate-unicode-properties-10.1.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "10.0.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; - sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; + sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; }; }; "regenerator-runtime-0.11.1" = { @@ -10111,13 +10102,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.9" = { + "regenerator-runtime-0.13.10" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.9"; + version = "0.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; + sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; }; }; "regenerator-runtime-0.9.6" = { @@ -10156,13 +10147,13 @@ let sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; - "regexpu-core-5.1.0" = { + "regexpu-core-5.2.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.1.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; - sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz"; + sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; }; }; "registry-auth-token-4.2.2" = { @@ -10183,22 +10174,22 @@ let sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.6.0" = { + "regjsgen-0.7.1" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.6.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"; - sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz"; + sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; }; }; - "regjsparser-0.8.4" = { + "regjsparser-0.9.1" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.8.4"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"; - sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"; + sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="; }; }; "relateurl-0.2.7" = { @@ -10579,6 +10570,15 @@ let sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; + "safe-regex-test-1.0.0" = { + name = "safe-regex-test"; + packageName = "safe-regex-test"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; + sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; + }; + }; "safename-1.0.2" = { name = "safename"; packageName = "safename"; @@ -10687,22 +10687,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.0.0" = { + "semver-7.3.8" = { name = "semver"; packageName = "semver"; - version = "7.0.0"; + version = "7.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; }; }; "semver-regex-3.1.4" = { @@ -10939,13 +10930,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.13.0" = { + "simple-git-3.14.1" = { name = "simple-git"; packageName = "simple-git"; - version = "3.13.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz"; - sha512 = "VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.14.1.tgz"; + sha512 = "1ThF4PamK9wBORVGMK9HK5si4zoGS2GpRO7tkAFObA4FZv6dKaCVHLQT+8zlgiBm6K2h+wEU9yOaFCu/SR3OyA=="; }; }; "simple-swizzle-0.2.2" = { @@ -11398,22 +11389,22 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.5" = { + "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; + sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; }; }; - "string.prototype.trimstart-1.0.5" = { + "string.prototype.trimstart-1.0.6" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; + sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; }; }; "string_decoder-0.10.31" = { @@ -11632,13 +11623,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "supports-hyperlinks-2.2.0" = { + "supports-hyperlinks-2.3.0" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; + url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"; + sha512 = "RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA=="; }; }; "supports-preserve-symlinks-flag-1.0.0" = { @@ -11659,13 +11650,13 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; - "table-6.8.0" = { + "table-6.8.1" = { name = "table"; packageName = "table"; - version = "6.8.0"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.8.0.tgz"; - sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; + url = "https://registry.npmjs.org/table/-/table-6.8.1.tgz"; + sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; }; }; "tapable-1.1.3" = { @@ -11686,13 +11677,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.1.11" = { + "tar-6.1.12" = { name = "tar"; packageName = "tar"; - version = "6.1.11"; + version = "6.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz"; + sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; }; }; "temp-0.9.0" = { @@ -11731,13 +11722,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.15.0" = { + "terser-5.15.1" = { name = "terser"; packageName = "terser"; - version = "5.15.0"; + version = "5.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz"; - sha512 = "L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; + sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -12001,13 +11992,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.0" = { + "tslib-2.4.1" = { name = "tslib"; packageName = "tslib"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; + sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; }; }; "tsyringe-4.7.0" = { @@ -12082,13 +12073,22 @@ let sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typescript-4.7.4" = { + "typedarray-0.0.7" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.7.tgz"; + sha512 = "ueeb9YybpjhivjbHP2LdFDAjbS948fGEPj+ACAMs4xCMmh72OCOMQWBQKlaN4ZNQ04yfLSDLSx1tGRIoWimObQ=="; + }; + }; + "typescript-4.8.4" = { name = "typescript"; packageName = "typescript"; - version = "4.7.4"; + version = "4.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; - sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; + sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; }; }; "uglify-es-3.3.10" = { @@ -12172,13 +12172,13 @@ let sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; }; }; - "unicode-property-aliases-ecmascript-2.0.0" = { + "unicode-property-aliases-ecmascript-2.1.0" = { name = "unicode-property-aliases-ecmascript"; packageName = "unicode-property-aliases-ecmascript"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; - sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"; + sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; }; }; "union-value-1.0.1" = { @@ -12298,13 +12298,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.5" = { + "update-browserslist-db-1.0.10" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.5"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"; - sha512 = "dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; + sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; }; }; "upgrade-1.1.0" = { @@ -12388,6 +12388,15 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; + "utf-8-validate-5.0.10" = { + name = "utf-8-validate"; + packageName = "utf-8-validate"; + version = "5.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz"; + sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -12505,58 +12514,58 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vscode-jsonrpc-6.0.0" = { + "vscode-jsonrpc-8.0.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "6.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz"; - sha512 = "wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz"; + sha512 = "RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ=="; }; }; - "vscode-languageserver-7.0.0" = { + "vscode-languageserver-8.0.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "7.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz"; - sha512 = "60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz"; + sha512 = "bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA=="; }; }; - "vscode-languageserver-protocol-3.16.0" = { + "vscode-languageserver-protocol-3.17.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz"; - sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz"; + sha512 = "8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg=="; }; }; - "vscode-languageserver-textdocument-1.0.4" = { + "vscode-languageserver-textdocument-1.0.7" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.4"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz"; - sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz"; + sha512 = "bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg=="; }; }; - "vscode-languageserver-types-3.16.0" = { + "vscode-languageserver-types-3.17.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.16.0"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"; - sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz"; + sha512 = "zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="; }; }; - "vscode-uri-3.0.3" = { + "vscode-uri-3.0.6" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz"; - sha512 = "EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz"; + sha512 = "fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ=="; }; }; "watchpack-1.7.5" = { @@ -12595,13 +12604,13 @@ let sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; }; }; - "web-tree-sitter-0.20.5" = { + "web-tree-sitter-0.20.7" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.20.5"; + version = "0.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.5.tgz"; - sha512 = "mpXlqIeEBE5Q71cnBnt8w6XKhIiKmllPECqsIFBtMvzcfCxA8+614iyMJXBCQo95Vs3y1zORLqiLJn25pYZ4Tw=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.7.tgz"; + sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; }; }; "webpack-4.44.2" = { @@ -13308,7 +13317,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typedarray-0.0.6" + sources."typedarray-0.0.7" sources."ultron-1.0.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -13468,7 +13477,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -13532,13 +13541,13 @@ in sources."has-flag-4.0.0" ]; }) - (sources."table-6.8.0" // { + (sources."table-6.8.1" // { dependencies = [ sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.1.11" + sources."tar-6.1.12" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -13604,9 +13613,10 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."body-parser-1.20.0" + sources."body-parser-1.20.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."bufferutil-4.0.7" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -13639,7 +13649,7 @@ in sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.18.1" + sources."express-4.18.2" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.3" @@ -13652,7 +13662,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.2" + sources."get-intrinsic-1.1.3" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -13686,9 +13696,10 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."ms-2.0.0" sources."negotiator-0.6.3" + sources."node-gyp-build-4.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."object-inspect-1.12.2" @@ -13705,7 +13716,7 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."rc-1.2.8" @@ -13746,6 +13757,7 @@ in sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."which-2.0.2" @@ -13765,10 +13777,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "2.4.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.4.1.tgz"; - sha512 = "v8WU/LOrksaR1IO3WkcH5KCfS1ExDDNSE8Aqz/SYMlkZ4RF2aU418Pm54ppdiVX5AOTgHjc6U6mp5LXZocoEqw=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.5.2.tgz"; + sha512 = "teyHJdzdP3IhFQBmqFy4zJAkodPiyPnOdnzVsGOkDybsQ1IbDpvfFvD973ipDjr+s248QzYCtEUv3caxpFwIXg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -13784,7 +13796,7 @@ in sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.11" + sources."fast-glob-3.2.12" sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."fsevents-2.3.2" @@ -13824,13 +13836,13 @@ in sources."ts-debounce-4.0.0" sources."tslib-1.14.1" sources."tsyringe-4.7.0" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-3.0.3" - sources."web-tree-sitter-0.20.5" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-textdocument-1.0.7" + sources."vscode-languageserver-types-3.17.2" + sources."vscode-uri-3.0.6" + sources."web-tree-sitter-0.20.7" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -13885,7 +13897,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.15.1" + sources."follow-redirects-1.15.2" sources."fresh-0.5.2" sources."fsevents-2.3.2" sources."get-stream-4.1.0" @@ -13963,10 +13975,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision9"; + version = "0.19.1-revision10"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision9.tgz"; - sha512 = "lvHJbh16sy7oUBBPIEMN+0v6dGDZFmfvwq+V+TnGPk5ZlI64vcykx8E8+zLt/E+Ja42UKMMXXgN1ZHQ1V6Ic2Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision10.tgz"; + sha512 = "33jXpA15alVcYjX+UJOkiOmQIQxjd3c0eeg3960VyhEf8tG8O4g4B5ipMmu6KAllncrSxSQrYzKJnNJM/8ZiCg=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -13979,9 +13991,9 @@ in sources."chokidar-3.5.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.4.0" + sources."commander-9.4.1" sources."cross-spawn-7.0.3" - sources."elm-solve-deps-wasm-1.0.1" + sources."elm-solve-deps-wasm-1.0.2" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -14033,11 +14045,10 @@ in dependencies = [ sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.13" + sources."@types/node-18.11.9" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -14047,7 +14058,6 @@ in sources."mimic-response-1.0.1" ]; }) - sources."compress-brotli-1.3.8" sources."config-chain-1.1.13" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" @@ -14067,7 +14077,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.4.1" + sources."keyv-4.5.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -14084,7 +14094,7 @@ in sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.7" + sources."semver-7.3.8" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -14212,7 +14222,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.6" @@ -14317,7 +14327,7 @@ in sources."isarray-1.0.0" sources."jsonfile-4.0.0" sources."klaw-2.1.1" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -14355,40 +14365,40 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.18.13" + sources."@babel/compat-data-7.20.1" sources."@babel/core-7.12.10" - sources."@babel/generator-7.18.13" + sources."@babel/generator-7.20.4" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.18.9" // { + (sources."@babel/helper-compilation-targets-7.20.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.13" - sources."@babel/helper-create-regexp-features-plugin-7.18.6" + sources."@babel/helper-create-class-features-plugin-7.20.2" + sources."@babel/helper-create-regexp-features-plugin-7.19.0" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-explode-assignable-expression-7.18.6" - sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-module-transforms-7.20.2" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.18.9" - sources."@babel/helper-simple-access-7.18.6" - sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-replace-supers-7.19.1" + sources."@babel/helper-simple-access-7.20.2" + sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" - sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-string-parser-7.19.4" + sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.18.11" - sources."@babel/helpers-7.18.9" + sources."@babel/helper-wrap-function-7.19.0" + sources."@babel/helpers-7.20.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.13" - sources."@babel/plugin-proposal-async-generator-functions-7.18.10" + sources."@babel/parser-7.20.3" + sources."@babel/plugin-proposal-async-generator-functions-7.20.1" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" @@ -14396,7 +14406,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.20.2" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -14416,10 +14426,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" - sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.20.2" + sources."@babel/plugin-transform-classes-7.20.2" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.20.2" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -14427,20 +14437,20 @@ in sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" - sources."@babel/plugin-transform-modules-amd-7.18.6" - sources."@babel/plugin-transform-modules-commonjs-7.18.6" - sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-amd-7.19.6" + sources."@babel/plugin-transform-modules-commonjs-7.19.6" + sources."@babel/plugin-transform-modules-systemjs-7.19.6" sources."@babel/plugin-transform-modules-umd-7.18.6" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-parameters-7.20.3" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-regenerator-7.18.6" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.18.6" - sources."@babel/plugin-transform-spread-7.18.9" + sources."@babel/plugin-transform-spread-7.19.0" sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" @@ -14450,8 +14460,8 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.18.13" - sources."@babel/types-7.18.13" + sources."@babel/traverse-7.20.1" + sources."@babel/types-7.20.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -14461,25 +14471,25 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.17" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" - sources."@types/minimatch-5.1.0" - sources."@types/node-18.7.13" + sources."@types/minimatch-5.1.2" + sources."@types/node-18.11.9" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.17.0" // { + (sources."@types/uglify-js-3.17.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.32" // { + (sources."@types/webpack-4.41.33" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14529,12 +14539,12 @@ in sources."arr-union-3.1.0" sources."array-filter-0.0.1" sources."array-flatten-2.1.2" - sources."array-map-0.0.0" + sources."array-map-0.0.1" sources."array-reduce-0.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.4" + sources."array.prototype.reduce-1.0.5" sources."asap-2.0.6" sources."asn1-0.2.6" (sources."asn1.js-5.4.1" // { @@ -14570,7 +14580,6 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" (sources."babel-runtime-6.26.0" // { @@ -14593,12 +14602,12 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" ]; }) (sources."bonjour-3.5.0" // { @@ -14621,7 +14630,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.3" + sources."browserslist-4.21.4" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -14631,14 +14640,14 @@ in sources."cacache-12.0.4" sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.1" + sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001382" + sources."caniuse-lite-1.0.30001431" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14720,7 +14729,7 @@ in ]; }) sources."content-type-1.0.4" - sources."convert-source-map-1.8.0" + sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" @@ -14737,11 +14746,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.25.0" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) + sources."core-js-compat-3.26.0" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -14754,13 +14759,22 @@ in sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" + (sources."css-declaration-sorter-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) (sources."css-loader-4.3.0" // { dependencies = [ sources."camelcase-6.3.0" - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.4" sources."lru-cache-6.0.0" - sources."semver-7.3.7" + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."semver-7.3.8" + sources."source-map-0.6.1" sources."yallist-4.0.0" ]; }) @@ -14773,11 +14787,29 @@ in }) sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-4.1.11" - sources."cssnano-preset-default-4.0.8" + (sources."cssnano-4.1.11" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."cssnano-preset-default-4.0.8" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) sources."cssnano-util-get-arguments-4.0.0" sources."cssnano-util-get-match-4.0.0" - sources."cssnano-util-raw-cache-4.0.1" + (sources."cssnano-util-raw-cache-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) sources."cssnano-util-same-parent-4.0.1" (sources."csso-4.2.0" // { dependencies = [ @@ -14838,7 +14870,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.228" + sources."electron-to-chromium-1.4.284" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14848,15 +14880,15 @@ in sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.6" sources."elm-hot-webpack-loader-1.1.7" - sources."elm-solve-deps-wasm-1.0.1" - (sources."elm-test-0.19.1-revision9" // { + sources."elm-solve-deps-wasm-1.0.2" + (sources."elm-test-0.19.1-revision10" // { dependencies = [ sources."ansi-styles-4.3.0" sources."brace-expansion-2.0.1" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.4.0" + sources."commander-9.4.1" sources."glob-8.0.3" sources."has-flag-4.0.0" sources."minimatch-5.1.0" @@ -14876,7 +14908,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.20.1" + sources."es-abstract-1.20.4" sources."es-array-method-boxes-properly-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -14926,12 +14958,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."safe-buffer-5.2.1" ]; }) @@ -14982,7 +15014,7 @@ in }) (sources."file-loader-6.2.0" // { dependencies = [ - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.4" sources."schema-utils-3.1.1" ]; }) @@ -15005,7 +15037,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.1" + sources."follow-redirects-1.15.2" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -15024,7 +15056,7 @@ in sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.2" + sources."get-intrinsic-1.1.3" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -15104,7 +15136,13 @@ in sources."https-browserify-1.0.0" sources."i-0.3.7" sources."iconv-lite-0.4.24" - sources."icss-utils-4.1.1" + (sources."icss-utils-4.1.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-3.3.10" @@ -15148,9 +15186,9 @@ in sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.4" + sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.10.0" + sources."is-core-module-2.11.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -15193,12 +15231,12 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-1.0.2" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" sources."json5-2.2.1" sources."jsonfile-4.0.0" - sources."jsonify-0.0.0" + sources."jsonify-0.0.1" sources."jsprim-1.4.2" sources."killable-1.0.1" sources."kind-of-6.0.3" @@ -15213,7 +15251,7 @@ in ]; }) sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { + (sources."loader-utils-1.4.2" // { dependencies = [ sources."json5-1.0.1" ]; @@ -15225,7 +15263,7 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.0" + sources."loglevel-1.8.1" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -15269,7 +15307,7 @@ in sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.16.0" + sources."nan-2.17.0" sources."nanoid-3.3.4" sources."nanomatch-1.2.13" sources."ncp-1.0.1" @@ -15324,10 +15362,10 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.4" - sources."object.entries-1.1.5" - sources."object.getownpropertydescriptors-2.1.4" + sources."object.entries-1.1.6" + sources."object.getownpropertydescriptors-2.1.5" sources."object.pick-1.3.0" - sources."object.values-1.1.5" + sources."object.values-1.1.6" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -15395,146 +15433,272 @@ in dependencies = [ sources."async-2.6.4" sources."debug-3.2.7" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."mkdirp-0.5.6" ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { + sources."postcss-8.4.19" + (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."source-map-0.6.1" ]; }) - sources."postcss-calc-7.0.5" (sources."postcss-colormin-4.0.3" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-convert-values-4.0.1" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-discard-comments-4.0.2" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-discard-duplicates-4.0.2" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-discard-empty-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-discard-overridden-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-flexbugs-fixes-4.2.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" ]; }) - sources."postcss-discard-comments-4.0.2" - sources."postcss-discard-duplicates-4.0.2" - sources."postcss-discard-empty-4.0.1" - sources."postcss-discard-overridden-4.0.1" - sources."postcss-flexbugs-fixes-4.2.1" (sources."postcss-loader-4.1.0" // { dependencies = [ sources."cosmiconfig-7.0.1" sources."import-fresh-3.3.0" - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.4" sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.1.1" - sources."semver-7.3.7" + sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) (sources."postcss-merge-longhand-4.0.11" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-merge-rules-4.0.3" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" ]; }) (sources."postcss-minify-font-values-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-minify-gradients-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-minify-params-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-modules-extract-imports-2.0.0" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-modules-local-by-default-3.0.3" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-modules-scope-2.2.0" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-modules-values-3.0.0" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-normalize-charset-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" ]; }) - sources."postcss-modules-extract-imports-2.0.0" - sources."postcss-modules-local-by-default-3.0.3" - sources."postcss-modules-scope-2.2.0" - sources."postcss-modules-values-3.0.0" - sources."postcss-normalize-charset-4.0.1" (sources."postcss-normalize-display-values-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-positions-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-repeat-style-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-string-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-timing-functions-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-unicode-4.0.1" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-url-4.0.1" // { dependencies = [ sources."normalize-url-3.3.0" + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-normalize-whitespace-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) (sources."postcss-ordered-values-4.1.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-reduce-initial-4.0.3" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" ]; }) - sources."postcss-reduce-initial-4.0.3" (sources."postcss-reduce-transforms-4.0.2" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" ]; }) - (sources."postcss-safe-parser-5.0.2" // { - dependencies = [ - sources."postcss-8.4.16" - ]; - }) + sources."postcss-safe-parser-5.0.2" sources."postcss-selector-parser-6.0.10" (sources."postcss-svgo-4.0.3" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-value-parser-3.3.1" + sources."source-map-0.6.1" + ]; + }) + (sources."postcss-unique-selectors-4.0.1" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" + sources."source-map-0.6.1" ]; }) - sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.2.0" sources."prepend-http-1.0.4" sources."pretty-bytes-5.6.0" @@ -15627,14 +15791,14 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.0.1" - sources."regenerator-runtime-0.13.9" + sources."regenerate-unicode-properties-10.1.0" + sources."regenerator-runtime-0.13.10" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.1.0" - sources."regjsgen-0.6.0" - (sources."regjsparser-0.8.4" // { + sources."regexpu-core-5.2.1" + sources."regjsgen-0.7.1" + (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -15675,6 +15839,7 @@ in }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."schema-utils-2.7.1" @@ -15823,8 +15988,8 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" + sources."string.prototype.trimend-1.0.6" + sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -15837,12 +16002,15 @@ in sources."strip-eof-1.0.0" (sources."style-loader-1.3.0" // { dependencies = [ - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.4" ]; }) (sources."stylehacks-4.0.3" // { dependencies = [ + sources."picocolors-0.2.1" + sources."postcss-7.0.39" sources."postcss-selector-parser-3.1.2" + sources."source-map-0.6.1" ]; }) sources."supports-color-5.5.0" @@ -15903,7 +16071,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.4.0" + sources."tslib-2.4.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -15942,7 +16110,7 @@ in sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" - sources."unicode-property-aliases-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" @@ -15962,7 +16130,7 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.5" + sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -15972,7 +16140,7 @@ in }) (sources."url-loader-4.1.1" // { dependencies = [ - sources."loader-utils-2.0.2" + sources."loader-utils-2.0.4" sources."schema-utils-3.1.1" ]; }) @@ -16214,7 +16382,7 @@ in sources."jest-matcher-utils-27.5.1" sources."lodash-4.17.21" sources."minimatch-3.1.2" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.6" @@ -16230,7 +16398,7 @@ in sources."supports-color-7.2.0" sources."temp-0.9.4" sources."ts-union-2.3.0" - sources."typescript-4.7.4" + sources."typescript-4.8.4" sources."which-1.3.1" sources."wrappy-1.0.2" ]; @@ -16258,7 +16426,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.17" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -16268,14 +16436,14 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.37" - sources."@types/lodash-4.14.184" - sources."@types/minimatch-5.1.0" + sources."@types/lodash-4.14.188" + sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.8.0" + sources."acorn-8.8.1" sources."ansi-escapes-3.2.0" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -16287,7 +16455,7 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."on-finished-2.4.1" ]; @@ -16295,6 +16463,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" + sources."bufferutil-4.0.7" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -16345,7 +16514,7 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."finalhandler-1.2.0" sources."on-finished-2.4.1" @@ -16358,7 +16527,7 @@ in ]; }) sources."extend-shallow-2.0.1" - sources."fast-glob-3.2.11" + sources."fast-glob-3.2.12" sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -16368,7 +16537,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.2" + sources."get-intrinsic-1.1.3" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" @@ -16421,11 +16590,12 @@ in sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."negotiator-0.6.3" sources."nice-try-1.0.5" + sources."node-gyp-build-4.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."object-hash-2.2.0" @@ -16459,7 +16629,7 @@ in sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -16504,7 +16674,7 @@ in sources."strip-json-comments-2.0.1" sources."sudo-prompt-8.2.5" sources."supports-color-7.2.0" - (sources."terser-5.15.0" // { + (sources."terser-5.15.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -16519,6 +16689,7 @@ in sources."universalify-2.0.0" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" + sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."which-2.0.2" @@ -16538,19 +16709,18 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.7.4"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.4.tgz"; - sha512 = "D6J3Gx1JCuNiTk7QeXbRkywLhEtOWqvZKyZoihxQdYlxUqVICwvQf2qaP0d1QunpQKY22iQQpzyEn0PAczNn7Q=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.8.2.tgz"; + sha512 = "eDuDy4gAD3198LEUJSaquBchyPxMLBZgChxBNg/1feXh4g8qDS10QLyZlwa2H8YqYBicFpK1AxvCjfgyVkrLJA=="; }; dependencies = [ sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" + sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" - sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.7.13" + sources."@types/node-18.11.9" sources."@types/responselike-1.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -16574,7 +16744,6 @@ in sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.4" @@ -16583,9 +16752,9 @@ in sources."mimic-response-3.1.0" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."elm-tooling-1.8.0" + sources."elm-tooling-1.10.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -16621,7 +16790,7 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.4.1" + sources."keyv-4.5.2" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -16629,7 +16798,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.8" - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."normalize-path-3.0.0" @@ -16663,7 +16832,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.2.0" + sources."supports-hyperlinks-2.3.0" sources."temp-0.9.4" sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" @@ -16700,8 +16869,8 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.3.7" - sources."simple-git-3.13.0" + sources."semver-7.3.8" + sources."simple-git-3.14.1" sources."upath-2.0.1" sources."yallist-4.0.0" ]; diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix deleted file mode 100644 index 77b3fd9d0b91..000000000000 --- a/pkgs/development/compilers/go/1.17.nix +++ /dev/null @@ -1,282 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, perl -, which -, pkg-config -, procps -, pcre -, cacert -, Security -, Foundation -, xcbuild -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, threadsCross -}: - -let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; - - goarch = platform: { - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "386"; - "mips" = "mips"; - "mips64el" = "mips64le"; - "mipsel" = "mipsle"; - "powerpc64le" = "ppc64le"; - "riscv64" = "riscv64"; - "s390x" = "s390x"; - "x86_64" = "amd64"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; - - isCross = stdenv.buildPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation rec { - pname = "go"; - version = "1.17.13"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-oaSLI6+yBvlee7qpuJjZZfkIJvbx0fwMHXhK2gzTAP0="; - }; - - strictDeps = true; - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - depsBuildTarget = lib.optional isCross targetCC; - - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.16.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./skip-chown-tests-1.16.patch - ./skip-external-network-tests-1.16.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks-1.16.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if isCross then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString isCross '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - passthru = { - inherit goBootstrap; - }; - - meta = with lib; { - description = "The Go Programming language"; - homepage = "https://go.dev/"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; - }; -} diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch deleted file mode 100644 index 6a18e6cc42e8..000000000000 --- a/pkgs/development/compilers/go/creds-test.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000 -@@ -76,8 +76,8 @@ - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err - } -- if err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err != syscall.EPERM && err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } - } - diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch deleted file mode 100644 index a4d9f0674791..000000000000 --- a/pkgs/development/compilers/go/go-1.9-skip-flaky-19608.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go -index 7137599..43cca2e 100644 ---- a/src/net/http/serve_test.go -+++ b/src/net/http/serve_test.go -@@ -5361,6 +5361,7 @@ func testServerKeepAlivesEnabled(t *testing.T, h2 bool) { - // the server's doing its 1-byte background read between requests, - // waiting for the connection to maybe close. - func TestServerCancelsReadTimeoutWhenIdle(t *testing.T) { -+ testenv.SkipFlaky(t, 19608) - setParallel(t) - defer afterTest(t) - const timeout = 250 * time.Millisecond diff --git a/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/pkgs/development/compilers/go/remove-test-pie-1.15.patch deleted file mode 100644 index f00685feba90..000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.15.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index e1cd4965c3..66bf980fc6 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -584,29 +584,6 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.internalLinkPIE() { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- // Also test a cgo package. -- if t.cgoEnabled && t.internalLink() { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal_cgo", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- } -- - // sync tests - if goos != "js" { // js doesn't support -cpu=10 - t.tests = append(t.tests, distTest{ diff --git a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch deleted file mode 100644 index 945d3ef8d126..000000000000 --- a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index e1cd4965c3..0980d044df 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error { - t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal") - } - t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie") -- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") -+ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") - } - } - } diff --git a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch b/pkgs/development/compilers/go/skip-chown-tests-1.16.patch deleted file mode 100644 index 783446cdf317..000000000000 --- a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001 -From: regnat -Date: Wed, 3 Nov 2021 10:17:28 +0100 -Subject: [PATCH] Disable the chown tests - -See https://github.com/golang/go/issues/42525 and -https://github.com/NixOS/nix/issues/3245 ---- - os/os_unix_test.go | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/os/os_unix_test.go b/os/os_unix_test.go -index 51693fd..0936542 100644 ---- a/src/os/os_unix_test.go -+++ b/src/os/os_unix_test.go -@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) { - } - - func TestChown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are -@@ -83,6 +84,7 @@ func TestChown(t *testing.T) { - } - - func TestFileChown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are -@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) { - } - - func TestLchown(t *testing.T) { -+ t.Skipf("https://github.com/golang/go/issues/42525") - // Use TempDir() to make sure we're on a local file system, - // so that the group ids returned by Getgroups will be allowed - // on the file. On NFS, the Getgroups groups are --- -2.31.1 - diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch deleted file mode 100644 index 8f1eb6be7bb8..000000000000 --- a/pkgs/development/compilers/go/skip-external-network-tests-1.16.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/internal/testenv/testenv.go b/src/internal/testenv/testenv.go -index c902b1404f..66016088a2 100644 ---- a/src/internal/testenv/testenv.go -+++ b/src/internal/testenv/testenv.go -@@ -163,13 +163,15 @@ func MustHaveExecPath(t testing.TB, path string) { - // HasExternalNetwork reports whether the current system can use - // external (non-localhost) networks. - func HasExternalNetwork() bool { -- return !testing.Short() && runtime.GOOS != "js" -+ // Nix sandbox does not external network in sandbox -+ return false - } - - // MustHaveExternalNetwork checks that the current system can use - // external (non-localhost) networks. - // If not, MustHaveExternalNetwork calls t.Skip with an explanation. - func MustHaveExternalNetwork(t testing.TB) { -+ t.Skipf("Nix sandbox does not have networking") - if runtime.GOOS == "js" { - t.Skipf("skipping test: no external network on %s", runtime.GOOS) - } -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 57cf5554ad..d00be53b2c 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,7 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") - mobile := runtime.GOOS == "android" || runtime.GOOS == "ios" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/pkgs/development/compilers/go/skip-nohup-tests.patch deleted file mode 100644 index 1da07407d049..000000000000 --- a/pkgs/development/compilers/go/skip-nohup-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go -index 3d79c7a..6e0f7b4 100644 ---- a/src/os/signal/signal_test.go -+++ b/src/os/signal/signal_test.go -@@ -217,6 +217,8 @@ var checkSighupIgnored = flag.Bool("check_sighup_ignored", false, "if true, Test - - // Test that Ignored(SIGHUP) correctly detects whether it is being run under nohup. - func TestDetectNohup(t *testing.T) { -+ t.Skip("Fails in nix build environment") -+ - if *checkSighupIgnored { - if !Ignored(syscall.SIGHUP) { - t.Fatal("SIGHUP is not ignored.") -@@ -306,6 +308,8 @@ func TestStop(t *testing.T) { - // Test that when run under nohup, an uncaught SIGHUP does not kill the program, - // but a - func TestNohup(t *testing.T) { -+ t.Skip("Fails in nix build environment") -+ - // Ugly: ask for SIGHUP so that child will not have no-hup set - // even if test is running under nohup environment. - // We have no intention of reading from c. diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch deleted file mode 100644 index ab681826499a..000000000000 --- a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go -index dce66c5c2e..2532224376 100644 ---- a/src/os/exec/exec_test.go -+++ b/src/os/exec/exec_test.go -@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) { - t.Skipf("skipping test on %q", runtime.GOOS) - } - -+ if runtime.GOOS == "linux" && runtime.GOARCH == "386" { -+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) -+ } -+ - // Force network usage, to verify the epoll (or whatever) fd - // doesn't leak to the child, - ln, err := net.Listen("tcp", "127.0.0.1:0") diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch deleted file mode 100644 index 5251882fce83..000000000000 --- a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go -index dce66c5c2e..2532224376 100644 ---- a/src/os/exec/exec_test.go -+++ b/src/os/exec/exec_test.go -@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) { - t.Skipf("skipping test on %q", runtime.GOOS) - } - -+ if runtime.GOOS == "linux" && runtime.GOARCH == "arm" { -+ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS) -+ } -+ - // Force network usage, to verify the epoll (or whatever) fd - // doesn't leak to the child, - ln, err := net.Listen("tcp", "127.0.0.1:0") diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch b/pkgs/development/compilers/go/ssl-cert-file-1.16.patch deleted file mode 100644 index f4bc16e5b8cb..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.16.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/crypto/x509/root.go b/src/crypto/x509/root.go -index ac92915128..fb1d70c735 100644 ---- a/src/crypto/x509/root.go -+++ b/src/crypto/x509/root.go -@@ -6,7 +6,11 @@ package x509 - - //go:generate go run root_ios_gen.go -version 55161.140.3 - --import "sync" -+import ( -+ "io/ioutil" -+ "os" -+ "sync" -+) - - var ( - once sync.Once -@@ -20,6 +24,16 @@ func systemRootsPool() *CertPool { - } - - func initSystemRoots() { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ systemRoots = roots -+ return -+ } -+ } -+ - systemRoots, systemRootsErr = loadSystemRoots() - if systemRootsErr != nil { - systemRoots = nil diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 1f6492b911a6..f0edb4815d6a 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -9,12 +9,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.54.1"; + version = "0.55.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ="; + sha256 = "sha256-GEw9OEHXdTxBvb5ATIcL71wdUCLD+X/A7CYQxwTUQWw="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix index 555a202659fb..cd03a0cc33aa 100644 --- a/pkgs/development/interpreters/elixir/1.14.nix +++ b/pkgs/development/interpreters/elixir/1.14.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.14.1"; - sha256 = "sha256-/QQckiRvwmD3gdIo19TXM0bIgdxNx8eQwpd1RnEo35A="; - # https://hexdocs.pm/elixir/1.14.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.14.2"; + sha256 = "sha256-ABS+tXWm0vP3jb4ixWSi84Ltya7LHAuEkGMuAoZqHPA="; + # https://hexdocs.pm/elixir/1.14.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "23"; } diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 156f45f873bf..0720b836388b 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.18"; + version = "0.6.20"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-id4PrPK40yG7DDVh5QWwq2PP7QAso47vgWT8TxIVYXY="; + sha256 = "sha256-d6o+ClQMhoSU8wjdP0nr+g6r4ZqzXhxBJcEfTOSlS7o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index 45ab56edae2f..ecbd7238ced7 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-compression"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; rev = "v${version}"; - sha256 = "sha256-VWQsPEanti6EyAfDbdUfFwe3sh/AhElytTQn2ZpLVgg="; + sha256 = "sha256-aQ5UsMms8aJh5yrE9of1AQgIGTAk9vyBRaybwYqUY68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 73ed621c6516..4f9a46820b08 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.24"; + version = "0.6.27"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-sY0R9Hn0keX4djkHVXszCCfdqa+rzokTe18e5YH0fqs="; + sha256 = "sha256-prDQemFMIt33fna44tAaKlnblO4t5UU0vS6qyJKgJxk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index e4752c7748be..71e32e074c8f 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 7573da66c0d8..31743a8f6895 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,5 +1,14 @@ -{ fetchurl, lib, stdenv, pkg-config, meson, ninja -, gobject-introspection, clutter, gtk3, gnome }: +{ fetchurl +, lib +, stdenv +, pkg-config +, meson +, ninja +, gobject-introspection +, clutter +, gtk3 +, gnome +}: let pname = "clutter-gtk"; @@ -19,6 +28,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ clutter gtk3 ]; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; + postPatch = '' + # ld: malformed 32-bit x.y.z version number: =1 + substituteInPlace meson.build \ + --replace "host_system == 'darwin'" "false" + ''; + postBuild = "rm -rf $out/share/gtk-doc"; passthru = { @@ -33,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 2bf1162fe192..80c4187c951c 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib -, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon +{ lib +, stdenv +, fetchurl +, pkg-config +, libGLU +, libGL +, libX11 +, libXext +, libXfixes +, libXdamage +, libXcomposite +, libXi +, libxcb +, cogl +, pango +, atk +, json-glib +, gobject-introspection +, gtk3 +, gnome +, libinput +, libgudev +, libxkbcommon }: let @@ -19,12 +39,34 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkg-config gobject-introspection ]; - propagatedBuildInputs = - [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon - ]; + propagatedBuildInputs = [ + cogl + pango + atk + json-glib + gobject-introspection + ] ++ lib.optionals (!stdenv.isDarwin) [ + libX11 + libGL + libGLU + libXext + libXfixes + libXdamage + libXcomposite + libXi + libxcb + libinput + libgudev + libxkbcommon + ]; - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK + configureFlags = [ + "--enable-introspection" # needed by muffin AFAIK + ] ++ lib.optionals stdenv.isDarwin [ + "--without-x" + "--enable-x11-backend=no" + "--enable-quartz-backend=yes" + ]; #doCheck = true; # no tests possible without a display @@ -57,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.mesaPlatforms; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 7eef53e4c625..74f09ce29283 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,7 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome -, mesa, automake, autoconf -, gstreamerSupport ? true, gst_all_1 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, libGL +, glib +, gdk-pixbuf +, xorg +, libintl +, pangoSupport ? true +, pango +, cairo +, gobject-introspection +, wayland +, gnome +, mesa +, automake +, autoconf +, gstreamerSupport ? true +, gst_all_1 +, harfbuzz +, OpenGL +}: stdenv.mkDerivation rec { pname = "cogl"; @@ -35,26 +55,46 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" + ] ++ lib.optionals (!stdenv.isDarwin) [ "--enable-kms-egl-platform" "--enable-wayland-egl-platform" "--enable-wayland-egl-server" - ] ++ lib.optional gstreamerSupport "--enable-cogl-gst" - ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + "--enable-gles1" + "--enable-gles2" + ] ++ lib.optionals stdenv.isDarwin [ + "--disable-glx" + "--without-x" + ] ++ lib.optionals gstreamerSupport [ + "--enable-cogl-gst" + ]; # TODO: this shouldn't propagate so many things # especially not gobject-introspection - propagatedBuildInputs = with xorg; [ - glib gdk-pixbuf gobject-introspection wayland mesa - libGL libXrandr libXfixes libXcomposite libXdamage - ] - ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; + propagatedBuildInputs = [ + glib + gdk-pixbuf + gobject-introspection + ] ++ lib.optionals stdenv.isLinux [ + wayland + mesa + libGL + xorg.libXrandr + xorg.libXfixes + xorg.libXcomposite + xorg.libXdamage + ] ++ lib.optionals gstreamerSupport [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; - buildInputs = lib.optionals pangoSupport [ pango cairo ]; + buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS - = lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); #doCheck = true; # all tests fail (no idea why) @@ -76,7 +116,7 @@ stdenv.mkDerivation rec { render without stepping on each other's toes. ''; - platforms = platforms.mesaPlatforms; + platforms = platforms.unix; license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ]; }; } diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index ff7aa2fbdda8..4622c6bf602b 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gtest }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, prometheus-cpp +}: stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.6.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-yUiFxi80FWBmTZgqmqTMf9oqcBeg3o4I4vKd4djyRWY="; + sha256 = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo="; }; nativeBuildInputs = [ cmake ]; @@ -25,6 +31,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit prometheus-cpp; + }; + meta = with lib; { description = "A microbenchmark support library"; homepage = "https://github.com/google/benchmark"; diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix index 7dcd20991a26..19c46d4776c4 100644 --- a/pkgs/development/libraries/gssdp/1.6.nix +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FI7UFijI8XM2osj6SxSrD7rpi2Amvi2s/d6nv0OGZok="; + sha256 = "0r4KbiWREJpuQlhRFhpKU7xUtPBqAhTHlwVmMpvVYzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 3ec5cea99b04..63fdf01ac5f1 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "gssdp"; - version = "1.4.0.1"; + version = "1.4.1"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hnaEnVf7giuHKIVtut6/OGf4nuR6DsR6IARdAR9DFYI="; + sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 7054a75d3887..0e4afedc369f 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MsSdrkd4zT74/Zpg9jdenId2ju5sPAWzPYp5+R4Ivcs="; + sha256 = "sha256-hTgUUtKvlbjhSyTUqYljPQ2DzYjRJy8nzLJBbMyDbUc="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 07b64064ce63..34634ddf5fb5 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -9,7 +9,7 @@ , gtk-doc , docbook_xsl , docbook_xml_dtd_412 -, docbook_xml_dtd_44 +, docbook_xml_dtd_45 , glib , gssdp , libsoup @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.4.3"; + version = "1.4.4"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o="; + sha256 = "sha256-N2GxXLBjYh+Efz7/t9djfwMXUA/Ka9oeGQT3OSF1Ch8="; }; patches = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 - docbook_xml_dtd_44 + docbook_xml_dtd_45 ]; buildInputs = [ diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load_3.85+.patch similarity index 91% rename from pkgs/development/libraries/nss/85_security_load.patch rename to pkgs/development/libraries/nss/85_security_load_3.85+.patch index 2b2cce465ba7..bc3f48e66744 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load_3.85+.patch @@ -12,13 +12,13 @@ index ad8f3b84e..74676d039 100644 if (!lib) { PR_fprintf(PR_STDERR, "loading softokn3 failed"); diff --git nss/lib/pk11wrap/pk11load.c nss/lib/pk11wrap/pk11load.c -index 9e7a0a546..a0a23a1a4 100644 +index 119c8c512..720d39ccc 100644 --- nss/lib/pk11wrap/pk11load.c +++ nss/lib/pk11wrap/pk11load.c -@@ -466,6 +466,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) - * unload the library if anything goes wrong from here on out... - */ +@@ -486,6 +486,15 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) + #else library = PR_LoadLibrary(mod->dllName); + #endif // defined(_WIN32) +#ifndef NSS_STATIC_SOFTOKEN + if ((library == NULL) && + !rindex(mod->dllName, PR_GetDirectorySeparator())) { @@ -32,7 +32,7 @@ index 9e7a0a546..a0a23a1a4 100644 if (library == NULL) { diff --git nss/lib/util/secload.c nss/lib/util/secload.c -index 12efd2f75..8b74478f6 100644 +index 1cebae4e2..9194bb761 100644 --- nss/lib/util/secload.c +++ nss/lib/util/secload.c @@ -70,9 +70,14 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) @@ -66,8 +66,8 @@ index 12efd2f75..8b74478f6 100644 @@ -89,6 +99,10 @@ loader_LoadLibInReferenceDir(const char* referencePath, const char* name) | PR_LD_ALT_SEARCH_PATH #endif - ); -+ if (! dlh) { + ); ++ if (!dlh) { + strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL); + } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index e6d2eae2449c..a2e44f40227f 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { patches = [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch - (if (lib.versionOlder version "3.77") then - ./85_security_load.patch - else + (if (lib.versionOlder version "3.84") then ./85_security_load_3.77+.patch + else + ./85_security_load_3.85+.patch ) ./fix-cross-compilation.patch ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 09eaa64e600a..56d6c0e47103 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.84"; - hash = "sha256-mjh//jUP8U8AHZQ/lswMBkiRVR1x4al6Xdv/5/EgeiU="; + version = "3.85"; + hash = "sha256-r9nWRRCxFU3rvWyrNXHp/2SjNziY4DSD5Mhc2toT0pc="; } diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 7e3471eefa01..f9a6bdd7002b 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake + # passthru.tests +, tmux +, fcft +, arrow-cpp +}: stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UjZFW+ECU1qbKoo2J2GE8gMEas7trz7YI4mqF5WtOvM="; + sha256 = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +25,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit fcft tmux arrow-cpp; + }; + meta = with lib; { description = "A clean C library for processing UTF-8 Unicode data"; homepage = "https://juliastrings.github.io/utf8proc/"; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 0b6045884270..580af7235e05 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.2"; + version = "5.5.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0="; + hash = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0="; }; postPatch = '' diff --git a/pkgs/development/lisp-modules-new/imported.nix b/pkgs/development/lisp-modules-new/imported.nix index f5c9477fb2e3..160eff9399a0 100644 --- a/pkgs/development/lisp-modules-new/imported.nix +++ b/pkgs/development/lisp-modules-new/imported.nix @@ -36543,6 +36543,10 @@ in { }); systems = [ "gsll" ]; lispLibs = [ (getAttr "alexandria" pkgs) (getAttr "foreign-array" pkgs) (getAttr "cffi-grovel" pkgs) (getAttr "cffi-libffi" pkgs) (getAttr "lisp-unit" pkgs) (getAttr "metabang-bind" pkgs) (getAttr "trivial-features" pkgs) (getAttr "trivial-garbage" pkgs) ]; + meta = { + # needs "nativeLibs=nixpkgs.gsl" for libgslcblas.so and a way to set CFLAGS="-I gsl/include" or something similar + broken = true; + }; }; gt = { pname = "gt"; diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 15d3d1b70862..9aeacc86f6b0 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.2.7"; - sha256 = "sha256-0NwNC1aphfT1LOogcXEz09oFNoh2vA+UMXweYOAxnn0="; + version = "3.2.12"; + sha256 = "072qd4i22g0qmz0h1p6jhxx8rv0c8k7pgzwk52qfdijc0pgzz75n"; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index dcc1a0c0c043..7c4150a5cf79 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.14.1"; - sha256 = "sha256-uuKodv3ME9bNATn7Wyrv1RydXISmpPxTvr2+PxYtg14="; + version = "1.14.2"; + sha256 = "1amayawrkyl1f44b8qwvm9567nxxfpv12pkn65adgjbwk5ds6z3g"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index d43ed40f8cee..a01845d98823 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, buildPecl, php, valgrind, pcre2 }: let pname = "openswoole"; - version = "4.11.1"; + version = "4.12.0"; in buildPecl { inherit pname version; - sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg="; + sha256 = "16fxwkjqihinzsmjbpzslf13m8yp0wnsqa2y5g0b07cf15g6qbny"; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index a5b22e97953a..0eef321ff067 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.21.6"; - sha256 = "sha256-vyJbWsY/adrMK2PLdu+Zm1paopY+5qct2Y2AS2a70gg="; + version = "3.21.9"; + sha256 = "05zlq9k6c45wj1286850nl31024ik158jnj1f5kskr1pchknnsf3"; buildInputs = [ pcre2 ]; diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 857233833600..c2f2f1cd126f 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.8.11"; - sha256 = "sha256-MH3deQniTI7df2UNfK7v1qkP5JxyGw3j9adAeZBDD2c="; + version = "5.0.1"; + sha256 = "1zq5vvwjqpg3d4qv8902w54gvghjgcb3c7szi7fpqi6f51mhhwvf"; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 74a6d63aba16..80b0ec73109c 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.1.5"; - sha256 = "sha256-VfbvOBJF2gebL8XOHPvLeWEZfQwOBPnZd2E8+aqWmnk="; + version = "3.1.6"; + sha256 = "1lnmrb5kgq8lbhjs48j3wwhqgk44pnqb1yjq4b5r6ysv9l5wlkjm"; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix new file mode 100644 index 000000000000..9ea35ea2d668 --- /dev/null +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, openssl +, pylsqpack +, certifi +, pytestCheckHook +, pyopenssl +}: + +buildPythonPackage rec { + pname = "aioquic"; + version = "0.9.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; + }; + + propagatedBuildInputs = [ + certifi + pylsqpack + pyopenssl + ]; + + buildInputs = [ openssl ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "aioquic" ]; + + meta = with lib; { + description = "Implementation of QUIC and HTTP/3"; + homepage = "https://github.com/aiortc/aioquic"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix new file mode 100644 index 000000000000..84423c6afbbc --- /dev/null +++ b/pkgs/development/python-modules/async-modbus/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, connio +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, umodbus +}: + +buildPythonPackage rec { + pname = "async-modbus"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tiagocoutinho"; + repo = "async_modbus"; + rev = "refs/tags/v${version}"; + hash = "sha256-TB+ndUvLZ9G3XXEBpLb4ULHlYZC2CoqGnL2BjMQrhRg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"--cov=async_modbus",' "" \ + --replace '"--cov-report=html", "--cov-report=term",' "" \ + --replace '"--durations=2", "--verbose"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + connio + umodbus + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "async_modbus" + ]; + + meta = with lib; { + description = "Library for Modbus communication"; + homepage = "https://github.com/tiagocoutinho/async_modbus"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index c5c2ecb68bc4..348919554ea0 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -34,6 +34,9 @@ buildPythonPackage rec { }) ]; + # Tests bind to localhost + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "boltons" ]; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index 1d66da4e2bc6..85b7a9447919 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.64"; + version = "1.2.65"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FS+p+dtfGfStp+dWI+k/RdBb/T+ynZyuhPKRc6JZFTA="; + hash = "sha256-vwH5sSA9rFrnFO4zIvjloYXSNWK5Vn1rODO74vPWvEE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 2aebcfb6ddfb..9a3352ca1424 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -1,24 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, nose }: buildPythonPackage rec { pname = "colored"; - version = "1.4.3"; + version = "1.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b7b48b9f40e8a65bbb54813d5d79dd008dc8b8c5638d5bbfd30fc5a82e6def7a"; + sha256 = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; }; - # No proper test suite - doCheck = false; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "colored" + ]; meta = with lib; { - homepage = "https://gitlab.com/dslackw/colored"; description = "Simple library for color and formatting to terminal"; + homepage = "https://gitlab.com/dslackw/colored"; + changelog = "https://gitlab.com/dslackw/colored/-/raw/${version}/CHANGES.md"; + maintainers = with maintainers; [ ]; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix new file mode 100644 index 000000000000..14574ab9da33 --- /dev/null +++ b/pkgs/development/python-modules/connio/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, serialio +, sockio +}: + +buildPythonPackage rec { + pname = "connio"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tiagocoutinho"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-fPM7Ya69t0jpZhKM2MTk6BwjvoW3a8SV3k000LB9Ypo="; + }; + + propagatedBuildInputs = [ + serialio + sockio + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "connio" + ]; + + meta = with lib; { + description = "Library for concurrency agnostic communication"; + homepage = "https://github.com/tiagocoutinho/connio"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 85eb37772af9..79f1f92a52bc 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.63"; + version = "0.63.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-kzehFvGSmGo2TAtiNZCjRVv/kaiE+shniNnD0gO58b4="; + sha256 = "sha256-KMD4dmflmBp0s4nueLyPpDnXngpftS9/h5M6RPYMGrk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 79a45bdb3575..ca9e2f823748 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -14,12 +14,14 @@ , parameterized , pytestCheckHook , GitPython +, parsel +, requests , ruamel-yaml }: buildPythonPackage rec { pname = "dateparser"; - version = "1.1.1"; + version = "1.1.3"; disabled = !isPy3k; @@ -27,16 +29,11 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "dateparser"; rev = "v${version}"; - sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU="; + sha256 = "sha256-2bZaaaLT3hocIiqLZpudP6gmiYwxPNMrjG9dYF3GvTc="; }; patches = [ ./regex-compat.patch - (fetchpatch { - name = "tests-31st.patch"; - url = "https://github.com/scrapinghub/dateparser/commit/b132381b9c15e560a0be5183c7d96180119a7b4f.diff"; - sha256 = "nQUWtfku5sxx/C45KJnfwvDXiccXGeVM+cQDKX9lxbE="; - }) ]; postPatch = '' @@ -46,18 +43,26 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - # install_requires - python-dateutil pytz regex tzlocal - # extra_requires - hijri-converter convertdate fasttext langdetect + python-dateutil + pytz + regex + tzlocal ]; + passthru.optional-dependencies = { + calendars = [ hijri-converter convertdate ]; + fasttext = [ fasttext ]; + langdetect = [ langdetect ]; + }; + checkInputs = [ parameterized pytestCheckHook GitPython + parsel + requests ruamel-yaml - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = '' export HOME="$TEMPDIR" diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index f69c386047db..37cb3968da39 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -18,14 +18,14 @@ let in buildPythonPackage rec { pname = "deepwave"; - version = "0.0.14"; + version = "0.0.17"; format = "pyproject"; src = fetchFromGitHub { owner = "ar4"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k1MUrnIkllxGIpkEScTZBEDBBNHgJHxau1e/L8TOEKc="; + sha256 = "sha256-4B3V87/voYs61pXhqmydLe48JsnRGuJlUYOOdmJlroA="; }; # unable to find ninja although it is available, most likely because it looks for its pip version diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 9d7b58db9b55..8b683872d6d0 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.6.0"; + version = "5.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fj3Qp5Z7mt+NnzZhaXDDW4T+ZP6g0nT/cIhI04dqW7Y="; + hash = "sha256-E4XNHrAq49F1EHG1mMOJrlsCG9W2KY8swijxHRO9MCc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 9167e629d573..ee54e80f3a6b 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -1,41 +1,31 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook +, python +, setuptools }: buildPythonPackage rec { pname = "dill"; - version = "0.3.5.1"; + version = "0.3.6"; + format = "pyproject"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; rev = "refs/tags/dill-${version}"; - sha256 = "sha256-gWE7aQodblgHjUqGAzOJGgxJ4qx9wHo/DU4KRE6JMWo="; + hash = "sha256-lh1o/TqnqtYN9xTZom33y1/7ZhMEAFpheLdtalwgObQ="; }; - checkInputs = [ - pytestCheckHook + nativeBuildInputs = [ + setuptools ]; - # Tests seem to fail because of import pathing and referencing items/classes in modules. - # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests. - disabledTestPaths = [ - "tests/test_diff.py" - "tests/test_module.py" - "tests/test_objects.py" - "tests/test_session.py" - ]; - - disabledTests = [ - "test_class_objects" - "test_importable" - "test_method_decorator" - "test_the_rest" - # test exception catching needs updating, can probably be removed with next update - "test_recursive_function" - ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} dill/tests/__main__.py + runHook postCheck + ''; pythonImportsCheck = [ "dill" ]; @@ -43,6 +33,6 @@ buildPythonPackage rec { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tjni ]; }; } diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 5a29f75911bf..d11bb0c841a7 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.3"; + version = "5.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs="; + hash = "sha256-wSurRS0x3TwkRFbPHfODrPFLoUfPmUBMXkRBJZbeQvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 621c3e827361..f89781988701 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "eve"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "Eve"; - sha256 = "sha256-UiOhnJyEy5bPIIRHAhuWo8AqHOCp0OE5d0btujfeq4o="; + sha256 = "sha256-RZ6dwekCKA+PomBp2Ht7/0elOLLUs/sO0KgdxxTOjtc="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 74a460b41c22..96053f935256 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-HHRBH/cEQEyl5AV6RguItdm5AjBwkZ0RqispeWll7VI="; + hash = "sha256-sfGfF0kz37QX0Xjrtdl9XU9biVu7v8l6u/S27NeAW+k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 0bd151e236af..24b351494303 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -18,15 +18,21 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw="; + hash = "sha256-4/v0xodpJzVi6/ciW5icqDFGCtBFKtGoMB92CknH9xw="; }; + postPatch = '' + # https://github.com/Cyr-ius/heatzypy/issues/7 + substituteInPlace setup.py \ + --replace 'version="replace_by_workflow"' 'version="${version}"' + ''; + propagatedBuildInputs = [ aiohttp requests ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index 74372f57641e..05a1085a8e18 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "hpccm"; - version = "22.8.0"; + version = "22.10.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "hpc-container-maker"; rev = "v${version}"; - sha256 = "sha256-nq1zixIu/Kv2CtkQX1Sw7Q3BsOZKcCJjV0+uroXPEBs="; + sha256 = "sha256-dLMbwtvn7HTVVlWHAzXU19ERdJxytf9NlnqMXW6ShKI="; }; propagatedBuildInputs = [ six archspec ]; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 95f988a34951..b4c7d2abf3a9 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.56.0"; + version = "0.57.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-g1m44hUtD/x7zEe/ELY6zj2hJikSmZB6S8ZHEHPrvz0="; + hash = "sha256-plJ+X4RtZT77fWEAXAsyi5YnonjaWfZfKbSNFKE1DKc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix new file mode 100644 index 000000000000..4a3ce21b82a7 --- /dev/null +++ b/pkgs/development/python-modules/nibe/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, aresponses +, async-modbus +, async-timeout +, buildPythonPackage +, construct +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, tenacity +}: + +buildPythonPackage rec { + pname = "nibe"; + version = "1.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "yozik04"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-y1/yZE5Gfj2XPscZ27TNXOM/VGy/iIFkvg2TCNsh4tI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + async-modbus + async-timeout + construct + tenacity + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nibe" + ]; + + meta = with lib; { + description = "Library for the communication with Nibe heatpumps"; + homepage = "https://github.com/yozik04/nibe"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index d24029f87d0d..ae8d4c51af35 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oralb-ble"; - version = "0.14.1"; + version = "0.14.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Tg2sk8E4+UjgP2PyZH6ZqNJv6Yg/muTl7QPaBlXHUj0="; + hash = "sha256-LPVNxdmKaOfUcnLVSH1kANW7Zz6bPPEyCemsau5YyHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index a367a180807d..64b331db992d 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "pamqp"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gmr"; repo = "pamqp"; rev = version; - hash = "sha256-qiYfQsyYvG6pyRFDt3pyYKNNWNP88maj+VAeGD68OmY="; + hash = "sha256-zvvRoGMNP4NMy3Etjif5MYUPdRqmQXATbFgxaPp1TaM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 52a3cbcf91af..ad779eb2ffc4 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -1,42 +1,22 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub , protobuf , dill , grpcio -, pulumi-bin +, pulumi , isPy27 , semver +, pytestCheckHook , pyyaml , six - - -# for tests -, go -, pulumictl -, pylint -, pytest -, pytest-timeout -, wheel -, pytest-asyncio - -, mypy }: -let - data = import ./data.nix {}; -in buildPythonPackage rec { - pname = "pulumi"; - version = pulumi-bin.version; - disabled = isPy27; + inherit (pulumi) version src; - src = fetchFromGitHub { - owner = "pulumi"; - repo = "pulumi"; - rev = "v${pulumi-bin.version}"; - sha256 = "sha256-vqEZEHTpJV65a3leWwYhyi3dzAsN67BXOvk5hnTPeuI="; - }; + pname = "pulumi"; + + disabled = isPy27; propagatedBuildInputs = [ semver @@ -48,28 +28,35 @@ buildPythonPackage rec { ]; checkInputs = [ - pulumi-bin - pulumictl - mypy - go - pytest - pytest-timeout - pytest-asyncio - wheel + pulumi.pkgs.pulumi-language-python + pytestCheckHook ]; - sourceRoot="source/sdk/python/lib"; + pytestFlagsArray = [ + "test/" + ]; + + sourceRoot = "source/sdk/python/lib"; + # we apply the modifications done in the pulumi/sdk/python/Makefile # but without the venv code postPatch = '' cp ../../README.md . - sed -i "s/\''${VERSION}/${version}/g" setup.py + substituteInPlace setup.py \ + --replace "3.0.0" "${version}" \ + --replace "grpcio==1.47" "grpcio" ''; - # disabled because tests try to fetch go packages from the net - doCheck = false; + # Allow local networking in tests on Darwin + __darwinAllowLocalNetworking = true; - pythonImportsCheck = ["pulumi"]; + # Verify that the version substitution works + preCheck = '' + pip show "${pname}" | grep "Version: ${version}" > /dev/null \ + || (echo "ERROR: Version substitution seems to be broken"; exit 1) + ''; + + pythonImportsCheck = [ "pulumi" ]; meta = with lib; { description = "Modern Infrastructure as Code. Any cloud, any language"; diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix new file mode 100644 index 000000000000..0fbd7a757c00 --- /dev/null +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pylsqpack"; + version = "0.3.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pylsqpack" ]; + + meta = with lib; { + description = "Python wrapper for the ls-qpack QPACK library"; + homepage = "https://github.com/aiortc/pylsqpack"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index f17e42b5d46f..a0ce4ea814d3 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -4,30 +4,28 @@ , fetchFromGitHub , pyaes , pysocks -, async-lru -, tgcrypto , pytestCheckHook , pytest-asyncio }: buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.30"; + version = "2.0.59"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchFromGitHub { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-EG9LafZHqCC4klYm5gAlShnznGoaDOGsak4cEOh2OA4="; + hash = "sha256-vGgtVXvi/zvbU8f+LBQJN8GSxyVqdv/fBYfsBR4BKf4="; }; propagatedBuildInputs = [ pyaes pysocks - async-lru - tgcrypto ]; checkInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index a9423a7a58df..1d8456df5fd0 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -27,13 +27,13 @@ let ]; }); in buildPythonPackage rec { - version = "1.6"; + version = "1.9"; pname = "python-rapidjson"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GJzxqWv5/NhtADYPFa12qDzgiJuK6NHLD9srKZXlocg="; + hash = "sha256-vn01HHES2sYIEzoj9g6VOVZo0JgaB/QDf2Pg6Ir88Bo="; }; setupPyBuildFlags = [ diff --git a/pkgs/development/python-modules/rmrl/default.nix b/pkgs/development/python-modules/rmrl/default.nix index d05bb5beede5..747fba8302b1 100644 --- a/pkgs/development/python-modules/rmrl/default.nix +++ b/pkgs/development/python-modules/rmrl/default.nix @@ -5,6 +5,7 @@ , poetry-core , pdfrw , reportlab +, setuptools , svglib , xdg }: @@ -29,6 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pdfrw reportlab + setuptools svglib xdg ]; diff --git a/pkgs/development/python-modules/sanic/22.3.2-CVE-2022-35920.patch b/pkgs/development/python-modules/sanic/22.3.2-CVE-2022-35920.patch deleted file mode 100644 index 694c69602c12..000000000000 --- a/pkgs/development/python-modules/sanic/22.3.2-CVE-2022-35920.patch +++ /dev/null @@ -1,141 +0,0 @@ -Based on upstream 9d415e4ec63d31b3749fd540e2c2ac7c98dedcdd and -2fa28f1711a8e59c6f4d3468e9c2f8b6991188a2, adjusted to apply to -v22.3.2, raise the same exception as before and not remove any -imports. - -diff --git a/sanic/mixins/routes.py b/sanic/mixins/routes.py -index 9e2cf96..e0cf86b 100644 ---- a/sanic/mixins/routes.py -+++ b/sanic/mixins/routes.py -@@ -3,7 +3,7 @@ from contextlib import suppress - from functools import partial, wraps - from inspect import getsource, signature - from mimetypes import guess_type --from os import path -+from os import path, sep - from pathlib import PurePath - from re import sub - from textwrap import dedent -@@ -775,23 +775,23 @@ class RouteMixin(metaclass=SanicMeta): - content_type=None, - __file_uri__=None, - ): -- # Using this to determine if the URL is trying to break out of the path -- # served. os.path.realpath seems to be very slow -- if __file_uri__ and "../" in __file_uri__: -- raise InvalidUsage("Invalid URL") - # Merge served directory and requested file if provided -- # Strip all / that in the beginning of the URL to help prevent python -- # from herping a derp and treating the uri as an absolute path -- root_path = file_path = file_or_directory -+ root_path = file_path = path.abspath(unquote(file_or_directory)) -+ - if __file_uri__: -- file_path = path.join( -- file_or_directory, sub("^[/]*", "", __file_uri__) -- ) -+ # Strip all / that in the beginning of the URL to help prevent -+ # python from herping a derp and treating the uri as an -+ # absolute path -+ unquoted_file_uri = unquote(__file_uri__).lstrip("/") -+ -+ segments = unquoted_file_uri.split("/") -+ if ".." in segments or any(sep in segment for segment in segments): -+ raise InvalidUsage("Invalid URL") -+ -+ file_path = path.join(file_or_directory, unquoted_file_uri) -+ file_path = path.abspath(file_path) - -- # URL decode the path sent by the browser otherwise we won't be able to -- # match filenames which got encoded (filenames with spaces etc) -- file_path = path.abspath(unquote(file_path)) -- if not file_path.startswith(path.abspath(unquote(root_path))): -+ if not file_path.startswith(root_path): - error_logger.exception( - f"File not found: path={file_or_directory}, " - f"relative_url={__file_uri__}" -diff --git a/tests/test_static.py b/tests/test_static.py -index 36a98e1..aeb625b 100644 ---- a/tests/test_static.py -+++ b/tests/test_static.py -@@ -1,6 +1,7 @@ - import inspect - import logging - import os -+import sys - - from collections import Counter - from pathlib import Path -@@ -8,7 +9,7 @@ from time import gmtime, strftime - - import pytest - --from sanic import text -+from sanic import Sanic, text - from sanic.exceptions import FileNotFound - - -@@ -21,6 +22,22 @@ def static_file_directory(): - return static_directory - - -+@pytest.fixture(scope="module") -+def double_dotted_directory_file(static_file_directory: str): -+ """Generate double dotted directory and its files""" -+ if sys.platform == "win32": -+ raise Exception("Windows doesn't support double dotted directories") -+ -+ file_path = Path(static_file_directory) / "dotted.." / "dot.txt" -+ double_dotted_dir = file_path.parent -+ Path.mkdir(double_dotted_dir, exist_ok=True) -+ with open(file_path, "w") as f: -+ f.write("DOT\n") -+ yield file_path -+ Path.unlink(file_path) -+ Path.rmdir(double_dotted_dir) -+ -+ - def get_file_path(static_file_directory, file_name): - return os.path.join(static_file_directory, file_name) - -@@ -578,3 +595,40 @@ def test_resource_type_dir(app, static_file_directory): - def test_resource_type_unknown(app, static_file_directory, caplog): - with pytest.raises(ValueError): - app.static("/static", static_file_directory, resource_type="unknown") -+ -+ -+@pytest.mark.skipif( -+ sys.platform == "win32", -+ reason="Windows does not support double dotted directories", -+) -+def test_dotted_dir_ok( -+ app: Sanic, static_file_directory: str, double_dotted_directory_file: Path -+): -+ app.static("/foo", static_file_directory) -+ dot_relative_path = str( -+ double_dotted_directory_file.relative_to(static_file_directory) -+ ) -+ _, response = app.test_client.get("/foo/" + dot_relative_path) -+ assert response.status == 200 -+ assert response.body == b"DOT\n" -+ -+ -+def test_breakout(app: Sanic, static_file_directory: str): -+ app.static("/foo", static_file_directory) -+ -+ _, response = app.test_client.get("/foo/..%2Fstatic/test.file") -+ assert response.status == 400 -+ -+ -+@pytest.mark.skipif( -+ sys.platform != "win32", reason="Block backslash on Windows only" -+) -+def test_double_backslash_prohibited_on_win32( -+ app: Sanic, static_file_directory: str -+): -+ app.static("/foo", static_file_directory) -+ -+ _, response = app.test_client.get("/foo/static/..\\static/test.file") -+ assert response.status == 400 -+ _, response = app.test_client.get("/foo/static\\../static/test.file") -+ assert response.status == 400 diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 3959c3b7bd7b..e1559e1ec432 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -20,11 +20,12 @@ , uvicorn , uvloop , websockets +, aioquic }: buildPythonPackage rec { pname = "sanic"; - version = "22.3.2"; + version = "22.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,22 +34,12 @@ buildPythonPackage rec { owner = "sanic-org"; repo = pname; rev = "v${version}"; - hash = "sha256-4zdPp3X22dfZ5YlW3G5/OqeUxrt+NiFO9dk2XjEKXEg="; + hash = "sha256-krEQd0ak9Uua+r+pYmLStlizgE4HmZBO8Q0I2/gWAwU="; }; - patches = [ - ./22.3.2-CVE-2022-35920.patch - ]; - - postPatch = '' - # Loosen dependency requirements. - substituteInPlace setup.py \ - --replace "pytest==6.2.5" "pytest" \ - --replace "gunicorn==20.0.4" "gunicorn" - ''; - propagatedBuildInputs = [ aiofiles + aioquic httptools multidict sanic-routing @@ -88,6 +79,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # Require networking + "test_full_message" # Fails to parse cmdline arguments "test_dev" "test_auto_reload" @@ -130,9 +123,7 @@ buildPythonPackage rec { # for the same local port __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ - "sanic" - ]; + pythonImportsCheck = [ "sanic" ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix new file mode 100644 index 000000000000..56f82e449a70 --- /dev/null +++ b/pkgs/development/python-modules/serialio/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pyserial +, sockio +}: + +buildPythonPackage rec { + pname = "serialio"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tiagocoutinho"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-9TRGT0wpoRRcHqnH1XzlMBh0IcVzdEcOzN7hkeYnoW4="; + }; + + propagatedBuildInputs = [ + pyserial + sockio + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "serialio" + ]; + + meta = with lib; { + description = "Library for concurrency agnostic serial connunication"; + homepage = "https://github.com/tiagocoutinho/serialio"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/sockio/default.nix b/pkgs/development/python-modules/sockio/default.nix new file mode 100644 index 000000000000..6476c88c31a6 --- /dev/null +++ b/pkgs/development/python-modules/sockio/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sockio"; + version = "0.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tiagocoutinho"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-NSGd7/k1Yr408dipMNBSPRSwQ+wId7VLxgqMM/UmN/Q="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-config=.coveragerc --cov sockio" "" \ + --replace "--cov-report html --cov-report term" "" \ + --replace "--durations=2 --verbose" "" + ''; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sockio" + ]; + + disabledTests = [ + # Tests require network access + "test_open_timeout" + "test_write_readline_error" + "test_open_close" + "test_callbacks" + "test_coroutine_callbacks" + "test_error_callback" + "test_eof_callback" + "test_write_read" + "test_write_readline" + "test_write_readlines" + "test_writelines_readlines" + "test_writelines" + "test_readline" + "test_readuntil" + "test_readexactly" + "test_readlines" + "test_read" + "test_readbuffer" + "test_parallel_rw" + "test_parallel" + "test_stream" + "test_timeout" + "test_line_stream" + "test_block_stream" + "test_socket_for_url" + "test_root_socket_for_url" + ]; + + disabledTestPaths = [ + # We don't care about Python 2.x + "tests/test_py2.py" + ]; + + meta = with lib; { + description = "Implementation of the Modbus protocol"; + homepage = "https://tiagocoutinho.github.io/sockio/"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix index a1188e8f0104..9152bb4b2ac6 100644 --- a/pkgs/development/python-modules/tgcrypto/default.nix +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -2,22 +2,29 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "tgcrypto"; - version = "1.2.4"; + version = "1.2.5"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "pyrogram"; repo = "tgcrypto"; rev = "refs/tags/v${version}"; - sha256 = "sha256-hifRWVEvNZVFyIJPwYY+CDR04F1I9GyAi3dt2kx+81c="; + sha256 = "sha256-u+mXzkmM79NBi4oHnb32RbN9WPnba/cm1q2Ko0uNEZg="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix new file mode 100644 index 000000000000..845548dcb790 --- /dev/null +++ b/pkgs/development/python-modules/umodbus/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "umodbus"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AdvancedClimateSystems"; + repo = "uModbus"; + rev = "refs/tags/${version}"; + hash = "sha256-5IXadb5mjrMwr+L9S1iMN5kba5VGrzYt1p8nBvvLCh4="; + }; + + propagatedBuildInputs = [ + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "umodbus" + ]; + + meta = with lib; { + description = "Implementation of the Modbus protocol"; + homepage = "https://github.com/AdvancedClimateSystems/uModbus/"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index 8e0fa5311283..07474de16868 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.4.10"; + version = "0.4.12"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+LJ0ggRUXFfqmiDbIF2ZWL6qsE6gOzp5OKMFSY3dGG0="; + sha256 = "sha256-/RM1tqtGBCUa1fcqh5yvVQMNzaEqpAUPonciEIE6lC4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b009fb2a5099..f81a155bdfa5 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.85"; + version = "0.0.86"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-SRuKYu88AWHrSpmUBduWN+wPkYpANmJ+FawhsPRS09A="; + hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/development/tools/analysis/jacoco/default.nix new file mode 100644 index 000000000000..7382933fa3c6 --- /dev/null +++ b/pkgs/development/tools/analysis/jacoco/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchzip +, makeWrapper +, jre +}: + +stdenv.mkDerivation rec { + pname = "jacoco"; + version = "0.8.8"; + + src = fetchzip { + url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip"; + stripRoot = false; + sha256 = "sha256-NfXkMAFG1yMj1o06Hlhg9+B4RzL0I36fAGjZx3IC+NQ="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $doc/share/doc $out/bin + + cp -r doc $doc/share/doc/jacoco + install -Dm444 lib/* -t $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/jacoco \ + --add-flags "-jar $out/share/java/jacococli.jar" + + runHook postInstall + ''; + + meta = with lib; { + description = "A free code coverage library for Java"; + homepage = "https://jacoco.org/jacoco"; + license = licenses.epl20; + platforms = platforms.all; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 89f23062692a..1127e6323de5 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/aquasecurity/tfsec/version.Version=${version}" + "-X github.com/aquasecurity/tfsec/version.Version=v${version}" ## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) # "-extldflags '-fno-PIC -static'" ]; diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 51cc427ff199..886db356cfa1 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-nJ4ercNykECDBqecuL8cdCl4DHgbgIUmbiFBG/jiOaA="; + hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo="; }; cargoRoot = "generator"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-4JVbHYlMOKztWPYW7tXQdvdNh/ygfpi0CY6Ly93VxsI="; + hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -36,13 +36,6 @@ stdenv.mkDerivation rec { rust.rustc ]); - cmakeFlags = [ - "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo" - - # tests cannot find cargo because Rust_CARGO is unset before tests - "-DCORROSION_BUILD_TESTS=OFF" - ]; - meta = with lib; { description = "Tool for integrating Rust into an existing CMake project"; homepage = "https://github.com/corrosion-rs/corrosion"; diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index 63592bb1359b..21b96fbef4e8 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - sha256 = "1lj0cv1rmcqg36rxnnjh1dazn0sdggfc9kigjg3id6h0y8k7d9b3"; + sha256 = "sha256-A5/TwISGsk9L0Z/ZF9Z/fxiMG+rcPgtAr2BNVJ+1Xfo="; }; - cargoSha256 = "sha256-xHvnxRPxe09EmxUK9j7+V2AA1xJFP3ibwbkSs3FBgcw="; + cargoSha256 = "sha256-BrhYHUx28Sb6eNU3nTMlMewtokyY6+I5ww+bBVshQqk="; meta = with lib; { description = "A small command-line JSON log viewer"; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 234046a5ab56..dc31aa23ac24 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-XH/qSl16LQThj9ghwlSGJuSsez7VxsZS9Sun7F2sT7Y="; + hash = "sha256-bGxgL/Vajy2AtYtSE5/RoURvHHyajpXpR8m7DUeqsks="; }; - vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk="; + vendorSha256 = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index bac766ac6076..794affe4434a 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-a2LJUWRQsUnwU0DZnO5T+geeVOBXPfsBptEMnO+jnFA="; + sha256 = "sha256-Y1QLNiAeHKYsSbFW235mdTiHyQFBQQsO+FtuFxDX9Hs="; }; - cargoSha256 = "sha256-IJqM9XuJSEZadYc38TnyVrszuL5noYktnlyVu7IBE5k="; + cargoSha256 = "sha256-+9uy5R/dO2T/6dRhtYlPCKfosaYua0JvbECvMacc3XA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/jdt-language-server/default.nix b/pkgs/development/tools/jdt-language-server/default.nix index 553c4eb7b5ea..1af69700152d 100644 --- a/pkgs/development/tools/jdt-language-server/default.nix +++ b/pkgs/development/tools/jdt-language-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jdt-language-server"; - version = "1.16.0"; - timestamp = "202209291445"; + version = "1.17.0"; + timestamp = "202210271413"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "bf16a0c3a7034260f646206c51fba14b3c10ef68cece23b7a3c681248f5c1f3a"; + sha256 = "sha256-3NVzL3o/8LXR94/3Yma42XHfwNEFEVrmUijkeMs/vL0="; }; sourceRoot = "."; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index fc604a68ceea..605022ffc12d 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; + vendorSha256 = null; #vendorSha256 = ""; subPackages = [ "." ]; @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/cswank/kcli"; license = licenses.mit; maintainers = with maintainers; [ cswank ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 5d37c5dc0990..74f65ef6303b 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; - rev = "v${version}"; - hash = "sha256-NR6wziuER7Vm4Er0WSkQKGkDOrsFUT4gmHO36h9yRWw="; + rev = "refs/tags/v${version}"; + hash = "sha256-Lq2qDTGkyG3qZaxF3umUHBWf0Dgy1ds6bTUe4y3u7Qc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index c42e364b88ed..e0984dae74d7 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -1,16 +1,20 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "modd"; - version = "0.8"; + version = "unstable-2021-12-15"; + src = fetchFromGitHub { owner = "cortesi"; repo = "modd"; - rev = "v${version}"; - sha256 = "1dmfpbpcvbx4sl4q1hwbfpalq1ml03w1cca7x40y18g570qk7aq5"; + rev = "6083f9d1c171bd3292945672dab654a70d205945"; + sha256 = "sha256-KDZyOnytDLyybHTgU1v/NpiomeHXMIUHiQ+Xpmwyo0w="; }; - goPackagePath = "github.com/cortesi/modd"; - subPackages = [ "cmd/modd" ]; + + vendorSha256 = "sha256-O+hJRMSwV/9NHxbaLjloCWnfPugfRYaXNve098wjbqQ="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; homepage = "https://github.com/cortesi/modd"; diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix index 11a9494c2a94..b7d638e0af41 100644 --- a/pkgs/development/tools/nc4nix/default.nix +++ b/pkgs/development/tools/nc4nix/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "nc4nix"; - version = "unstable-2022-08-06"; + version = "unstable-2022-11-12"; src = fetchFromGitLab { - domain = "git.helsinki.tools"; - owner = "helsinki-systems"; + domain = "git.project-insanity.org"; + owner = "onny"; repo = "nc4nix"; - rev = "91d92e8c339862fe81fb066fd370da7757042367"; - sha256 = "sha256-8ggYOc+w3oiY2B0Ned5B26/ZNco2vCdvScC+Ms+gOWo="; + rev = "d7f55a42b5ca0d02382349c6ec776eefe6079703"; + sha256 = "sha256-MfMW2B+udXV/lQPGUBFuAE7jwmy4D1M+CYkCuJ088aM="; }; vendorSha256 = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; meta = with lib; { description = "Packaging helper for Nextcloud apps"; - homepage = "https://git.helsinki.tools/helsinki-systems/nc4nix"; + homepage = "https://git.project-insanity.org/onny/nc4nix"; license = licenses.unfree; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 36a1d90cf761..caae4dd8d3ab 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.110"; + version = "0.0.113"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L7LqIov0Ifz4wRV6FD4PIcUFauQCBaL8HXea400j0tE="; + sha256 = "sha256-ZP3kIr8W/b2+BXzl7CBzqZz2vBsR/i0LUT6Pc2QT21Y="; }; - cargoSha256 = "sha256-CcLNgZqcfJK/1DwLNP+GTej+OwmJ4w6SXob0Y3ccwS8="; + cargoSha256 = "sha256-vPvSdET+T8DsYdBz9Y1TLDShJ+iC3cLu1TmUsslcpi4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index d938b93c2456..9e2eb3ee7e1e 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-supply-chain"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2iOAa0f0C3tS4oLrSJYjGnuoziPFxcQzXZLqENQq5PY="; + sha256 = "sha256-0WyaenLyD1MNkV+mzCIodhtkU6FqbGnuTdw6PvzIrVU="; }; - cargoSha256 = "sha256-7wjaakyh27U7jjQQ6wNKR4lKQ7Y/+EEfLCfjVojk3TU="; + cargoSha256 = "sha256-K3qBhd090BUZyJIAbhPBCQpCwgudCSGL7i7EezOp66Y="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix new file mode 100644 index 000000000000..c9cd2dfbb5d5 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchCrate +, curl +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-unused-features"; + version = "0.1.7"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-PdSR2nZbRzV2Kg2LNEpI7/Us+r8Gy6XLdUzMLei5r8c="; + }; + + cargoSha256 = "sha256-Y0U5Qzj+S7zoXWemcSfMn0YS7wCAPj+ER0jao+f2B28="; + + nativeBuildInputs = [ + curl.dev + pkg-config + ]; + + buildInputs = [ + curl + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + Security + ]); + + meta = with lib; { + description = "A tool to find potential unused enabled feature flags and prune them"; + homepage = "https://github.com/timonpost/cargo-unused-features"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "unused-features"; + }; +} diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 8f854fdedf69..7493c5233a27 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.29.2"; + version = "4.30.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-ZHl0FTxWdoxHrbWx6mp5qR/l/FtC3bBkzGuR0T2NouA="; + sha256 = "sha256-S4O/5iqX7P6oCONLHu/PucATVVJf2lgae1YtZmJCuns="; }; vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 89256eae0be6..816ee72f28be 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.429"; + version = "0.0.430"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-rx+5wHd6RyvsoL6176zBCgAZLCAXfdOIgZ41Vq48rdI="; + sha256 = "sha256-XlUg0FNQw8IuZ5biMILy53FJ9s84+M/VdACSbBwGKG0="; }; vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc="; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 0d0ae17729fa..1a8b232c2808 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.4"; + version = "5.2.5"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-jtv14Y6TfiIHwbqqaX36j2H/4+UCikbpFhYgNeAP3L4="; + sha256 = "sha256-RI1O10kObIaEjOuUFuAchjIgjrNDKmwRY0+Vep6UT54="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index b97e755b2753..d06e3c1aa158 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { done ''; + # RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/ + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 248db620fe11..b20d00a8da4e 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -24,6 +24,7 @@ , Cocoa , IOKit , libsamplerate +, shaderc }: let assets = fetchsvn { @@ -48,6 +49,8 @@ let "graphics_engine" # Internal library of STK, nothing to do about it "graphics_utils" + # Internal library. + "simd_wrapper" # This irrlicht is bundled with cmake # whereas upstream irrlicht still uses # archaic Makefiles, too complicated to switch to. @@ -65,13 +68,13 @@ in stdenv.mkDerivation rec { pname = "supertuxkart"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "1llyxkdc4m9gnjxqaxlpwvv3ayvpw2bfjzfkkrljaxhznq811g0l"; + hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM="; }; postPatch = '' @@ -91,6 +94,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + shaderc SDL2 glew libvorbis diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 2ae8bb2dca24..487ad533668f 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fatrace"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68="; + sha256 = "sha256-MRHM+hyuRevK4L3u6dGw1S3O7w+BJBsprJVcSz6Q9xg="; }; buildInputs = [ python3 which ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index a7746194570c..eadf88fd1168 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -153,7 +153,7 @@ installPhase() { if [ -n "$firmware" ]; then # Install the GSP firmware - install -Dm644 firmware/gsp.bin $firmware/lib/firmware/nvidia/$version/gsp.bin + install -Dm644 -t $firmware/lib/firmware/nvidia/$version firmware/gsp*.bin fi # All libs except GUI-only are installed now, so fixup them. diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2a0f14574254..a11ba86d4747 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -45,11 +45,11 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "515.43.04"; - sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc="; - openSha256 = "sha256-1bAr5dWZ4jnY3Uo2JaEz/rhw2HuW9LZ5bACmA1VG068="; - settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY="; - persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo="; + version = "525.53"; + sha256_64bit = "sha256-dLsJcfBPHd3TxGQciRcG+5bo3lLiL2B55Q3nbTpRaH8="; + openSha256 = "sha256-XA5RY+dQZv+dTHF7rm/bXnPZLj1G75PJKSTfREpuKag="; + settingsSha256 = "sha256-N3+EOm2D2NSmD/cai+Pm2z5WHmV+GEJVr9KTQv/7j88="; + persistencedSha256 = "sha256-AhB6zetbejQzajg76+hqpbfv3OzftueXGpviepH/xss="; }); # Vulkan developer beta driver diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index ea9dbcabd0e9..74addc6c5010 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -127,7 +127,8 @@ let platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - inherit broken; + # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2 + broken = broken || (kernel != null && kernel.kernelAtLeast "6.2"); }; }; diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/os-specific/linux/pam_ussh/default.nix index 889c8bc6f57c..4d02efa67330 100644 --- a/pkgs/os-specific/linux/pam_ussh/default.nix +++ b/pkgs/os-specific/linux/pam_ussh/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { inherit prePatch; }); - vendorSha256 = "0hjifc3kbwmx7kjn858vi05cwwra6q19cqjfd94k726pwhk37qkw"; + vendorSha256 = null; #vendorSha256 = ""; buildInputs = [ pam @@ -63,5 +63,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ lukegb ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 75ef6d943897..a324f64abfb4 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dgraph"; - version = "22.0.0"; + version = "22.0.1"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-2ZLZ1emsXmt1RjVq5Pdsbi+ItzxN/fEImOq7VBg5pxA="; + sha256 = "sha256-c4gNkT1N1yPotDhRjZvuVvO5TTaL2bqR5I+Z2PcvW10="; }; vendorSha256 = "sha256-K2Q2QBP6fJ3E2LEmZO2U/0DiQifrJVG0lcs4pO5yqrY="; diff --git a/pkgs/servers/filtron/default.nix b/pkgs/servers/filtron/default.nix index 36d64db4e215..6abf5933445c 100644 --- a/pkgs/servers/filtron/default.nix +++ b/pkgs/servers/filtron/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26"; }; - vendorSha256 = "05q2g591xl08h387mm6njabvki19yih63dfsafgpc9hyk5ydf2n9"; + vendorSha256 = null; #vendorSha256 = ""; # The upstream test checks are obsolete/unmaintained. doCheck = false; @@ -22,5 +22,6 @@ buildGoModule rec { license = licenses.agpl3; maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index 9a4fd071338e..d3be7cd4a4fc 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0lfsbsgcb7z8ljxn1by37rbx02vaprrpacybk1kja1rjli7ik7m9"; }; - vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; + vendorSha256 = null; #vendorSha256 = ""; ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; @@ -21,5 +21,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index c7beee4a7bf1..224eca352bb9 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { make -e build${lib.optionalString enableStatic "-static"} ''; - vendorSha256 = "1nkni9ikpc0wngh5v0qmlpn5s9v85lb2ih22f3h3lih7nc29yv87"; + vendorSha256 = null; #vendorSha256 = ""; installPhase = '' mkdir -p $out/bin @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://gobetween.io"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4ba82df927e0..c2974f0f4e0d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2128,8 +2128,9 @@ "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nibe_heatpump" = ps: with ps; [ + nibe tenacity - ]; # missing inputs: nibe + ]; "nightscout" = ps: with ps; [ py-nightscout ]; @@ -4144,6 +4145,7 @@ "nexia" "nextbus" "nextdns" + "nibe_heatpump" "nightscout" "nina" "nmap_tracker" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6eca3b16bdf6..270e5269306b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,6 +62,16 @@ let }; }); + nibe = super.nibe.overridePythonAttrs (oldAttrs: rec { + version = "0.5.0"; + src = fetchFromGitHub { + owner = "yozik04"; + repo = "nibe"; + rev = "refs/tags/${version}"; + hash = "sha256-DguGWNJfc5DfbcKMX2eMM2U1WyVPcdtv2BmpVloOFSU="; + }; + }); + # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8004993a2094..982169125a08 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2225"; + version = "0.20.2238"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "HrI0B5gvN/UC9TmErwsmRc85aqCXfYYEQfPkRchHY5Q="; + sha256 = "3kYpx3s4gYBTrqSOt7eLOf8x4cPnlDVmesYBbFzRZVU="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index d4ec9d6e9ed7..9fac37bffbc9 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "20.0.0"; + version = "20.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-dJueuXKv3GoDnaQnvYMzIJJSr+NNSYgS7KY3MTGE37Y="; + sha256 = "sha256-UriiCCVKxdcaKEcDyn8HsS1S4zJAUC2chYu6iiNsJwA="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 9bd998cd8505..501aabaca9e3 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,35 +1,52 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }: -stdenv.mkDerivation rec { +let + os = if stdenv.isDarwin then "osx" else "linux"; + arch = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + x86_64-darwin = "x64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + hash = { + x64-linux_hash = "sha256-iuI24gT7/RFZ9xc4csd+zWEzPSPsxqYY5F+78IWRjxQ="; + arm64-linux_hash = "sha256-yHAoZxLeKF6mlR/Av0EH0Lh2XquM9Vx6huNDTEs4wyU="; + x64-osx_hash = "sha256-ES6njZTSfd/36+RvibE1hlQlCT+hEEcOem8epBSsnXc="; + }."${arch}-${os}_hash"; +in stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.8.1.2135"; + version = "1.0.2.2592"; src = fetchurl { - url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; - sha256 = "sha256-eJX6t19D2slX68fXSMd/Vix3XSgCVylK+Wd8VH9jsuI="; + url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; + sha256 = hash; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/bin - cp -r * $out/bin/ + runHook preInstall - # Mark main executable as executable - chmod +x $out/bin/Lidarr.exe - - makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \ - --add-flags "$out/bin/Lidarr.exe" \ - --prefix PATH : ${lib.makeBinPath [ chromaprint ]} \ + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. + makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Lidarr \ + --add-flags "$out/share/${pname}-${version}/Lidarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo ]} + curl sqlite libmediainfo icu openssl ]} + + runHook postInstall ''; + + passthru = { + updateScript = ./update.sh; + tests.smoke-test = nixosTests.lidarr; + }; + meta = with lib; { description = "A Usenet/BitTorrent music downloader"; homepage = "https://lidarr.audio/"; license = licenses.gpl3; maintainers = [ maintainers.etu ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh new file mode 100755 index 000000000000..cff608e7ebf0 --- /dev/null +++ b/pkgs/servers/lidarr/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + arch=$2 + os=$3 + + hashKey="${arch}-${os}_hash" + + url="https://github.com/Lidarr/Lidarr/releases/download/v$version/Lidarr.master.$version.$os-core-$arch.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sriHash="$(nix hash to-sri --type sha256 $hash)" + + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version) + +latestTag=$(curl https://api.github.com/repos/Lidarr/Lidarr/releases/latest | jq -r ".tag_name") +latestVersion="$(expr $latestTag : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Lidarr is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion $latestVersion + +updateHash $latestVersion x64 linux +updateHash $latestVersion arm64 linux +updateHash $latestVersion x64 osx diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 2d36dcb8e1d5..de12c0336c77 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1hjfkksqb675gabzjc221b33h2m4s6qsanmkm382d3fyzqj71dh9"; }; - vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj"; + vendorSha256 = null; #vendorSha256 = ""; postPatch = '' sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/metalmatze/alertmanager-bot"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d10d8b8c073d..804070d0f0f5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests -, tcl, which, ps +, tcl, which, ps, fetchpatch , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-ZwVMw3tYwSXfk714AAJh7A70Q2omtA84Jix4DlYxXMM="; }; + patches = [ + # https://nvd.nist.gov/vuln/detail/CVE-2022-3647 + (fetchpatch { + name = "CVE-2022-3647.patch"; + url = "https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3.patch"; + sha256 = "sha256-R5Tj/bHFTRnvWXiOYvRulqePzU5zvKbGfpO87TLfLWk="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 90edc3e278ad..2c14a080f9b1 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.2.7"; + version = "22.3.1"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-hUChGYimCFXEvSxb49QgPo/LYlef0ZMVhKNy9i3SpVA="; + linux.amd = "sha256-liUFM9f7OQocb5j/qvZNVWiJGIf651ULMlRmX67qyoQ="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 553cf937b0ea..98563bda6cd0 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -16,6 +16,10 @@ self = stdenv.mkDerivation rec { nativeBuildInputs = [ bison cmake pkg-config ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. postPatch = '' substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool diff --git a/pkgs/servers/sql/mysql/no-force-outline-atomics.patch b/pkgs/servers/sql/mysql/no-force-outline-atomics.patch new file mode 100644 index 000000000000..a716a4f7f481 --- /dev/null +++ b/pkgs/servers/sql/mysql/no-force-outline-atomics.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 727d66011f9..acae1aada57 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG + ENDIF() + ENDIF() + +-# For aarch64 some sub-architectures support LSE atomics and some don't. Thus, +-# compiling for the common denominator (-march=armv8-a) means LSE is not used. +-# The -moutline-atomics switch enables run-time detection of LSE support. +-# There are compilers (gcc 9.3.1 for example) which support this switch, but +-# do not enable it by default, even though it seems to help. So, we force it. +-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS) +- IF(HAVE_OUTLINE_ATOMICS) +- STRING_APPEND(CMAKE_C_FLAGS " -moutline-atomics") +- STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics") +- ENDIF() +-ENDIF() +- + IF(LINUX) + OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF) + SET(LINK_RANDOMIZE_SEED "mysql" diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix index 670d42102f51..a091a10d8890 100644 --- a/pkgs/servers/web-apps/invoiceplane/default.nix +++ b/pkgs/servers/web-apps/invoiceplane/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "invoiceplane"; - version = "1.6-beta-1"; + version = "1.6-beta-3"; src = fetchurl { url = "https://github.com/InvoicePlane/InvoicePlane/releases/download/v${version}/v${version}.zip"; - sha256 = "sha256-hIbk9zzqbwv2kSFClgPfTObB1YHj7KR4swKjGoN2v2E="; + sha256 = "sha256-sw5LaU3v4MIdX99WGKOaerVc9m3d8aQVuvrLn7KvcKE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index f00dc9b27332..d14a1559e468 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-UG5FYlJowBy71DJHgoDE1/lIIndp0qx1yFlDIeMV0Og="; + sha256 = "sha256-eSi0qwzXoJ1wYUzi34s7QbBbwRm2hfXoyGFivhPBq5o="; }; installPhase = '' diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index e02162b1f548..4192811b7d50 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-J+VFla3sWO+DfB2IxxrKzbiG+KWFJr9caf8sTHyWXY4="; + hash = "sha256-ddxEtBw6JcSsZCN5uKyuBMVkWwSoThfxrcvHZGZzFr4="; }; postPatch = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 7f79d5dabc8a..39d1577226ec 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.117.0"; + version = "0.118.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-3OYhwl+oJNSAYI5RLJgdZgq8teqkjCHy5r/XOqJdz7I="; + sha256 = "sha256-YeAFJYJ+MLRGyL/T2qazS5/knSjMGs7hEZUcm40klxo="; }; - vendorSha256 = "sha256-a5E6a+DFrbAA2/sznrKbE4IP68f49+Nbiujx94snryQ="; + vendorSha256 = "sha256-7gg/ujVlTLA7gWLBmQ2st24r5qsOsDefw8d4Z7L/VVc="; doCheck = false; diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index 8d915495c8b8..f11d76648aee 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.16.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0HCfJwgeLM4uLiXcaW+9FxMVgeDJG7Opr0dEj525npw="; + sha256 = "sha256-iBTssDECRVh/3Iunfvykeoio6i8lN/Qty/ka0Kwe294="; }; - vendorSha256 = "sha256-wtzk5J9b1SbWkRRgPmVdxiMJdgPDwAtNOx6Uup7iakk="; + vendorSha256 = "sha256-3J15UAu2s65f6UDDhCPIwL9fFBSICkZT2ruS88dAVYA="; subPackages = [ "." ]; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix similarity index 100% rename from pkgs/tools/admin/pulumi/data.nix rename to pkgs/tools/admin/pulumi-bin/data.nix diff --git a/pkgs/tools/admin/pulumi-bin/default.nix b/pkgs/tools/admin/pulumi-bin/default.nix new file mode 100644 index 000000000000..71c61d7a0543 --- /dev/null +++ b/pkgs/tools/admin/pulumi-bin/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }: + +with lib; + +let + data = import ./data.nix {}; +in stdenv.mkDerivation { + pname = "pulumi"; + version = data.version; + + postUnpack = '' + mv pulumi-* pulumi + ''; + + srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system}; + + installPhase = '' + install -D -t $out/bin/ * + '' + optionalString stdenv.isLinux '' + wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + '' + '' + installShellCompletion --cmd pulumi \ + --bash <($out/bin/pulumi completion bash) \ + --fish <($out/bin/pulumi completion fish) \ + --zsh <($out/bin/pulumi completion zsh) + ''; + + nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + + meta = { + homepage = "https://pulumi.io/"; + description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = with licenses; [ asl20 ]; + platforms = builtins.attrNames data.pulumiPkgs; + maintainers = with maintainers; [ + ghuntley + peterromfeldhk + jlesquembre + cpcloud + ]; + }; +} diff --git a/pkgs/tools/admin/pulumi/update-pulumi-shell.nix b/pkgs/tools/admin/pulumi-bin/update-pulumi-shell.nix similarity index 100% rename from pkgs/tools/admin/pulumi/update-pulumi-shell.nix rename to pkgs/tools/admin/pulumi-bin/update-pulumi-shell.nix diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh similarity index 100% rename from pkgs/tools/admin/pulumi/update.sh rename to pkgs/tools/admin/pulumi-bin/update.sh diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/tools/admin/pulumi-packages/base.nix new file mode 100644 index 000000000000..001a247379bc --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/base.nix @@ -0,0 +1,128 @@ +{ buildGoModule +, fetchFromGitHub +, python3Packages +}: +let + mkBasePackage = + { pname + , src + , version + , vendorHash + , cmd + , extraLdflags + , ... + }@args: buildGoModule (rec { + inherit pname src vendorHash version; + + sourceRoot = "${src.name}/provider"; + + subPackages = [ "cmd/${cmd}" ]; + + doCheck = false; + + ldflags = [ + "-s" + "-w" + ] ++ extraLdflags; + } // args); + + mkPythonPackage = + { meta + , pname + , src + , version + , ... + }: python3Packages.callPackage + ({ buildPythonPackage, pythonOlder, parver, pulumi, semver }: + buildPythonPackage rec { + inherit pname meta src version; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + sourceRoot = "${src.name}/sdk/python"; + + propagatedBuildInputs = [ + parver + pulumi + semver + ]; + + postPatch = '' + sed -i \ + -e 's/^VERSION = .*/VERSION = "${version}"/g' \ + -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ + setup.py + ''; + + # Auto-generated; upstream does not have any tests. + # Verify that the version substitution works + checkPhase = '' + runHook preCheck + + pip show "${pname}" | grep "Version: ${version}" > /dev/null \ + || (echo "ERROR: Version substitution seems to be broken"; exit 1) + + runHook postCheck + ''; + + pythonImportsCheck = [ + (builtins.replaceStrings [ "-" ] [ "_" ] pname) + ]; + }) + { }; +in +{ owner +, repo +, rev +, version +, hash +, vendorHash +, cmdGen +, cmdRes +, extraLdflags +, meta +, fetchSubmodules ? false +, ... +}@args: +let + src = fetchFromGitHub { + name = "source-${repo}-${rev}"; + inherit owner repo rev hash fetchSubmodules; + }; + + pulumi-gen = mkBasePackage rec { + inherit src version vendorHash extraLdflags; + + cmd = cmdGen; + pname = cmdGen; + }; +in +mkBasePackage ({ + inherit meta src version vendorHash extraLdflags; + + pname = repo; + + nativeBuildInputs = [ + pulumi-gen + ]; + + cmd = cmdRes; + + postConfigure = '' + pushd .. + + chmod +w sdk/ + ${cmdGen} schema + + popd + + VERSION=v${version} go generate cmd/${cmdRes}/main.go + ''; + + passthru.sdks.python = mkPythonPackage { + inherit meta src version; + + pname = repo; + }; +} // args) diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix new file mode 100644 index 000000000000..f343f9c893ba --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/default.nix @@ -0,0 +1,11 @@ +{ callPackage }: +let + mkPulumiPackage = callPackage ./base.nix { }; + callPackage' = p: args: callPackage p (args // { inherit mkPulumiPackage; }); +in +{ + pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; + pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; + pulumi-language-python = callPackage ./pulumi-language-python.nix { }; + pulumi-random = callPackage' ./pulumi-random.nix { }; +} diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix new file mode 100644 index 000000000000..2a0582ecb805 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix @@ -0,0 +1,34 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-aws-native"; + version = "0.38.0"; + rev = "v${version}"; + hash = "sha256-v7jNPCrjtfi9KYD4RhiphMIpV23g/CBV/sKPBkMulu0="; + vendorHash = "sha256-Yu9tNakwXWYdrjzI6/MFRzVBhJAEOjsmq9iBAQlR0AI="; + cmdGen = "pulumi-gen-aws-native"; + cmdRes = "pulumi-resource-aws-native"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + ]; + + fetchSubmodules = true; + postConfigure = '' + pushd .. + + ${cmdGen} schema aws-cloudformation-schema ${version} + + popd + ''; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Native AWS Pulumi Provider"; + homepage = "https://github.com/pulumi/pulumi-aws-native"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix new file mode 100644 index 000000000000..6d2df0af08f8 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -0,0 +1,24 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-azure-native"; + version = "1.81.0"; + rev = "v${version}"; + hash = "sha256-xiifVjvtt4bKi0fBYLU/Gfkx2tziLIq2vddRNWwuyz0="; + vendorHash = "sha256-VSwT5I5casJiBpXAcV9vLEWU9XWuDTktmfGqE6H/HX4="; + cmdGen = "pulumi-gen-azure-native"; + cmdRes = "pulumi-resource-azure-native"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}" + ]; + fetchSubmodules = true; + __darwinAllowLocalNetworking = true; + meta = with lib; { + description = "Native Azure Pulumi Provider"; + homepage = "https://github.com/pulumi/pulumi-azure-native"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix new file mode 100644 index 000000000000..658755fcf2f8 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -0,0 +1,45 @@ +{ lib +, buildGoModule +, pulumi +, python3 +}: +buildGoModule rec { + inherit (pulumi) version src; + + pname = "pulumi-language-python"; + + sourceRoot = "${src.name}/sdk"; + + vendorHash = "sha256-IZIdLmNGMFjRdkLPoE9UyON3pX/GBIgz/rv108v8iLY="; + + postPatch = '' + # Requires network + substituteInPlace python/python_test.go \ + --replace "TestRunningPipInVirtualEnvironment" \ + "SkipTestRunningPipInVirtualEnvironment" + + substituteInPlace python/cmd/pulumi-language-python/main_test.go \ + --replace "TestDeterminePulumiPackages" \ + "SkipTestDeterminePulumiPackages" + ''; + + subPackages = [ + "python/cmd/pulumi-language-python" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" + ]; + + checkInputs = [ + python3 + ]; + + postInstall = '' + cp python/cmd/pulumi-language-python-exec $out/bin + cp python/dist/pulumi-resource-pulumi-python $out/bin + cp python/dist/pulumi-analyzer-policy-python $out/bin + ''; +} diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix new file mode 100644 index 000000000000..4248ae73dda7 --- /dev/null +++ b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix @@ -0,0 +1,23 @@ +{ lib +, mkPulumiPackage +}: +mkPulumiPackage rec { + owner = "pulumi"; + repo = "pulumi-random"; + version = "4.8.2"; + rev = "v${version}"; + hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY="; + vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs="; + cmdGen = "pulumi-tfgen-random"; + cmdRes = "pulumi-resource-random"; + extraLdflags = [ + "-X github.com/pulumi/${repo}/provider/v4/pkg/version.Version=v${version}" + ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { + description = "A Pulumi provider that safely enables randomness for resources"; + homepage = "https://github.com/pulumi/pulumi-random"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch trundle ]; + }; +} diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 71c61d7a0543..5f0b754e8ddb 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -1,43 +1,108 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }: +{ stdenv +, lib +, buildGoModule +, coreutils +, fetchFromGitHub +, installShellFiles +, git + # passthru +, runCommand +, makeWrapper +, pulumi +, pulumiPackages +}: -with lib; - -let - data = import ./data.nix {}; -in stdenv.mkDerivation { +buildGoModule rec { pname = "pulumi"; - version = data.version; + version = "3.43.1"; - postUnpack = '' - mv pulumi-* pulumi + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-LbPXCwU6aJp+z5scfej5Reo2X8QUvZpASWkcDBBF1J0="; + }; + + vendorSha256 = "sha256-APGiCqHdXDRCFx0W8RDeL89sskYZ2vzdpg4ePE7KixA="; + + sourceRoot = "source/pkg"; + + nativeBuildInputs = [ installShellFiles ]; + + # Bundle release metadata + ldflags = [ + # Omit the symbol table and debug information. + "-s" + # Omit the DWARF symbol table. + "-w" + ] ++ importpathFlags; + + importpathFlags = [ + "-X github.com/pulumi/pulumi/pkg/v3/version.Version=v${version}" + ]; + + doCheck = true; + + checkInputs = [ + git + ]; + + preCheck = '' + # The tests require `version.Version` to be unset + ldflags=''${ldflags//"$importpathFlags"/} + + # Create some placeholders for plugins used in tests. Otherwise, Pulumi + # tries to donwload them and fails, resulting in really long test runs + dummyPluginPath=$(mktemp -d) + for name in pulumi-{resource-pkg{A,B},-pkgB}; do + ln -s ${coreutils}/bin/true "$dummyPluginPath/$name" + done + + export PATH=$dummyPluginPath''${PATH:+:}$PATH + + # Code generation tests also download dependencies from network + rm codegen/{docs,dotnet,go,nodejs,python,schema}/*_test.go + '' + lib.optionalString stdenv.isDarwin '' + export PULUMI_HOME=$(mktemp -d) ''; - srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system}; + # Allow tests that bind or connect to localhost on macOS. + __darwinAllowLocalNetworking = true; - installPhase = '' - install -D -t $out/bin/ * - '' + optionalString stdenv.isLinux '' - wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" - '' + '' + doInstallCheck = true; + installCheckPhase = '' + PULUMI_SKIP_UPDATE_CHECK=1 $out/bin/pulumi version | grep v${version} > /dev/null + ''; + + postInstall = '' installShellCompletion --cmd pulumi \ - --bash <($out/bin/pulumi completion bash) \ - --fish <($out/bin/pulumi completion fish) \ - --zsh <($out/bin/pulumi completion zsh) + --bash <($out/bin/pulumi gen-completion bash) \ + --fish <($out/bin/pulumi gen-completion fish) \ + --zsh <($out/bin/pulumi gen-completion zsh) ''; - nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + passthru = { + pkgs = pulumiPackages; + withPackages = f: runCommand "${pulumi.name}-with-packages" + { + nativeBuildInputs = [ makeWrapper ]; + } + '' + mkdir -p $out/bin + makeWrapper ${pulumi}/bin/pulumi $out/bin/pulumi \ + --suffix PATH : ${lib.makeSearchPath "bin" (f pulumiPackages)} + ''; + }; - meta = { + meta = with lib; { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = with licenses; [ asl20 ]; - platforms = builtins.attrNames data.pulumiPkgs; + sourceProvenance = sourceTypes.fromSource; + license = licenses.asl20; + platforms = platforms.unix; maintainers = with maintainers; [ - ghuntley - peterromfeldhk - jlesquembre - cpcloud + trundle + veehaitch ]; }; } diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 75b8feeccdb2..5e9e1ca17aef 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -15,20 +15,16 @@ let bees = stdenv.mkDerivation rec { pname = "bees"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - sha256 = "sha256-hD6/pMRnQgPqL1M6QOuRka6ESJv9kjeKy+29nRMTY1o="; + sha256 = "sha256-xBejyi/W8DLQmcicTqEQb5c4uZKu7jsLGjmWmW74t88="; }; buildInputs = [ - # Works around build failure for flexible array members. - # Can be removed after 0.7.3 release where it was fixed upstream. - linuxHeaders_5_19 - btrfs-progs # for btrfs/ioctl.h util-linux # for uuid.h ]; @@ -61,10 +57,10 @@ let meta = with lib; { homepage = "https://github.com/Zygo/bees"; description = "Block-oriented BTRFS deduplication service"; + longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; - longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ"; }; }; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 3e04a2ae98e9..282665681da2 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-Fn6+hAVGgbsqR6wQc2tGcslyxlX5XIqc1PYLyhjTfh0="; + sha256 = "sha256-21JHfaEug8d7FeG1AT137IDFGagY51Zn4mx+lfjCgn8="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 83f42dabebe0..86706d6dbe0b 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-KxG06a56XPa34IJGAJbBeHUKkCEba+R7HOSosTCwQKU="; + sha256 = "sha256-nniSn6HjEWJsn1y7EwmI8Ln6CvfSryXjVfMEfGwuSkQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index ac976f1416a9..a6100784a6b2 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "pipe-rename"; - version = "1.6.0"; + version = "1.6.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-fAjJDHc6p/+a1RLricpNkww4JLJBAXNMfw1T2HmlxPg="; + sha256 = "sha256-95Gj5iy8VYBzpV0kmGhronIR5LSjelfOueBQD/8gbfw="; }; - cargoSha256 = "sha256-UvYRegfc/+cFx7kLuhQIYZGla5YCrWXKOsTMlV9c874="; + cargoSha256 = "sha256-HiElAPgNeICEVbMBfK6syCoQb5smHhBH1MOuo2swci4="; checkInputs = [ python3 ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index ec2362b27009..673d266a41ee 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-P5cEdcbL9f9tJbcfiOLA0lSPW6m2x39Cz4tL1yFFbCg="; + hash = "sha256-3GRCvoClV484xoEEa/9HSgIAdqC6bLBDSVkZ6KXEGY0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index a5b0b7c80786..b79df12bfb49 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eZ61LIDMv+G7jnSrEFCsm6MP5+BpzJW+OnI9bqAZ5hw="; + sha256 = "sha256-wRpITbxtn2sHw7kkQ8rnCPQCU0JS6smdQLq1Z/RyeHo="; }; - vendorSha256 = "sha256-5U/YqqNfZfLZLEwuRh4mXACr9Gj7iOrLQRSLC/b8ZRw="; + vendorSha256 = "sha256-b77Sje5OsysTRRbzgdLnTlLLyLIACjD4c/oS9zyI0d8="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 96fa955a6b66..0b878a678e65 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-TWFi3oPTIKjBaw0Rq0AfZgxyVukvL2SWa2qvWw2WAQ4="; + sha256 = "sha256-V8wFswGs4p045mOyLA1Zrlz4JtfojHbUir0esS2iUIs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index 9930f1f1fe52..c342ac433b86 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -40,7 +40,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config protobuf go-protobuf makeWrapper protoc-gen-go-grpc ]; - vendorSha256 = "sha256-81BKMLuEXA/NeIjO7icBm48ROq6KxAxHtvP0nV5yM5A="; + vendorSha256 = null; #vendorSha256 = ""; preBuild = '' make -C ../proto ../daemon/ui/protocol/ui.pb.go @@ -71,5 +71,6 @@ buildGoModule rec { license = licenses.gpl3Only; maintainers = [ maintainers.raboof ]; platforms = platforms.linux; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 3577939c8da4..109188d0b1b5 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - vendorSha256 = "sha256-llseW3k8ygTXwkSpnRfQEnX3OVj2zdL8JDpIoRcC9kE="; + vendorSha256 = null; #vendorSha256 = ""; doCheck = false; @@ -27,5 +27,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ infinisil ]; mainProgram = "shadowfox-updater"; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index db8c983be096..8b0c987059ef 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.19"; + version = "2.4.20"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-70OHHcdCsZBa95KQEEYhs6LfpjPg+ULOB+A+VrQVltU="; + sha256 = "sha256-ZKEcDLwZPPgbaSx+LvTHNWcdYR/mZEGLc9b0Fb+CyEE="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 7ef984147a32..bc52bb33e370 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; - vendorSha256 = "sha256-grQFLo0BIIa/kNKF4vPw/V1WN9sxOucz6+wET2PBU1I="; + vendorSha256 = null; #vendorSha256 = ""; subPackages = [ "." ]; @@ -34,5 +34,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ guibert ]; platforms = platforms.linux; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 7e86b4438a1f..c162ee8036a4 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -11,12 +11,13 @@ buildGoModule rec { sha256 = "sha256-H0soiKOytchfcFx17az0pGoFbA+hhXLxGJVdaARvnDc="; }; - vendorSha256 = "sha256-omeAIq8KBYXRnldiGKDF1g+aOKYc+B4grusmfg5wOuA="; + vendorSha256 = null; #vendorSha256 = ""; meta = with lib; { homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 454ee0944620..93683bc6f7fa 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "xrootd"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-a8qw8uHxd7OLMMq+HPMB36O0Yjctlnf8DkfEdMvc1NQ="; + hash = "sha256-PaLT3+5FucPnWLStWxtBBqTKs8hvogKMrZteSNY+xXI="; }; outputs = [ "bin" "out" "dev" "man" ]; @@ -66,11 +66,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs genversion.sh - - # Manually apply part of - # https://github.com/xrootd/xrootd/pull/1619 - # Remove after the above PR is merged. - sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake ''; # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675= diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index aec7a05f2695..11a192bbd318 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WjvgRveSoDgOvGHy3jnIq2InKi1NaPiuorufrsSsp5k="; + sha256 = "sha256-Qb4jzn1UM/0B4ryk3cPVuhqVtJML+Vv5KtebBjirSuI="; }; - vendorSha256 = "sha256-EbA4ljsSessyGJLw9BfJ4wulAcXQeLOXk4f6KVu9mIY="; + vendorSha256 = "sha256-fvSA0BQQKhXxyNu0/ilNcMmTBtLm/piA4rJu6p5+8GU="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index e351eb7a79d4..bfe004d2d9b1 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; }; - vendorSha256 = "0vpkzykfg1rq4qi1v5lsa0drpil9i6ccfw96k48ppi9hiwzpq94w"; + vendorSha256 = null; #vendorSha256 = ""; meta = with lib; { description = "Phishing tool for red teams and pentesters"; @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/dsnezhkov/deepsea"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/security/git-hound/default.nix b/pkgs/tools/security/git-hound/default.nix index 2d13b11d302d..463d550cbcab 100644 --- a/pkgs/tools/security/git-hound/default.nix +++ b/pkgs/tools/security/git-hound/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = "sha256-qnIcjk2mzG/51ouhrAW6R3ZqoUSL6ZzYCOVZvKS7sBQ="; + vendorSha256 = null; #vendorSha256 = ""; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/tillson/git-hound"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/tools/security/httpdump/default.nix index c2e5a62969be..0bab990f1741 100644 --- a/pkgs/tools/security/httpdump/default.nix +++ b/pkgs/tools/security/httpdump/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0yh8kxy1k23lln09b614limwk9y59r7cn5qhbnzc06ga4mxfczv2"; }; - vendorSha256 = "0lb1p63lzn1ngj54bar9add7w0azvgcq3azhv9c5glk3ykv9c3iy"; + vendorSha256 = null; #vendorSha256 = ""; propagatedBuildInputs = [ libpcap ]; @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/hsiafan/httpdump"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix new file mode 100644 index 000000000000..54657f534fc2 --- /dev/null +++ b/pkgs/tools/security/katana/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "katana"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-8OpBxv++AjKNitHqB6y8hN8LlkFBvyzooJZPWhHd28w="; + }; + + vendorSha256 = "sha256-jc8OcImVOmN/iYbcYQJ9Z2cYaNAVVdn9nKWBSuyh2HQ="; + + CGO_ENABLED = 0; + + subPackages = [ "cmd/katana" ]; + + meta = with lib; { + description = "A next-generation crawling and spidering framework"; + homepage = "https://github.com/projectdiscovery/katana"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 7e28bb7c0bfc..851a0dac9031 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -1,25 +1,22 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, pcsclite }: -buildGoPackage rec { +buildGoModule rec { pname = "keycard-cli"; - version = "0.6.0"; - - goPackagePath = "github.com/status-im/keycard-cli"; - subPackages = [ "." ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcsclite ]; + version = "0.7.0"; src = fetchFromGitHub { owner = "status-im"; repo = pname; rev = version; - sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU="; + hash = "sha256-K2XxajprpPjfIs8rrnf2coIEQjPnir9/U0fTvqV2++g="; }; - ldflags = [ - "-X main.version=${version}" - ]; + vendorHash = "sha256-3XzWOiZF2WNs2pdumYN9bphvBKY+rrjuT+wWhB2pwT0="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pcsclite ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A command line tool and shell to manage keycards"; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4a6dd4336fab..7959e18698d2 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.25" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.26" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1817df3c473a..d635a1231580 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2ab12336a4a6197c88ca4777c016311fa4fb7a3d - ref: refs/tags/6.2.25 + revision: ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc + ref: refs/tags/6.2.26 specs: - metasploit-framework (6.2.25) + metasploit-framework (6.2.26) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -32,7 +32,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.97) + metasploit-payloads (= 2.0.99) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.656.0) - aws-sdk-core (3.166.0) + aws-partitions (1.659.0) + aws-sdk-core (3.167.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.345.0) + aws-sdk-ec2 (1.349.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.73.0) @@ -236,7 +236,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.97) + metasploit-payloads (2.0.99) metasploit_data_models (5.0.6) activerecord (~> 6.0) activesupport (~> 6.0) @@ -427,7 +427,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.2) webrick - zeitwerk (2.6.5) + zeitwerk (2.6.6) PLATFORMS ruby diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6b3578105cf7..cae6648f5ef9 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.25"; + version = "6.2.26"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-lrooEMmSu7pgG3Nm35G385ipdc4WdlM696Dd5KdwVJ0="; + sha256 = "sha256-qPhN+N0AFSrkdxtUPZwJMicDafKpuwaQg+sDA6ssHow="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 0e3186c100be..8e9709c984e3 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l4n8wrjhm4n9hn8c1dm92vwqlcf5wryw4dqmmp5whm6k2k9slkh"; + sha256 = "0iwkwvx56rivfrqgsjap7bkn0zd9d5m712fx0b1mgcfalm6xjcpl"; type = "gem"; }; - version = "1.656.0"; + version = "1.659.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj5975raq5abh6jfn66l1pkpb8rj2a032777jypy00k3yiq4yw2"; + sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; type = "gem"; }; - version = "3.166.0"; + version = "3.167.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lqx1iadp1vdm3rgb79a219a7xkss409fadqnd5k7vl0cncxkg2s"; + sha256 = "1xk33r0q44ngsy9d6nh4isw9aa9rz31ajb69apk4b2wmc2gi1mcw"; type = "gem"; }; - version = "1.345.0"; + version = "1.349.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2ab12336a4a6197c88ca4777c016311fa4fb7a3d"; - sha256 = "17alf2ky9pd0ywx56xhnrrssk67kny8xyrkk3dhbmfwjr482ifln"; + rev = "ef8b26c32cbcf48e9ba6a4d6c01d587a1d45f6cc"; + sha256 = "130y5jmh60zbhf80dfx9y9lh69rj16f3sm0vfzj2l580vpw4vy58"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.25"; + version = "6.2.26"; }; metasploit-model = { groups = ["default"]; @@ -626,10 +626,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3ymwqm3paa0sqpnbd2mfz6gwqskv3mg1nphaqns7s1kx1za5nm"; + sha256 = "1rfnxkg31ksylg1rjk05d9kk4af4rbw66ipwl3q0vl3qvnbymfm8"; type = "gem"; }; - version = "2.0.97"; + version = "2.0.99"; }; metasploit_data_models = { groups = ["default"]; @@ -1568,9 +1568,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ipi1b3rh2vgwskfzcrgagc6hw5ppsz7jamsimglvww8bvya3zy"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.5"; + version = "2.6.6"; }; } diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 2a901a599d49..8d0fe229fc70 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - hash = "sha256-dfyTaWwV2hNZPZfvM+AqqR1zbChjT6Y/TEkQPEXRtGA="; + hash = "sha256-PNmbWynEO8XcE7lLqfjJdCRnvRdCR8+stdwqRIKQfqM="; }; - cargoHash = "sha256-yf46le0jG4EXo60kGKc0GwSO5vl4Dw0gmYJ4yr+TFdE="; + cargoHash = "sha256-DSQDsgx608NUSi/KNwtntav7FTdnXGeIBzCkma5Tjts="; postPatch = '' # The GPGME backend is recommended diff --git a/pkgs/tools/security/shhgit/default.nix b/pkgs/tools/security/shhgit/default.nix index a05eba1282c1..fa714622fe97 100644 --- a/pkgs/tools/security/shhgit/default.nix +++ b/pkgs/tools/security/shhgit/default.nix @@ -15,12 +15,13 @@ buildGoModule rec { sha256 = "1b7r4ivfplm4crlvx571nyz2rc6djy0xvl14nz7m0ngh6206df9k"; }; - vendorSha256 = "0isa9faaknm8c9mbyj5dvf1dfnyv44d1pjd2nbkyfi6b22hcci3d"; + vendorSha256 = null; #vendorSha256 = ""; meta = with lib; { description = "Tool to detect secrets in repositories"; homepage = "https://github.com/eth0izzle/shhgit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/tools/security/smbscan/default.nix index a3a2257c065c..f807704005e1 100644 --- a/pkgs/tools/security/smbscan/default.nix +++ b/pkgs/tools/security/smbscan/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "smbscan"; version = "unstable-2022-05-26"; - format = "setuptools"; + format = "other"; src = fetchFromGitHub { owner = "jeffhacks"; diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix index d6305e4cf4a4..a461fad2fd8c 100644 --- a/pkgs/tools/security/ssb/default.nix +++ b/pkgs/tools/security/ssb/default.nix @@ -14,12 +14,13 @@ buildGoModule rec { sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; }; - vendorSha256 = "1q3dxizyz9bcdfs5j2bzhl2aadhd00cvzhj202wlls0zrlb9pp4f"; + vendorSha256 = null; #vendorSha256 = ""; meta = with lib; { description = "Tool to bruteforce SSH server"; homepage = "https://github.com/kitabisa/ssb"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix index e228f946a8c8..aeafda70a2d6 100644 --- a/pkgs/tools/text/wrap/default.nix +++ b/pkgs/tools/text/wrap/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz"; + vendorSha256 = null; #vendorSha256 = ""; patches = [ (fetchpatch { @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/Wraparound/wrap"; license = licenses.gpl3Only; maintainers = [ maintainers.austinbutler ]; + broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check }; } diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index e57c43059774..bb06d3f33fa7 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-vtCZ0w1Kaiw9bIrzwEb4Jnv7QoQLp8JDjaGmAP91hpE="; + hash = "sha256-ORe1tSWhmgIaDj3CTEovsFCq+60LQmYy8RUx9v7De30="; }; buildCommand = '' diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index f007057222f7..40281e014681 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20221104.00"; + version = "20221109.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-JvI0tj6/+iCu+Q5XB3QOrrfBl6n2/bB6pj9lUDZL8DE="; + sha256 = "sha256-maVFdsS6upJIAOzSpkwDEGppA4qdTikluEg1Hlu5+U0="; }; vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fe9cb1c4011..09159320ed78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2179,7 +2179,6 @@ with pkgs; asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2; }; - gsl = gsl_1; }; async = callPackage ../development/tools/async {}; @@ -3819,7 +3818,7 @@ with pkgs; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; - djv = callPackage ../applications/graphics/djv { stdenv = gcc10StdenvCompat; }; + djv = callPackage ../applications/graphics/djv { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -4144,10 +4143,7 @@ with pkgs; gdu = callPackage ../tools/system/gdu { }; - go-chromecast = callPackage ../applications/video/go-chromecast { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; @@ -4787,10 +4783,7 @@ with pkgs; pixiecore = callPackage ../tools/networking/pixiecore {}; - waitron = callPackage ../tools/networking/waitron { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + waitron = callPackage ../tools/networking/waitron { }; pyCA = python3Packages.callPackage ../applications/video/pyca {}; @@ -7093,10 +7086,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-hound = callPackage ../tools/security/git-hound { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + git-hound = callPackage ../tools/security/git-hound { }; git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { }; @@ -7863,10 +7853,7 @@ with pkgs; httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; - httpdump = callPackage ../tools/security/httpdump { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + httpdump = callPackage ../tools/security/httpdump { }; httpie = with python3Packages; toPythonApplication httpie; @@ -8314,6 +8301,8 @@ with pkgs; kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + katana = callPackage ../tools/security/katana { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kbs2 = callPackage ../tools/security/kbs2 { @@ -8365,10 +8354,7 @@ with pkgs; jdk = jdk11; }; - kfctl = callPackage ../applications/networking/cluster/kfctl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kfctl = callPackage ../applications/networking/cluster/kfctl { }; kluctl = callPackage ../applications/networking/cluster/kluctl { }; @@ -9867,10 +9853,7 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; - opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { }; opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { }; @@ -10248,7 +10231,13 @@ with pkgs; prism = callPackage ../applications/video/prism { }; - pulumi-bin = callPackage ../tools/admin/pulumi { }; + pulumi = callPackage ../tools/admin/pulumi { }; + + pulumiPackages = recurseIntoAttrs ( + callPackage ../tools/admin/pulumi-packages { } + ); + + pulumi-bin = callPackage ../tools/admin/pulumi-bin { }; p0f = callPackage ../tools/security/p0f { }; @@ -11708,10 +11697,7 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -12960,10 +12946,7 @@ with pkgs; wpgtk = callPackage ../tools/X11/wpgtk { }; - wrap = callPackage ../tools/text/wrap { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + wrap = callPackage ../tools/text/wrap { }; wring = nodePackages.wring; @@ -12971,10 +12954,7 @@ with pkgs; wrk2 = callPackage ../tools/networking/wrk2 { }; - wuzz = callPackage ../tools/networking/wuzz { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + wuzz = callPackage ../tools/networking/wuzz { }; wv = callPackage ../tools/misc/wv { }; @@ -15167,6 +15147,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { }; + cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; @@ -15782,7 +15763,7 @@ with pkgs; php81 = callPackage ../development/interpreters/php/8.1.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = !stdenv.isDarwin; }; }; php81Extensions = recurseIntoAttrs php81.extensions; @@ -15792,7 +15773,7 @@ with pkgs; php80 = callPackage ../development/interpreters/php/8.0.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; pcre2 = pcre2.override { - withJitSealloc = false; # Needed to avoid crashes, see https://bugs.php.net/bug.php?id=78630 + withJitSealloc = !stdenv.isDarwin; }; }; php80Extensions = recurseIntoAttrs php80.extensions; @@ -17213,6 +17194,8 @@ with pkgs; itstool = callPackage ../development/tools/misc/itstool { }; + jacoco = callPackage ../development/tools/analysis/jacoco { }; + inherit (callPackage ../development/tools/build-managers/jam { }) jam ftjam; @@ -18479,7 +18462,9 @@ with pkgs; coercer = callPackage ../tools/security/coercer { }; - cogl = callPackage ../development/libraries/cogl { }; + cogl = callPackage ../development/libraries/cogl { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -18823,10 +18808,7 @@ with pkgs; filter-audio = callPackage ../development/libraries/filter-audio {}; - filtron = callPackage ../servers/filtron { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + filtron = callPackage ../servers/filtron { }; flann = callPackage ../development/libraries/flann { }; @@ -22310,10 +22292,7 @@ with pkgs; sfsexp = callPackage ../development/libraries/sfsexp {}; - shhgit = callPackage ../tools/security/shhgit { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + shhgit = callPackage ../tools/security/shhgit { }; shhmsg = callPackage ../development/libraries/shhmsg { }; @@ -23259,19 +23238,6 @@ with pkgs; buildGoModule = buildGo119Module; buildGoPackage = buildGo119Package; - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ - inherit (darwin.apple_sdk.frameworks) Foundation Security; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - buildGo117Module = callPackage ../build-support/go/module.nix { - go = buildPackages.go_1_17; - }; - buildGo117Package = callPackage ../build-support/go/package.nix { - go = buildPackages.go_1_17; - }; - # requires a newer Apple SDK go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; @@ -23697,10 +23663,7 @@ with pkgs; gerbera = callPackage ../servers/gerbera {}; - gobetween = callPackage ../servers/gobetween { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gobetween = callPackage ../servers/gobetween { }; gobgpd = callPackage ../servers/misc/gobgpd { }; @@ -23744,8 +23707,6 @@ with pkgs; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; }; ic-keysmith = callPackage ../tools/security/ic-keysmith { }; @@ -24743,10 +24704,7 @@ with pkgs; mbtileserver = callPackage ../servers/geospatial/mbtileserver { }; - pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { }; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; @@ -24776,10 +24734,7 @@ with pkgs; alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; - alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; @@ -25648,10 +25603,7 @@ with pkgs; pam_usb = callPackage ../os-specific/linux/pam_usb { }; - pam_ussh = callPackage ../os-specific/linux/pam_ussh { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + pam_ussh = callPackage ../os-specific/linux/pam_ussh { }; paxctl = callPackage ../os-specific/linux/paxctl { }; @@ -26436,6 +26388,8 @@ with pkgs; hermit = callPackage ../data/fonts/hermit { }; + hubot-sans = callPackage ../data/fonts/hubot-sans { }; + humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { }; hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { }; @@ -26653,6 +26607,8 @@ with pkgs; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; + mona-sans = callPackage ../data/fonts/mona-sans { }; + monoid = callPackage ../data/fonts/monoid { }; mononoki = callPackage ../data/fonts/mononoki { }; @@ -26934,6 +26890,8 @@ with pkgs; stix-two = callPackage ../data/fonts/stix-two { }; + super-tiny-icons = callPackage ../data/icons/super-tiny-icons { }; + inherit (callPackages ../data/fonts/gdouros { }) aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings; @@ -29885,10 +29843,7 @@ with pkgs; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; - kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; kubent = callPackage ../applications/networking/cluster/kubent { }; @@ -31837,10 +31792,7 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -33376,6 +33328,8 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; + youtube-music = callPackage ../applications/audio/youtube-music { }; + yt-dlp = with python3Packages; toPythonApplication yt-dlp; yt-dlp-light = with python3Packages; toPythonApplication yt-dlp-light; @@ -35291,10 +35245,7 @@ with pkgs; deepdiff = with python3Packages; toPythonApplication deepdiff; - deepsea = callPackage ../tools/security/deepsea { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + deepsea = callPackage ../tools/security/deepsea { }; deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; @@ -37997,10 +37948,7 @@ with pkgs; kaf = callPackage ../development/tools/kaf { }; - kcli = callPackage ../development/tools/kcli { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {}; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0b9f4237327b..69d849f2208b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -58,7 +58,9 @@ lib.makeScope pkgs.newScope (self: with self; { # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { pname = "php-${pname}"; - meta.mainProgram = args.meta.mainProgram or pname; + meta = args.meta // { + mainProgram = args.meta.mainProgram or pname; + }; }); # Function to build an extension which is shipped as part of the php diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af0c07084a9f..92129da8e115 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ self: super: with self; { aioqsw = callPackage ../development/python-modules/aioqsw { }; + aioquic = callPackage ../development/python-modules/aioquic { }; + aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -666,6 +668,8 @@ self: super: with self; { async-lru = callPackage ../development/python-modules/async-lru { }; + async-modbus = callPackage ../development/python-modules/async-modbus { }; + asyncclick = callPackage ../development/python-modules/asyncclick { }; asynccmd = callPackage ../development/python-modules/asynccmd { }; @@ -1070,10 +1074,16 @@ self: super: with self; { pad4pi = callPackage ../development/python-modules/pad4pi { }; - pulumi = callPackage ../development/python-modules/pulumi { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; + pulumi-aws-native = pkgs.pulumiPackages.pulumi-aws-native.sdks.python; + + pulumi-azure-native = pkgs.pulumiPackages.pulumi-azure-native.sdks.python; + + pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python; + backcall = callPackage ../development/python-modules/backcall { }; backoff = callPackage ../development/python-modules/backoff { }; @@ -1564,6 +1574,8 @@ self: super: with self; { connection-pool = callPackage ../development/python-modules/connection-pool { }; + connio = callPackage ../development/python-modules/connio { }; + coqpit = callPackage ../development/python-modules/coqpit { }; coqui-trainer = callPackage ../development/python-modules/coqui-trainer {}; @@ -6133,6 +6145,8 @@ self: super: with self; { nibabel = callPackage ../development/python-modules/nibabel { }; + nibe = callPackage ../development/python-modules/nibe { }; + nidaqmx = callPackage ../development/python-modules/nidaqmx { }; Nikola = callPackage ../development/python-modules/Nikola { }; @@ -8030,6 +8044,8 @@ self: super: with self; { pylru = callPackage ../development/python-modules/pylru { }; + pylsqpack = callPackage ../development/python-modules/pylsqpack { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; pyls-flake8 = callPackage ../development/python-modules/pyls-flake8 { }; @@ -10098,6 +10114,8 @@ self: super: with self; { pythonSupport = true; })); + serialio = callPackage ../development/python-modules/serialio { }; + serpent = callPackage ../development/python-modules/serpent { }; serpy = callPackage ../development/python-modules/serpy { }; @@ -10362,6 +10380,8 @@ self: super: with self; { socid-extractor = callPackage ../development/python-modules/socid-extractor { }; + sockio = callPackage ../development/python-modules/sockio { }; + sockjs = callPackage ../development/python-modules/sockjs { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; @@ -11470,6 +11490,8 @@ self: super: with self; { umap-learn = callPackage ../development/python-modules/umap-learn { }; + umodbus = callPackage ../development/python-modules/umodbus { }; + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; unasync = callPackage ../development/python-modules/unasync { };