diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cde1edad6a50..8b101926d855 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4366,6 +4366,12 @@ githubId = 405105; name = "Dustin Frisch"; }; + foo-dogsquared = { + email = "foo.dogsquared@gmail.com"; + github = "foo-dogsquared"; + githubId = 34962634; + name = "Gabriel Arazas"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; 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 864b6e47db26..be3adc4d3bed 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 @@ -267,6 +267,13 @@ been removed due to lack of upstream maintenance. + + + The meta.mainProgram attribute of packages + in wineWowPackages now defaults to + "wine64". + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index d4059e739322..3f9afe13f1d9 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -104,6 +104,8 @@ In addition to numerous new and upgraded packages, this release has the followin `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream maintenance. +- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index edbf31f5ca1a..49b39b03d475 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -243,6 +243,7 @@ in { done '' + (if cfg.accessUser != "" then reloadScript else ""); serviceConfig = { + Type = "oneshot"; User = jenkinsCfg.user; RuntimeDirectory = "jenkins-job-builder"; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 0f697c0cc255..66b85cd9d8a9 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -30,15 +30,22 @@ let updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu + # be careful not to leak secrets in the filesystem or in process listings + + umask 0077 + # get the api key by parsing the config.xml while - ! api_key=$(${pkgs.libxml2}/bin/xmllint \ + ! ${pkgs.libxml2}/bin/xmllint \ --xpath 'string(configuration/gui/apikey)' \ - ${cfg.configDir}/config.xml) + ${cfg.configDir}/config.xml \ + >"$RUNTIME_DIRECTORY/api_key" do sleep 1; done + (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" + curl() { - ${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \ + ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } @@ -576,6 +583,7 @@ in { serviceConfig = { User = cfg.user; RemainAfterExit = true; + RuntimeDirectory = "syncthing-init"; Type = "oneshot"; ExecStart = updateConfig; }; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 63b5860f0d20..3f111426db38 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -81,7 +81,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { in '' start_all() - master.wait_for_unit("jenkins") + master.wait_for_unit("default.target") assert "Authentication required" in master.succeed("curl http://localhost:8080") @@ -96,8 +96,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("jobs are declarative"): # Check that jobs are created on disk. - master.wait_for_unit("jenkins-job-builder") - master.wait_until_fails("systemctl is-active jenkins-job-builder") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") @@ -115,8 +113,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { ) # Check that jobs are removed from disk. - master.wait_for_unit("jenkins-job-builder") - master.wait_until_fails("systemctl is-active jenkins-job-builder") master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") diff --git a/nixos/tests/podgrab.nix b/nixos/tests/podgrab.nix index e5a340dc2ac8..dc9dfebaf49b 100644 --- a/nixos/tests/podgrab.nix +++ b/nixos/tests/podgrab.nix @@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() default.wait_for_unit("podgrab") - default.wait_for_open_port(defaultPort) + default.wait_for_open_port(${toString defaultPort}) default.succeed("curl --fail http://localhost:${toString defaultPort}") customized.wait_for_unit("podgrab") - customized.wait_for_open_port(customPort) + customized.wait_for_open_port(${toString customPort}) customized.succeed("curl --fail http://localhost:${toString customPort}") ''; diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index b2cce97bbc46..7408f57a1a98 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; + sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 9e4e6a2880d0..291c3875cea8 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc="; + sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index addc9313527a..f6a1ef821b5d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.55"; + version = "1.56"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0="; + sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 3a8554470566..064b8a2d489e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.6.17"; + version = "22.7.15"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng"; + sha256 = "sha256-tQwxzhy+d2hA7VvZB9qSF7uaYIffAyX9ovZYQ8HDEB8="; }; sourceRoot = "."; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 551d898cdf56..afd7634e7247 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1955,8 +1955,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "3.14.0"; - sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7"; + version = "4.1.0"; + sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index e3875e130a18..a280b9d3e3d6 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -6,7 +6,7 @@ patches, vkd3dArches, moltenvk, - buildScript ? null, configureFlags ? [] + buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: with import ./util.nix { inherit lib; }; @@ -198,6 +198,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; - mainProgram = "wine"; + inherit mainProgram; }; }) diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c119feb783d3..3b5aa19658ce 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -28,6 +28,7 @@ in with src; { monos = [ mono ]; configureFlags = [ "--enable-win64" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "wine64"; }; wineWow = callPackage ./base.nix { pname = "wine-wow"; @@ -40,5 +41,6 @@ in with src; { monos = [ mono ]; buildScript = ./builder-wow.sh; platforms = [ "x86_64-linux" ]; + mainProgram = "wine64"; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 146ee9b145a7..316798712075 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -145,6 +145,7 @@ let kio-extras = callPackage ./kio-extras.nix {}; kio-gdrive = callPackage ./kio-gdrive.nix {}; kipi-plugins = callPackage ./kipi-plugins.nix {}; + kirigami-gallery = callPackage ./kirigami-gallery.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; diff --git a/pkgs/applications/kde/kirigami-gallery.nix b/pkgs/applications/kde/kirigami-gallery.nix new file mode 100644 index 000000000000..f012188ed992 --- /dev/null +++ b/pkgs/applications/kde/kirigami-gallery.nix @@ -0,0 +1,31 @@ +{ mkDerivation +, lib +, kirigami2 +, extra-cmake-modules +, kitemmodels +, qtgraphicaleffects +, qtquickcontrols2 +, qttools +, qtbase +}: + +mkDerivation rec { + pname = "kirigami-gallery"; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + buildInputs = [ + qtgraphicaleffects + qtquickcontrols2 + kirigami2 + kitemmodels + ]; + + meta = with lib; { + homepage = "https://apps.kde.org/kirigami2.gallery/"; + description = "View examples of Kirigami components"; + license = licenses.lgpl2; + maintainers = with maintainers; [ shadowrz ]; + broken = versionOlder qtbase.version "5.15"; + }; +} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 0d18b3dd37a3..72f4120cfc04 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.5.1"; + version = "2.6.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; - i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip"; + i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-1/DgwHMkUenj+2ZyADeBK1HJ3M/b2PoAey36eAqAUSQ=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix new file mode 100644 index 000000000000..0d8a658f3ea9 --- /dev/null +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3Packages +, wrapGAppsHook4 +, gtk4 +, meson +, ninja +, pkg-config +, appstream-glib +, desktop-file-utils +, glib +, gobject-introspection +, libnotify +, libadwaita +, libportal +, gettext +, librsvg +, tesseract5 +, zbar +}: + +python3Packages.buildPythonApplication rec { + pname = "gnome-frog"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "TenderOwl"; + repo = "Frog"; + rev = version; + sha256 = "sha256-yOjfiGJUU25zb/4WprPU59yDAMpttS3jREp1kB5mXUE="; + }; + + format = "other"; + + patches = [ ./update-compatible-with-non-flatpak-env.patch ]; + postPatch = '' + chmod +x ./build-aux/meson/postinstall.py + patchShebangs ./build-aux/meson/postinstall.py + substituteInPlace ./build-aux/meson/postinstall.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + substituteInPlace ./frog/language_manager.py --subst-var out + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + meson + ninja + pkg-config + glib + wrapGAppsHook4 + ]; + + buildInputs = [ + librsvg + gobject-introspection + libnotify + libadwaita + libportal + zbar + tesseract5 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pillow + pytesseract + pyzbar + ]; + + # This is to prevent double-wrapping the package. We'll let + # Python do it by adding certain arguments inside of the + # wrapper instead. + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://getfrog.app/"; + description = + "Intuitive text extraction tool (OCR) for GNOME desktop"; + license = licenses.mit; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch new file mode 100644 index 000000000000..aac9b4f76fd2 --- /dev/null +++ b/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch @@ -0,0 +1,33 @@ +diff --git a/frog/config.py b/frog/config.py +index 9837755..b73e4e3 100644 +--- a/frog/config.py ++++ b/frog/config.py +@@ -30,10 +30,14 @@ import os + APP_ID = "com.github.tenderowl.frog" + RESOURCE_PREFIX = "/com/github/tenderowl/frog" + ++# This is based from the XDG Base Directory specification. ++if not os.getenv('XDG_DATA_HOME'): ++ os.environ['XDG_DATA_HOME'] = os.path.expanduser("~/.local/share") ++ + if not os.path.exists(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')): + os.mkdir(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')) + + tessdata_url = "https://github.com/tesseract-ocr/tessdata/raw/main/" + tessdata_best_url = "https://github.com/tesseract-ocr/tessdata_best/raw/main/" + tessdata_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata') +-tessdata_config = f'--tessdata-dir {tessdata_dir} –psm 6' ++tessdata_config = f'–-psm 6 --tessdata-dir {tessdata_dir}' +diff --git a/frog/language_manager.py b/frog/language_manager.py +index 5752be6..4f6a908 100644 +--- a/frog/language_manager.py ++++ b/frog/language_manager.py +@@ -156,7 +156,7 @@ class LanguageManager(GObject.GObject): + os.mkdir(tessdata_dir) + + dest_path = os.path.join(tessdata_dir, 'eng.traineddata') +- source_path = pathlib.Path('/app/share/appdata/eng.traineddata') ++ source_path = pathlib.Path('@out@/share/appdata/eng.traineddata') + if os.path.exists(dest_path): + return + diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index c44fc41a5c65..7a588209c3a4 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.06.18-2"; + version = "2022.06.29-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; + sha256 = "sha256-/K3bxnb6y+9nEuGvoIpPl218xmNqjOWgpV8hQ/W12ZA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 038ab2c2bf7f..aaff24f70760 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM="; + sha256 = "sha256-R+X0fp4AdC3u+/rX2Vb0P3MTBRi94wfT9YvW2pxwr5Y="; }; - vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w="; + vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 4439e89d71fd..b20aa362fbe6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -5,21 +5,22 @@ , installShellFiles , btrfs-progs , glibc -, gitUpdater +, testers +, werf }: buildGoModule rec { pname = "werf"; - version = "1.2.128"; + version = "1.2.138"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik="; + sha256 = "sha256-gRMPTw/PzAE/kij4dq9ph/1Iz/a+fEsT5HSogC5EDFE="; }; - vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg="; + vendorSha256 = "sha256-6/XiTgAQ3M3ge/b7uEFD0K+3kd7I2yqZJjgPVXP+uQ0="; proxyVendor = true; @@ -58,10 +59,10 @@ buildGoModule rec { --zsh <($out/bin/werf completion --shell=zsh) ''; - passthru.updateScript = gitUpdater { - inherit pname version; - ignoredVersions = "1\.[3-9].*"; - rev-prefix = "v"; + passthru.tests.version = testers.testVersion { + package = werf; + command = "werf version"; + version = "v${version}"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 750511ebf152..d3a7abae8205 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ="; + sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 9ea6c32c7de6..b04cd2e07aab 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A="; + hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index c702c02c147a..e339b2a0c4bf 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,26 +1,15 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.21"; + version = "1.22.1"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY="; + sha256 = "sha256-gte1N43b9AokmEqONdvEcaGXDPIeGflsk+wuxDtTeR4="; }; - patches = [ - (fetchpatch { - # Update werkzeug compatibility - url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch"; - hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE="; - excludes = [ - ".pre-commit-config.yaml" - ]; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index d71443c9b384..8309b856936c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, rustPlatform, fetchgit -, pkg-config, wayland-scanner, libcap, minijail, wayland, wayland-protocols +, pkg-config, wayland-scanner +, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , linux }: @@ -30,7 +31,9 @@ in nativeBuildInputs = [ pkg-config wayland-scanner ]; - buildInputs = [ libcap minijail wayland wayland-protocols ]; + buildInputs = [ + libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols + ]; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -42,6 +45,8 @@ in export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy ''; + buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; + postInstall = '' mkdir -p $out/share/policy/ cp seccomp/${arch}/* $out/share/policy/ diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index ea8603020c06..da647306ede6 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2022-05-29"; + version = "2022-07-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-F4kqQ1B8JNo2TAdGFondAtQu5C/6os9SQ8NS2gfRCQM="; + sha256 = "sha256-0T9D42XwyvIb5XeXdqXbyahVHNcSeT469lSgWSisNvA="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index e5f3246b06bb..d5bfb1dd3bfb 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, libexif , lxqt , qtbase , qttools @@ -32,6 +33,7 @@ mkDerivation rec { ]; buildInputs = [ + libexif qtbase qttools qtx11extras diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index d52066be3f26..092d11346552 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,9 +1,7 @@ -{ pkgs, newScope }: +{ pkgs, lib }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { # Update script tailored to mate packages from git repository mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: @@ -101,4 +99,4 @@ let }; -in self +in lib.makeScope pkgs.newScope packages diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 3d52eda7660e..c296d013e3d1 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -8,20 +8,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; + # https://github.com/svaarala/duktape/issues/2464 + LDFLAGS = [ "-lm" ]; + nativeBuildInputs = [ validatePkgConfig ]; - postPatch = '' - substituteInPlace Makefile.sharedlibrary \ - --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ - --replace 'g++' '${stdenv.cc.targetPrefix}c++' - substituteInPlace Makefile.cmdline \ - --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ - --replace 'g++' '${stdenv.cc.targetPrefix}c++' - ''; buildPhase = '' make -f Makefile.sharedlibrary make -f Makefile.cmdline ''; + installPhase = '' install -d $out/bin install -m755 duk $out/bin/ @@ -30,6 +26,7 @@ stdenv.mkDerivation rec { make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 619ed721dff2..81b84e1a11fe 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; + sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; }; postPatch = '' diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 8c0f213b8298..bf4b74c03649 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,18 +11,17 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220216"; + version = "20220721"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; + sha256 = "sha256-35OwvYYZtfugvujWl6bL8p8HU+z1kQsvnJ+aQOgO8V8="; }; patches = [ ./cmakelists.patch - ./gpu-include.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/ncnn/gpu-include.patch b/pkgs/development/libraries/ncnn/gpu-include.patch deleted file mode 100644 index 8f751c769947..000000000000 --- a/pkgs/development/libraries/ncnn/gpu-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gpu.cpp b/src/gpu.cpp -index 51cd7f95..bf7ed828 100644 ---- a/src/gpu.cpp -+++ b/src/gpu.cpp -@@ -21,7 +21,7 @@ - #include - - #include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include "glslang/Public/ShaderLang.h" - - #include "command.h" - #include "layer.h" diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c5d1d1b9e88d..d4e94a4c72d8 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.25.0"; + version = "3.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24="; + hash = "sha256-lkzTJfjJNKsMmLet9VXv5Ao8+Dks4P0+0nRpWHHs3G0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 6c6ba7e93ec6..69932532efa2 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = version; - hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU="; + rev = "refs/tags/${version}"; + hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 17e5389a5bbc..19e2cc827b94 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -37,8 +37,8 @@ , sqlalchemy , tenacity , typing-extensions -, scikit-learn -}: +, testcontainers +, scikit-learn }: buildPythonPackage rec { pname = "apache-beam"; @@ -107,6 +107,7 @@ buildPythonPackage rec { scikit-learn sqlalchemy tenacity + testcontainers ]; # Make sure we're running the tests for the actually installed @@ -122,8 +123,6 @@ buildPythonPackage rec { # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], # E NameError: name 'MySqlContainer' is not defined # - # Test relies on the testcontainers package, which is not currently (as of - # 2022-04-08) available in nixpkgs. "apache_beam/io/external/xlang_jdbcio_it_test.py" # These tests depend on the availability of specific servers backends. diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index f2cd65d9a6f2..6e857499f651 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "5.0.1"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-v8++qPeAPc/0nYEYK4GltDflF/unPbX0EvKkjZFuOQY="; + hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 05cb491c14e2..fc275b16dfeb 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "2.6.0"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UM5z8FEu+Pua/LToraGh8N6V3ujUnu4F6lJec+4cUg4="; + hash = "sha256-Imn9wl5I7dzkUnVBzK2vhWOrf89FycVW4GvEYFeSujU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index d2256958313f..589ec159684f 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.1.1"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-s399GZ/ZuGQcV03NMJMUczEI00m8/xuuFJfzcjuV7T0="; + hash = "sha256-fFpRrFRa1VcVdc/uIJZ+DR74ivttRKkXgibXV3q72qY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index cd1b4e3bbacf..2ef751ad1b3b 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; + sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index accd8fcf5b91..5eac6a3f2c2f 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA="; + sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1c79ef3c7642..43a349c8f2eb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.11"; + version = "2022.7.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BR92UGcmNWwQWZFK40rnkYvNbRoL2AYod4oozYXLSuM="; + sha256 = "sha256-9ErXsJUFM0Us9ChkYvpa2bNEy3CBJwfYAz4vnk2wu4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 2330a356dd89..df9bf4d718a6 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-pfVjnRO6iKEgLDQz4JMARzab21XLbbUDUMyMWatGlJ8="; + hash = "sha256-z27VGApm5VsDm6VG0DaDOmhFrvRhLLINHtSM/cIiXyY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 81fd7c8a693a..45dc837665cf 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; + sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index ca5b0d3184e0..2f13ce79c96f 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.17"; + version = "4.1.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s="; + hash = "sha256-zBikruHBTXKK4Yk7euTp0lTcdCG5AQ/kMZrECAvQ7Zw="; }; # Module has no tests diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 9ff4bc02e74e..e818b1d1e612 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-WCwj/2iUXOhmww4hiI5KPA7VyoVEYDeEMmnZM+DGHmc="; + sha256 = "sha256-LHZp5IXZqPYNwPlOQySwxon3uZX15caZvMeMY6QQIqk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index 5e4412dcf857..fe7cc3ef7163 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE="; + hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 44247bfdcc67..f4082ad41257 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.7.0"; + version = "9.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k="; + hash = "sha256-iILDOpajLdTi+yPBNIr2+Sb1qBl0KCoSow2XBmDpFSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index fcbb4925fc80..4ddd955cf4d0 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.11.2"; + version = "4.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; - rev = version; - sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U="; + rev = "refs/tags/${version}"; + sha256 = "sha256-GtFAHNqneoWPCUegFDIpmeyuCsjwAx9o6t0ptGNLBeQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 8ebfd659b408..16f777aad94c 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.20.1"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng="; + sha256 = "sha256-pw1apxqjKKv05Qw2VFN0cKit/3fas7PUb1wS/XsJruY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index e06f23acd30e..8087c66bdb57 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pydal"; - version = "20220720.1"; + version = "20220721.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cKw3thTqQWsTRqJQD9SyaBVBLM9YIqE/y/gIh4FL1bc="; + sha256 = "sha256-dOSTpK9HZFZL5/QWK/HTzPAgpsCSyj9r5a57cQpmlhY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index caa84f7a6558..5340be273fc9 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.1.3"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CYXsYOqh41qRob2DRxTB6zcc/jcdT9/vWJTRk2LJgWo="; + hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 7da521ef48fe..9de892352760 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.13.0"; + version = "0.14.1"; format = "setuptools"; src = fetchFromGitHub { owner = "square"; repo = "pylink"; - rev = "v${version}"; - hash = "sha256-SH2oxOlsX5dE8wMXpWPA/rEVrJwxJzizsOiYbwaGjLw="; + rev = "refs/tags/v${version}"; + hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g="; }; propagatedBuildInputs = [ psutil six future ]; diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index aa316a261753..7f7539973ab3 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; - rev = "v${version}"; - hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI="; + rev = "refs/tags/v${version}"; + hash = "sha256-W6wnxQPrtMDG5jctB7CMXr4kPIhZievFTBJCeSeDCWw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index d7deac2bc257..a125c68dbf98 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.6.6"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-9t582CuDq7JeCcaPqWZGMUVLx8e78PygfNPp/s7rMA8="; + hash = "sha256-Jq37/9w1GHr+GZ8Fvftmfz2XkL3zUpTjbDlokrUoLtw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index eca91def2313..477dc540cf8d 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.7.2"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk="; + hash = "sha256-PtGQJUZ6/u2exmg6P5VV2RoBKyuV3G2YuAWgA06oQKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 7a2d6790b47d..5108f9ea5eaa 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw="; + hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 2bbd7dd532f9..fae42ac5914e 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.1"; + version = "5.8.2"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU="; + sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index a690be883340..65c8ed8bf460 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -3,8 +3,7 @@ , buildPythonPackage , deprecation , docker -, wrapt -}: +, wrapt }: buildPythonPackage rec { pname = "testcontainers"; @@ -31,7 +30,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Allows using docker containers for functional and integration testing"; + description = '' + Allows using docker containers for functional and integration testing + ''; homepage = "https://github.com/testcontainers/testcontainers-python"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2b85e9ef8bdf..8c0a1f7fc2f2 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.11.0"; + version = "7.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ="; + hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 2c7e5f73879c..fe533ab5ea3c 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.1.1"; + version = "2022.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TnrdcIhtwu5u51NcgYSibusKyduvrpliy4gtdLn2czA="; + sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 90fd0a6bf413..a42ce6a71d79 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.2"; + version = "2.28.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OY+IzZMCx5bLY9ECGvKh+3rlB3QaPVCO344HRtjBagQ="; + sha256 = "sha256-+56mkxF2aWf56RhhIR7HRJ9khAJbdm6nCWicDbsp17o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index fafb100aa8b3..fd1c98be2fa9 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "63.2.0"; + version = "63.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ="; + sha256 = "sha256-KVekCt38pccSX9jThqnv2lN5CYxuZqCOAiV/0c6kITE="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix index 8ad26668bc5e..26a47a1f7698 100644 --- a/pkgs/development/python-modules/zcs/default.nix +++ b/pkgs/development/python-modules/zcs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zcs"; - version = "0.1.17"; + version = "0.1.18"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; + sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4="; }; patches = [ diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 340c3b736caf..839f7b1b6ccc 100644 --- a/pkgs/development/tools/biodiff/default.nix +++ b/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho="; + sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE="; }; - cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0="; + cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e636f938c776..50474c2a522b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY="; + sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 57dee6810940..d8e116ffcd1c 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4lMRd4pzbkRDct5kz17MB9drN6sEtYLk29d6TlubLk="; + sha256 = "sha256-nFFgVvctkGCU0BOh8JWftw2pt0KP5bYh+uhm/LhdspQ="; }; cargoSha256 = "sha256-MoXKNUgNeg2AG7G78wnZvLXADhCsK/WB5WiT5lTSmIQ="; diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index 89c2745e33e6..50f074a266d5 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Roswell is a Lisp implementation installer/manager, launcher, and much more"; license = licenses.mit; maintainers = with maintainers; [ hiro98 ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://github.com/roswell/roswell"; mainProgram = "ros"; }; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 59ea51406ce0..f39cbfea08f3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.13"; + version = "0.35.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA="; + sha256 = "sha256-fHW3ypi/BlfDybhnHOmPoBlyMdf3ZK7pOnH35cvhhRU="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8="; + cargoSha256 = "sha256-Az7A0VMlWv34uUeM0TH7tT5FPja/j0x6aoF7qDw8JCs="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock index 4de3b80928aa..97a7addb26e1 100644 --- a/pkgs/development/tools/uniffi-bindgen/Cargo.lock +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -4,21 +4,15 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "askama" -version = "0.10.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" dependencies = [ "askama_derive", "askama_escape", @@ -27,9 +21,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.5" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", @@ -38,18 +32,20 @@ dependencies = [ [[package]] name = "askama_escape" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_shared" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" dependencies = [ "askama_escape", - "nom 6.2.1", + "mime", + "mime_guess", + "nom 7.1.1", "proc-macro2", "quote", "serde", @@ -57,6 +53,23 @@ dependencies = [ "toml", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "1.3.2" @@ -77,26 +90,15 @@ dependencies = [ [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "callbacks" -version = "0.17.0" -dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" [[package]] name = "camino" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ "serde", ] @@ -112,22 +114,17 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", "semver", - "semver-parser", "serde", "serde_json", ] -[[package]] -name = "cdylib-dependency" -version = "0.17.0" - [[package]] name = "cfg-if" version = "1.0.0" @@ -136,29 +133,46 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.34.0" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ + "atty", "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "lazy_static", + "strsim", + "termcolor", "textwrap", - "unicode-width", ] [[package]] -name = "coverall" -version = "0.17.0" +name = "clap_derive" +version = "3.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] name = "crate_one" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -169,7 +183,7 @@ dependencies = [ [[package]] name = "crate_two" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -179,70 +193,6 @@ dependencies = [ "uniffi_macros", ] -[[package]] -name = "custom-types" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "uniffi", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "ext-types-guid" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ext-types-lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "custom-types", - "ext-types-guid", - "uniffi", - "uniffi-one", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "external_types_lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "crate_one", - "crate_two", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ffi-crate" -version = "0.17.0" -dependencies = [ - "cdylib-dependency", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - [[package]] name = "form_urlencoded" version = "1.0.1" @@ -253,6 +203,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" + [[package]] name = "funty" version = "1.1.0" @@ -266,30 +222,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "heck" -version = "0.3.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "i1015-fully-qualified-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] -name = "i356-enum-without-int-helpers" -version = "0.17.0" +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "libc", ] [[package]] @@ -304,19 +254,20 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.1" +name = "indexmap" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] [[package]] -name = "kotlin-experimental-unsigned-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "lazy_static" @@ -325,23 +276,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.6" +name = "libc" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libloading" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "arrayvec", - "bitflags", "cfg-if", - "ryu", - "static_assertions", + "winapi", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] @@ -359,15 +313,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] -name = "nom" -version = "5.1.2" +name = "mime" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "memchr", - "version_check", + "mime", + "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "nom" version = "6.2.1" @@ -376,31 +342,37 @@ checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" dependencies = [ "bitvec", "funty", - "lexical-core", "memchr", "version_check", ] [[package]] -name = "omit_argument_labels" -version = "0.17.0" +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "memchr", + "minimal-lexical", ] [[package]] name = "once_cell" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "os_str_bytes" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "percent-encoding" @@ -409,28 +381,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "pest" -version = "2.1.3" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "ucd-trie", + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -443,43 +430,33 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "semver" -version = "0.11.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ - "semver-parser", "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -488,9 +465,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", @@ -504,14 +481,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "syn" -version = "1.0.86" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -522,36 +505,33 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -560,9 +540,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -575,72 +555,65 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "trybuild" -version = "1.0.55" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" dependencies = [ "glob", "once_cell", "serde", + "serde_derive", "serde_json", "termcolor", "toml", ] [[package]] -name = "ucd-trie" -version = "0.1.3" +name = "unicase" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "uniffi" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", + "camino", "cargo_metadata", "lazy_static", "log", @@ -652,7 +625,7 @@ dependencies = [ [[package]] name = "uniffi-example-arithmetic" -version = "0.17.0" +version = "0.19.3" dependencies = [ "thiserror", "uniffi", @@ -662,16 +635,29 @@ dependencies = [ [[package]] name = "uniffi-example-callbacks" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", "uniffi_macros", ] +[[package]] +name = "uniffi-example-custom-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + [[package]] name = "uniffi-example-geometry" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -680,7 +666,7 @@ dependencies = [ [[package]] name = "uniffi-example-rondpoint" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -689,7 +675,7 @@ dependencies = [ [[package]] name = "uniffi-example-sprites" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -698,7 +684,7 @@ dependencies = [ [[package]] name = "uniffi-example-todolist" -version = "0.17.0" +version = "0.19.3" dependencies = [ "lazy_static", "thiserror", @@ -708,9 +694,10 @@ dependencies = [ ] [[package]] -name = "uniffi-fixture-time" -version = "0.17.0" +name = "uniffi-fixture-callbacks" +version = "0.19.3" dependencies = [ + "lazy_static", "thiserror", "uniffi", "uniffi_build", @@ -718,8 +705,47 @@ dependencies = [ ] [[package]] -name = "uniffi-one" -version = "0.17.0" +name = "uniffi-fixture-coverall" +version = "0.19.3" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi-example-custom-types", + "uniffi-fixture-ext-types-guid", + "uniffi-fixture-ext-types-lib-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "uniffi-fixture-ext-types-guid" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types-lib-one" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -728,33 +754,153 @@ dependencies = [ "uniffi_macros", ] +[[package]] +name = "uniffi-fixture-external-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-kotlin" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-rust" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-reexport-scaffolding-macro" +version = "0.19.3" +dependencies = [ + "cargo_metadata", + "lazy_static", + "libloading", + "uniffi", + "uniffi-fixture-callbacks", + "uniffi-fixture-coverall", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency" +version = "0.19.3" + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency-ffi-crate" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi-fixture-regression-cdylib-dependency", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i1015-fully-qualified-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i356-enum-without-int-helpers" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-kotlin-experimental-unsigned-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-missing-newline" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-swift-omit-argument-labels" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + [[package]] name = "uniffi_bindgen" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "askama", + "camino", "cargo_metadata", "clap", + "fs-err", "heck", + "lazy_static", "paste", "serde", "toml", - "weedle", + "weedle2", ] [[package]] name = "uniffi_build" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", + "camino", "uniffi_bindgen", ] [[package]] name = "uniffi_macros" -version = "0.17.0" +version = "0.19.3" dependencies = [ + "camino", "glob", "proc-macro2", "quote", @@ -762,9 +908,22 @@ dependencies = [ "uniffi_build", ] +[[package]] +name = "uniffi_testing" +version = "0.19.3" +dependencies = [ + "anyhow", + "camino", + "cargo_metadata", + "fs-err", + "lazy_static", + "serde", + "serde_json", +] + [[package]] name = "uniffi_uitests" -version = "0.17.0" +version = "0.19.3" dependencies = [ "trybuild", "uniffi", @@ -791,12 +950,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "weedle" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +name = "weedle2" +version = "3.0.0" dependencies = [ - "nom 5.1.2", + "fs-err", + "nom 6.2.1", ] [[package]] diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index 59ecd71a4114..28ecc281a14e 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -11,17 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "uniffi-bindgen"; - version = "0.17.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "mozilla"; repo = "uniffi-rs"; rev = "v${version}"; - hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc="; }; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; - cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; + cargoLock.lockFile = ./Cargo.lock; cargoBuildFlags = [ "-p uniffi_bindgen" ]; cargoTestFlags = [ "-p uniffi_bindgen" ]; @@ -36,6 +35,8 @@ rustPlatform.buildRustPackage rec { --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Toolkit for building cross-platform software components in Rust"; homepage = "https://mozilla.github.io/uniffi-rs/"; diff --git a/pkgs/development/tools/uniffi-bindgen/update.sh b/pkgs/development/tools/uniffi-bindgen/update.sh new file mode 100755 index 000000000000..4815f6eedd6d --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p nix cargo rsync nix-update +#! nix-shell -i bash + +set -euo pipefail + +if [[ -z "${UPDATE_NIX_ATTR_PATH+x}" ]]; then + echo "Error: run the following command from nixpkgs root:" >&2 + echo " nix-shell maintainers/scripts/update.nix --argstr package uniffi-bindgen" >&2 + exit 1 +fi + +targetLockfile="$(dirname "$0")/Cargo.lock" + +# Update version and hash +nix-update "$UPDATE_NIX_ATTR_PATH" + +# Update lockfile through `cargo update` +src=$(nix-build -A "${UPDATE_NIX_ATTR_PATH}.src" --no-out-link) + +tmp=$(mktemp -d) + +cleanup() { + echo "Removing $tmp" >&2 + rm -rf "$tmp" +} + +trap cleanup EXIT + +rsync -a --chmod=ugo=rwX "$src/" "$tmp" + +pushd "$tmp" +cargo update +cp "Cargo.lock" "$targetLockfile" +popd diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 2497956b9182..4924b42079c0 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.7"; + version = "5.1.9"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag="; + sha256 = "sha256-gOC1jwFoasxTAhXoX/Mbl5uL1p6NjXcjpz7td8DZUlk="; }; nativeBuildInputs = [ unzip ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://grails.org/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 45ec432dc7ba..82064325ab5f 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.52"; + version = "2.1.54"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4="; + sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8="; + sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI="; + sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; }; }; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 6fa7029f37a0..262df2e853a6 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.719.0"; + version = "2022.723.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-SSKiXIj02VCTHDLgQMV0vZyKUoUv2c4KOfEJJ2NOLjY="; + sha256 = "sha256-j3NxT/WCOCSB62JUO8hYCRUoF+GL1QAdaUaynY7aGj8="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index a2370f1e2041..52c3b6f7a921 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -142,14 +142,14 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.4"; sha256 = "1fk0029b1183pxd6qvzkmy8byx5dhjka3f8x20sd7drbzvqpn6am"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.4"; sha256 = "0ahxg4mckzljav5y9g7c1795wgyx2banysg5l7ix3xrl4xmjfmp3"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.607.0"; sha256 = "07rf10lpnly9d8wf7mwys3jsr4kh0rkf86rjck1hmb73b8524jq9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.719.0"; sha256 = "1rm72pm1m1nrfla2m3943nm85aj2i32rx4ikggm97fm74018cjsx"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.722.0"; sha256 = "1ps8cfny35hyairw32bjz3cvkdhqch27yfzz83zbv6rdbk687zjq"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.716.0"; sha256 = "03g70lsxad0xrrii4d1qh8xb1q4983hn7raydwihvm15pqwv9741"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.722.0"; sha256 = "0ilzm9cfvhzxwlv1irzcsbwnm3p5qjbc3hzh5ss992s0y5v6xray"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.563-alpha"; sha256 = "09bk81nibfwicjmy8bg4h14myp3x0a7yz4axwdfnk33pj5dsn953"; }) (fetchNuGet { pname = "Realm"; version = "10.14.0"; sha256 = "0pbnqp2z27lm6i8j8pbb2500gyyv8gb73kskv49ympvpa09mzcrv"; }) diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index f7d0f9af13d7..40692cb3c7a8 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -16,21 +16,22 @@ , openal , msaClientID ? "" , jdks ? [ jdk jdk8 ] +, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "polymc"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o="; + sha256 = "sha256-gaPqCAC/tE6nUONgWSrVm3oBzSnOhZ5xiAJ+QyX+8rA="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; buildInputs = [ qtbase zlib quazip ]; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/misc/autotiling-rs/default.nix new file mode 100644 index 000000000000..6e0ffebf0323 --- /dev/null +++ b/pkgs/misc/autotiling-rs/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "autotiling-rs"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ammgws"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA="; + }; + + cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4="; + + meta = with lib; { + description = "Autotiling for sway (and possibly i3)"; + homepage = "https://github.com/ammgws/autotiling-rs"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 73edb3be9ec3..7c20b74e54cb 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { + broken = kernel.kernelAtLeast "5.16"; description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index aa9115d2b125..59624b15db62 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.12"; #zen + version = "5.18.13"; #zen suffix = "zen1"; #zen - sha256 = "1h0qnwq967ncqv40msa94jlwqf9rw2kgrr4gwx6n8i6wn0dmxpbq"; #zen + sha256 = "0m5wwiaasv49f50qxv7kydmxzfry2w6gl6489hba4i4xl7h8k8nj"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.12"; #lqx + version = "5.18.13"; #lqx suffix = "lqx1"; #lqx - sha256 = "0bxmscx7m9fp73brj6x3d2vk5fnys7a502vllsf8dg74k0g83781"; #lqx + sha256 = "12fzls0rmq2zlfdlx81f44hylmfk0j2nsxbg9s3iyakyhkwynvvk"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 8a04386a7186..2286e86df72c 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = kernel.kernelAtLeast "5.16"; homepage = "http://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2ef6d8c8243d..279f7c22e646 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.19"; + version = "1.90.0"; outputs = [ "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; @@ -37,18 +37,9 @@ stdenv.mkDerivation rec { owner = "upower"; repo = "upower"; rev = "v${version}"; - sha256 = "gpLsBh4jgiDO8bxic2BTFhjIwc2q/tuAIxykTHqK6UM="; + hash = "sha256-+C/4dDg6WTLpBgkpNyxjthSdqYdaTLC8vG6jG1LNJ7w="; }; - patches = [ - # Fix test - # https://gitlab.freedesktop.org/upower/upower/-/merge_requests/150 - (fetchpatch { - url = "https://gitlab.freedesktop.org/upower/upower/-/commit/a78ee6039054770b466749f8ec4bfbe4c278d697.patch"; - sha256 = "aUPXnr/2PlOZNb7mQl43hmKe01DtuBUrGnqvwBFRf7Q="; - }) - ]; - strictDeps = true; depsBuildBuild = [ diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index a7759191a12a..07458c40b8f8 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LP3tOInpqVpO/BWla7/gZCGUUZ/1J8dHegGa0hRiRDQ="; + sha256 = "sha256-vKCQgg0m58hoN79WcZ4mM6bjCJOPxhAT4ifZ3b/5bkA="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index eda6b1ec9571..a695698c15ab 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.3"; + version = "9.0.4"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-oFVAiQt+ZxLB1On1wKM2R2qTEl5zBbWpkvBOLQ081+A="; + sha256 = "sha256-V28wUkgWLUTRBNbx5xAdLUcFGU2DQ5Az5SSIJPv393U="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-l2XTC0OxIeUD4sjM4w9WsT9s5akGjWpFmnZnmI/vSEA="; + sha256 = "sha256-UU/THOSYJfbgx/Mn3rMZiODeHX4I6l/7Kpg5mBq5FUI="; }; - vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU="; + vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 79a84f965bcd..82c5ac5ea5da 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -145,6 +145,12 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' + substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ + --replace kAudioObjectPropertyElement{Main,Master} \ + --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume + ''; + # Otherwise, the meson log says: # # Program zip found: NO diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index bc1f0905c6b8..1c7c76b2bd43 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let +{ lib, stdenv, fetchurl, unzip, writeText, dos2unix, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.16.0"; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip dos2unix ]; unpackPhase = '' mkdir rainloop @@ -16,7 +16,19 @@ sha256 = sha256; }; - includeScript = pkgs.writeText "include.php" '' + prePatch = '' + dos2unix ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php + ''; + + patches = [ + ./fix-cve-2022-29360.patch + ]; + + postPatch = '' + unix2dos ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php + ''; + + includeScript = writeText "include.php" '' setAttribute($sKey, $sValue); + } + +- $oWrapDom = $oDom->createElement('div', '___xxx___'); ++ $rand_str = base64_encode(random_bytes(32)); ++ $oWrapDom = $oDom->createElement('div', $rand_str); + $oWrapDom->setAttribute('data-x-div-type', 'body'); + foreach ($aBodylAttrs as $sKey => $sValue) + { +@@ -250,7 +251,7 @@ class HtmlUtils + + $sWrp = $oDom->saveHTML($oWrapHtml); + +- $sResult = \str_replace('___xxx___', $sResult, $sWrp); ++ $sResult = \str_replace($rand_str, $sResult, $sWrp); + } + + $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult); diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index d0dfa5d00f56..d8373f598484 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4="; + sha256 = "sha256-GM89AT9FsaqO1Z14vHB+nhJeJQ2PBhU5aum/4918PXw="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 97414481a915..134e992a56c8 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -42,12 +42,12 @@ , defaultFontPath ? "" }: stdenv.mkDerivation rec { - pname = "xwayland"; - version = "22.1.1"; + version = "22.1.3"; + src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc="; + sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU="; }; depsBuildBuild = [ diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 01219e2165ec..060f1e5844dc 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -287,7 +287,7 @@ let homepage = "https://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ cole-h ]; + maintainers = with maintainers; [ cole-h winter srapenne ]; }; passthru = { diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 4fa5d9b087be..ed11f0828d66 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.11.0"; + version = "0.13.0"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "sha256-jfxQMEVABTOhx679V0iGVX9RisuY42lSdztYXMLwdcw="; + sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc="; }; LC_ALL = "en_US.UTF-8"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' - wrapProgram $out/bin/xon.sh \ + wrapProgram $out/bin/xonsh \ $makeWrapperArgs ''; @@ -49,6 +49,8 @@ python3Packages.buildPythonApplication rec { "test_colorize_file" "test_loading_correctly" "test_no_command_path_completion" + "test_bsd_man_page_completions" + "test_xonsh_activator" # fails on non-interactive shells "test_capture_always" "test_casting" @@ -56,9 +58,14 @@ python3Packages.buildPythonApplication rec { "test_dirty_working_directory" "test_man_completion" "test_vc_get_branch" + "test_bash_and_is_alias_is_only_functional_alias" ]; disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/test_ptk_highlight.py" + "tests/test_ptk_shell.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index d2914dbf95ae..792fed6e35d7 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,31 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M="; + sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU="; }; - patches = [ - (fetchpatch { - name = "backport_TestConnect-Apple-Fixes.patch"; - url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch"; - sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4="; - }) - - (fetchpatch { - name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch"; - url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch"; - sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds="; - }) - ]; - - vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; + vendorSha256 = "sha256-G9YpMF4qyL8eJPnai81ihVTDK9E4meKxdpk+rjISnIM="; meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 4f41a09304fb..150230f775a4 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -2,9 +2,9 @@ , lib , fetchurl - # Only used for x86/x86_64 + # Only used for Linux's x86/x86_64 , uasm -, useUasm ? stdenv.hostPlatform.isx86 +, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86) # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -16,23 +16,23 @@ }: let - inherit (stdenv.hostPlatform) system; - platformSuffix = { - aarch64-linux = "_arm64"; - i686-linux = "_x86"; - x86_64-linux = "_x64"; - }.${system} or - (builtins.trace "`platformSuffix` not available for `${system}.` Making a generic `7zz` build." ""); + makefile = { + aarch64-darwin = "../../cmpl_mac_arm64.mak"; + x86_64-darwin = "../../cmpl_mac_x64.mak"; + aarch64-linux = "../../cmpl_gcc_arm64.mak"; + i686-linux = "../../cmpl_gcc_x86.mak"; + x86_64-linux = "../../cmpl_gcc_x64.mak"; + }.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build in stdenv.mkDerivation rec { pname = "7zz"; - version = "22.00"; + version = "22.01"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; hash = { - free = "sha256-QzGZgPxHobGwstFfVRtb4V+hqMM7dMIy2/EZcJ2aZe8="; - unfree = "sha256-QJafYB6Gr/Saqgug31zm/Tl89+JoOoS1kbAIHkYe9nU="; + free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg="; + unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv @@ -51,27 +51,40 @@ stdenv.mkDerivation rec { ''; }; - sourceRoot = "CPP/7zip/Bundles/Alone2"; + sourceRoot = "."; + + patches = [ ./fix-build-on-darwin.patch ]; + patchFlags = [ "-p0" ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-Wno-deprecated-copy-dtor" + ]; + + inherit makefile; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" - ] ++ - lib.optionals useUasm [ "MY_ASM=uasm" ] ++ + ] + ++ lib.optionals useUasm [ "MY_ASM=uasm" ] + # We need at minimum 10.13 here because of utimensat, however since + # we need a bump anyway, let's set the same minimum version as the one in + # aarch64-darwin so we don't need additional changes for it + ++ lib.optionals stdenv.isDarwin [ "MACOSX_DEPLOYMENT_TARGET=10.16" ] # it's the compression code with the restriction, see DOC/License.txt - lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; - - makefile = "../../cmpl_gcc${platformSuffix}.mak"; + ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; nativeBuildInputs = lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; + preBuild = "cd CPP/7zip/Bundles/Alone2"; + installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g${platformSuffix}/7zz + install -Dm555 -t $out/bin b/*/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -96,7 +109,7 @@ stdenv.mkDerivation rec { # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; maintainers = with maintainers; [ anna328p peterhoeg jk ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "7zz"; }; } diff --git a/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch b/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch new file mode 100644 index 000000000000..9d8ee7f9bc60 --- /dev/null +++ b/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch @@ -0,0 +1,24 @@ +diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp +--- CPP/7zip/Common/FileStreams.cpp ++++ CPP/7zip/Common/FileStreams.cpp +@@ -12,7 +12,7 @@ + #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include +diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp +--- CPP/7zip/UI/Common/UpdateCallback.cpp ++++ CPP/7zip/UI/Common/UpdateCallback.cpp +@@ -9,7 +9,7 @@ + // #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh index bbc9804799ab..1a6d38ea6097 100755 --- a/pkgs/tools/archivers/7zz/update.sh +++ b/pkgs/tools/archivers/7zz/update.sh @@ -1,13 +1,14 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl jq +#! nix-shell -i bash -p coreutils gnused curl jq nix-prefetch set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" DRV_DIR="$PWD" OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -NEW_VERSION="$(curl "https://sourceforge.net/projects/sevenzip/best_release.json" | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)" +# The best_release.json is not always up-to-date +# In those cases you can force the version by calling `./update.sh ` +NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}" echo "comparing versions $OLD_VERSION => $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index e9fdec592204..e2aeea83776d 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -10,38 +10,30 @@ , inih , systemd , appstream +, makeWrapper +, findutils +, gawk +, procps }: stdenv.mkDerivation rec { pname = "gamemode"; - version = "1.6.1"; + version = "1.7"; src = fetchFromGitHub { owner = "FeralInteractive"; repo = pname; rev = version; - sha256 = "sha256-P00OnZiPZyxBu9zuG+3JNorXHBhJZy+cKPjX+duZrJ0="; + sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; }; outputs = [ "out" "dev" "lib" "man" "static" ]; patches = [ - # Run executables from PATH instead of /usr/bin - # See https://github.com/FeralInteractive/gamemode/pull/323 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/be44b7091baa33be6dda60392e4c06c2f398ee72.patch"; - sha256 = "TlDUETs4+N3pvrVd0FQGlGmC+6ByhJ2E7gKXa7suBtE="; - }) - - # Fix loading shipped config when using a prefix other than /usr - # See https://github.com/FeralInteractive/gamemode/pull/324 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/b29aa903ce5acc9141cfd3960c98ccb047eca872.patch"; - sha256 = "LwBzBJQ7dfm2mFVSOSPjJP+skgV5N6h77i66L1Sq+ZM="; - }) - # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch + # Do not install systemd sysusers configuration + ./no-install-systemd-sysusers.patch ]; postPatch = '' @@ -55,6 +47,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config @@ -85,13 +78,20 @@ stdenv.mkDerivation rec { moveToOutput lib/*.a "$static" ''; - # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since - # they use dlopen to load libgamemode. Can't use makeWrapper since - # it would break the security wrapper in the NixOS module. postFixup = '' + # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since + # they use dlopen to load libgamemode. Can't use makeWrapper since + # it would break the security wrapper in the NixOS module. for bin in "$out/bin/gamemoded" "$out/bin/gamemode-simulate-game"; do patchelf --set-rpath "$lib/lib:$(patchelf --print-rpath "$bin")" "$bin" done + + wrapProgram "$out/bin/gamemodelist" \ + --prefix PATH : ${lib.makeBinPath [ + findutils + gawk + procps + ]} ''; meta = with lib; { diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch new file mode 100644 index 000000000000..27aa1d4d710c --- /dev/null +++ b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch @@ -0,0 +1,16 @@ +diff --git i/data/meson.build w/data/meson.build +index 6fb82d8..2e9e170 100644 +--- i/data/meson.build ++++ w/data/meson.build +@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' + configuration: data_conf, + install_dir: path_systemd_unit_dir, + ) +- # Install the sysusers.d file +- install_data( +- files('gamemode.conf'), +- install_dir: path_systemd_sysusers_dir, +- ) + endif + + # Install the D-BUS service file diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index a160fb8b1c58..20699c52849f 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.11"; + version = "0.12.13"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-7K0p20FqaYFzOmUAeq1ousAPCeqE4AZoARF3UY4p4bY="; + hash = "sha256-j3Dj43AbD0V5pZ6mM1uvPsqWAVJrmWyWvwC5NK1cRRY="; }; - cargoHash = "sha256-BN6cdRmhvMjYQlaEa840+syuVKKUQ59TPMKicm40MTk="; + cargoHash = "sha256-HPs55JBbYObunU0cSm/7lsu/DOk4ne9Ea9MCRJ427zo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 69fa8d694541..d0736761bada 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu -, cppcheck +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, glew +, glm +, libGLU +, libGL +, libX11 +, libXext +, libXrender +, icu +, libSM }: stdenv.mkDerivation rec { @@ -14,17 +25,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ lib.optional doCheck cppcheck; + nativeBuildInputs = [ + cmake + pkg-config + ]; - doCheck = false; + buildInputs = [ + glew + glm + libGLU + libGL + libX11 + libXext + libXrender + icu + libSM + ]; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = lib.platforms.linux; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 87d6dcfb0c2e..13f741c5444f 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; - disabledTests = lib.optional stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" "test_from_file" "test_from_env" diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/tools/misc/time-decode/default.nix index 5dcc64cf1cfd..28fcaea73e7a 100644 --- a/pkgs/tools/misc/time-decode/default.nix +++ b/pkgs/tools/misc/time-decode/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "4.0.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J5mgAEANAKKbzRMX/LIpdlnP8GkOXFEOmhEO495Z0p4="; + sha256 = "sha256-79TReAEHvLldp0n3jTvws3mFE/1O1h6TocjMHrurwt4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/tools/misc/wayshot/default.nix new file mode 100644 index 000000000000..659ad3add410 --- /dev/null +++ b/pkgs/tools/misc/wayshot/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "wayshot"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "waycrate"; + repo = pname; + rev = version; + hash = "sha256-4tzL/9p/qBCSWX+O7wZlKi9qb7mIt+hoxcQY7cWlFoU="; + }; + + cargoHash = "sha256-/FAI2VUoyQ1+3CuA7sEpeF5oeJdGB9CRZEp1leLnTh4="; + + meta = with lib; { + description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river"; + homepage = "https://github.com/waycrate/wayshot"; + license = licenses.bsd2; + maintainers = [ maintainers.dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 2c73a6ea9d6d..1451e85c391b 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-P3jmpyk53+N/7BhPfLmCiXOoGJv35eZcvrxGqejYin8="; + sha256 = "sha256-RqJ3AfnHKA6qJhio7SMvJlcKBec7/fDz5s2ucqOkQWE="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/tools/security/slowhttptest/default.nix index 5dce5d5439ac..b4c2b0efeec3 100644 --- a/pkgs/tools/security/slowhttptest/default.nix +++ b/pkgs/tools/security/slowhttptest/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slowhttptest"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "shekyan"; repo = pname; rev = "v${version}"; - sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx"; + sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index 01873cb86aab..bf2c6adf76a4 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -11,24 +11,24 @@ in stdenv.mkDerivation rec { pname = "minijail"; - version = "17"; + version = "18"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; rev = "linux-v${version}"; - sha256 = "1j65h50wa39m6qvgnh1pf59fv9jdsdbc6a6c1na7y0rgljxhmdzv"; + sha256 = "sha256-OpwzISZ5iZNQvJAX7UJJ4gELEaVfcQgY9cqMM0YvBzc="; }; nativeBuildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu; buildInputs = [ libcap ]; - makeFlags = [ "LIBDIR=$(out)/lib" ]; + makeFlags = [ "ECHO=echo" "LIBDIR=$(out)/lib" ]; dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc") "LDFLAGS=-L${glibc.static}/lib"; postPatch = '' - substituteInPlace common.mk --replace /bin/echo echo + substituteInPlace Makefile --replace /bin/echo echo patchShebangs platform2_preinstall.sh ''; @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://android.googlesource.com/platform/external/minijail/"; description = "Sandboxing library and application using Linux namespaces and capabilities"; + changelog = "https://android.googlesource.com/platform/external/minijail/+/refs/tags/linux-v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ pcarrier qyliss ]; platforms = platforms.linux; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 37b0b42d23e5..c3e5c66ba56f 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config }: +{ lib, stdenv, testers, fetchFromGitHub, zlib, libpng, libjpeg, SystemConfiguration, Foundation, pkg-config, htmldoc }: stdenv.mkDerivation rec { pname = "htmldoc"; @@ -14,8 +14,18 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libpng libjpeg ] ++ lib.optionals stdenv.isDarwin [ Foundation SystemConfiguration ]; + # do not generate universal binary on Darwin + # because it is not supported by Nix's clang + postPatch = '' + substituteInPlace configure --replace "-arch x86_64 -arch arm64" "" + ''; + + passthru.tests = testers.testVersion { + package = htmldoc; + command = "htmldoc --version"; + }; + meta = with lib; { - broken = stdenv.isDarwin; description = "Converts HTML files to PostScript and PDF"; homepage = "https://michaelrsweet.github.io/htmldoc"; changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 480c5ab77043..9c00b8f45322 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -995,7 +995,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; - _7zz = callPackage ../tools/archivers/7zz { }; + _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -1909,7 +1909,8 @@ with pkgs; }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; - arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; + # arcanist currently crashes with some workflows on php8.1, use 8.0 + arcanist = callPackage ../development/tools/misc/arcanist { php = php80; }; arduino = arduino-core.override { withGui = true; }; @@ -6705,6 +6706,8 @@ with pkgs; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; + gnome-frog = callPackage ../applications/misc/gnome-frog { }; + gnome-keysign = callPackage ../tools/security/gnome-keysign { }; gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; @@ -27799,6 +27802,8 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; + wayshot = callPackage ../tools/misc/wayshot { }; + wbg = callPackage ../applications/misc/wbg { }; hikari = callPackage ../applications/window-managers/hikari { @@ -34493,6 +34498,8 @@ with pkgs; autotiling = python3Packages.callPackage ../misc/autotiling { }; + autotiling-rs = callPackage ../misc/autotiling-rs { }; + avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; beep = callPackage ../misc/beep { };