diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index fa61973263ae..93351ce1bdb3 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -452,6 +452,8 @@ The list of source files or directories to be unpacked or copied. One of these m After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself. +By default the `sourceRoot` is set to `"source"`. If you want to point to a sub-directory inside your project, you therefore need to set `sourceRoot = "source/my-sub-directory"`. + ##### `setSourceRoot` {#var-stdenv-setSourceRoot} Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3efd6efcefaa..6bab03bf45b1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8975,7 +8975,7 @@ name = "Millian Poquet"; }; mpscholten = { - email = "marc@mpscholten.de"; + email = "marc@digitallyinduced.com"; github = "mpscholten"; githubId = 2072185; name = "Marc Scholten"; @@ -15146,4 +15146,14 @@ fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; }]; }; + cafkafk = { + email = "cafkafk@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys = [{ + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + }]; + }; } 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 e3c76918911a..d434b76da214 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 @@ -206,6 +206,13 @@ services.kanata. + + + languagetool, + a multilingual grammar, style, and spell checker. Available as + services.languagetool. + + Outline, @@ -384,6 +391,14 @@ cosigned binary anymore. + + + Emacs now uses the Lucid toolkit by default instead of GTK + because of stability and compatibility issues. Users who still + wish to remain using GTK can do so by using + emacs-gtk. + + riak package removed along with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index afeaa7aaac73..a90e0f896eca 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -76,6 +76,9 @@ In addition to numerous new and upgraded packages, this release has the followin - [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. Available as [services.kanata](options.html#opt-services.kanata.enable). +- [languagetool](https://languagetool.org/), a multilingual grammar, style, and spell checker. + Available as [services.languagetool](options.html#opt-services.languagetool.enable). + - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). - [netbird](https://netbird.io), a zero configuration VPN. @@ -134,6 +137,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `pkgs.cosign` does not provide the `cosigned` binary anymore. +- Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues. + Users who still wish to remain using GTK can do so by using `emacs-gtk`. + - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. - xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 3ff3cf5645f8..117d9d59e025 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -426,7 +426,9 @@ class Machine: self.monitor.send(message) return self.wait_for_monitor_prompt() - def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None: + def wait_for_unit( + self, unit: str, user: Optional[str] = None, timeout: int = 900 + ) -> None: """Wait for a systemd unit to get into "active" state. Throws exceptions on "failed" and "inactive" states as well as after timing out. @@ -456,7 +458,7 @@ class Machine: unit, f" with user {user}" if user is not None else "" ) ): - retry(check_active) + retry(check_active, timeout) def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index c51f9c0b214b..25cab0611975 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -233,11 +233,8 @@ in } { - assertion = cfg.powerManagement.enable -> ( - builtins.pathExists (cfg.package.out + "/bin/nvidia-sleep.sh") && - builtins.pathExists (cfg.package.out + "/lib/systemd/system-sleep/nvidia") - ); - message = "Required files for driver based power management don't exist."; + assertion = cfg.powerManagement.enable -> versionAtLeast nvidia_x11.version "430.09"; + message = "Required files for driver based power management only exist on versions >= 430.09."; } { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cb3599589cfe..132bbdcd933b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -589,6 +589,7 @@ ./services/misc/jackett.nix ./services/misc/jellyfin.nix ./services/misc/klipper.nix + ./services/misc/languagetool.nix ./services/misc/logkeys.nix ./services/misc/leaps.nix ./services/misc/lidarr.nix diff --git a/nixos/modules/services/misc/languagetool.nix b/nixos/modules/services/misc/languagetool.nix new file mode 100644 index 000000000000..20dc9b6b447d --- /dev/null +++ b/nixos/modules/services/misc/languagetool.nix @@ -0,0 +1,78 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.languagetool; + settingsFormat = pkgs.formats.javaProperties {}; +in { + options.services.languagetool = { + enable = mkEnableOption (mdDoc "the LanguageTool server"); + + port = mkOption { + type = types.port; + default = 8081; + example = 8081; + description = mdDoc '' + Port on which LanguageTool listens. + ''; + }; + + public = mkEnableOption (mdDoc "access from anywhere (rather than just localhost)"); + + allowOrigin = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://my-website.org"; + description = mdDoc '' + Set the Access-Control-Allow-Origin header in the HTTP response, + used for direct (non-proxy) JavaScript-based access from browsers. + `null` to allow access from all sites. + ''; + }; + + settings = lib.mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.cacheSize = mkOption { + type = types.ints.unsigned; + default = 1000; + apply = toString; + description = mdDoc "Number of sentences cached."; + }; + }; + default = {}; + description = mdDoc '' + Configuration file options for LanguageTool, see + 'languagetool-http-server --help' + for supported settings. + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.languagetool = { + description = "LanguageTool HTTP server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + User = "languagetool"; + Group = "languagetool"; + CapabilityBoundingSet = [ "" ]; + RestrictNamespaces = [ "" ]; + SystemCallFilter = [ "@system-service" "~ @privileged" ]; + ProtectHome = "yes"; + ExecStart = '' + ${pkgs.languagetool}/bin/languagetool-http-server \ + --port ${toString cfg.port} \ + ${optionalString cfg.public "--public"} \ + ${optionalString (cfg.allowOrigin != null) "--allow-origin ${cfg.allowOrigin}"} \ + "--configuration" ${settingsFormat.generate "languagetool.conf" cfg.settings} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index e82d66516e21..9e34b25e4527 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -284,5 +284,5 @@ in ]; }; - meta.maintainers = [ majewsky ] ++ teams.c3d2.members; + meta.maintainers = [ maintainers.majewsky ] ++ teams.c3d2.members; } diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 3be9fb31ec79..f09ef1a959ed 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -152,6 +152,7 @@ in WorkingDirectory = cfg.dataDir; User = user; Group = group; + Restart = "on-failure"; }; }; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e3c699dfd0c9..0fa9d63df022 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -276,6 +276,7 @@ in { krb5 = discoverTests (import ./krb5 {}); ksm = handleTest ./ksm.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; + languagetool = handleTest ./languagetool.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; lemmy = handleTest ./lemmy.nix {}; diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 799535eecef6..1fef7cb57cfc 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -33,7 +33,7 @@ in hardware.opengl.enable = true; programs.xwayland.enable = true; - services.udisks2.enable = true; + security.polkit.enable = true; environment.systemPackages = [ pkgs.cagebreak pkgs.wayland-utils ]; # Need to switch to a different GPU driver than the default one (-vga std) so that Cagebreak can launch: diff --git a/nixos/tests/languagetool.nix b/nixos/tests/languagetool.nix new file mode 100644 index 000000000000..e4ab2a47064e --- /dev/null +++ b/nixos/tests/languagetool.nix @@ -0,0 +1,19 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +let port = 8082; +in { + name = "languagetool"; + meta = with lib.maintainers; { maintainers = [ fbeffa ]; }; + + nodes.machine = { ... }: + { + services.languagetool.enable = true; + services.languagetool.port = port; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("languagetool.service") + machine.wait_for_open_port(${toString port}) + machine.wait_until_succeeds('curl -d "language=en-US" -d "text=a simple test" http://localhost:${toString port}/v2/check') + ''; +}) diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix index 4570e8963882..8fd011e0cb21 100644 --- a/nixos/tests/moodle.nix +++ b/nixos/tests/moodle.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { testScript = '' start_all() - machine.wait_for_unit("phpfpm-moodle.service") + machine.wait_for_unit("phpfpm-moodle.service", timeout=1800) machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'") ''; }) diff --git a/nixos/tests/zigbee2mqtt.nix b/nixos/tests/zigbee2mqtt.nix index 1592202fb3a7..1a40d175df83 100644 --- a/nixos/tests/zigbee2mqtt.nix +++ b/nixos/tests/zigbee2mqtt.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: - { + name = "zigbee2mqtt"; nodes.machine = { pkgs, ... }: { services.zigbee2mqtt = { diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index aa3162df9187..4e65d79ab21a 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -23,7 +23,6 @@ , nlohmann_json , pipewire , pkg-config -, python3 , rnnoise , rubberband , speexdsp @@ -35,13 +34,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.8"; + version = "6.3.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo="; + sha256 = "sha256-OLxuE1jiALuKlC9U9esVlhaMBEaoZyNae8OO8upE4ZM="; }; nativeBuildInputs = [ @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook4 ]; @@ -76,11 +74,6 @@ stdenv.mkDerivation rec { zita-convolver ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - preFixup = let lv2Plugins = [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 724280fbcdd5..870f4b216f51 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -6,6 +6,7 @@ , boost , curl , eigen +, faust , fftw , gettext , glib @@ -42,22 +43,13 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.42.1"; + version = "0.44.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr"; + sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; }; - patches = [ - (fetchpatch { - name = "guitarix-gcc11.patch"; - url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch"; - stripLen = 1; - sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il"; - }) - ]; - nativeBuildInputs = [ gettext hicolor-icon-theme @@ -74,6 +66,7 @@ stdenv.mkDerivation rec { boost curl eigen + faust fftw glib glib-networking.out @@ -96,11 +89,7 @@ stdenv.mkDerivation rec { zita-resampler ]; - # this doesnt build, probably because we have the wrong faust version: - # "--faust" - # aproved versions are 2.20.2 and 2.15.11 wafConfigureFlags = [ - "--no-faust" "--no-font-cache-update" "--shared-lib" "--no-desktop-update" diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index f422ad7fe136..c305b9917617 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, copyDesktopItems }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "NoiseTorch"; @@ -20,8 +20,6 @@ buildGoModule rec { subPackages = [ "." ]; - nativeBuildInputs = [ copyDesktopItems ]; - preBuild = '' make -C c/ladspa/ go generate @@ -30,7 +28,7 @@ buildGoModule rec { postInstall = '' install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png - copyDesktopItems assets/noisetorch.desktop $out/share/applications/ + install -Dm444 ./assets/noisetorch.desktop $out/share/applications/noisetorch.desktop ''; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 4243ad47a243..6a1f199461ac 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -18,7 +18,7 @@ , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin , withGTK2 ? false, gtk2-x11 ? null -, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null +, withGTK3 ? false, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withMotif ? false, motif ? null , withSQLite3 ? false @@ -30,7 +30,7 @@ , withAthena ? false , withToolkitScrollBars ? true , withPgtk ? false -, withXinput2 ? false +, withXinput2 ? withX && lib.versionAtLeast version "29" , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" @@ -204,15 +204,10 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.concatStringsSep "\n" [ - - (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' - patchelf --set-rpath \ - "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \ - "$out/bin/emacs" + postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" - '') - ]; + ''; passthru = { inherit nativeComp; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 1f4fbdf4edde..10b2b0a54aef 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.6.3"; + version = "6.6.4"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-QBK+4V9Nff3K6KcJ1PEyU0Ohn3cLawKe/5sR4Tih0dM="; + sha256 = "sha256-NwqvlDG37OpWaLJHb6NqkRYvWwDzICKqfgIJRTBDnkI="; }; dontBuild = true; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 5a790e78090d..d8e57fdb508f 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -25,7 +25,6 @@ in buildFHSUserEnv rec { # qsys requirements xorg.libXtst xorg.libXi - libudev0-shim ]; multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? @@ -44,6 +43,7 @@ in buildFHSUserEnv rec { xorg.libX11 xorg.libXext xorg.libXrender + libudev0-shim ]; passthru = { inherit unwrapped; }; @@ -71,7 +71,7 @@ in buildFHSUserEnv rec { EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" for executable in $EXECUTABLES; do echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable done cd $out @@ -80,7 +80,12 @@ in buildFHSUserEnv rec { ln --symbolic --relative --target-directory ./bin $EXECUTABLES ''; + # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when + # starting most operations in many containerized environments, including WSL2, Docker, and LXC + # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) + # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version + # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 runScript = writeScript "${name}-wrapper" '' - exec $@ + exec env LD_PRELOAD=libudev.so.0 "$@" ''; } diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 4b5669860238..134a7807e0b3 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, unstick, requireFile +{ stdenv, lib, unstick, fetchurl , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: @@ -34,18 +34,18 @@ let }; version = "20.1.1.720"; - homepage = "https://fpgasoftware.intel.com"; - require = {name, sha256}: requireFile { + download = {name, sha256}: fetchurl { inherit name sha256; - url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; + # e.g. "20.1.1.720" -> "20.1std.1/720" + url = "https://downloads.intel.com/akdlm/software/acdsinst/${lib.versions.majorMinor version}std.${lib.versions.patch version}/${lib.elemAt (lib.splitVersion version) 3}/ib_installers/${name}"; }; in stdenv.mkDerivation rec { inherit version; pname = "quartus-prime-lite-unwrapped"; - src = map require ([{ + src = map download ([{ name = "QuartusLiteSetup-${version}-linux.run"; sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k"; } { @@ -87,12 +87,11 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - inherit homepage; + homepage = "https://fpgasoftware.intel.com"; description = "FPGA design and simulation software"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kwohlfahrt ]; }; } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index da1aa12dabb6..1cea988235ea 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -375,18 +375,6 @@ final: prev: meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; - TrueZen-nvim = buildVimPluginFrom2Nix { - pname = "TrueZen.nvim"; - version = "2022-08-07"; - src = fetchFromGitHub { - owner = "Pocco81"; - repo = "true-zen.nvim"; - rev = "98740c76254c65576ec294551028b65081053588"; - sha256 = "1g7wwb081yliqzpzmgjgvv9fn9qcry9k4xbgv0zcgz7z1lbhmyj1"; - }; - meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; - }; - VimCompletesMe = buildVimPluginFrom2Nix { pname = "VimCompletesMe"; version = "2022-02-18"; @@ -4449,6 +4437,18 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; + moonscript-vim = buildVimPluginFrom2Nix { + pname = "moonscript-vim"; + version = "2016-11-22"; + src = fetchFromGitHub { + owner = "leafo"; + repo = "moonscript-vim"; + rev = "715c96c7c3b02adc507f84bf5754985460afc426"; + sha256 = "1m4yz2xnazqagmkcli2xvwidsgssy9p650ykgdybk7wwlrq2vvqi"; + }; + meta.homepage = "https://github.com/leafo/moonscript-vim/"; + }; + mru = buildVimPluginFrom2Nix { pname = "mru"; version = "2022-08-20"; @@ -7757,6 +7757,18 @@ final: prev: meta.homepage = "https://github.com/folke/trouble.nvim/"; }; + true-zen-nvim = buildVimPluginFrom2Nix { + pname = "true-zen.nvim"; + version = "2022-08-07"; + src = fetchFromGitHub { + owner = "Pocco81"; + repo = "true-zen.nvim"; + rev = "98740c76254c65576ec294551028b65081053588"; + sha256 = "1g7wwb081yliqzpzmgjgvv9fn9qcry9k4xbgv0zcgz7z1lbhmyj1"; + }; + meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime.vim"; version = "2020-09-09"; @@ -10231,6 +10243,18 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-liquid/"; }; + vim-llvm = buildVimPluginFrom2Nix { + pname = "vim-llvm"; + version = "2022-05-03"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-llvm"; + rev = "ac3fbdd79b0f5bd68049d38a4901e43a93d4cfd0"; + sha256 = "1nzmyd2fh2rfxqi87pgdx40xxq7b16izgi57fib8fpywcw26s2ga"; + }; + meta.homepage = "https://github.com/rhysd/vim-llvm/"; + }; + vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; version = "2022-05-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index df226ed39a8d..726ef1447eba 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -30,7 +30,6 @@ https://github.com/jaredgorski/SpaceCamp/,, https://github.com/SpaceVim/SpaceVim/,, https://github.com/ackyshake/Spacegray.vim/,, https://github.com/chrisbra/SudoEdit.vim/,, -https://github.com/Pocco81/TrueZen.nvim/,, https://github.com/ackyshake/VimCompletesMe/,, https://github.com/hsitz/VimOrganizer/,, https://github.com/VundleVim/Vundle.vim/,, @@ -373,6 +372,7 @@ https://github.com/jghauser/mkdir.nvim/,main, https://github.com/SidOfc/mkdx/,, https://github.com/tomasr/molokai/,, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua +https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2-bufword/,, @@ -650,6 +650,7 @@ https://github.com/tjdevries/train.nvim/,, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, +https://github.com/Pocco81/true-zen.nvim/,, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, @@ -859,6 +860,7 @@ https://github.com/lfe-support/vim-lfe/,, https://github.com/josa42/vim-lightline-coc/,, https://github.com/tommcdo/vim-lion/,, https://github.com/tpope/vim-liquid/,, +https://github.com/rhysd/vim-llvm/,HEAD, https://github.com/embear/vim-localvimrc/,, https://github.com/andreshazard/vim-logreview/,, https://github.com/mlr-msft/vim-loves-dafny/,, diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index b4731b5701c9..92c2a5daffeb 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -11,7 +11,7 @@ , nodePackages, bash # Attributes inherit from specific versions -, version, src, meta, sourceRoot +, version, src, meta, sourceRoot, commandLineArgs , executableName, longName, shortName, pname, updateScript # sourceExecutableName is the name of the binary in the source archive, over # which we have no control @@ -110,6 +110,7 @@ let # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --add-flags ${lib.escapeShellArg commandLineArgs} ) ''; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1a09d6475004..a0ffaf348d06 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -1,4 +1,7 @@ -{ stdenv, lib, callPackage, fetchurl, isInsiders ? false }: +{ stdenv, lib, callPackage, fetchurl +, isInsiders ? false +, commandLineArgs ? "" +}: let inherit (stdenv.hostPlatform) system; @@ -15,22 +18,23 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08p4l47zr4dm7mw65wwdsf6q1wkzkzg3l2y5zrs3ng3nafql96zs"; - x86_64-darwin = "1pf8xpg2sb0iwfaixvzhmglqrrky2625b66fjwlc5zkj0dlff106"; - aarch64-linux = "1c35s7zykcrqf3va1cv7hqf1dp3cl70kdvqv3vgflqldc1wcza9h"; - aarch64-darwin = "1jpsf54x7yy53d6766gpw90ngdi6kicpqm1qbzbmmsasndl7rklp"; - armv7l-linux = "10vj751bjdkzsdcrdpq6xb430pdhdbz8ysk835ir64i3mv6ygi7k"; + x86_64-linux = "0cnrbjqcnkv7ybj9j7l0lcnfnxq18mddhdkj9797928q643bmj6z"; + x86_64-darwin = "1d9gb3i2k0c9cn38igg1nm91bfqdi4xg29zlprqsqh98ijwqy25y"; + aarch64-linux = "1jm8ll8f4m99ly53rv7000ng9a0l8jn4xpc6kfhmqdnf0jqfncsh"; + aarch64-darwin = "1awmaxkr5nl513c50g6k4r2j3w8p2by1j9i3kw7vkmwn91bk24i4"; + armv7l-linux = "1d2hl9jy1kfkzn4j7qkp3k8j1qc3r9rpqhvkfrr2axcqrahcrfsd"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.2"; + version = "1.71.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders"; + inherit commandLineArgs; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index e8043eef9fac..a739fc5c4a8f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, nixosTests }: +{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "" }: let inherit (stdenv.hostPlatform) system; @@ -15,21 +15,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1b2603fcb28479dajwg9q2ck083fym6khjv02ax3l0p6jazjyc70"; - x86_64-darwin = "0xggqfmsm7zzbn43mjmmk8wg75nr2nvkiaddcgwq3a2xn1x90jb5"; - aarch64-linux = "1wfrfap840a9azik1dbzp7kib04amc3y2m6s45v3qa3c0kw1162a"; - aarch64-darwin = "1nfv5ysri6p2sfp47786alv7b8rrn7mxsaisdlz970r8d79mrp5n"; - armv7l-linux = "185ayjvahyqxqab7dkpygxd68adxai25sw4fcw00x5c4l5lgmvhl"; + x86_64-linux = "03lbfl3azrjhxzkadrz632dpwnv6hyyls10mc8wzspwraz77v1m5"; + x86_64-darwin = "1fd66fbs414lja7ca38sdgx02nw9w1qfrlxhcb52ijls5xbmbgm4"; + aarch64-linux = "0hwzx0lvrxrzrpggpsymjzy53dq4msg0j3vrxq82308ydc5ssnzd"; + aarch64-darwin = "0dqhi6br29bq8a97wgfxgz4d236cg0ydgaqv8j5nqjgvjwp13p9l"; + armv7l-linux = "07qq0ic9nckl9fkk5rl9dy4gksw3l248jsy7v8ws8f3mq4l8gi49"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; in callPackage ./generic.nix rec { - inherit sourceRoot; + inherit sourceRoot commandLineArgs; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.2.22230"; + version = "1.71.0.22245"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix new file mode 100644 index 000000000000..f9378c06ea4c --- /dev/null +++ b/pkgs/applications/graphics/entwine/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pdal +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "entwine"; + version = "unstable-2022-08-03"; + + src = fetchFromGitHub { + owner = "connormanning"; + repo = "entwine"; + rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae"; + sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g="; + }; + + buildInputs = [ + openssl + pdal + curl + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Point cloud organization for massive datasets"; + homepage = "https://entwine.io/"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 79b505479c8c..6b991e8dd398 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "496"; + version = "497"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8="; + sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 9eee028949df..ccb8c36f6fb1 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-2yEUMD3FQ9JrecCnWSr0Fej4ngk7HVCZUgbRqmGbCK8="; + sha256 = "sha256-Uoi12odfJGyNc8Ap7E/zm4xklYdPPQvCGNxjb9AWJOI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index c8306feac759..eec281b9a50d 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.19.1"; + version = "1.20.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-ARBi+8IAheEJ5keyiDCub6Y83hT/dU/BajPChi3f1po="; + sha256 = "sha256-zDCvRwAtjBbBOa5D1k7khZGXeql5COMlWMi/dpwiiYM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 70602b7b7cde..ef996754f19d 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.102.2"; + version = "0.102.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mAkdx42JaYSSpNLssBNkX45V3VniVKVbPt2SQ/QaXmY="; + sha256 = "sha256-qk5iv/oJ2Q8vR5jFl0gR7gA0H/3sHJOOlr8rwg7HjUY="; }; vendorSha256 = "sha256-oWOu8vmxe0a/nIgkjpx7XrB49rjcuqnnpuOMtI9bLfY="; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index b6bb65a0bfff..f822ed8f0c2b 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -32,8 +32,8 @@ with python3.pkgs; buildPythonApplication rec { # shell completions installShellCompletion --cmd khal \ --bash <(_KHAL_COMPLETE=bash_source $out/bin/khal) \ - --fish <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \ - --zsh <(_KHAL_COMPLETE=fish_source $out/bin/khal) + --zsh <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \ + --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 49ca23ab3ded..3ea7afcbdeb4 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "sioyek"; - version = "1.4.0"; + version = "unstable-2022-08-30"; src = fetchFromGitHub { owner = "ahrm"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-F71JXgYaWAye+nlSrZvGjJ4ucvHTx3tPZHRC5QI4QiU="; + rev = "8d0a63484334e2cb2b0571a07a3875e6ab6c8916"; + sha256 = "sha256-29Wxg/VVQPDDzzxKcvMa1+rtiP4bDkPAB/JJsj+F+WQ="; }; buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ] diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 42c2a429de96..10b98e0642c0 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -11,8 +11,10 @@ , python3 , runtimeShell , wrapGAppsHook -, fehSupport ? false, feh -, imagemagickSupport ? true, imagemagick +, fehSupport ? false +, feh +, imagemagickSupport ? true +, imagemagick }: python3.pkgs.buildPythonApplication rec { @@ -29,17 +31,19 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook + gobject-introspection ]; - propagatedBuildInputs = [ - gexiv2 - gobject-introspection - gtk3 - hicolor-icon-theme - libnotify - librsvg - ] - ++ (with python3.pkgs; [ + buildInputs = [ + gexiv2 + gobject-introspection + gtk3 + hicolor-icon-theme + libnotify + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 configobj dbus-python @@ -51,14 +55,17 @@ python3.pkgs.buildPythonApplication rec { pygobject3 requests setuptools - ]) + ] ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; doCheck = false; - postInstall = '' - wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; prePatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c9c2d6a20dab..74b2568c1c24 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "105.0.5195.54", - "sha256": "0hj40scp54hp5xw036vb9v0h951hik4dq8skr52hffw24jqa9d5k", - "sha256bin64": null, + "version": "105.0.5195.102", + "sha256": "0qlj6s182d4nv0g76r0pcr1rvvh74pngcv79ml3cbqsir4khbfhw", + "sha256bin64": "0n6rghaszyd9s6l702wypm8k13770kl6njnc2pwzahbxq5v921wa", "deps": { "gn": { "version": "2022-07-11", @@ -56,8 +56,8 @@ "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" }, "ungoogled-patches": { - "rev": "105.0.5195.54-1", - "sha256": "021y7cm1fdwkakhqrvz3jw5hx30740qn827wcvih0jdc3msfgd97" + "rev": "105.0.5195.102-1", + "sha256": "17n06lqzbz19a3fdqbv5wj7s6v3rc0bfshdz8syw0k2gkw3x6ivc" } } } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 69cb5562109a..53c01b977e4e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.4.2753.37-1"; + version = "5.4.2753.47"; src = fetchurl { - url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "05aaprv1bqnb7iml1m6vlzv038dizy05ycwkrgb5nw1wiz9w6cyw"; + url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; + sha256 = "1p155mcrmfz395yajxa6fqjk1paac216kim26i3r56wah5329gmr"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index a49f2fe1307a..b5c9cd02e792 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "104.0.5112.79"; + version = "104.0.5112.101"; src = fetchurl { - url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38="; + url = "https://launchpadlibrarian.net/618703258/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-V+zqLhI8L/8ssxSR6S2v4gUAtoK3fB8Fi9bajBFEauU="; }; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index ab072340173a..ec8a9d7d6624 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -12,7 +12,7 @@ version() { } vivaldi_version_old=$(version vivaldi) -vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p') +vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p') if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then echo "vivaldi is already up-to-date" @@ -20,7 +20,7 @@ if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then fi # Download vivaldi and save hash and file path. -url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb" +url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb" mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") hash=${prefetch[0]} path=${prefetch[1]} diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index eb51cf14dadb..7b68d68beece 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LayPASPMSnRZkDs9LylWR62eS+b/5TB9PidDQCs+MXU="; + sha256 = "sha256-mgyzdu7xzN6rDSHBcC8Uz8m5+5VEfA0RPe8cPZYfEgM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 544e6d780e62..30ae4f468f8c 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.10"; + version = "1.12.11"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-ez98npQDkRmtE+Bh9O/bAOePwMQCvc0UZRcw5R2hAPY="; + hash = "sha256-vG1FSBHXaJBJk9dC61yZK1Vkr8PyQ7Q4TVZWRIsDY3E="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-wY0f9RUe9Z1FpjqWDpDG6QXQlFDChfAkjJzlvBMaaFE="; + vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 8b54719d5cad..d988e061f3a2 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_24 = mkKops rec { - version = "1.24.1"; - sha256 = "sha256-rePNCk76/j6ssvi+gSvxn4GqoW/QovTFCJ0rj2Dd+0A="; + version = "1.24.2"; + sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY="; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1c9090ea9620..91e38aae5c7a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.19"; ptb = "0.0.29"; - canary = "0.0.137"; + canary = "0.0.138"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-dreKO2yBDP547VYuJziBhC2sLdpbM2fcK5bxeds0zUQ="; + sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY="; }; }; aarch64-darwin = { diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 394120ef8b29..272e0551e762 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -11,17 +11,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = pname; rev = version; - sha256 = "sha256-w0h6BNuGwXV1CzyvXvsRs2MXHKLbK3EUaK4mKiuNBxc="; + hash = "sha256-n5rRvLhCy2d8xUoTNyM5JYKGJWN0nEwkQeBCOpUrUrc="; }; proxyVendor = true; - vendorSha256 = "sha256-vw9lDIZMswh/vrF1g8FvZ/faN5jWWPwfgnm66EWaohw="; + vendorHash = "sha256-Z1dW3cK3Anl8JpAfwppsSBRgV5SdRmQemOG+652z0KA="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 9eb377f1b98e..d15ab04315e8 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib +, zstd, enableZstd ? true, enableMixmaster ? false }: stdenv.mkDerivation rec { @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb mailcap sqlite - ]; + ] + ++ lib.optional enableZstd zstd; nativeBuildInputs = [ docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m @@ -62,7 +64,9 @@ stdenv.mkDerivation rec { # https://github.com/neomutt/neomutt/pull/2367 "--disable-include-path-in-cflags" "--zlib" - ]; + ] + ++ lib.optional enableZstd "--zstd" + ++ lib.optional enableMixmaster "--mixmaster"; # Fix missing libidn in mutt; # this fix is ugly since it links all binaries in mutt against libidn @@ -95,7 +99,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ]; + maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index e4b46c5bc2dd..6b87afd54cf4 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -11,6 +11,10 @@ , xclip , xdotool , makeWrapper +, stdenv +, AppKit +, Cocoa +, Foundation }: rustPlatform.buildRustPackage rec { @@ -39,7 +43,12 @@ rustPlatform.buildRustPackage rec { libnotify xclip openssl + ] ++ lib.optionals stdenv.isLinux [ xdotool + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation ]; # Some tests require networking @@ -55,7 +64,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://espanso.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat ]; - platforms = platforms.linux; + platforms = platforms.unix; longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 6492e6e1e2c9..a5964e0d28a6 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.5.10"; + version = "2.5.13"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-uKHLKZtvaaklJMYqAHtu4ULwcfbut1L2h6bjZkqI91o="; + sha256 = "sha256-n9lZfg+0JRRaO3H+sDXRIrELTs6NE5G78Ni0RKWzYuI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index b10d817d9e49..95d33d6f1eec 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20211016"; + version = "20220823"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "13xzqnhvnw6yipv4izkq0s9ykyl9pc5ifpr1ii8xfp28ch706qyw"; + sha256 = "sha256-V+8HQAYU2XjOYeku0XEHqkY4m0XjiUBxM61QcupnlVM="; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 44caca2fa2c8..9aa655932d35 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "2.1.7"; + version = "2.1.9"; src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; - rev = version; - hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU="; + rev = "refs/tags/${version}"; + hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix index 08be0740117a..772e9c22a59a 100644 --- a/pkgs/applications/science/logic/kissat/default.nix +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -4,14 +4,13 @@ stdenv.mkDerivation rec { pname = "kissat"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "kissat"; - # https://github.com/arminbiere/kissat/issues/18 - rev = "abfa45fb782fa3b7c6e2eb6b939febe74d7270b7"; - sha256 = "06pbmkjxgf2idhsrd1yzvbxr2wf8l06pjb38bzbygm6n9ami89b8"; + rev = "rel-${version}"; + sha256 = "sha256-C1lvkyYgFNhV7jGVLlrpJ5zZ8SFHg8g+iW1lDczhpBM="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f02e45280a81..2d1bf3aa251e 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial -, setuptools, wxPython_4_0, billiard, gnureadline }: +, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }: buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.52"; + version = "1.8.55"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo="; + sha256 = "sha256-RS3/U52n1Gs3cJtlZeE5z5q1EmC8NrPFt0mHhvIWVTA="; }; postPatch = '' @@ -22,6 +22,7 @@ buildPythonApplication rec { pyserial setuptools wxPython_4_0 + opencv4 ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 667dfd83d2cf..66cac403727a 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-ugly gtk4 libadwaita libpulseaudio diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index 25cb52220266..dbeb85821deb 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -1,18 +1,15 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , rustPlatform , gnome , pkg-config , meson , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , blueprint-compiler , ninja -, python3 -, gtk3-x11 -, glib , gobject-introspection , gtk4 , libadwaita @@ -37,31 +34,25 @@ stdenv.mkDerivation rec { }; patches = [ - # The metainfo.xml file has a URL to a screenshot of the application, - # unaccessible in the build's sandbox. We don't need the screenshot, so - # it's best to remove it. - ./remove-screenshot-metainfo.diff + # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 + (fetchpatch { + url = "https://gitlab.gnome.org/YaLTeR/video-trimmer/-/commit/2faf4bb13d44463ea940c39ece9187f76627dbe9.diff"; + sha256 = "sha256-BPjwfFCDIqnS1rAlIinQ982VKdAYLyzDAPLCmPDvdp4="; + }) ]; - postPatch = '' - patchShebangs \ - build-aux/meson/postinstall.py \ - build-aux/cargo.sh \ - build-aux/dist-vendor.sh - ''; - nativeBuildInputs = [ pkg-config meson wrapGAppsHook4 - appstream-glib + gobject-introspection desktop-file-utils blueprint-compiler ninja - # For post-install.py - python3 - gtk3-x11 # For gtk-update-icon-cache - glib # For glib-compile-schemas + # Present here in addition to buildInputs, because meson runs + # `gtk4-update-icon-cache` during installPhase, thanks to: + # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 + gtk4 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo @@ -69,7 +60,6 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - gobject-introspection gtk4 libadwaita gst_all_1.gstreamer @@ -79,10 +69,6 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.updateScript = gnome.updateScript { - packageName = pname; - }; - meta = with lib; { homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; description = "Trim videos quickly"; diff --git a/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff b/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff deleted file mode 100644 index 2d8741998d14..000000000000 --- a/pkgs/applications/video/video-trimmer/remove-screenshot-metainfo.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -index 9bd25b6..c627369 100644 ---- i/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -+++ w/data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in -@@ -19,12 +19,6 @@ - Video Trimmer cuts out a fragment of a video given the start and end timestamps. The video is never re-encoded, so the process is very fast and does not reduce the video quality. -

- -- -- -- https://gitlab.gnome.org/YaLTeR/video-trimmer/uploads/e840fa093439348448007197d07c8033/image.png -- Main Window -- -- - - - diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/applications/video/xplayer/plparser.nix index da3daa445f6a..c26bd06802f4 100644 --- a/pkgs/applications/video/xplayer/plparser.nix +++ b/pkgs/applications/video/xplayer/plparser.nix @@ -1,9 +1,10 @@ { stdenv , lib , fetchFromGitHub -, intltool +, meson +, ninja , gobject-introspection -, gmime +, gmime3 , libxml2 , libsoup , pkg-config @@ -11,23 +12,24 @@ stdenv.mkDerivation rec { pname = "xplayer-plparser"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1i7sld8am6b1wwbpfb18v7qp17vk2a5p8xcfds50yznr30lddsb2"; + sha256 = "6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4="; }; nativeBuildInputs = [ - intltool + meson + ninja pkg-config gobject-introspection ]; buildInputs = [ - gmime + gmime3 libxml2 libsoup ]; diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 4921017cf336..058d0b3a01d7 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -1,32 +1,42 @@ -{ callPackage, lib, fetchFromGitHub }: +{ callPackage, lib, fetchFromSourcehut }: let - sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ]; - version = "0.3.1"; - src = fetchFromGitHub { - owner = "protesilaos"; + sets = [ + "comfy" + "comfy-fixed" + "comfy-duo" + "comfy-wide" + "comfy-wide-fixed" + "comfy-motion" + "comfy-motion-duo" + ]; + version = "0.4.0"; + src = fetchFromSourcehut { + owner = "~protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-SMy3Kqve65ZU13lf1vZQR61mH7gcl1DvIZt3yD6tIf4="; + sha256 = "sha256-d3C5HNiZCd0xva6zvMP9NmvmeU4uXuaO04pbgIepwfw="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; overrideAttrs = (attrs: { inherit version; meta = with lib; { - homepage = "https://github.com/protesilaos/iosevka-comfy"; + inherit (src.meta) homepage; description = '' - Custom build of Iosevka with a rounded style and open shapes, - adjusted metrics, and overrides for almost all individual glyphs - in both roman (upright) and italic (slanted) variants. - ''; + Custom build of Iosevka with a rounded style and open shapes, + adjusted metrics, and overrides for almost all individual glyphs + in both roman (upright) and italic (slanted) variants. + ''; license = licenses.ofl; platforms = attrs.meta.platforms; maintainers = [ maintainers.DamienCassou ]; }; }); - makeIosevkaFont = set: (callPackage ./. { - inherit set privateBuildPlan; - }).overrideAttrs overrideAttrs; -in -builtins.listToAttrs (builtins.map (set: {name=set; value=makeIosevkaFont set;}) sets) + makeIosevkaFont = set: + (callPackage ./. { inherit set privateBuildPlan; }).overrideAttrs + overrideAttrs; +in builtins.listToAttrs (builtins.map (set: { + name = set; + value = makeIosevkaFont set; +}) sets) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 7d850ef71667..e829e98bee0b 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder -, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click +, afdko, appdirs, attrs, booleanoperations, brotlipy, click , defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli @@ -28,7 +28,6 @@ buildPythonPackage rec { afdko appdirs attrs - black booleanoperations brotlipy click @@ -70,9 +69,10 @@ buildPythonPackage rec { cp -r third_party $out ''; - meta = { + meta = with lib; { description = "Noto fonts support tools and scripts plus web site generation"; - license = lib.licenses.asl20; homepage = "https://github.com/googlefonts/nototools"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ba912854f7c7..0f11459a1702 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20220727"; + version = "20220830"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-IpHlI07Ymagww28rQFb/XnYjX0uge1k0IfSGUpBjTV4="; + sha256 = "sha256-gRFkPZDeq4ONt/IT8VS+8uBXNQqcg0JF7gHdZEM7qvs="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 132e2e9c3762..7dcb5a8a501a 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-03-22"; + version = "2022-09-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; - sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc="; + rev = version; + sha256 = "PaqEkl0E3pUEJDEv1WwUqcjzAcQniN8rUGhVgbOxuhA="; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation rec { ) ''} - jdupes -L -r $out/share + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index a52c0d0357bc..19a7eb4a0fad 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.23.1"; + version = "3.23.2"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "hfi2TBRrZTSN43tYKMPvb/dWwwUE7RakKTMBziHnCWA="; + sha256 = "h4sPjKpTufaunVP0d4Z5x/K+vRW1FpuLrMJjydx/a6w="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 5ac7fa9e79b9..fed25720e336 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -17,9 +17,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.4"; + version = "4.16.5"; - sha256 = "sha256-DlGcec5oUPDMzVztADw9fROmBIIO7isZ8gZEMGeDVcA="; + sha256 = "sha256-RK4sEir8CvB1aa2dZWJftA+2n4YPUEkhF9afOfOTA0Y="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 7e397b395f35..bc3c714eb0a4 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.16.0"; + version = "4.16.1"; - sha256 = "sha256-w/JNjyAlxZqfVpm8EBt+ieHhUziOtfd//XHzIjJjy/4="; + sha256 = "sha256-JecuD0DJASHaxL6gwmL3hcmAEA7sVIyaM0ushrdq4/Y="; buildInputs = [ exo diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 2360621268be..816960bc9c0d 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.0"; + version = "1.2.3.1"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-LwRfLvnn1JAvSXPTkVcIB4PbPrrVweIv72Xk5g015ck="; + sha256 = "sha256-mOswMUvr7LGN4GmczPUqNMUjs0c1Pc8SiC5k2Ou52Iw="; fetchSubmodules = true; }; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index fac10a28107f..3b6255683c8c 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, udev }: rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; - version = "unstable-2021-12-12"; + version = "1.3.7"; - src = fetchFromGitHub { - owner = "JoNil"; - repo = pname; - rev = "91ae98873ed01971ab1543b98266a5ad2ec09210"; - sha256 = "sha256-DGrT+YdDLdTYy5SWcQ+DNbpifGjrF8UTXyEeE/ug564="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-2ZilZIYXCNrKJlkHBsz/2/pMtF+UDfjDlt53ylcwgus="; }; nativeBuildInputs = [ @@ -19,7 +17,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-5ui1+987xICP2wUSHy4YzKskn52W51Pi4DbEh+GbSPE="; + cargoSha256 = "sha256-+3Rqlzkrw9XfM3PelGNbnRGaWQLbzVJ7iJgvGgVt5FE="; meta = with lib; { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index e36793debdff..69778f034829 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc="; + hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; }; postPatch = '' diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 6496d1acff06..0adadc3f2c87 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl }: stdenv.mkDerivation rec { - version = "2.6.1"; + version = "2.7.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-S+RvD7sXn8yjGAHv1OqiJJMAA45r8N1Rhz89d8yGv1Q="; + sha256 = "sha256-YGd0ft61L5ZmcWY0+wON2YgX1fKAcQlIGHNaD7I7exg="; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index f8c3834e7d8d..ab88e6d8921f 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, zlib, openssl, libre }: stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.7.0"; pname = "librem"; src = fetchFromGitHub { owner = "baresip"; repo = "rem"; rev = "v${version}"; - sha256 = "sha256-Rn3KKYW5OBInZYaDhwYVyPvL3UiuRG8CyHtPvW1S0Zo="; + sha256 = "sha256-t+klxuDiP7KAbN3ZK8eTWHTzNNpNTrlFINktjPDfeoo="; }; buildInputs = [ zlib openssl libre ]; makeFlags = [ diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 218059ab1afb..dc1afaab3f40 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-S/eJrSueJOv3+cUyzcCE3l287l0ihvzOZHB6ZCHtHpQ="; + sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index dc68abe38c36..559d8094b287 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -131,9 +131,10 @@ in stdenvNoCC.mkDerivation ({ install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt # Dynamic libraries - install -Dm0755 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* - install -Dm0755 -t $out/lib opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* - install -Dm0755 -t $out/lib opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* + mkdir -p $out/lib + cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib + cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib + cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index dcf8a1da2586..51b55592d42e 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.11.0"; + version = "5.13.0"; outputs = [ "out" "dev" "doc" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU="; + sha256 = "sha256-Anen1YtXsSPhk8DpA4JtADIz9m8oXFl9umlkb4iImf8="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: - # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" "LAPACK=-llapack" ] diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 0e9de5807ff3..9bab0482668e 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,40 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr -, result, uucp, uuseg, uutf -, lwt ? null }: +{ lib, buildDunePackage, fetchurl, cppo +, uutf +, lwt +}: -with lib; +buildDunePackage rec { + version = "0.2.3"; + pname = "notty"; -if versionOlder ocaml.version "4.05" -|| versionAtLeast ocaml.version "4.14" -then throw "notty is not available for OCaml ${ocaml.version}" -else - -let withLwt = lwt != null; in - -stdenv.mkDerivation rec { - version = "0.2.2"; - pname = "ocaml${ocaml.version}-notty"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; - sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q"; + sha256 = "sha256-dGWfsUBz20Q4mJiRqyTyS++Bqkl9rBbZpn+aHJwgCCQ="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ ocb-stubblr topkg ocamlbuild ]; - propagatedBuildInputs = [ result uucp uuseg uutf ] ++ - optional withLwt lwt; + nativeBuildInputs = [ cppo ]; - strictDeps = true; + propagatedBuildInputs = [ lwt uutf ]; - buildPhase = topkg.buildPhase - + " --with-lwt ${boolToString withLwt}"; - - inherit (topkg) installPhase; - - meta = { + meta = with lib; { homepage = "https://github.com/pqwy/notty"; - inherit (ocaml.meta) platforms; description = "Declarative terminal graphics for OCaml"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/development/php-packages/pdepend/default.nix index db0db7c86a4c..62d4e9212581 100644 --- a/pkgs/development/php-packages/pdepend/default.nix +++ b/pkgs/development/php-packages/pdepend/default.nix @@ -2,14 +2,14 @@ let pname = "pdepend"; - version = "2.11.0"; + version = "2.11.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar"; - sha256 = "sha256-QhNO/yI2oJNhkwSn32gdId5IY0VR69eF/b/yMklhPKs="; + sha256 = "sha256-3jZAhOw9wfR9Fl6Mlj8o0uinjUZO46CAHRkZxrQP5rU="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 97bdc19a8039..64e5ce632065 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI="; + sha256 = "sha256-yteZI35DcLUPd+cW543TVlp7P9gvzVpBp2qhUS1RB10="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index f2dd2c420527..03899b7a0222 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.18.0"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-yAqGVZnnragi3+jaAGnkYNH/XtpH3bojXHmPCrANgJU="; + hash = "sha256-mWb/24/9O8HvzblgudbVaLDR1igTkYpWZn53VqN2vbg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 080889680443..4d6875ad5782 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.3"; + version = "0.14.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-nLlldO4otyWKn91L6vCiBh9csplFrN8tiK1tfeik6Y4="; + hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index 617b87bc12f1..fe2cd731a1ce 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "biliass"; - version = "1.3.5"; + version = "1.3.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; + sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 61a93bf98655..d1c28e8066a0 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "black"; - version = "22.6.0"; + version = "22.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bG054ortN5rsQNocZUNMd9deZbtZoeHCg95UX7Tnxsk="; + hash = "sha256-eS9+tUC6mhfoZWU4cB0+sa/LE047RbcfILJcd6jbfm4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index ab5e1f579fc8..6b8f662cbcc6 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.22"; + version = "1.5.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-pJGyfo+7Sz4IxurkAo+51veN+o6gHAqBor5SLXERNdo="; + sha256 = "sha256-Zf2+GOyLQelFR0gugSzHWJV9WSKD/8IEkc4li4N+jnI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 9eb4c8525a32..92bdb1a6578e 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.12.4"; + version = "0.12.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-PHs6bS/I6BpJYEPHgB9yuM35Ix33fN5n/KxqKuQzwEk="; + hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index e26e936f48fd..2ba45e099673 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -1,16 +1,17 @@ { buildPythonPackage , fetchFromGitHub , lib -, black , graphql-core , promise , fetchpatch , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "graphql-server-core"; version = "2.0.0"; + disable = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; @@ -19,8 +20,6 @@ buildPythonPackage rec { sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr"; }; - disable = pythonOlder "3.6"; - patches = [ (fetchpatch { url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch"; @@ -33,18 +32,17 @@ buildPythonPackage rec { promise ]; - checkPhase = "black --check graphql_server tests"; + # fail with: cannot import name 'format_error' from 'graphql' + doCheck = false; checkInputs = [ - black + pytestCheckHook ]; meta = with lib; { description = "Core package for using GraphQL in a custom server easily"; homepage = "https://github.com/graphql-python/graphql-server-core"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index ee14b6fc1f1d..c9378af0b393 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "v${version}"; - hash = "sha256-7Tg+/3BXRmzG39jIC281MKxyJyf9e9/1uOqUji08B3U="; + hash = "sha256-QMHxQLHp2p3/kGDd995CjBvQqn2BVM6d02NCzrjExr0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 7083f9514cdc..cc5f3a36e85b 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "markdownify"; - version = "0.11.4"; + version = "0.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-crOkiv/M8v7rJd/Tvsq67PU76vTgi+aNzthEcniDKBM="; + sha256 = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4="; }; propagatedBuildInputs = [ beautifulsoup4 six ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index f6658ad1f6f8..f8d9b341663e 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.5.1"; + version = "0.6.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "napari"; repo = "npe2"; rev = "refs/tags/v${version}"; - hash = "sha256-+tTJrtJFUGwOhFzWgA5cFVp458DGuPVkErN/5O2LHk4="; + hash = "sha256-1wGMd4box+ulHcEL4zoArJ3ez95s7GcbXa9bWfLbSCw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 7bb46b115e00..6822886bda4e 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b"; + sha256 = "sha256-Boc86//WWo/KfCDA49wDJlXH7o3g9VIgXK07V0JlwpM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 10537b419ae8..4f63cca8a8b1 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonApplication rec { pname = "python-glanceclient"; - version = "4.0.1"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pfQnIvrZFw16eRF2kPxmthWpY7qWkBu9SUavQnXO8zQ="; + hash = "sha256-fknYBKZzCA6sThugNQT5+p+/hqv8vW6M2LMMpbT+7rY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 38daad08bdb0..c51c222dd6fa 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "python-heatclient"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs="; + hash = "sha256-/SW8hRj588N++4Cuz7elbU0qO++4Jhm1va069JnNmZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 198ef19465c4..55fb3fff3182 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-D1DaM78gtVrPxZ1PlGD6Lvwb4V/QXsPyNnTQPror6j8="; + hash = "sha256-qLv2cfVsJKpaN6IluY8plLggY9c+NIZlfrUAozpAbSk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index d0a8fc3a0fc6..9a9e01ff4be7 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TEGzUNgYTkb2VrvW2E3lurD6N1XcIhH2tjmPlsJ/5MI="; + hash = "sha256-yoyQyhyqRQZ8yyn3sv94JqkVZQMybwxLGFForZowr3o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 7c672d5d8307..3329753d6334 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "4.0.1"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O2jHNpnF+8OKzXtvEUPWmSOz+vcQ82XZd6QQS9kni/8="; + hash = "sha256-+CKY5KSPfL3WgPJjjIXRynrhp27b4wA20htM16KcCes="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 2dcb884931d9..ad3bac33e24e 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2022.03.4"; + version = "2022.03.5"; src = let @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2"; + sha256 = "19idgilabh04cbr1qj6zgrgsfjm248mmfz6fsr0smrd68d0xnml9"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index f26ceb4ab135..9569de3e6496 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.3.3"; + version = "2.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,16 +27,9 @@ buildPythonPackage rec { owner = "SMTG-UCL"; repo = "sumo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-XEs4lLbVwN00UDnDC0kUNlut9RFXPfcyevBA1f1UqSU="; + sha256 = "sha256-kgTTYCTq8jTNOmc92TRskbsOcnk6wTZgf0UfoctJ4M4="; }; - postPatch = '' - # Loosen castepxbin dependency version pinning - # https://github.com/SMTG-UCL/sumo/issues/173 - substituteInPlace setup.py \ - --replace "castepxbin==0.1.0" "castepxbin>=0.1.0" - ''; - nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index c0adbad33e8a..4695854dbfad 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.48.0"; + version = "6.49.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-DXoiV5AunDGagfq8BWHFcgGBv9OdGij5DDuxOKJYnE4="; + hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 2c9e9092939c..24306ddf4173 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }: +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-xCw2Wuc2ndTcLrwR7uv5FFnwImxTcG/STeTQBiaKuIw="; + sha256 = "sha256-Zlk6wUQBftst8Tx+dAT67/WBID1BHD4aSAvRcGO9ErE="; }; dontUnpack = true; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index feae045b68e1..45ca5b0152fa 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hc3b1r8Wr8cXAWoqINneBRU1Mdv4RkAeOOCK7O9Vp9g="; + sha256 = "sha256-RV+oXcu74lyc3v3i3aQvKqrm6KrKwvPwED4JAwXgjqw="; }; - vendorSha256 = "sha256-g/0OjAqT+0P0VtB0i0o2QfMqU8YDnoRtwA5isNJlSBE="; + vendorSha256 = "sha256-F20/EQjlrwYzejLPcnuzb7K9RmbbrqU+MwzBO1MvhL4="; doCheck = false; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 58af734a16cc..e19bd18b68c1 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "4.0.7"; + version = "5.0.1"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5QVktJpGpHzwRUN8oIFoLydnA+ELhUprcQASeGzgLG8="; + sha256 = "sha256-UfVhkwb89OU7yENcCXM7JfYNsO//des0gsEnvnJGMjA="; }; - cargoSha256 = "sha256-qmLmkWFP8T886uR8kJKCqB0G5XIfk+r+kubamKryktc="; + cargoSha256 = "sha256-kkWslFEdjsWGIrRWylGyTDZnNXcfCVrWT+dVnyvTRqk="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index fb646d395955..405e7e7b9b07 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.3.0"; + version = "1.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "v${version}"; - hash = "sha256-8uFAWcf9ookmFAnCdA97+oade+fECt58DuDSk1uTMQI="; + hash = "sha256-zHdgVpe92OiwLC4jHVtT3oC+WnB30e5U3ZOHnmuo+Ao="; }; buildInputs = [ diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 75971e7ad342..98ad6a7a05ee 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6laSFo8aBmZpeN5V3utZQHIWuoQcdy1hd1yU8LxpEJQ="; + sha256 = "sha256-HV/0ORI3siAnVyLcNDzu4BwK/sFO841ptQoxK6c+1Xs="; }; - cargoSha256 = "sha256-bbyeI/cr5aBejiEcYyyyJO8UX5QoIlT9MFgnpDr/z1M="; + cargoSha256 = "sha256-jhn795bTcqOG60yzydWJ5Y9eR2UTVUBteuMw03M7wM0="; cargoBuildFlags = [ "--package" "lang-srv" ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "A language server for Standard ML"; homepage = "https://github.com/azdavis/millet"; changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; - license = licenses.mit; + license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 793b1da2fa03..6f51eb892df8 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.8.30"; + version = "2022.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QUda28Wt4XGEZDvP36mWMuf2FROhfsccSDIDG4hiy6s="; + sha256 = "sha256-EMCIPt0f2Aqin9Yz34JoPCSVjol3i/UMRnNhC/ttv7A="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 5458df424b12..d2855861dc8f 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -58,7 +58,8 @@ buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'requirements-detector = "^0.7"' 'requirements-detector = "*"' \ --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \ - --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' + --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' \ + --replace 'pycodestyle = ">=2.6.0,<2.9.0"' 'pycodestyle = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix index 64437bb32529..50372b287411 100644 --- a/pkgs/development/tools/taplo/default.nix +++ b/pkgs/development/tools/taplo/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchCrate -, openssl , stdenv , Security , withLsp ? true @@ -9,18 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "taplo"; - version = "0.6.9"; + version = "0.7.0"; src = fetchCrate { inherit version; pname = "taplo-cli"; - sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys="; + sha256 = "sha256-lJdDr6pXOxndv3mBAbqkDnVXOFklSMcnzTed0U1Nm9U="; }; - cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs="; - - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; + cargoSha256 = "sha256-1wN43HOyrSFTs9nKxUi3kcnGvtONW8SgKwIEK1ckCgk="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index f2a4863ecbca..402991e60594 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -9,13 +9,13 @@ llvmPackages.stdenv.mkDerivation rec { pname = "wasmedge"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = version; - sha256 = "sha256-SJi8CV0sa+g+Ngvdw8+SxV3kHqoiKBhYUwDLZM4+jX0="; + sha256 = "sha256-4w9+3hp1GVLx2dOTDXlUOH6FgK1jvkt12wXs4/S9UlI="; }; buildInputs = [ diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index fe401a627b5b..eddb96f301da 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,47 +1,62 @@ -{ lib, stdenv, fetchurl, pkg-config, SDL2, libogg, libvorbis, zlib, unzip }: - -let - - # Digital recordings of the music on an original Roland MT-32. So - # we don't need actual MIDI playback capability. - audio = fetchurl { - url = "mirror://sourceforge/exult/exult_audio.zip"; - sha256 = "0s5wvgy9qja06v38g0qwzpaw76ff96vzd6gb1i3lb9k4hvx0xqbj"; - }; - -in +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, autoconf +, automake +, libogg +, libtool +, libvorbis +, pkg-config +, zlib +, enableTools ? false +}: stdenv.mkDerivation rec { pname = "exult"; - version = "1.6"; + version = "1.8"; - src = fetchurl { - url = "mirror://sourceforge/exult/exult-${version}.tar.gz"; - sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s"; + src = fetchFromGitHub { + owner = "exult"; + repo = "exult"; + rev = "v${version}"; + hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E="; }; - configureFlags = [ "--disable-tools" ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ SDL2 libogg libvorbis zlib ]; + buildInputs = [ + SDL2 + libogg + libvorbis + zlib + ]; - enableParallelBuilding = true; + preConfigure = '' + ./autogen.sh + ''; - NIX_LDFLAGS = "-lX11"; + configureFlags = lib.optional (!enableTools) "--disable-tools"; - postInstall = - '' - mkdir -p $out/share/exult/music - unzip -o -d $out/share/exult ${audio} - chmod 644 $out/share/exult/*.flx - ''; # */ - - meta = { - homepage = "http://exult.sourceforge.net/"; - description = "A reimplementation of the Ultima VII game engine"; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; - hydraPlatforms = lib.platforms.linux; # darwin times out - license = lib.licenses.gpl2Plus; + meta = with lib; { + description = "Exult is a project to recreate Ultima VII for modern operating systems"; + longDescription = '' + Ultima VII, an RPG from the early 1990's, still has a huge following. But, + being a DOS game with a very nonstandard memory manager, it is difficult + to run it on the latest computers. Exult is a project that created an + Ultima VII game engine that runs on modern operating systems, capable of + using the data and graphics files that come with the game. Exult aims to + let those people who own Ultima VII play the game on modern hardware, in + as close to (or perhaps even surpassing) its original splendor as is + possible. + ''; + homepage = "http://exult.info"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ azahi eelco ]; }; } diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 6b81593c8af1..c04c90b97753 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.27"; + version = "0.20.28"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-h9WmeVONX19/pUBfE1T/OSMI/HkTKJiTfyyEJV/noB8="; + sha256 = "sha256-33EsxwwvgkN9U8kpYywV0wsRnLzjGv87zYJ9jSVi91c="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 067ce78fae9c..227cfdcb6dc8 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, SDL2, SDL2_image , curl -, libogg, libvorbis, libGLU, libGL, openal, boost, glew -, libpng, freetype, glm +{ lib +, stdenv +, fetchurl +, cmake +, pkg-config +, boost +, curl +, SDL2 +, SDL2_image +, libSM +, libXext +, libpng +, freetype +, libGLU +, libGL +, glew +, glm +, openal +, libogg +, libvorbis }: stdenv.mkDerivation rec { @@ -14,8 +31,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew - libpng freetype glm + buildInputs = [ + boost + curl + SDL2 + SDL2_image + libSM + libXext + libpng + freetype + libGL + libGLU + glew + glm + openal + libogg + libvorbis ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index bcc53e82b9aa..6b7f596683e4 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-07-24-${kernel.version}"; + version = "unstable-2022-08-15-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "925d86b7be3ccf21b17734cfececf40e43c4598e"; - sha256 = "sha256-N5lGJu4c03cVDk3WTcegzZHBDmguPEX8dCedJS2TMSI="; + rev = "e4bf2d51d3fe8485ad2b28a89c157ada32ee3d77"; + sha256 = "sha256-zvl1H9AIExgt6t2A2w7zDwXmRsmLY8y3P6EfbBuFdh8="; }; hardeningDisable = [ "pic" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19"; + broken = kernel.kernelOlder "4.9"; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d47ec1ab1f62..c23e956972c2 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "frr"; - version = "8.3"; + version = "8.3.1"; src = fetchFromGitHub { owner = "FRRouting"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-PW6ULiSGNznKS6zw4aa27QSSgbew7TTLCqwNm9bH2LY="; + hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index a46a25ee5a19..3d475b81a608 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-iFtoxEjb+Wk8E2oj1SjSRNwxg20//0LgFtjMq9qJOEQ="; + sha256 = "sha256-NJK8MW/vUZwdGIEipL/zyh24o/pu7fwQMeDxyoFdtP4="; }; vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index efaf156a2225..3ffe75cf4553 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.40.0"; + version = "2.41.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-L4ofFpHaC2yygCnzX9N+1BForY0R/FZ1qYScurtm33Y="; + hash = "sha256-dJWxOUw+G3U19HSeL9rebWGdilQnNC9x89e99vFbp0s="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index b68fb2cf524a..a6e9213cd748 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.80.0"; + version = "1.81.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SIwl8Mgbkk/z3xZ6wCmce7D2T2A2+dcuQ607BOsfrkQ="; + sha256 = "sha256-O13dNhj+0SVz/6RNmFIJKSXqd38zdFc1CJ09q3jiKfg="; }; vendorSha256 = null; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 0ed96d249b49..ffe9f901df58 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "12.0.6"; + version = "12.0.7"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-DVum2fUa1BiSyL0d8hzRo3AzEVSRX2EBrJ4DBBIxftE="; + sha256 = "sha256-Eaei4Zi0Rg9zu7DInLAcaRo8Fyu2mqBblcYNRaS46c8="; }; preConfigure = '' diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d7b65d55d152..f6c4cdaba046 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.8.3"; + version = "2.8.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-ww5yy4W6voP5Wo1wVuCXUtmyA9CoVk1HU5UzPUoHf/E="; + sha256 = "sha256-TzNjz1usnQ0CMu47i9pnCRR6N/d3ig2E0wVH3E8xJp0="; stripRoot = false; }; - vendorSha256 = "sha256-ogq/4gBX4+5GZomk00Yu8J3JSbkhEFOWE6Ik+HqtkWk="; + vendorSha256 = "sha256-+jqMokDuvw5LTqBxJ/2VyoT3wkdBHewTrYsK/5Uv6js="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 00a88b8073fe..22884d6d70c1 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -22,7 +22,7 @@ let ); in stdenv.mkDerivation rec { - version = "0.12.0"; # also update communityModules + version = "0.12.1"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo="; + sha256 = "sha256-p+y75B8BpCUYBVk6xtFdvGy3XZx6h2x2tFbPdP9LkOU="; }; # A note to all those merging automated updates: Please also update this @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "65438e4ba563"; - sha256 = "sha256-zHOrMzcgHOdBl7nObM+OauifbcmKEOfAuj81MDSoLMk="; + rev = "cce12a660b98"; + sha256 = "sha256-dFWS1EFd2wtFnnuU4xKPnBisIdKkgMAvBtsfAEbdLjE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 1f6b3a106c60..94d6c138ba19 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,14 +3,14 @@ let package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { - version = "1.27.0"; + version = "1.27.2"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "8qkoVXHXlvVK5GROVNhTkN52g9RQ/CuAMtDLq0Fx3T0="; + sha256 = "FwW3hnZsOitdFjhiZFAyM5aBH0/LO05SG0TyavqNiHw="; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 121a0ea6f4de..cd088c24546e 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -31,22 +31,22 @@ let sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; }; }; - "@babel/core-7.18.9" = { + "@babel/core-7.18.10" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.9"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"; - sha512 = "1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz"; + sha512 = "JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw=="; }; }; - "@babel/generator-7.18.9" = { + "@babel/generator-7.18.12" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.9"; + version = "7.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz"; - sha512 = "wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz"; + sha512 = "dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -94,13 +94,13 @@ let sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; - "@babel/helper-define-polyfill-provider-0.3.1" = { + "@babel/helper-define-polyfill-provider-0.3.2" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; - sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz"; + sha512 = "r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg=="; }; }; "@babel/helper-environment-visitor-7.18.9" = { @@ -184,13 +184,13 @@ let sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; }; }; - "@babel/helper-remap-async-to-generator-7.18.6" = { + "@babel/helper-remap-async-to-generator-7.18.9" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; - sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; + sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; "@babel/helper-replace-supers-7.18.9" = { @@ -229,6 +229,15 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; + "@babel/helper-string-parser-7.18.10" = { + name = "_at_babel_slash_helper-string-parser"; + packageName = "@babel/helper-string-parser"; + version = "7.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; + sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + }; + }; "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; @@ -247,13 +256,13 @@ let sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.18.6" = { + "@babel/helper-wrap-function-7.18.11" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.18.6"; + version = "7.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; - sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz"; + sha512 = "oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w=="; }; }; "@babel/helpers-7.18.9" = { @@ -274,13 +283,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.9" = { + "@babel/parser-7.18.11" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.9"; + version = "7.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz"; - sha512 = "9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"; + sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -301,13 +310,13 @@ let sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.18.6" = { + "@babel/plugin-proposal-async-generator-functions-7.18.10" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; - sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; + 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=="; }; }; "@babel/plugin-proposal-class-properties-7.18.6" = { @@ -328,13 +337,13 @@ let sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; }; }; - "@babel/plugin-proposal-decorators-7.18.9" = { + "@babel/plugin-proposal-decorators-7.18.10" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.18.9"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.9.tgz"; - sha512 = "KD7zDNaD14CRpjQjVbV4EnH9lsKYlcpUrhZH37ei2IY+AlXrfAPy5pTmRUE4X6X1k8EsKXPraykxeaogqQvSGA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz"; + sha512 = "wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -895,13 +904,13 @@ let sha512 = "ijHNhzIrLj5lQCnI6aaNVRtGVuUZhOXFLRVFs7lLrkXTHip4FKty5oAuQdk4tywG0/WjXmjTfQCWmuzrvFer1w=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.18.6" = { + "@babel/plugin-transform-unicode-escapes-7.18.10" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; - sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; + sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; }; }; "@babel/plugin-transform-unicode-regex-7.18.6" = { @@ -913,13 +922,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.18.9" = { + "@babel/preset-env-7.18.10" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.18.9"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz"; - sha512 = "75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz"; + sha512 = "wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -949,31 +958,31 @@ let sha512 = "38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug=="; }; }; - "@babel/template-7.18.6" = { + "@babel/template-7.18.10" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.6"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; - sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; + sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.18.9" = { + "@babel/traverse-7.18.11" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.9"; + version = "7.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz"; - sha512 = "LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz"; + sha512 = "TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ=="; }; }; - "@babel/types-7.18.9" = { + "@babel/types-7.18.10" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.9"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz"; - sha512 = "WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz"; + sha512 = "MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1012,13 +1021,22 @@ let sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; - "@humanwhocodes/config-array-0.9.5" = { + "@humanwhocodes/config-array-0.10.4" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; + version = "0.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz"; + sha512 = "mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw=="; + }; + }; + "@humanwhocodes/gitignore-to-minimatch-1.0.2" = { + name = "_at_humanwhocodes_slash_gitignore-to-minimatch"; + packageName = "@humanwhocodes/gitignore-to-minimatch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz"; + sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -1544,13 +1562,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jest-28.1.6" = { + "@types/jest-28.1.7" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "28.1.6"; + version = "28.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz"; - sha512 = "0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-28.1.7.tgz"; + sha512 = "acDN4VHD40V24tgu0iC44jchXavRNVFXQ/E6Z5XNsswgoSO/4NgsXoEYmPUGookKldlZQyIpmrEXsHI9cA3ZTA=="; }; }; "@types/js-yaml-4.0.5" = { @@ -1697,85 +1715,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.31.0" = { + "@typescript-eslint/eslint-plugin-5.33.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz"; - sha512 = "VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz"; + sha512 = "S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ=="; }; }; - "@typescript-eslint/parser-5.31.0" = { + "@typescript-eslint/parser-5.33.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz"; - sha512 = "UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz"; + sha512 = "IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA=="; }; }; - "@typescript-eslint/scope-manager-5.31.0" = { + "@typescript-eslint/scope-manager-5.33.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"; - sha512 = "8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz"; + sha512 = "8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA=="; }; }; - "@typescript-eslint/type-utils-5.31.0" = { + "@typescript-eslint/type-utils-5.33.1" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz"; - sha512 = "7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz"; + sha512 = "X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g=="; }; }; - "@typescript-eslint/types-5.31.0" = { + "@typescript-eslint/types-5.33.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz"; - sha512 = "/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz"; + sha512 = "7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ=="; }; }; - "@typescript-eslint/typescript-estree-5.31.0" = { + "@typescript-eslint/typescript-estree-5.33.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"; - sha512 = "3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz"; + sha512 = "JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA=="; }; }; - "@typescript-eslint/utils-5.31.0" = { + "@typescript-eslint/utils-5.33.1" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz"; - sha512 = "kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz"; + sha512 = "uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ=="; }; }; - "@typescript-eslint/visitor-keys-5.31.0" = { + "@typescript-eslint/visitor-keys-5.33.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.31.0"; + version = "5.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"; - sha512 = "ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz"; + sha512 = "nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg=="; }; }; - "acorn-8.7.1" = { + "acorn-8.8.0" = { name = "acorn"; packageName = "acorn"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; + sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; }; }; "acorn-jsx-5.3.2" = { @@ -1994,31 +2012,31 @@ let sha512 = "Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q=="; }; }; - "babel-plugin-polyfill-corejs2-0.3.1" = { + "babel-plugin-polyfill-corejs2-0.3.2" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; - sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz"; + sha512 = "LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.2" = { + "babel-plugin-polyfill-corejs3-0.5.3" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; - sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz"; + sha512 = "zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw=="; }; }; - "babel-plugin-polyfill-regenerator-0.3.1" = { + "babel-plugin-polyfill-regenerator-0.4.0" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; - sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz"; + sha512 = "RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw=="; }; }; "babel-preset-current-node-syntax-1.0.1" = { @@ -2102,13 +2120,13 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "browserslist-4.20.3" = { + "browserslist-4.21.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.3"; + version = "4.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; - sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"; + sha512 = "898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="; }; }; "bser-2.1.1" = { @@ -2183,13 +2201,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001344" = { + "caniuse-lite-1.0.30001374" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001344"; + version = "1.0.30001374"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz"; - sha512 = "0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz"; + sha512 = "mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw=="; }; }; "chalk-2.4.2" = { @@ -2444,13 +2462,13 @@ let sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; }; }; - "core-js-compat-3.22.7" = { + "core-js-compat-3.24.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.22.7"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.7.tgz"; - sha512 = "uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz"; + sha512 = "XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw=="; }; }; "core-js-pure-3.23.1" = { @@ -2696,13 +2714,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.141" = { + "electron-to-chromium-1.4.211" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.141"; + version = "1.4.211"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.141.tgz"; - sha512 = "mfBcbqc0qc6RlxrsIgLG2wCqkiPAjEezHxGTu7p3dHHFOurH4EjS9rFZndX5axC8264rI1Pcbw8uQP39oZckeA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz"; + sha512 = "BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A=="; }; }; "emittery-0.10.2" = { @@ -2804,13 +2822,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.20.0" = { + "eslint-8.22.0" = { name = "eslint"; packageName = "eslint"; - version = "8.20.0"; + version = "8.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"; - sha512 = "d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz"; + sha512 = "ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA=="; }; }; "eslint-config-google-0.14.0" = { @@ -2822,13 +2840,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-26.7.0" = { + "eslint-plugin-jest-26.8.5" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "26.7.0"; + version = "26.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.7.0.tgz"; - sha512 = "/YNitdfG3o3cC6juZziAdkk6nfJt01jXVfj4AgaYVLs7bupHzRDL5K+eipdzhDXtQsiqaX1TzfwSuRlEgeln1A=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.8.5.tgz"; + sha512 = "DEaimuVhah/fx6jDkaP4oEPhH6VLr9skpZxYqbbmfeYvXzjos3AX61NpyMvq4aB4x6XJ3rsu/zcJfg0z0nytfw=="; }; }; "eslint-scope-5.1.1" = { @@ -2876,13 +2894,13 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "espree-9.3.2" = { + "espree-9.3.3" = { name = "espree"; packageName = "espree"; - version = "9.3.2"; + version = "9.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; + url = "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz"; + sha512 = "ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng=="; }; }; "esprima-4.0.1" = { @@ -3101,6 +3119,15 @@ let sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; + "find-up-5.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; + }; + }; "flat-cache-3.0.4" = { name = "flat-cache"; packageName = "flat-cache"; @@ -3344,6 +3371,15 @@ let sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; + "grapheme-splitter-1.0.4" = { + name = "grapheme-splitter"; + packageName = "grapheme-splitter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; + sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; + }; + }; "has-1.0.3" = { name = "has"; packageName = "has"; @@ -4055,13 +4091,13 @@ let sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; - "jszip-3.10.0" = { + "jszip-3.10.1" = { name = "jszip"; packageName = "jszip"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz"; - sha512 = "LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz"; + sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; "kleur-3.0.3" = { @@ -4136,6 +4172,15 @@ let sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; + "locate-path-6.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; + }; + }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -4151,7 +4196,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; }; }; "lodash.merge-4.6.2" = { @@ -4442,13 +4487,13 @@ let sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; }; }; - "node-releases-2.0.5" = { + "node-releases-2.0.6" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"; - sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; + sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; "normalize-path-3.0.0" = { @@ -4604,6 +4649,15 @@ let sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; + "p-locate-5.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; + }; + }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -5810,6 +5864,15 @@ let sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; }; }; + "update-browserslist-db-1.0.5" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"; + sha512 = "dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q=="; + }; + }; "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; @@ -6062,49 +6125,49 @@ let sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; }; - "zigbee-herdsman-0.14.46" = { + "zigbee-herdsman-0.14.53" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.14.46"; + version = "0.14.53"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.46.tgz"; - sha512 = "i05yGfbe7xZv7dazBz1bZMHaMG7m5MMXr8u7huHuItyIgUysdY1fePVFQCoQOEKtDiPPbyXSJ/nzj157Trb9Cg=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.53.tgz"; + sha512 = "D4jmeqI9UzACMamssVSv9qeBNt5KeHXDAdGPFlcf1baFznvOmP4NMzTW7kElH/49mNtV0VWlvxgb2+vE0zt2TQ=="; }; }; - "zigbee-herdsman-converters-14.0.583" = { + "zigbee-herdsman-converters-14.0.610" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.583"; + version = "14.0.610"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.583.tgz"; - sha512 = "yHaMj8hvaXgQ1gQ+IT2adg53AgI+gB7FgrvSxxBOYqq1v6/GJQKFIju0d3YiYoFMvQ7P2I5GNcKJz6yKK3wotg=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.610.tgz"; + sha512 = "EjJtICW/z5D1FLV0BJOFeo2P8MzxyuvqZuqilsJT0IBp3xsyvZHEc67AyB3Y1y/dRg7QvkQ+zu/priQJ0AMXPg=="; }; }; - "zigbee2mqtt-frontend-0.6.107" = { + "zigbee2mqtt-frontend-0.6.110" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.107"; + version = "0.6.110"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.107.tgz"; - sha512 = "/s9Ec2DnOPTH7+zOnebQdkC/9pDZ1H+kvOZhN2/V9yrwAXQHJm9A0RVhY/ErSk0Ecl/gR9jw1Dvn9bEmtK3Kuw=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.110.tgz"; + sha512 = "OszWm6XUviOLBtuXmMVHvEz/WwxjQGFVNdB2bRs8Km/421EmlSrng/BRrP1xlyqHB+zevGt3bDqGb2Rj/GhknQ=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.27.0"; + version = "1.27.2"; src = ./.; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.18.8" - (sources."@babel/core-7.18.9" // { + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.9" // { + (sources."@babel/generator-7.18.12" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -6118,7 +6181,7 @@ let }) sources."@babel/helper-create-class-features-plugin-7.18.9" sources."@babel/helper-create-regexp-features-plugin-7.18.6" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6132,23 +6195,24 @@ let sources."@babel/helper-module-transforms-7.18.9" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.18.9" - sources."@babel/helper-remap-async-to-generator-7.18.6" + 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-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-validator-option-7.18.6" - sources."@babel/helper-wrap-function-7.18.6" + sources."@babel/helper-wrap-function-7.18.11" sources."@babel/helpers-7.18.9" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.18.9" + sources."@babel/parser-7.18.11" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" - sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-class-static-block-7.18.6" - sources."@babel/plugin-proposal-decorators-7.18.9" + sources."@babel/plugin-proposal-decorators-7.18.10" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -6211,9 +6275,9 @@ let sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-typescript-7.18.6" - sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.18.9" // { + (sources."@babel/preset-env-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6221,9 +6285,9 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.18.6" sources."@babel/runtime-7.18.3" - sources."@babel/template-7.18.6" - sources."@babel/traverse-7.18.9" - sources."@babel/types-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.11" + sources."@babel/types-7.18.10" sources."@bcoe/v8-coverage-0.2.3" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" @@ -6235,7 +6299,8 @@ let sources."type-fest-0.20.2" ]; }) - sources."@humanwhocodes/config-array-0.9.5" + sources."@humanwhocodes/config-array-0.10.4" + sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ @@ -6349,7 +6414,7 @@ let sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jest-28.1.6" + sources."@types/jest-28.1.7" sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" @@ -6366,15 +6431,15 @@ let sources."@types/ws-8.5.3" sources."@types/yargs-17.0.10" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.31.0" - sources."@typescript-eslint/parser-5.31.0" - sources."@typescript-eslint/scope-manager-5.31.0" - sources."@typescript-eslint/type-utils-5.31.0" - sources."@typescript-eslint/types-5.31.0" - sources."@typescript-eslint/typescript-estree-5.31.0" - sources."@typescript-eslint/utils-5.31.0" - sources."@typescript-eslint/visitor-keys-5.31.0" - sources."acorn-8.7.1" + sources."@typescript-eslint/eslint-plugin-5.33.1" + sources."@typescript-eslint/parser-5.33.1" + sources."@typescript-eslint/scope-manager-5.33.1" + sources."@typescript-eslint/type-utils-5.33.1" + sources."@typescript-eslint/types-5.33.1" + sources."@typescript-eslint/typescript-estree-5.33.1" + sources."@typescript-eslint/utils-5.33.1" + sources."@typescript-eslint/visitor-keys-5.33.1" + sources."acorn-8.8.0" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-8.11.0" @@ -6408,13 +6473,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-28.1.3" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + (sources."babel-plugin-polyfill-corejs2-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babel-plugin-polyfill-corejs3-0.5.3" + sources."babel-plugin-polyfill-regenerator-0.4.0" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-28.1.3" sources."balanced-match-1.0.2" @@ -6424,7 +6489,7 @@ let sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.20.3" + sources."browserslist-4.21.3" sources."bser-2.1.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -6432,7 +6497,7 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001344" + sources."caniuse-lite-1.0.30001374" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."chownr-1.1.4" @@ -6467,7 +6532,7 @@ let sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" sources."core-js-3.24.1" - (sources."core-js-compat-3.22.7" // { + (sources."core-js-compat-3.24.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -6498,7 +6563,7 @@ let sources."dom-helpers-5.2.1" sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.141" + sources."electron-to-chromium-1.4.211" sources."emittery-0.10.2" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -6508,7 +6573,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.20.0" // { + (sources."eslint-8.22.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" @@ -6518,15 +6583,19 @@ let sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" + sources."find-up-5.0.0" sources."globals-13.15.0" sources."has-flag-4.0.0" sources."json-schema-traverse-0.4.1" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."supports-color-7.2.0" sources."type-fest-0.20.2" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.7.0" + sources."eslint-plugin-jest-26.8.5" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -6534,7 +6603,7 @@ let ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" + sources."espree-9.3.3" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -6607,6 +6676,7 @@ let sources."globby-11.1.0" sources."glossy-0.1.7" sources."graceful-fs-4.2.10" + sources."grapheme-splitter-1.0.4" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" @@ -6832,7 +6902,7 @@ let sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.2.1" sources."jsonpointer-5.0.0" - (sources."jszip-3.10.0" // { + (sources."jszip-3.10.1" // { dependencies = [ sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" @@ -6885,7 +6955,7 @@ let sources."natural-compare-1.4.0" sources."node-abi-3.22.0" sources."node-int64-0.4.0" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" @@ -7068,6 +7138,7 @@ let sources."unicode-property-aliases-ecmascript-2.0.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" @@ -7101,9 +7172,9 @@ let sources."yargs-17.5.1" sources."yargs-parser-21.0.1" sources."yocto-queue-0.1.0" - sources."zigbee-herdsman-0.14.46" - sources."zigbee-herdsman-converters-14.0.583" - sources."zigbee2mqtt-frontend-0.6.107" + sources."zigbee-herdsman-0.14.53" + sources."zigbee-herdsman-converters-14.0.610" + sources."zigbee2mqtt-frontend-0.6.110" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/tools/X11/smart-wallpaper/default.nix new file mode 100644 index 000000000000..20779e6e07b9 --- /dev/null +++ b/pkgs/tools/X11/smart-wallpaper/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, makeWrapper +, xdpyinfo +, killall +, xwinwrap +}: + +stdenvNoCC.mkDerivation { + pname = "smart-wallpaper"; + version = "unstable-2022-09-01"; + + src = fetchFromGitHub { + owner = "Baitinq"; + repo = "smart-wallpaper"; + rev = "d175695d3485fb14144c1908eb3569b20caa6ba5"; + sha256 = "sha256-cFgvuntdKPzdQJ7xE2DIT+aNAazocIhM6BBbcQOlryU="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 -t $out/bin smart-wallpaper + wrapProgram $out/bin/smart-wallpaper \ + --prefix PATH : ${lib.makeBinPath [ xdpyinfo killall xwinwrap ]} + ''; + + meta = with lib; { + homepage = "https://github.com/Baitinq/smart-wallpaper"; + description = "A simple bash script that automatically changes your wallpaper depending on if its daytime or nighttime"; + license = licenses.bsd2; + maintainers = with maintainers; [ baitinq ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 48b3bbffd324..1bdc5b0f49ba 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,19 +3,22 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.5.0"; + version = "6.5.5"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "0gv607jrdfbmadjyy3pbrj5ksh1dmaw5hz7l8my2z7sh0ifds0n2"; + sha256 = "sha256-g3flxQNiNta+uL4t21Lhpij8b5yB78SJLGaFpTcm9fE="; }; + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ wrapGAppsHook gtk3 - gobject-introspection gnome.adwaita-icon-theme libxslt ]; @@ -46,6 +49,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/deviantfero/wpgtk"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = [ maintainers.melkor333 ]; + maintainers = [ maintainers.melkor333 maintainers.cafkafk ]; }; } diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix new file mode 100644 index 000000000000..98bdf82e0ad9 --- /dev/null +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -0,0 +1,37 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "auth0-cli"; + version = "0.11.10"; + + src = fetchFromGitHub { + owner = "auth0"; + repo = "auth0-cli"; + rev = "v${version}"; + hash = "sha256-1/T2hpSNamorWFuaSBoLsGpe9I06HGew9S3yJsDLmLQ="; + }; + + vendorHash = "sha256-d9ZwK/LAZGgeagGsg3bGYnVykfQcCLUex0pe/PUCtkA="; + + ldflags = [ + "-s" "-w" + "-X github.com/auth0/auth0-cli/internal/buildinfo.Version=v${version}" + "-X github.com/auth0/auth0-cli/internal/buildinfo.Revision=0000000" + ]; + + preCheck = '' + # Feed in all tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + unset subPackages + ''; + + subPackages = [ "cmd/auth0" ]; + + meta = with lib; { + description = "Supercharge your developer workflow"; + homepage = "https://auth0.github.io/auth0-cli"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 4da2cdb4266e..144524df6949 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.109.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-C4BeQoNYAcY5nKqjXlYimJGpsrQfhaNHmgjz9FjZZiM="; + sha256 = "sha256-QcSSdMWQNgsxzK9JJxGgIUkx54sLYXaF2HEAJZGWnjI="; }; - vendorSha256 = "sha256-M6vwwS7JdK9sYltXxz/fScqny2qYoESJtmLWjBZnKLM="; + vendorSha256 = "sha256-Dka0UbTxR2UsMkClq8t0//m+Ky7NEw3g9XP6PtTWOe4="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index cd58c8a72846..4f3caefefa9b 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.59.0"; + version = "1.59.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-QLIxoCV+QL+uXmT0IdeztzefiOpW9xNVf0XuZPVpp/Y="; + sha256 = "sha256-dkiUO68NtWU/GOOuJvihlOfnEjF+5sNSkOAttCrQEHI="; }; vendorSha256 = null; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 1a30548f3cc4..9d636d0bae61 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3004.2"; + version = "3005"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-L6ZE9iANTja1WEbLNytuZ7bKD77AaX8djXPncbZl7XA="; + hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -30,10 +30,6 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./fix-libcrypto-loading.patch - (fetchpatch { - url = "https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch"; - hash = "sha256-OQCJeG12cp2EZ0BErp6yqsqhv023923rVFDHAFUfF6c="; - }) ]; postPatch = '' @@ -46,14 +42,6 @@ python3.pkgs.buildPythonApplication rec { # `extraInputs` like on any other platform echo -n > "requirements/darwin.txt" - # Bug in 3004.1: https://github.com/saltstack/salt/pull/61839 - substituteInPlace "salt/utils/entrypoints.py" \ - --replace 'if sys.version_info >= (3, 10):' 'if False:' - - # Bug in 3004.1: https://github.com/saltstack/salt/issues/61865 - substituteInPlace "salt/transport/tcp.py" \ - --replace 'payload = self.pack_publish(package)' 'package = self.pack_publish(package)' - # 3004.1: requirement of pyzmq was restricted to <22.0.0; looks like that req was incorrect # https://github.com/saltstack/salt/commit/070597e525bb7d56ffadede1aede325dfb1b73a4 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259279 diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/tools/games/minecraft/fabric-installer/default.nix index f0068f5c829d..74b822a97486 100644 --- a/pkgs/tools/games/minecraft/fabric-installer/default.nix +++ b/pkgs/tools/games/minecraft/fabric-installer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fabric-installer"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar"; - sha256 = "sha256-aLpC6k+Cum0QfdIa1sUXS4BBKFTudJGbcjS1LSFP0Qo="; + sha256 = "sha256-eRf5+hS+babvPNt/5r87Y6WToOuHO9Yn6YGn45iM1zo="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index c0ff0fec328a..9e8619459852 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dynamic-colors"; - version = "0.2.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "dynamic-colors"; rev = "v${version}"; - sha256 = "0i63570z9aqbxa8ixh4ayb3akgjdnlqyl2sbf9d7x8f1pxhk5kd5"; + sha256 = "sha256-jSdwq9WwYZP8MK6z7zJa0q93xfanr6iuvAt8YQkQxxE="; }; PREFIX = placeholder "out"; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index e3a5da9ca450..6657b09f5e01 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.8.0"; + version = "2022.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lukK++CRpl7ucX9RuYa4qhHBbBY4oc/ijqGopeIaXPY="; + hash = "sha256-eBD7UC6xNxW9tkqXSLgntDqwyGpLwv6fpChIYgbIFBM="; }; postPatch = '' diff --git a/pkgs/tools/misc/gammy/default.nix b/pkgs/tools/misc/gammy/default.nix deleted file mode 100644 index e06d20eb2ff7..000000000000 --- a/pkgs/tools/misc/gammy/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qmake, libXxf86vm, wrapQtAppsHook }: - -let - pname = "gammy"; - version = "0.9.64"; -in - -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "Fushko"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-NPvkT7jSbDjcZDHpMIOik9fNsz7OJXQ3g9OFxkpA3pk="; - }; - - nativeBuildInputs = [ qmake wrapQtAppsHook ]; - - buildInputs = [ libXxf86vm ]; - - meta = with lib; { - description = "GUI tool for manual- of auto-adjusting of brightness/temperature"; - homepage = "https://github.com/Fushko/gammy"; - license = licenses.gpl3; - maintainers = with maintainers; [ atemu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 6d12d8af1514..451a3581b40e 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "13.0.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-i+oi5lCNIWPVPP5o7IamSVPvCB/FhO/v08zOipmaE+c="; + sha256 = "sha256-RTz8BdbEiAY6wyIS18LZRQQ1DQzIRz2Bk7bOeMf7sT8="; }; - cargoSha256 = "sha256-acxdGhExfE4g1YNp3bRQlEuUqz79y1IhDnqTaYh/nxc="; + cargoSha256 = "sha256-fHVKm4DWhkwbbRGLvMfoEjJfM6VF7RW6x75NR7aNs7o="; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix index d6ffd653204b..95c775417cb8 100644 --- a/pkgs/tools/misc/pls/default.nix +++ b/pkgs/tools/misc/pls/default.nix @@ -26,6 +26,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'rich = "^12.5.1"' 'rich = "*"' \ + ''; + pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ]; pythonImportsCheck = [ "pls" ]; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 3e22f247147d..3ec466e92663 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-iFtoxEjb+Wk8E2oj1SjSRNwxg20//0LgFtjMq9qJOEQ="; + sha256 = "sha256-NJK8MW/vUZwdGIEipL/zyh24o/pu7fwQMeDxyoFdtP4="; }; vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 0aad6619a7de..001a6deeedb0 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Re/tcS9aZhMtMuUIVrDLjTM8stm7LE6VF5H4EEmcqq4="; + sha256 = "sha256-bVfe2Imklv1Q/5HoGJVlIO+CotrFQ1yG0L6p+MBE9vI="; }; - vendorSha256 = "sha256-KtRQwrCBsOX7Jk9mKdDNOD7zfssADfBXCO1RPZbp5Aw="; + vendorSha256 = "sha256-HGWKkvJKIEwTLhEK8i+4lraoFEDSljmwxMOhFHhobms="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -84,6 +84,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://netbird.io"; + changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; maintainers = with maintainers; [ misuzu ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index f9c33298fc31..e37aaf77f0d6 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, nixosTests }: +{ lib, stdenv, fetchurl, fetchpatch, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "stunnel"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; + patches = [ + # Fixes compilation on darwin, patch is from + # https://github.com/mtrojnar/stunnel/pull/15. + (fetchpatch { + name = "stunnel_darwin_environ.patch"; + url = "https://github.com/mtrojnar/stunnel/commit/d41932f6d55f639cc921007c2e180a55ef88bf00.patch"; + sha256 = "sha256-d2K/BHE6GxvDCBIbttCHEVwH9SCu0jggNvhVHkC/qto="; + }) + ]; buildInputs = [ openssl ]; configureFlags = [ diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 990534b13dfa..85ea5daf1f65 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g="; + sha256 = "sha256-BHYzthKjD1JFYcZDCjI5/w82q2rsgGhrEorPF5RExhQ="; }; - cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4="; + cargoSha256 = "sha256-BBQfefi1ZT9qIUx7xK/fH4WNgxvowl/Yvu7LgLXd4bM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 744c5c6aabe9..e3a684ae7448 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-08-10"; + version = "2022-09-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t+y28QDeu0tIUidPjSqSPcmOzfaH6SnreuiEBDtKzP0="; + hash = "sha256-gZdoaY3wm45DhM2jlKneOzMupmKsPbeOzHIBhmgDeV0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5286d0f4a275..27f2589fecd3 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.4"; + version = "1.14.5"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UQvwkprHGez5qRpk6KodtgX99013rcezbgpaCateI4k="; + sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI="; }; - vendorSha256 = "sha256-169KBsJhytzfOgIOHb54gEsLAmhVv+O64hP/DU6cT6A="; + vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4="; subPackages = [ "." ]; diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 7cbbdfc0c36c..d22612e0bc76 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-HooO8T1FLIuERlI2dWGWMtPbtjVB9MPuA1IB+9CYytw="; + sha256 = "sha256-gf8Q/x9JXQcYEPa7fHoxwEvLFjpXVraY5aEcA89xJsc="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-5HwipbtQ/zW61fgam1BGnEJYVzA98TH7y3eZ8bES2Ck="; + cargoSha256 = "sha256-CUbiEqFNEQCe9CKhpa8m8+/XVOOTv1ltmx0sXssx+e8="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index da48d81dfb23..537a9dc84029 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: +{ lib, stdenv, fetchzip, jre, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "LanguageTool"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.languagetool = nixosTests.languagetool; + meta = with lib; { homepage = "https://languagetool.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/tools/text/ltex-ls/default.nix index c21ab2e038ab..c2464895cf90 100644 --- a/pkgs/tools/text/ltex-ls/default.nix +++ b/pkgs/tools/text/ltex-ls/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }: +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "ltex-ls"; version = "15.2.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -rfv bin/ lib/ $out - rm -fv $out/bin/*.bat + rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat for file in $out/bin/{ltex-ls,ltex-cli}; do wrapProgram $file --set JAVA_HOME "${jre_headless}" done diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 5e1a3333cfbb..e883ac46005a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1q32a1ps66am6sbi3al528175kscq1fqc47gkdpb58r1kiyj9pm3"; + sha256 = "1n7nlrvhdp6ilpx6agb5w6flss5vbflbldv0495h19fy5fxkb5vz"; }; configureFlags = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 47c6302adac5..c0b803f3ebb5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -463,6 +463,7 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 397995a45efb..72932d566af7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -274,6 +274,8 @@ with pkgs; authz0 = callPackage ../tools/security/authz0 { }; + auth0-cli = callPackage ../tools/admin/auth0-cli { }; + atomic-operator = callPackage ../tools/security/atomic-operator { }; avro-tools = callPackage ../development/tools/avro-tools { }; @@ -2491,8 +2493,6 @@ with pkgs; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; - gammy = qt5.callPackage ../tools/misc/gammy { stdenv = gcc10StdenvCompat; }; - gams = callPackage ../tools/misc/gams (config.gams or {}); gem = callPackage ../applications/audio/pd-plugins/gem { }; @@ -3746,6 +3746,8 @@ with pkgs; ent = callPackage ../tools/misc/ent { }; + entwine = callPackage ../applications/graphics/entwine { }; + envconsul = callPackage ../tools/system/envconsul { }; envsubst = callPackage ../tools/misc/envsubst { }; @@ -3756,7 +3758,9 @@ with pkgs; eschalot = callPackage ../tools/security/eschalot { }; - espanso = callPackage ../applications/office/espanso { }; + espanso = callPackage ../applications/office/espanso { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; + }; esphome = callPackage ../tools/misc/esphome { }; @@ -3830,9 +3834,7 @@ with pkgs; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; - flitter = callPackage ../tools/misc/flitter { - ocamlPackages = ocaml-ng.ocamlPackages_4_13; - }; + flitter = callPackage ../tools/misc/flitter { }; frangipanni = callPackage ../tools/text/frangipanni { }; @@ -9232,6 +9234,8 @@ with pkgs; nitrogen = callPackage ../tools/X11/nitrogen {}; + smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { }; + nms = callPackage ../tools/misc/nms { }; nomachine-client = callPackage ../tools/admin/nomachine-client { }; @@ -27083,6 +27087,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; emacs = emacs28; + emacs-gtk = emacs28-gtk; emacs-nox = emacs28-nox; emacs28 = callPackage ../applications/editors/emacs/28.nix { @@ -27097,6 +27102,10 @@ with pkgs; inherit (darwin) sigtool; }; + emacs28-gtk = emacs28.override { + withGTK3 = true; + }; + emacs28-nox = lowPrio (emacs28.override { withX = false; withNS = false; @@ -27608,14 +27617,15 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; + firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; - firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; - firefox-esr = firefox-esr-91; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-91; - firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; + firefox-esr = firefox-esr-102; + firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; + firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; @@ -28216,9 +28226,7 @@ with pkgs; indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_13; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { };