From d99c367e1ecb1229b3c53bd65b66b07801e6288e Mon Sep 17 00:00:00 2001 From: Dilip Date: Wed, 17 Jul 2024 21:05:04 +0530 Subject: [PATCH 001/151] dra-cla: unstable-2024-02-07 -> 0-unstable-2024-06-07 --- pkgs/applications/video/dra-cla/default.nix | 44 +++++++++++++-------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/applications/video/dra-cla/default.nix index 02a4a66be929..452980565a08 100644 --- a/pkgs/applications/video/dra-cla/default.nix +++ b/pkgs/applications/video/dra-cla/default.nix @@ -1,26 +1,27 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, makeWrapper -, gnugrep -, gnused -, curl -, mpv -, aria2 -, ffmpeg -, fzf -, openssl +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + gnugrep, + gnused, + curl, + mpv, + aria2, + ffmpeg, + fzf, + openssl, }: stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2024-02-07"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "cf8a90c0c68338404e8a1434af0a6e65fc5d0a08"; - hash = "sha256-3cz1VeDM0NHdYMiCDVnIq6Y/7rFSijhNrnxC36Yixxc="; + rev = "24d7eaa5d433bc2cbbba4f23552cd812506fefee"; + hash = "sha256-BmBQSkLSq+BaxkzXEy3hlI3qNq2NCIoGKDKt7gyDz+s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +32,18 @@ stdenvNoCC.mkDerivation { install -Dm755 dra-cla $out/bin/dra-cla wrapProgram $out/bin/dra-cla \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg fzf openssl ]} + --prefix PATH : ${ + lib.makeBinPath [ + gnugrep + gnused + curl + mpv + aria2 + ffmpeg + fzf + openssl + ] + } runHook postInstall ''; From 53596231c8c7253dee4ef8f8df6aa1293727c0b1 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 15 Sep 2024 23:01:50 +0200 Subject: [PATCH 002/151] gramma: remove mkYarnPackage usage --- pkgs/by-name/gr/gramma/package.json | 84 ----------------------------- pkgs/by-name/gr/gramma/package.nix | 32 ++++++++--- 2 files changed, 24 insertions(+), 92 deletions(-) delete mode 100644 pkgs/by-name/gr/gramma/package.json diff --git a/pkgs/by-name/gr/gramma/package.json b/pkgs/by-name/gr/gramma/package.json deleted file mode 100644 index 5aa4d87333b0..000000000000 --- a/pkgs/by-name/gr/gramma/package.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "name": "gramma", - "version": "1.6.0", - "license": "ISC", - "repository": "https://github.com/caderek/gramma", - "homepage": "https://caderek.github.io/gramma/", - "description": "Command line grammar checker", - "main": "src/index.js", - "bin": "src/cli.js", - "exports": { - ".": "./src/index.js", - "./esm": "./bundle/gramma.esm.js", - "./esm-min": "./bundle/gramma.esm.min.js", - "./iife": "./bundle/gramma.min.js" - }, - "types": "src/index.d.ts", - "scripts": { - "build": "rm -rf bin; yarn run build:win64; yarn run build:macos; yarn run build:linux64; yarn run build:zip; yarn run build:bundles", - "build:win64": "pkg -c package.json -t node16-win-x64 --out-path bin/windows64 src/cli.js", - "build:macos": "pkg -c package.json -t node16-macos-x64 --out-path bin/macos src/cli.js", - "build:linux64": "pkg -c package.json -t node16-linux-x64 --out-path bin/linux64 src/cli.js", - "build:bundles": "yarn run build:esm; yarn run build:esm-min; yarn run build:iife", - "build:esm": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.js --format=esm", - "build:esm-min": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.min.js --format=esm --minify", - "build:iife": "esbuild src/index.js --bundle --outfile=bundle/gramma.min.js --format=iife --minify --global-name=gramma", - "build:zip": "node scripts/zipBinaries.js", - "format": "prettier --write \"src/**/*.js\"", - "lint": "eslint src/**", - "test": "jest", - "test:ci": "jest --coverage && cat ./coverage/lcov.info | codacy-coverage", - "check:langs": "node scripts/checkLanguagesSupport.js", - "prepare": "husky install", - "definitions": "tsc" - }, - "keywords": [ - "grammar", - "command-line", - "checker" - ], - "author": "Maciej Cąderek | maciej.caderek@gmail.com", - "dependencies": { - "cli-progress": "^3.9.1", - "decompress": "^4.2.1", - "decompress-unzip": "^4.0.1", - "dotenv": "^10.0.0", - "intercept-stdout": "^0.1.2", - "isomorphic-fetch": "^3.0.0", - "kleur": "^4.1.4", - "portfinder": "^1.0.28", - "progress-stream": "^2.0.0", - "prompts": "^2.4.1", - "query-string": "^7.0.1", - "rimraf": "^3.0.2", - "tcp-port-used": "^1.0.2", - "yargs": "^17.2.1" - }, - "devDependencies": { - "@types/jest": "^27.0.2", - "codacy-coverage": "^3.4.0", - "esbuild": "^0.13.4", - "eslint": "^7.32.0", - "eslint-config-airbnb": "^18.2.1", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.24.2", - "eslint-plugin-jsx-a11y": "^6.4.1", - "eslint-plugin-react": "^7.26.1", - "gramma": "^1.5.0", - "husky": "^7.0.0", - "jest": "^27.2.4", - "pkg": "^5.3.3", - "prettier": "^2.4.1", - "shelljs": "^0.8.4", - "typescript": "^4.4.3" - }, - "jest": { - "verbose": true, - "testMatch": [ - "**/?(*.)(spec|test).?(m)js" - ] - }, - "engines": { - "node": ">=12.0.0" - } -} diff --git a/pkgs/by-name/gr/gramma/package.nix b/pkgs/by-name/gr/gramma/package.nix index d5ba331d0003..2161522c3fb3 100644 --- a/pkgs/by-name/gr/gramma/package.nix +++ b/pkgs/by-name/gr/gramma/package.nix @@ -1,34 +1,50 @@ { lib, - mkYarnPackage, + stdenvNoCC, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gramma"; version = "1.6.0"; src = fetchFromGitHub { owner = "caderek"; repo = "gramma"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg="; }; - packageJSON = ./package.json; + postPatch = '' + # Set a script name to avoid yargs using cli.js as $0 + substituteInPlace src/cli.js \ + --replace-fail '.demandCommand()' '.demandCommand().scriptName("gramma")' + ''; + offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-FuR6wUhAaej/vMgjAlICMEj1pPf+7PFrdu2lTFshIkg="; }; + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + passthru.updateScript = nix-update-script { }; meta = { description = "command-line grammar checker"; homepage = "https://caderek.github.io/gramma/"; - changelog = "https://github.com/caderek/gramma/releases/tag/v${version}"; + changelog = "https://github.com/caderek/gramma/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; mainProgram = "gramma"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From c1cb18cd9e20b4166e48a30b752e7e9e6f53303e Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Mon, 3 Jun 2024 13:10:24 -0400 Subject: [PATCH 003/151] wivrn: init at 0.19 --- pkgs/by-name/wi/wivrn/package.nix | 149 ++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 pkgs/by-name/wi/wivrn/package.nix diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix new file mode 100644 index 000000000000..f795ec72b348 --- /dev/null +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -0,0 +1,149 @@ +{ + config, + lib, + stdenv, + fetchFromGitHub, + fetchFromGitLab, + applyPatches, + autoAddDriverRunpath, + avahi, + boost, + cli11, + cmake, + cudaPackages ? { }, + cudaSupport ? config.cudaSupport, + eigen, + ffmpeg, + freetype, + git, + glm, + glslang, + harfbuzz, + libdrm, + libGL, + libva, + libpulseaudio, + libX11, + libXrandr, + nix-update-script, + nlohmann_json, + onnxruntime, + openxr-loader, + pipewire, + pkg-config, + python3, + shaderc, + spdlog, + systemd, + udev, + vulkan-headers, + vulkan-loader, + vulkan-tools, + x264, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "wivrn"; + version = "0.19"; + + src = fetchFromGitHub { + owner = "wivrn"; + repo = "wivrn"; + rev = "v${finalAttrs.version}"; + hash = "sha256-DYV+JUWjjhLZLq+4Hv7jxOyxDqQut/mU1X0ZFMoNkDI="; + }; + + monado = applyPatches { + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado"; + repo = "monado"; + rev = "bcbe19ddd795f182df42051e5495e9727db36c1c"; + hash = "sha256-sh5slHROcuC3Dgenu1+hm8U5lUOW48JUbiluYvc3NiQ="; + }; + + patches = [ + "${finalAttrs.src}/patches/monado/0001-c-multi-disable-dropping-of-old-frames.patch" + "${finalAttrs.src}/patches/monado/0002-ipc-server-Always-listen-to-stdin.patch" + "${finalAttrs.src}/patches/monado/0003-c-multi-Don-t-log-frame-time-diff.patch" + "${finalAttrs.src}/patches/monado/0005-distortion-images.patch" + "${finalAttrs.src}/patches/monado/0008-Use-mipmaps-for-distortion-shader.patch" + "${finalAttrs.src}/patches/monado/0009-convert-to-YCbCr-in-monado.patch" + ]; + }; + + strictDeps = true; + + postUnpack = '' + # Let's make sure our monado source revision matches what is used by WiVRn upstream + ourMonadoRev="${finalAttrs.monado.src.rev}" + theirMonadoRev=$(grep "GIT_TAG" ${finalAttrs.src.name}/CMakeLists.txt | awk '{print $2}') + if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then + echo "Our Monado source revision doesn't match CMakeLists.txt." >&2 + echo " theirs: $theirMonadoRev" >&2 + echo " ours: $ourMonadoRev" >&2 + return 1 + fi + ''; + + nativeBuildInputs = [ + cmake + git + glslang + pkg-config + python3 + ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; + + buildInputs = [ + avahi + boost + cli11 + eigen + ffmpeg + freetype + glm + harfbuzz + libdrm + libGL + libva + libX11 + libXrandr + libpulseaudio + nlohmann_json + onnxruntime + openxr-loader + pipewire + shaderc + spdlog + systemd + udev + vulkan-headers + vulkan-loader + vulkan-tools + x264 + ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ]; + + cmakeFlags = [ + (lib.cmakeBool "WIVRN_USE_VAAPI" true) + (lib.cmakeBool "WIVRN_USE_X264" true) + (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport) + (lib.cmakeBool "WIVRN_USE_SYSTEMD" true) + (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true) + (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true) + (lib.cmakeBool "WIVRN_BUILD_CLIENT" false) + (lib.cmakeBool "WIVRN_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) + (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "An OpenXR streaming application to a standalone headset"; + homepage = "https://github.com/Meumeu/WiVRn/"; + changelog = "https://github.com/Meumeu/WiVRn/releases/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ passivelemon ]; + platforms = platforms.linux; + mainProgram = "wivrn-server"; + }; +}) From 6e9e75f7f22174291aeea4d465ed5a89f5619ec1 Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Mon, 3 Jun 2024 13:10:51 -0400 Subject: [PATCH 004/151] nixos/wivrn: init module --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/video/wivrn.nix | 226 ++++++++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 nixos/modules/services/video/wivrn.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 158257f20a7a..aee8b8072799 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -201,6 +201,8 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [watchdogd](https://troglobit.com/projects/watchdogd/), a system and process supervisor using watchdog timers. Available as [services.watchdogd](#opt-services.watchdogd.enable). +- [WiVRn](https://github.com/Meumeu/WiVRn), an OpenXR streaming application. Available as [services.wivrn](#opt-services.wivrn.enable). + - [Workout-tracker](https://github.com/jovandeginste/workout-tracker), a workout tracking web application for personal use. - [wyoming-satellite](https://github.com/rhasspy/wyoming-satellite), a voice assistant satellite for Home Assistant using the Wyoming protocol. Available as [services.wyoming.satellite](#opt-services.wyoming.satellite.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5068a04c8d34..f965f988e31b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1373,6 +1373,7 @@ ./services/video/mediamtx.nix ./services/video/unifi-video.nix ./services/video/v4l2-relayd.nix + ./services/video/wivrn.nix ./services/wayland/cage.nix ./services/wayland/hypridle.nix ./services/web-apps/akkoma.nix diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix new file mode 100644 index 000000000000..f571832053ad --- /dev/null +++ b/nixos/modules/services/video/wivrn.nix @@ -0,0 +1,226 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (lib) + mkIf + mkEnableOption + mkPackageOption + mkOption + optionalString + optionalAttrs + isDerivation + recursiveUpdate + getExe + literalExpression + types + maintainers + ; + cfg = config.services.wivrn; + configFormat = pkgs.formats.json { }; + + # For the application option to work with systemd PATH, we find the store binary path of + # the package, concat all of the following strings, and then update the application attribute. + # Application can either be a package or a list that has a package as the first element. + applicationExists = builtins.hasAttr "application" cfg.config.json; + applicationListNotEmpty = ( + if builtins.isList cfg.config.json.application then + (builtins.length cfg.config.json.application) != 0 + else + true + ); + applicationCheck = applicationExists && applicationListNotEmpty; + + applicationBinary = ( + if builtins.isList cfg.config.json.application then + builtins.head cfg.config.json.application + else + cfg.config.json.application + ); + applicationStrings = builtins.tail cfg.config.json.application; + + applicationPath = mkIf applicationCheck applicationBinary; + + applicationConcat = ( + if builtins.isList cfg.config.json.application then + builtins.concatStringsSep " " ([ (getExe applicationBinary) ] ++ applicationStrings) + else + (getExe applicationBinary) + ); + applicationUpdate = recursiveUpdate cfg.config.json ( + optionalAttrs applicationCheck { application = applicationConcat; } + ); + configFile = configFormat.generate "config.json" applicationUpdate; +in +{ + options = { + services.wivrn = { + enable = mkEnableOption "WiVRn, an OpenXR streaming application"; + + package = mkPackageOption pkgs "wivrn" { }; + + openFirewall = mkEnableOption "the default ports in the firewall for the WiVRn server"; + + defaultRuntime = mkEnableOption '' + WiVRn Monado as the default OpenXR runtime on the system. + The config can be found at `/etc/xdg/openxr/1/active_runtime.json`. + + Note that applications can bypass this option by setting an active + runtime in a writable XDG_CONFIG_DIRS location like `~/.config` + ''; + + autoStart = mkEnableOption "starting the service by default"; + + monadoEnvironment = mkOption { + type = types.attrs; + description = "Environment variables to be passed to the Monado environment."; + default = { + XRT_COMPOSITOR_LOG = "debug"; + XRT_PRINT_OPTIONS = "on"; + IPC_EXIT_ON_DISCONNECT = "off"; + }; + }; + + extraPackages = mkOption { + type = types.listOf types.package; + description = "Packages to add to the wivrn-application service $PATH."; + default = [ ]; + example = literalExpression "[ pkgs.bash pkgs.procps ]"; + }; + + config = { + enable = mkEnableOption "configuration for WiVRn"; + json = mkOption { + type = configFormat.type; + description = '' + Configuration for WiVRn. The attributes are serialized to JSON in config.json. + + Note that the application option must be either a package or a + list with package as the first element. + + See https://github.com/Meumeu/WiVRn/blob/master/docs/configuration.md + ''; + default = { }; + example = literalExpression '' + { + scale = 0.8; + bitrate = 100000000; + encoders = [ + { + encoder = "nvenc"; + codec = "h264"; + width = 1.0; + height = 1.0; + offset_x = 0.0; + offset_y = 0.0; + } + ]; + application = [ pkgs.wlx-overlay-s ]; + tcp_only = true; + } + ''; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !applicationCheck || isDerivation applicationBinary; + message = "The application in WiVRn configuration is not a package. Please ensure that the application is a package or that a package is the first element in the list."; + } + ]; + + systemd.user = { + services = { + # The WiVRn server runs in a hardened service and starts the applications in a different service + wivrn = { + description = "WiVRn XR runtime service"; + environment = { + # Default options + # https://gitlab.freedesktop.org/monado/monado/-/blob/598080453545c6bf313829e5780ffb7dde9b79dc/src/xrt/targets/service/monado.in.service#L12 + XRT_COMPOSITOR_LOG = "debug"; + XRT_PRINT_OPTIONS = "on"; + IPC_EXIT_ON_DISCONNECT = "off"; + } // cfg.monadoEnvironment; + serviceConfig = { + ExecStart = ( + (getExe cfg.package) + " --systemd" + optionalString cfg.config.enable " -f ${configFile}" + ); + # Hardening options + CapabilityBoundingSet = [ "CAP_SYS_NICE" ]; + AmbientCapabilities = [ "CAP_SYS_NICE" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + }; + wantedBy = mkIf cfg.autoStart [ "default.target" ]; + restartTriggers = [ + cfg.package + configFile + ]; + }; + wivrn-application = mkIf applicationCheck { + description = "WiVRn application service"; + requires = [ "wivrn.service" ]; + serviceConfig = { + ExecStart = ( + (getExe cfg.package) + " --application" + optionalString cfg.config.enable " -f ${configFile}" + ); + Restart = "on-failure"; + RestartSec = 0; + PrivateTmp = true; + }; + # We need to add the application to PATH so WiVRn can find it + path = [ applicationPath ] ++ cfg.extraPackages; + }; + }; + }; + + services = { + # WiVRn can be used with some wired headsets so we include xr-hardware + udev.packages = with pkgs; [ + android-udev-rules + xr-hardware + ]; + avahi = { + enable = true; + publish = { + enable = true; + userServices = true; + }; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 9757 ]; + allowedUDPPorts = [ 9757 ]; + }; + + environment = { + systemPackages = [ + cfg.package + applicationPath + ]; + pathsToLink = [ "/share/openxr" ]; + etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { + source = "${cfg.package}/share/openxr/1/openxr_wivrn.json"; + }; + }; + }; + meta.maintainers = with maintainers; [ passivelemon ]; +} From 8ed82c62be739f166c32512dc2b84e496f2d2855 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Mon, 23 Sep 2024 21:50:50 -0500 Subject: [PATCH 005/151] idris2Packages.pack: init at 2024-02-07 --- pkgs/development/compilers/idris2/default.nix | 2 + pkgs/development/compilers/idris2/pack.nix | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/compilers/idris2/pack.nix diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 8f628246c649..57031f673d3e 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -4,5 +4,7 @@ idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; + pack = callPackage ./pack.nix { }; + buildIdris = callPackage ./build-idris.nix { }; } diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix new file mode 100644 index 000000000000..7e65a3f73a77 --- /dev/null +++ b/pkgs/development/compilers/idris2/pack.nix @@ -0,0 +1,55 @@ +{ + lib, + idris2Packages, + fetchFromGitHub, +}: +let + inherit (idris2Packages) idris2Api buildIdris; + toml = buildIdris { + ipkgName = "toml"; + version = "2022-05-05"; + src = fetchFromGitHub { + owner = "cuddlefishie"; + repo = "toml-idr"; + rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; + hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + }; + idrisLibraries = [ ]; + }; + filepath = buildIdris { + ipkgName = "filepath"; + version = "2023-12-04"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-filepath"; + rev = "eac02d51b631633f32330c788bcebeb24221fa09"; + hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + }; + idrisLibraries = [ ]; + }; + packPkg = buildIdris { + ipkgName = "pack"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-pack"; + rev = "305123401a28a57b02f750c589c35af628b2a5eb"; + hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + }; + idrisLibraries = [ + idris2Api + toml + filepath + ]; + + meta = { + description = "An Idris2 Package Manager with Curated Package Collections"; + mainProgram = "pack"; + homepage = "https://github.com/stefan-hoeck/idris2-pack"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2Packages.idris2.meta) platforms; + }; + }; +in +packPkg.executable From 0fbfad403a76651f41739a410597aec659e3f0bf Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Thu, 26 Sep 2024 19:52:16 +0200 Subject: [PATCH 006/151] unicode-character-database: 15.1.0 -> 16.0.0 Release announcement: https://www.unicode.org/versions/Unicode16.0.0/ --- pkgs/data/misc/unicode-character-database/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix index 393fe7d2a806..cf61d30108f4 100644 --- a/pkgs/data/misc/unicode-character-database/default.nix +++ b/pkgs/data/misc/unicode-character-database/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "unicode-character-database"; - version = "15.1.0"; + version = "16.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip"; - sha256 = "sha256-yxxmPQU5JlAM1QEilzYEV1JxOgZr11gCCYWYt6cFYXc="; + sha256 = "sha256-yG3YHysUpDsMwGSqX4mqckE4aAHjXFnHmE5XmDJjTrI="; }; nativeBuildInputs = [ From 8039b13d00fd1910ea706591086ca88e80c45ddb Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Fri, 27 Sep 2024 00:41:10 +0200 Subject: [PATCH 007/151] gucharmap: 15.1.5 -> 16.0.1 Diff: https://gitlab.gnome.org/GNOME/gucharmap/-/compare/15.1.5...16.0.1 --- pkgs/by-name/gu/gucharmap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix index c22eae151402..f6fd425d434b 100644 --- a/pkgs/by-name/gu/gucharmap/package.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "gucharmap"; - version = "15.1.5"; + version = "16.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gucharmap"; rev = finalAttrs.version; - hash = "sha256-PG86D8QvqHdmo3aJseCerngmuWUqtSMdWzbixWE2HOQ="; + hash = "sha256-eQ27TIggwQ2RjDQO5ytVrUT7iNtbP5HOwMcpzweMW8A="; }; strictDeps = true; From 818180957da96bc6f358591a123157a9e36f6cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Thu, 3 Oct 2024 18:15:29 +0200 Subject: [PATCH 008/151] maintainers: add melon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5c51a0805dfd..27553b18f0cf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13515,6 +13515,12 @@ githubId = 1215331; name = "Matt Melling"; }; + melon = { + email = "melontime05@gmail.com"; + github = "BlaiZephyr"; + githubId = 101197249; + name = "Tim"; + }; melsigl = { email = "melanie.bianca.sigl@gmail.com"; github = "melsigl"; From dd8b2cc974c5b6dfdec4fe1a79d633671b619648 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 8 Oct 2024 14:32:19 +1100 Subject: [PATCH 009/151] ruby_3_4: init at 3.4.0.preview2 Release notes: https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ --- pkgs/development/interpreters/ruby/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 369d242192ac..f0308d334257 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -318,4 +318,9 @@ in { cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; + ruby_3_4 = generic { + version = rubyVersion "3" "4" "0" "preview2"; + hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E="; + cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787f20384e3c..0c5a3c14376d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16608,7 +16608,8 @@ with pkgs; mkRuby ruby_3_1 ruby_3_2 - ruby_3_3; + ruby_3_3 + ruby_3_4; ruby = ruby_3_3; rubyPackages = rubyPackages_3_3; @@ -16616,6 +16617,7 @@ with pkgs; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; + rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems; mruby = callPackage ../development/compilers/mruby { }; From 723c4a673591de18ef1d7915881de9077ffca6de Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Tue, 8 Oct 2024 17:04:08 +0200 Subject: [PATCH 010/151] xlockmore: set mainprogram to xlock This allows using `nix run nixpkgs#xlockmore`. --- pkgs/misc/screensavers/xlockmore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index d99c9fd7fcff..beb45b31a837 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; + mainProgram = "xlock"; }; } From b00742f5fb462caac9f3768dc157f78df8dca3b2 Mon Sep 17 00:00:00 2001 From: Petr Kozorezov Date: Thu, 10 Oct 2024 15:52:06 +0300 Subject: [PATCH 011/151] maintainers: add petrkozorezov --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ffe0c78b9573..28d65b5ebd30 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16487,6 +16487,13 @@ githubId = 28323; name = "Peter Simons"; }; + petrkozorezov = { + email = "petr.kozorezov@gmail.com"; + github = "petrkozorezov"; + githubId = 645017; + name = "Petr Kozorezov"; + keys = [ { fingerprint = "7F1A 353D 3D6D 9CEF 63A9 B5C6 699F 32D5 9999 7C90"; } ]; + }; petrosagg = { email = "petrosagg@gmail.com"; github = "petrosagg"; From 69ff55d18810ee2266f85a8995009c4ce36fa7b3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 12 Oct 2024 11:25:32 -0300 Subject: [PATCH 012/151] kid3: use regular callPackage instead of customized one Plus formatter. --- pkgs/applications/audio/kid3/default.nix | 134 ++++++++++++----------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 74 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 8cc6f6d8ec60..8403db5c9f3f 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,47 +1,44 @@ -{ chromaprint -, cmake -, docbook_xml_dtd_45 -, docbook_xsl -, fetchurl -, ffmpeg -, flac -, id3lib -, kdePackages -, lib -, libogg -, libvorbis -, libxslt -, mp4v2 -, pkg-config -, python3 -, qtbase -, qtdeclarative -, qtmultimedia -, qttools -, readline -, stdenv -, taglib -, wrapQtAppsHook -, zlib -, withCLI ? true -, withKDE ? true -, withQt ? false +{ + lib, + chromaprint, + cmake, + docbook_xml_dtd_45, + docbook_xsl, + fetchurl, + ffmpeg, + flac, + id3lib, + kdePackages, + libogg, + libvorbis, + libxslt, + mp4v2, + pkg-config, + python3, + qt6, + readline, + stdenv, + taglib, + zlib, + # Boolean flags + withCLI ? true, + withKDE ? true, + withQt ? false, }: let - inherit (lib) optionals; + inherit (qt6) + qtbase + qtdeclarative + qtmultimedia + qttools + wrapQtAppsHook + ; apps = lib.concatStringsSep ";" ( - optionals withCLI [ "CLI" ] - ++ optionals withKDE [ "KDE" ] - ++ optionals withQt [ "Qt" ] + lib.optionals withCLI [ "CLI" ] ++ lib.optionals withKDE [ "KDE" ] ++ lib.optionals withQt [ "Qt" ] ); - mainProgram = - if withQt then "kid3-qt" - else if withKDE then "kid3" - else "kid3-cli"; - in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; @@ -62,29 +59,34 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - chromaprint - ffmpeg - flac - id3lib - libogg - libvorbis - libxslt - mp4v2 - qtbase - qtdeclarative - qtmultimedia - readline - taglib - zlib - ] ++ lib.optionals withKDE (with kdePackages; [ - kconfig - kconfigwidgets - kcoreaddons - kio - kxmlgui - phonon - ]); + buildInputs = + [ + chromaprint + ffmpeg + flac + id3lib + libogg + libvorbis + libxslt + mp4v2 + qtbase + qtdeclarative + qtmultimedia + readline + taglib + zlib + ] + ++ lib.optionals withKDE ( + with kdePackages; + [ + kconfig + kconfigwidgets + kcoreaddons + kio + kxmlgui + phonon + ] + ); cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; @@ -95,10 +97,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Simple and powerful audio tag editor"; - inherit mainProgram; homepage = "https://kid3.kde.org/"; - license = lib.licenses.lgpl2Plus; + description = "Simple and powerful audio tag editor"; longDescription = '' If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full @@ -128,6 +128,14 @@ stdenv.mkDerivation (finalAttrs: { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; + license = lib.licenses.lgpl2Plus; + mainProgram = + if withQt then + "kid3-qt" + else if withKDE then + "kid3" + else + "kid3-cli"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15df4f0cfde..6d139905f989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30397,9 +30397,9 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3-cli = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; - kid3-kde = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; - kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; + kid3-cli = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; + kid3-kde = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; + kid3-qt = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; kile = callPackage ../applications/editors/kile { }; From 9cdf75404de6f498fe5ecb84a71f01647d2a700b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 12 Oct 2024 11:28:04 -0300 Subject: [PATCH 013/151] kid3: migrate to by-name --- .../audio/kid3/default.nix => by-name/ki/kid3/package.nix} | 0 pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{applications/audio/kid3/default.nix => by-name/ki/kid3/package.nix} (100%) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/by-name/ki/kid3/package.nix similarity index 100% rename from pkgs/applications/audio/kid3/default.nix rename to pkgs/by-name/ki/kid3/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d139905f989..b9951f819511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30397,10 +30397,9 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3-cli = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = false; }; - kid3-kde = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = true; withQt = false; }; - kid3-qt = callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; - kid3 = kid3-kde; + kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; }; + kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; }; + kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; }; kile = callPackage ../applications/editors/kile { }; From 17592f3f01ec3250ad735b8089483c534f688c7d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:05:52 -0300 Subject: [PATCH 014/151] vym: use standard callPackage --- pkgs/applications/misc/vym/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 8a550ac4a79f..b685a5e1d8af 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -3,15 +3,15 @@ , cmake , fetchFromGitHub , pkg-config -, qtbase -, qtscript -, qtsvg , substituteAll , unzip -, wrapQtAppsHook , zip +, qt5 }: +let + inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook; +in stdenv.mkDerivation (finalAttrs: { pname = "vym"; version = "2.9.26"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b15df4f0cfde..3e7e728dddbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33402,7 +33402,7 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = libsForQt5.callPackage ../applications/misc/vym { }; + vym = callPackage ../applications/misc/vym { }; wad = callPackage ../tools/security/wad { }; From 1236eb79b30e5789dd71f97c6739af876ab5ffd6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:12:03 -0300 Subject: [PATCH 015/151] vym: nixfmt-rfc-style and hammer - use lib.getExe - put patches on a dedicated directory --- pkgs/applications/misc/vym/default.nix | 50 ++++++++++++------- .../0000-fix-zip-paths.diff} | 0 2 files changed, 32 insertions(+), 18 deletions(-) rename pkgs/applications/misc/vym/{000-fix-zip-paths.diff => patches/0000-fix-zip-paths.diff} (100%) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index b685a5e1d8af..bafae7dad58e 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,16 +1,22 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, pkg-config -, substituteAll -, unzip -, zip -, qt5 +{ + lib, + cmake, + fetchFromGitHub, + pkg-config, + qt5, + stdenv, + substituteAll, + unzip, + zip, }: let - inherit (qt5) qtbase qtscript qtsvg wrapQtAppsHook; + inherit (qt5) + qtbase + qtscript + qtsvg + wrapQtAppsHook + ; in stdenv.mkDerivation (finalAttrs: { pname = "vym"; @@ -23,13 +29,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5cHhv9GDjJvSqGJ+7fI0xaWCiXw/0WP0Bem/ZRV8Y7M="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ (substituteAll { - src = ./000-fix-zip-paths.diff; - zipPath = "${zip}/bin/zip"; - unzipPath = "${unzip}/bin/unzip"; + src = ./patches/0000-fix-zip-paths.diff; + zipPath = "${lib.getExe zip}"; + unzipPath = "${lib.getExe unzip}"; }) ]; @@ -45,16 +54,20 @@ stdenv.mkDerivation (finalAttrs: { qtsvg ]; - strictDeps = true; - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ unzip zip ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + unzip + zip + ] + }" ]; + strictDeps = true; + meta = { homepage = "http://www.insilmaril.de/vym/"; description = "Mind-mapping software"; - mainProgram = "vym"; longDescription = '' VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. Such maps can help you to improve your creativity and @@ -67,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { work with such maps. ''; license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "vym"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/misc/vym/000-fix-zip-paths.diff b/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from pkgs/applications/misc/vym/000-fix-zip-paths.diff rename to pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff From fbd723ff804ed99058982559012a8ebcd637cda4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 11:40:24 -0300 Subject: [PATCH 016/151] vym: migrate to by-name --- .../misc/vym/default.nix => by-name/vy/vym/package.nix} | 0 .../misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc/vym/default.nix => by-name/vy/vym/package.nix} (100%) rename pkgs/{applications/misc => by-name/vy}/vym/patches/0000-fix-zip-paths.diff (100%) diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/by-name/vy/vym/package.nix similarity index 100% rename from pkgs/applications/misc/vym/default.nix rename to pkgs/by-name/vy/vym/package.nix diff --git a/pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff b/pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff similarity index 100% rename from pkgs/applications/misc/vym/patches/0000-fix-zip-paths.diff rename to pkgs/by-name/vy/vym/patches/0000-fix-zip-paths.diff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7e728dddbd..94624ee12ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33402,8 +33402,6 @@ with pkgs; vwm = callPackage ../applications/window-managers/vwm { }; - vym = callPackage ../applications/misc/vym { }; - wad = callPackage ../tools/security/wad { }; wafw00f = callPackage ../tools/security/wafw00f { }; From 0f7e7b687eebdb9d4a482f1594290cf9e9e58d69 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 09:22:21 +0300 Subject: [PATCH 017/151] dbeaver-bin: don't depend on swt (not needed at all) --- pkgs/by-name/db/dbeaver-bin/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index d8f5a5362c36..ef29c8a67548 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -9,7 +9,6 @@ autoPatchelfHook, wrapGAppsHook3, gtk3, - swt, glib, webkitgtk_4_0, glib-networking, @@ -65,11 +64,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : "${openjdk17}/bin" \ --set JAVA_HOME "${openjdk17.home}" \ - --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix LD_LIBRARY_PATH : "$out/lib:${ lib.makeLibraryPath [ - swt gtk3 glib webkitgtk_4_0 From 7c16395c9f1ce5b300a8a80625bc5d98b7102f99 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 09:23:31 +0300 Subject: [PATCH 018/151] portfolio: don't depend on swt (not needed at all) --- pkgs/by-name/po/portfolio/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index c73b6985f341..6d8d826007d2 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -9,7 +9,6 @@ makeDesktopItem, openjdk17, stdenvNoCC, - swt, webkitgtk_4_0, wrapGAppsHook3, gitUpdater, @@ -29,7 +28,6 @@ let glib-networking gtk3 libsecret - swt webkitgtk_4_0 ]; in @@ -56,7 +54,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix CLASSPATH : "${swt}/jars/swt.jar" \ --prefix PATH : ${openjdk17}/bin # Create desktop item From 271e05bbfb2f3d08e548f4d5efc24a76ff705807 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 09:28:00 +0300 Subject: [PATCH 019/151] ipscan: mark as broken (doesn't really launch) --- pkgs/tools/security/ipscan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index f61944fe63ea..149cd322219b 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -51,5 +51,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza totoroot ]; + # Very similar issue to hdfview, see: https://github.com/NixOS/nixpkgs/issues/340048 + broken = true; }; } From c582a1e5e650173bc3abb7b19e6af90c61cbb578 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 09:40:26 +0300 Subject: [PATCH 020/151] vuze: mark as broken --- pkgs/applications/networking/p2p/vuze/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index e24601757685..0d3ee40236b5 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -26,5 +26,8 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.all; maintainers = [ ]; + # Doesn't launch, gives java related incompatibilities errors. Probably + # related to swt. Same error happens with swt_jdk8 + broken = true; }; } From 729a27a947a50e38589d520c2604c2d0191db7a9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 10:04:30 +0300 Subject: [PATCH 021/151] tuxguitar: nixfmt & don't use 'with lib;' in meta --- .../editors/music/tuxguitar/default.nix | 63 ++++++++++++++----- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index a602de8a37b7..7c853967218f 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,11 +1,32 @@ -{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio, nixosTests }: +{ + lib, + stdenv, + fetchurl, + swt, + jre, + makeWrapper, + alsa-lib, + jack2, + fluidsynth, + libpulseaudio, + nixosTests, +}: -let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; - if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } - else - { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; -in stdenv.mkDerivation rec { +let + metadata = + assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; + if stdenv.hostPlatform.system == "i686-linux" then + { + arch = "x86"; + sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; + } + else + { + arch = "x86_64"; + sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; + }; +in +stdenv.mkDerivation rec { version = "1.5.5"; pname = "tuxguitar"; @@ -14,7 +35,9 @@ in stdenv.mkDerivation rec { sha256 = metadata.sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; installPhase = '' mkdir -p $out/bin @@ -27,22 +50,32 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/tuxguitar \ --set JAVA "${jre}/bin/java" \ - --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/:${ + lib.makeLibraryPath [ + swt + alsa-lib + jack2 + fluidsynth + libpulseaudio + ] + }" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; - passthru.tests = { inherit (nixosTests) tuxguitar; }; + passthru.tests = { + inherit (nixosTests) tuxguitar; + }; - meta = with lib; { + meta = { description = "Multitrack guitar tablature editor"; longDescription = '' TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. ''; homepage = "http://www.tuxguitar.com.ar/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.lgpl2; - maintainers = [ maintainers.ardumont ]; - platforms = platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ ardumont ]; + platforms = lib.platforms.linux; }; } From e72eb22590baf1d1cfae0d8ed7b721242eb3e9e7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 10:06:40 +0300 Subject: [PATCH 022/151] tuxguitar: use finalAttrs pattern --- pkgs/applications/editors/music/tuxguitar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 7c853967218f..5dc2f9c0a6cd 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -26,12 +26,12 @@ let sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.5"; pname = "tuxguitar"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz"; + url = "mirror://sourceforge/tuxguitar/tuxguitar-${finalAttrs.version}-linux-${metadata.arch}.tar.gz"; sha256 = metadata.sha256; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ardumont ]; platforms = lib.platforms.linux; }; -} +}) From dd12b437a6f6fd2b7d778ba7aad6c37dd841dbb6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 10:07:33 +0300 Subject: [PATCH 023/151] tuxguitar: rename passthru nixos test attribute --- pkgs/applications/editors/music/tuxguitar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 5dc2f9c0a6cd..aec5f0999dd9 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = { - inherit (nixosTests) tuxguitar; + nixos = nixosTests.tuxguitar; }; meta = { From b76ff9137f97509dff1ae18271ac6c8fa4697e80 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 6 Oct 2024 22:36:21 +0300 Subject: [PATCH 024/151] swt: 4.5 -> 4.33 Fixes #219771. Previous attempt: #75609 --- pkgs/by-name/sw/swt/awt-libs.patch | 8 --- pkgs/by-name/sw/swt/gtk-libs.patch | 14 ---- pkgs/by-name/sw/swt/package.nix | 105 +++++++++-------------------- 3 files changed, 30 insertions(+), 97 deletions(-) delete mode 100644 pkgs/by-name/sw/swt/awt-libs.patch delete mode 100644 pkgs/by-name/sw/swt/gtk-libs.patch diff --git a/pkgs/by-name/sw/swt/awt-libs.patch b/pkgs/by-name/sw/swt/awt-libs.patch deleted file mode 100644 index 6c3ff53b7983..000000000000 --- a/pkgs/by-name/sw/swt/awt-libs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -63,4 +63,4 @@ - - AWT_LFLAGS = -shared ${SWT_LFLAGS} --AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -+AWT_LIBS = `pkg-config --libs x11` -L$(AWT_LIB_PATH) -ljawt - diff --git a/pkgs/by-name/sw/swt/gtk-libs.patch b/pkgs/by-name/sw/swt/gtk-libs.patch deleted file mode 100644 index cd13082b5df7..000000000000 --- a/pkgs/by-name/sw/swt/gtk-libs.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -53,9 +53,4 @@ - --# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) --GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` -+GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst` -+GTKLIBS = `pkg-config --libs gtk+-$(GTK_VERSION) gthread-2.0 gtk+-unix-print-$(GTK_VERSION) x11 xtst` --ifeq ($(GTK_VERSION), 3.0) --GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 -lXtst --else --GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst --endif - diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 7f386779d47d..04d880dc3368 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -1,13 +1,9 @@ { - atk, fetchzip, - gtk2, + gtk3, jdk, lib, - libGL, libGLU, - libXt, - libXtst, pkg-config, stdenv, stripJavaArchivesHook, @@ -15,18 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "swt"; - version = "4.5"; - fullVersion = "${finalAttrs.version}-201506032000"; + version = "4.33"; + fullVersion = "${finalAttrs.version}-202409030240"; hardeningDisable = [ "format" ]; passthru.srcMetadataByPlatform = { x86_64-linux.platform = "gtk-linux-x86_64"; - x86_64-linux.hash = "sha256-JhzRCrVzsM2NBf65l6CDZdgchlbECHGUg0J0bQVT2Z0="; - i686-linux.platform = "gtk-linux-x86"; - i686-linux.hash = "sha256-C7H1CUFkl7GPpqDFSzYnlLWa1XcawI2hbtsn9fIJio0="; + x86_64-linux.hash = "sha256-0OUr+jpwTx5/eoA6Uo2E9/SBAtf+IMMiSVRhOfaWFhE="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; - x86_64-darwin.hash = "sha256-CrSFkrlnSP2uQzRrRzv8F0lXEA7TNK9RFe2neDjtXnI="; + x86_64-darwin.hash = "sha256-n948C/YPF55WPYvub3re/wARLP1Wk+XhJiIuI0YQH5c="; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; @@ -56,84 +50,39 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + jdk stripJavaArchivesHook pkg-config ]; buildInputs = [ - atk - gtk2 - jdk - libGL + gtk3 libGLU - libXtst - ] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [ libXt ]; - - patches = [ - ./awt-libs.patch - ./gtk-libs.patch ]; - prePatch = '' - # clear whitespace from makefiles (since we match on EOL later) - sed -i 's/ \+$//' ./*.mak + SWT_JAVA_HOME = jdk; + AWT_LIB_PATH = "${jdk}/lib/openjdk/lib"; + # Used by the makefile which is responsible for the shared objects only + OUTPUT_DIR = "${placeholder "out"}/lib"; + # GTK4 is not supported yet. Waiting for: + # https://github.com/eclipse-platform/eclipse.platform.swt/pull/1482 + makeFlags = "gtk3"; + preBuild = '' + cd library + mkdir -p ${finalAttrs.OUTPUT_DIR} ''; - postPatch = - let - makefile-sed = builtins.toFile "swt-makefile.sed" '' - # fix pkg-config invocations in CFLAGS/LIBS pairs. - # - # change: - # FOOCFLAGS = `pkg-config --cflags `foo bar` - # FOOLIBS = `pkg-config --libs-only-L foo` -lbaz - # into: - # FOOCFLAGS = `pkg-config --cflags foo bar` - # FOOLIBS = `pkg-config --libs foo bar` - # - # the latter works more consistently. - /^[A-Z0-9_]\+CFLAGS = `pkg-config --cflags [^`]\+`$/ { - N - s/${'' - ^\([A-Z0-9_]\+\)CFLAGS = `pkg-config --cflags \(.\+\)`\ - \1LIBS = `pkg-config --libs-only-L .\+$''}/${'' - \1CFLAGS = `pkg-config --cflags \2`\ - \1LIBS = `pkg-config --libs \2`''}/ - } - # fix WebKit libs not being there - s/\$(WEBKIT_LIB) \$(WEBKIT_OBJECTS)$/\0 `pkg-config --libs glib-2.0`/g - ''; - in - '' - declare -a makefiles=(./*.mak) - sed -i -f ${makefile-sed} "''${makefiles[@]}" - # assign Makefile variables eagerly & change backticks to `$(shell …)` - sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \ - -e 's/`\([^`]\+\)`/$(shell \1)/' \ - "''${makefiles[@]}" - ''; - - buildPhase = '' - runHook preBuild - - export JAVA_HOME=${jdk} - - ./build.sh - + # Build the jar + postBuild = '' + cd ../ mkdir out find org/ -name '*.java' -type f -exec javac -d out/ {} + - - runHook postBuild ''; + # The makefile doesn't have an install target, the installation of the shared + # objects is part of the `all` target. installPhase = '' runHook preInstall - if [[ -n "$prefix" ]]; then - install -d -- "$prefix" - fi - - install -Dm 644 -t "$out/lib" -- *.so - install -d -- "$out/jars" install -m 644 -t out -- version.txt (cd out && jar -c *) > "$out/jars/swt.jar" @@ -147,8 +96,14 @@ stdenv.mkDerivation (finalAttrs: { A widget toolkit for Java to access the user-interface facilities of the operating systems on which it is implemented. ''; - license = lib.licenses.epl10; + license = with lib.licenses; [ + # All of these are located in the about_files directory of the source + ijg + lgpl21 + mpl11 + mpl20 + ]; maintainers = [ ]; - platforms = lib.platforms.linux; + platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform; }; }) From 51475bd9d35a0f7b9cb40c7dce573996b0bbe9d7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 7 Oct 2024 10:08:49 +0300 Subject: [PATCH 025/151] tuxguitar: 1.5.5 -> 1.6.4; move to pkgs/by-name --- .../tu/tuxguitar/package.nix} | 24 +++++-------------- pkgs/top-level/all-packages.nix | 5 ---- 2 files changed, 6 insertions(+), 23 deletions(-) rename pkgs/{applications/editors/music/tuxguitar/default.nix => by-name/tu/tuxguitar/package.nix} (69%) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/by-name/tu/tuxguitar/package.nix similarity index 69% rename from pkgs/applications/editors/music/tuxguitar/default.nix rename to pkgs/by-name/tu/tuxguitar/package.nix index aec5f0999dd9..d3399471a75a 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -9,30 +9,17 @@ jack2, fluidsynth, libpulseaudio, + lilv, nixosTests, }: -let - metadata = - assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; - if stdenv.hostPlatform.system == "i686-linux" then - { - arch = "x86"; - sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; - } - else - { - arch = "x86_64"; - sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; - }; -in stdenv.mkDerivation (finalAttrs: { - version = "1.5.5"; + version = "1.6.4"; pname = "tuxguitar"; src = fetchurl { - url = "mirror://sourceforge/tuxguitar/tuxguitar-${finalAttrs.version}-linux-${metadata.arch}.tar.gz"; - sha256 = metadata.sha256; + url = "https://github.com/helge17/tuxguitar/releases/download/${finalAttrs.version}/tuxguitar-${finalAttrs.version}-linux-swt-amd64.tar.gz"; + hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; }; nativeBuildInputs = [ @@ -57,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { jack2 fluidsynth libpulseaudio + lilv ] }" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" @@ -76,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.lgpl2; maintainers = with lib.maintainers; [ ardumont ]; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d21ffc081ef..0bd2f1cd14aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33078,11 +33078,6 @@ with pkgs; tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { - jre = jre8; - swt = swt_jdk8; - }; - twmn = libsForQt5.callPackage ../applications/misc/twmn { }; testssl = callPackage ../applications/networking/testssl { }; From 01a9ca4f12856d786e70c9107dbd5836748fe377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 07:28:41 +0000 Subject: [PATCH 026/151] blueprint-compiler: 0.12.0 -> 0.14.0 --- pkgs/by-name/bl/blueprint-compiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index 95903e2e76d1..e426503c5487 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; + hash = "sha256-pkbTxCN7LagIbOtpiUCkh40aHw6uRtalQVFa47waXjU="; }; nativeBuildInputs = [ From 329e459dab229ffcade78fe2ab30a0690eddafb6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 13 Oct 2024 21:29:07 +0300 Subject: [PATCH 027/151] swt: make it actually useful Co-Authored-By: Ben Wolsieffer --- pkgs/by-name/sw/swt/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 04d880dc3368..b06eaa9ab08c 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation (finalAttrs: { postBuild = '' cd ../ mkdir out - find org/ -name '*.java' -type f -exec javac -d out/ {} + + find org/ -name '*.java' -type f -exec javac -encoding utf8 -d out/ {} + + # Copy non Java resource files + find org/ -not -name '*.java' -not -name '*.html' -type f -exec cp {} out/{} \; ''; # The makefile doesn't have an install target, the installation of the shared From c70579b0a564176e2aa9d9e042d13f6d9f8bd023 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 12:06:40 +0300 Subject: [PATCH 028/151] dataexplorer: make it launch by using swt built with jdk17 Co-Authored-By: Ben Wolsieffer --- pkgs/by-name/da/dataexplorer/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dataexplorer/package.nix b/pkgs/by-name/da/dataexplorer/package.nix index 4ee2b0a0e81a..09406b6b3beb 100644 --- a/pkgs/by-name/da/dataexplorer/package.nix +++ b/pkgs/by-name/da/dataexplorer/package.nix @@ -4,11 +4,12 @@ , ant # executable fails to start for jdk > 17 , jdk17 +, swt , makeWrapper , strip-nondeterminism -}: - -stdenv.mkDerivation (finalAttrs: { +}: let + swt-jdk17 = swt.override { jdk = jdk17; }; +in stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; version = "3.9.0"; @@ -40,12 +41,15 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall ant -Dprefix=$out/share/ -f build/build.xml install + # Use SWT from nixpkgs + ln -sf '${swt-jdk17}/jars/swt.jar' "$out/share/DataExplorer/java/ext/swt.jar" # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin makeWrapper ${jdk17}/bin/java $out/bin/DataExplorer \ + --prefix LD_LIBRARY_PATH : '${swt-jdk17}/lib' \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 From daf88706ecaff34e9babbd724ee55ae405b067e0 Mon Sep 17 00:00:00 2001 From: hauskens Date: Mon, 14 Oct 2024 20:38:59 +0200 Subject: [PATCH 029/151] seq-cli: init at 2024.3.922 --- pkgs/by-name/se/seq-cli/deps.nix | 23 ++++++++++++++++ pkgs/by-name/se/seq-cli/package.nix | 42 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/by-name/se/seq-cli/deps.nix create mode 100644 pkgs/by-name/se/seq-cli/package.nix diff --git a/pkgs/by-name/se/seq-cli/deps.nix b/pkgs/by-name/se/seq-cli/deps.nix new file mode 100644 index 000000000000..d99b2edc3be7 --- /dev/null +++ b/pkgs/by-name/se/seq-cli/deps.nix @@ -0,0 +1,23 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Autofac"; version = "8.1.1"; hash = "sha256-///N/c/OmCa7DUVz9/hIA/rFsaJ4TMltqdrVk7Ycmq8="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Seq.Api"; version = "2024.3.0"; hash = "sha256-OUBZ9VV7C5p/CzW0hoN3N9m1RAEGg24wNYFZgfJgk4s="; }) + (fetchNuGet { pname = "Seq.Apps"; version = "2023.4.0"; hash = "sha256-PLN0KYbxH9aQkMCTOSmb16NcGD+XDooJdU4QIej1i+0="; }) + (fetchNuGet { pname = "Seq.Syntax"; version = "1.0.0"; hash = "sha256-FcDdFhRE2EIgQjoTHDjKLq/Pl9mKzezL/B75pGhvk9s="; }) + (fetchNuGet { pname = "Serilog"; version = "4.0.2"; hash = "sha256-vkd4s/PsKnnVzN1+f9haIP5LoxNWxnhdv3mBQYl/2Hc="; }) + (fetchNuGet { pname = "Serilog.Expressions"; version = "5.0.0"; hash = "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "3.0.0"; hash = "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact.Reader"; version = "4.0.0"; hash = "sha256-89+SaaXp9Pt8YTkTwVuMV3PzlPMg9mOHiFBKs3oHOUs="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.Seq"; version = "8.0.0"; hash = "sha256-1AEtDLODwS9WBkJ2yrmjKl2Rq3q2VPs1H9bQCUhC05s="; }) + (fetchNuGet { pname = "SerilogTracing"; version = "2.1.2"; hash = "sha256-fhSiUgk21s7kiz4QYF2fy9YLC1X0YHibi95x2flPqMM="; }) + (fetchNuGet { pname = "Superpower"; version = "3.0.0"; hash = "sha256-5MNmhBDYyOs+sTH364Qdn+Ck328BAQaVC1KMQ7yK2Vw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.1"; hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "Tavis.UriTemplates"; version = "2.0.0"; hash = "sha256-Rd3VH55GFiXhMDbUcnKri2jDVIA1M7CQ+6Fjdsn/PSE="; }) +] diff --git a/pkgs/by-name/se/seq-cli/package.nix b/pkgs/by-name/se/seq-cli/package.nix new file mode 100644 index 000000000000..bec066fcced9 --- /dev/null +++ b/pkgs/by-name/se/seq-cli/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + testers, +}: + +buildDotnetModule (finalAttrs: { + pname = "seq-cli"; + version = "2024.3.922"; + + src = fetchFromGitHub { + owner = "datalust"; + repo = "seqcli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-qqvuxG/QkkYjYw+p5QxLBWYHyltKDWT3JT167bEAdEI="; + }; + + projectFile = "src/SeqCli/SeqCli.csproj"; + nugetDeps = ./deps.nix; + dotnetInstallFlags = "-f net8.0"; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + executables = [ "seqcli" ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "seqcli version"; + }; + + meta = { + description = "The Seq command-line client. Administer, log, ingest, search, from any OS"; + homepage = "https://github.com/datalust/seqcli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hausken ]; + mainProgram = "seqcli"; + platforms = lib.platforms.all; + }; +}) From b84f5e005bb677114328be7307280c8611373b46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 16:02:42 +0000 Subject: [PATCH 030/151] terranix: 2.7.0 -> 2.8.0 --- pkgs/applications/networking/cluster/terranix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index 4eb04c628646..e5b3222b9b0c 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM="; + sha256 = "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA="; }; nativeBuildInputs = [ makeWrapper ]; From 3f97d8bba281ff8362d258b26d23b784f7c16331 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 15 Oct 2024 22:31:10 +0200 Subject: [PATCH 031/151] opencomposite: use vendored OpenXR Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/op/opencomposite/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 50877ded84ca..f78e6a9de933 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -5,7 +5,6 @@ jsoncpp, lib, libGL, - openxr-loader, python3, stdenv, unstableGitUpdater, @@ -22,7 +21,8 @@ stdenv.mkDerivation { owner = "znixian"; repo = "OpenOVR"; rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d"; - hash = "sha256-CE+ushwNv8kQSXtrQ6K5veBmpQvQaMKk6P9G1wV2uvM="; + fetchSubmodules = true; + hash = "sha256-3Aar7HGhn9nd/EtJoeUbQTkUR16jx946ZXMNDOXSdfQ="; }; nativeBuildInputs = [ cmake ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation { glm jsoncpp libGL - openxr-loader python3 vulkan-headers vulkan-loader @@ -40,7 +39,8 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security") - (lib.cmakeBool "USE_SYSTEM_OPENXR" true) + # See https://gitlab.com/znixian/OpenOVR/-/issues/416 + (lib.cmakeBool "USE_SYSTEM_OPENXR" false) (lib.cmakeBool "USE_SYSTEM_GLM" true) ]; From a444ff29796c5ff9bcfaa6d473ca347bf6342989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 05:01:54 +0000 Subject: [PATCH 032/151] python312Packages.dbt-semantic-interfaces: 0.6.2 -> 0.7.4 --- .../python-modules/dbt-semantic-interfaces/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 9eb306074a57..94d21ce3ecef 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.6.2"; + version = "0.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs="; + hash = "sha256-LHcNitkrDQNz2971iMn13eELUyuJbjUK/u+u83JRIBk="; }; pythonRelaxDeps = [ "importlib-metadata" ]; From 53b37c99b41dbcbf9ddedc509f92776b055d08b4 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Mon, 14 Oct 2024 06:46:43 +0200 Subject: [PATCH 033/151] virtualbox: nixfmt --- .../virtualisation/virtualbox-guest.nix | 91 +++--- .../virtualisation/virtualbox-host.nix | 192 +++++++----- .../virtualization/virtualbox/default.nix | 287 ++++++++++++------ .../virtualization/virtualbox/extpack.nix | 18 +- .../guest-additions-iso/default.nix | 16 +- .../virtualbox/guest-additions/builder.nix | 152 ++++++---- .../virtualbox/guest-additions/default.nix | 209 ++++++++----- 7 files changed, 617 insertions(+), 348 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 31222d553a34..48eb4528a232 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -1,5 +1,10 @@ # Module for VirtualBox guests. -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.guest; kernel = config.boot.kernelPackages; @@ -28,7 +33,20 @@ let in { imports = [ - (lib.mkRenamedOptionModule [ "virtualisation" "virtualbox" "guest" "draganddrop" ] [ "virtualisation" "virtualbox" "guest" "dragAndDrop" ]) + (lib.mkRenamedOptionModule + [ + "virtualisation" + "virtualbox" + "guest" + "draganddrop" + ] + [ + "virtualisation" + "virtualbox" + "guest" + "dragAndDrop" + ] + ) ]; options.virtualisation.virtualbox.guest = { @@ -59,36 +77,38 @@ in ###### implementation - config = lib.mkIf cfg.enable (lib.mkMerge [ - { - assertions = [{ - assertion = pkgs.stdenv.hostPlatform.isx86; - message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; - }]; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isx86; + message = "Virtualbox not currently supported on ${pkgs.stdenv.hostPlatform.system}"; + } + ]; - environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; + environment.systemPackages = [ kernel.virtualboxGuestAdditions ]; - boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; + boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ]; - boot.supportedFilesystems = [ "vboxsf" ]; - boot.initrd.supportedFilesystems = [ "vboxsf" ]; + boot.supportedFilesystems = [ "vboxsf" ]; + boot.initrd.supportedFilesystems = [ "vboxsf" ]; - users.groups.vboxsf.gid = config.ids.gids.vboxsf; + users.groups.vboxsf.gid = config.ids.gids.vboxsf; - systemd.services.virtualbox = { - description = "VirtualBox Guest Services"; + systemd.services.virtualbox = { + description = "VirtualBox Guest Services"; - wantedBy = [ "multi-user.target" ]; - requires = [ "dev-vboxguest.device" ]; - after = [ "dev-vboxguest.device" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "dev-vboxguest.device" ]; + after = [ "dev-vboxguest.device" ]; - unitConfig.ConditionVirtualization = "oracle"; + unitConfig.ConditionVirtualization = "oracle"; - serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; - }; + serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; + }; - services.udev.extraRules = - '' + services.udev.extraRules = '' # /dev/vboxuser is necessary for VBoxClient to work. Maybe we # should restrict this to logged-in users. KERNEL=="vboxuser", OWNER="root", GROUP="root", MODE="0666" @@ -97,22 +117,17 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; - systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; - } - ( - lib.mkIf cfg.clipboard { + systemd.user.services.virtualboxClientVmsvga = mkVirtualBoxUserService "--vmsvga-session"; + } + (lib.mkIf cfg.clipboard { systemd.user.services.virtualboxClientClipboard = mkVirtualBoxUserService "--clipboard"; - } - ) - ( - lib.mkIf cfg.seamless { + }) + (lib.mkIf cfg.seamless { systemd.user.services.virtualboxClientSeamless = mkVirtualBoxUserService "--seamless"; - } - ) - ( - lib.mkIf cfg.dragAndDrop { + }) + (lib.mkIf cfg.dragAndDrop { systemd.user.services.virtualboxClientDragAndDrop = mkVirtualBoxUserService "--draganddrop"; - } - ) - ]); + }) + ] + ); } diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 8820b4ff5a83..29e2d4340f3c 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -1,9 +1,19 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.virtualisation.virtualbox.host; virtualbox = cfg.package.override { - inherit (cfg) enableHardening headless enableWebService enableKvm; + inherit (cfg) + enableHardening + headless + enableWebService + enableKvm + ; extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; @@ -93,93 +103,119 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [{ - warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) - ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; - environment.systemPackages = [ virtualbox ]; - - security.wrappers = let - mkSuid = program: { - source = "${virtualbox}/libexec/virtualbox/${program}"; - owner = "root"; - group = "vboxusers"; - setuid = true; - }; - executables = [ - "VBoxHeadless" - "VBoxNetAdpCtl" - "VBoxNetDHCP" - "VBoxNetNAT" - "VBoxVolInfo" - ] ++ (lib.optionals (!cfg.headless) [ - "VBoxSDL" - "VirtualBoxVM" - ]); - in lib.mkIf cfg.enableHardening - (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) executables)); - - users.groups.vboxusers.gid = config.ids.gids.vboxusers; - - services.udev.extraRules = - '' - SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" - SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - ''; - } (lib.mkIf cfg.enableKvm { - assertions = [ + config = lib.mkIf cfg.enable ( + lib.mkMerge [ { - assertion = !cfg.addNetworkInterface; - message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + warnings = lib.mkIf (pkgs.config.virtualbox.enableExtensionPack or false) [ + "'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'" + ]; + environment.systemPackages = [ virtualbox ]; + + security.wrappers = + let + mkSuid = program: { + source = "${virtualbox}/libexec/virtualbox/${program}"; + owner = "root"; + group = "vboxusers"; + setuid = true; + }; + executables = + [ + "VBoxHeadless" + "VBoxNetAdpCtl" + "VBoxNetDHCP" + "VBoxNetNAT" + "VBoxVolInfo" + ] + ++ (lib.optionals (!cfg.headless) [ + "VBoxSDL" + "VirtualBoxVM" + ]); + in + lib.mkIf cfg.enableHardening ( + builtins.listToAttrs ( + map (x: { + name = x; + value = mkSuid x; + }) executables + ) + ); + + users.groups.vboxusers.gid = config.ids.gids.vboxusers; + + services.udev.extraRules = '' + SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" + SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" + ''; } - ]; - }) (lib.mkIf (!cfg.enableKvm) { - boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ kernelModules ]; + (lib.mkIf cfg.enableKvm { + assertions = [ + { + assertion = !cfg.addNetworkInterface; + message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInterface."; + } + ]; + }) + (lib.mkIf (!cfg.enableKvm) { + boot.kernelModules = [ + "vboxdrv" + "vboxnetadp" + "vboxnetflt" + ]; + boot.extraModulePackages = [ kernelModules ]; - services.udev.extraRules = - '' - KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" - KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - ''; + services.udev.extraRules = '' + KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" + KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + ''; - # Since we lack the right setuid/setcap binaries, set up a host-only network by default. - }) (lib.mkIf cfg.addNetworkInterface { - systemd.services.vboxnet0 = - { description = "VirtualBox vboxnet0 Interface"; - requires = [ "dev-vboxnetctl.device" ]; - after = [ "dev-vboxnetctl.device" ]; - wantedBy = [ "network.target" "sys-subsystem-net-devices-vboxnet0.device" ]; - path = [ virtualbox ]; - serviceConfig.RemainAfterExit = true; - serviceConfig.Type = "oneshot"; - serviceConfig.PrivateTmp = true; - environment.VBOX_USER_HOME = "/tmp"; - script = - '' + # Since we lack the right setuid/setcap binaries, set up a host-only network by default. + }) + (lib.mkIf cfg.addNetworkInterface { + systemd.services.vboxnet0 = { + description = "VirtualBox vboxnet0 Interface"; + requires = [ "dev-vboxnetctl.device" ]; + after = [ "dev-vboxnetctl.device" ]; + wantedBy = [ + "network.target" + "sys-subsystem-net-devices-vboxnet0.device" + ]; + path = [ virtualbox ]; + serviceConfig.RemainAfterExit = true; + serviceConfig.Type = "oneshot"; + serviceConfig.PrivateTmp = true; + environment.VBOX_USER_HOME = "/tmp"; + script = '' if ! [ -e /sys/class/net/vboxnet0 ]; then VBoxManage hostonlyif create cat /tmp/VBoxSVC.log >&2 fi ''; - postStop = - '' + postStop = '' VBoxManage hostonlyif remove vboxnet0 ''; - }; + }; - networking.interfaces.vboxnet0.ipv4.addresses = [{ address = "192.168.56.1"; prefixLength = 24; }]; - # Make sure NetworkManager won't assume this interface being up - # means we have internet access. - networking.networkmanager.unmanaged = ["vboxnet0"]; - }) (lib.mkIf config.networking.useNetworkd { - systemd.network.networks."40-vboxnet0".extraConfig = '' - [Link] - RequiredForOnline=no - ''; - }) + networking.interfaces.vboxnet0.ipv4.addresses = [ + { + address = "192.168.56.1"; + prefixLength = 24; + } + ]; + # Make sure NetworkManager won't assume this interface being up + # means we have internet access. + networking.networkmanager.unmanaged = [ "vboxnet0" ]; + }) + (lib.mkIf config.networking.useNetworkd { + systemd.network.networks."40-vboxnet0".extraConfig = '' + [Link] + RequiredForOnline=no + ''; + }) -]); + ] + ); } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 437ceba29ce0..13d254699fef 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,25 +1,74 @@ -{ config, stdenv, fetchurl, fetchpatch, callPackage, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook -, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU -, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras -, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib, xz -, yasm, glslang -, nixosTests -# If open-watcom-bin is not passed, VirtualBox will fall back to use -# the shipped alternative sources (assembly). -, open-watcom-bin -, makeself, perl -, vulkan-loader -, javaBindings ? true, jdk # Almost doesn't affect closure size -, pythonBindings ? false, python3 -, extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio -, enableHardening ? false -, headless ? false -, enable32bitGuests ? true -, enableWebService ? false -, enableKvm ? false -, extraConfigureFlags ? "" +{ + config, + stdenv, + fetchurl, + fetchpatch, + callPackage, + lib, + acpica-tools, + dev86, + pam, + libxslt, + libxml2, + wrapQtAppsHook, + libX11, + xorgproto, + libXext, + libXcursor, + libXmu, + libIDL, + SDL2, + libcap, + libGL, + libGLU, + libpng, + glib, + lvm2, + libXrandr, + libXinerama, + libopus, + libtpms, + qtbase, + qtx11extras, + qttools, + qtsvg, + qtwayland, + pkg-config, + which, + docbook_xsl, + docbook_xml_dtd_43, + alsa-lib, + curl, + libvpx, + nettools, + dbus, + substituteAll, + gsoap, + zlib, + xz, + yasm, + glslang, + nixosTests, + # If open-watcom-bin is not passed, VirtualBox will fall back to use + # the shipped alternative sources (assembly). + open-watcom-bin, + makeself, + perl, + vulkan-loader, + javaBindings ? true, + jdk, # Almost doesn't affect closure size + pythonBindings ? false, + python3, + extensionPack ? null, + fakeroot, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, + libpulseaudio, + enableHardening ? false, + headless ? false, + enable32bitGuests ? true, + enableWebService ? false, + enableKvm ? false, + extraConfigureFlags ? "", }: # The web services use Java infrastructure. @@ -41,12 +90,26 @@ let virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; - inherit (lib) optional optionals optionalString getDev getLib; -in stdenv.mkDerivation (finalAttrs: { + inherit (lib) + optional + optionals + optionalString + getDev + getLib + ; +in +stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; version = finalAttrs.virtualboxVersion; - inherit buildType virtualboxVersion virtualboxSha256 kvmPatchVersion kvmPatchHash virtualboxGuestAdditionsIso; + inherit + buildType + virtualboxVersion + virtualboxSha256 + kvmPatchVersion + kvmPatchHash + virtualboxGuestAdditionsIso + ; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; @@ -55,39 +118,84 @@ in stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ optional withModsrc "modsrc"; - nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ] - ++ optional (!headless) wrapQtAppsHook; + nativeBuildInputs = [ + pkg-config + which + docbook_xsl + docbook_xml_dtd_43 + yasm + glslang + ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. dontWrapQtApps = true; - buildInputs = [ - acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL - libcap glib lvm2 alsa-lib curl libvpx pam makeself perl - libXmu libXrandr libpng libopus libtpms python3 xz ] + buildInputs = + [ + acpica-tools + dev86 + libxslt + libxml2 + xorgproto + libX11 + libXext + libXcursor + libIDL + libcap + glib + lvm2 + alsa-lib + curl + libvpx + pam + makeself + perl + libXmu + libXrandr + libpng + libopus + libtpms + python3 + xz + ] ++ optional javaBindings jdk ++ optional pythonBindings python3 # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals headless [ libGL ] - ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ] - ++ optionals enableWebService [ gsoap zlib ]; + ++ optionals (!headless) [ + qtbase + qtx11extras + libXinerama + SDL2 + libGLU + ] + ++ optionals enableWebService [ + gsoap + zlib + ]; - hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; + hardeningDisable = [ + "format" + "fortify" + "pic" + "stackprotector" + ]; prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ - ${optionalString (!headless) '' - -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ - ''} -i configure + ${ + optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ + '' + } -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' - ${optionalString pulseSupport - ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' + ${optionalString pulseSupport ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' @@ -100,39 +208,41 @@ in stdenv.mkDerivation (finalAttrs: { ''; patches = - optional enableHardening ./hardened.patch - # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 - ++ optionals (!headless) [ ./fix-sdl.patch - # No update patch disables check for update function - # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 - (fetchpatch { - url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; - hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; - })] - ++ [ ./extra_symbols.patch ] - # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees - # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. - # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, - # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around - # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, - # after the code that unsets it. Note that qtsvg is included so that SVG icons from - # the user's icon theme can be loaded. - ++ optional (!headless && enableHardening) (substituteAll { + optional enableHardening ./hardened.patch + # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 + ++ optionals (!headless) [ + ./fix-sdl.patch + # No update patch disables check for update function + # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 + (fetchpatch { + url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; + hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; + }) + ] + ++ [ ./extra_symbols.patch ] + # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees + # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. + # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run, + # and also because it would unset QT_PLUGIN_PATH for security reasons. We work around + # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, + # after the code that unsets it. Note that qtsvg is included so that SVG icons from + # the user's icon theme can be loaded. + ++ optional (!headless && enableHardening) (substituteAll { src = ./qt-env-vars.patch; qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; - }) - # While the KVM patch should not break any other behavior if --with-kvm is not specified, - # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch { + }) + # While the KVM patch should not break any other behavior if --with-kvm is not specified, + # we don't take any chances and only apply it if people actually want to use KVM support. + ++ optional enableKvm (fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; hash = finalAttrs.kvmPatchHash; }) - ++ [ - ./qt-dependency-paths.patch - # https://github.com/NixOS/nixpkgs/issues/123851 - ./fix-audio-driver-loading.patch - ]; + ++ [ + ./qt-dependency-paths.patch + # https://github.com/NixOS/nixpkgs/issues/123851 + ./fix-audio-driver-loading.patch + ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -161,18 +271,18 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_WITH_UPDATE_AGENT := ${optionalString javaBindings '' - VBOX_JAVA_HOME := ${jdk} + VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' - VBOX_WITH_VBOXSDL := 1 - PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib - PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include - PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib - PATH_QT5_TOOLS_INC := ${getDev qttools}/include + VBOX_WITH_VBOXSDL := 1 + PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include + PATH_QT5_TOOLS_LIB := ${getLib qttools}/lib + PATH_QT5_TOOLS_INC := ${getDev qttools}/include ''} ${optionalString enableWebService '' - # fix gsoap missing zlib include and produce errors with --as-needed - VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + # fix gsoap missing zlib include and produce errors with --as-needed + VBOX_GSOAP_CXX_LIBS := gsoapssl++ z ''} TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease LOCAL_CONFIG @@ -213,7 +323,9 @@ in stdenv.mkDerivation (finalAttrs: { -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin - for file in ${optionalString (!headless) "VirtualBox VBoxSDL"} ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${ + optionalString (!headless) "VirtualBox VBoxSDL" + } ${optionalString enableWebService "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file @@ -255,15 +367,16 @@ in stdenv.mkDerivation (finalAttrs: { ln -s "${finalAttrs.virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; - preFixup = optionalString (!headless) '' - wrapQtApp $out/bin/VirtualBox - '' - # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching - # the source code (see postPatch). - + optionalString (!headless && !enableHardening) '' - wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" - ''; + preFixup = + optionalString (!headless) '' + wrapQtApp $out/bin/VirtualBox + '' + # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching + # the source code (see postPatch). + + optionalString (!headless && !enableHardening) '' + wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}" + ''; passthru = { inherit extensionPack; # for inclusion in profile to prevent gc @@ -285,7 +398,11 @@ in stdenv.mkDerivation (finalAttrs: { ]; license = lib.licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with lib.maintainers; [ sander friedrichaltheide blitz ]; + maintainers = with lib.maintainers; [ + sander + friedrichaltheide + blitz + ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 365c635a17ae..524077cd02fd 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox }: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; in @@ -9,14 +13,20 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; - in assert (builtins.stringLength value) == 64; value; + let + value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; + in + assert (builtins.stringLength value) == 64; + value; meta = with lib; { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander friedrichaltheide ]; + maintainers = with maintainers; [ + sander + friedrichaltheide + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index f59dcc25f4c2..9eda8a64da98 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,4 +1,8 @@ -{ fetchurl, lib, virtualbox}: +{ + fetchurl, + lib, + virtualbox, +}: let inherit (virtualbox) version; @@ -13,7 +17,13 @@ fetchurl { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ + lib.maintainers.sander + lib.maintainers.friedrichaltheide + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 00d0d555c60a..f2571d11fe15 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,14 +1,32 @@ -{ stdenv, kernel, fetchurl, lib, pam, libxslt -, libXext, libXcursor, libXmu -, glib, libXrandr, dbus, xz -, pkg-config, which, xorg -, yasm, patchelf, makeself -, linuxHeaders, openssl}: +{ + stdenv, + kernel, + fetchurl, + lib, + pam, + libxslt, + libXext, + libXcursor, + libXmu, + glib, + libXrandr, + dbus, + xz, + pkg-config, + which, + xorg, + yasm, + patchelf, + makeself, + linuxHeaders, + openssl, +}: let buildType = "release"; -in stdenv.mkDerivation (finalAttrs: { +in +stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; version = "7.0.20"; @@ -19,8 +37,26 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf pkg-config which yasm makeself xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies; - buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ]; + nativeBuildInputs = [ + patchelf + pkg-config + which + yasm + makeself + xorg.xorgserver + openssl + linuxHeaders + xz + ] ++ kernel.moduleBuildDependencies; + buildInputs = [ + dbus + libxslt + libXext + libXcursor + pam + libXmu + libXrandr + ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; @@ -58,61 +94,61 @@ in stdenv.mkDerivation (finalAttrs: { ''; configurePhase = '' - NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') + NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') - cat >> LocalConfig.kmk <> LocalConfig.kmk < Date: Wed, 16 Oct 2024 14:44:35 +0200 Subject: [PATCH 034/151] obs-studio: enable debug info --- pkgs/applications/video/obs-studio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 520bcb3bb8cc..4ca4f675bbd7 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -73,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + separateDebugInfo = true; + patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch From 9c9b5188ee898e9a9cdbd860a681e125bee09806 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Oct 2024 00:48:11 +0200 Subject: [PATCH 035/151] dbt: relax protobuf --- pkgs/development/python-modules/dbt-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 4388c972c4d6..79a535075457 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/core"; pythonRelaxDeps = [ + "protobuf" "agate" "click" "dbt-semantic-interfaces" From 9d0575a00263159b84e3cffae41ade98fcac7d70 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Oct 2024 00:48:11 +0200 Subject: [PATCH 036/151] python312Packages.dbt-adapters: relax protobuf --- pkgs/development/python-modules/dbt-adapters/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index 50a775edfa4e..ce94c14f45ed 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { build-system = [ hatchling ]; + pythonRelaxDeps = [ "protobuf" ]; + dependencies = [ agate dbt-common From dd9cebba8151d983b2638fde8f65f17eb9c110be Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 17 Oct 2024 00:48:12 +0200 Subject: [PATCH 037/151] python312Packages.dbt-common: relax protobuf --- pkgs/development/python-modules/dbt-common/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 0bb43248db08..b97f071343e3 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -36,7 +36,10 @@ buildPythonPackage rec { build-system = [ hatchling ]; - pythonRelaxDeps = [ "agate" ]; + pythonRelaxDeps = [ + "protobuf" + "agate" + ]; dependencies = [ agate From 684df0290ea2e1f8e51670eb6190a26b0eb840b7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 16 Oct 2024 21:57:05 -0400 Subject: [PATCH 038/151] gpt4all: 3.3.0 -> 3.4.2 --- pkgs/by-name/gp/gpt4all/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 938b9166897f..125a3f4d46b7 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -3,6 +3,7 @@ , stdenv , fetchFromGitHub , fetchurl +, fetchpatch , cmake , qt6 , fmt @@ -16,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-aez/APsei30Tp1em/RDCuq+v8hOavHq4O9qZahrsF/g="; + hash = "sha256-QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -33,6 +34,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./embedding-local.patch + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051"; + sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU="; + # remove the `gpt4all-chat` part of the paths as sourceRoot is gpt4all-chat + stripLen = 1; + }) ]; sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; @@ -70,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: { "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF" "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON" "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF" + "-DGGML_VULKAN=ON" + "-DGGML_KOMPUTE=ON" ] ++ lib.optionals (!cudaSupport) [ "-DLLMODEL_CUDA=OFF" ]; From e758ca25b37816a463c06c57dcd07c26a86a25f3 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:46:34 +0300 Subject: [PATCH 039/151] bear: 3.1.3 -> 3.1.5 Bump to 3.1.5 and switch from protobuf_25 to protobuf, since upstream 3.1.4 has a patch that fixed previously encountered build failures. Drop stale patch for functional tests that aren't run anyway. Next patches reenable tests. --- .../tools/build-managers/bear/default.nix | 13 +++----- .../bear/fix-functional-tests.patch | 32 ------------------- 2 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/bear/fix-functional-tests.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 489181187c4e..6595c143084f 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -6,7 +6,7 @@ ninja, pkg-config, grpc, - protobuf_25, + protobuf, openssl, nlohmann_json, gtest, @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - hash = "sha256-1nZPzgLWcmaRkOUXdm16IW2Nw/p1w8GBGEfZX/v+En0="; + hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ grpc - protobuf_25 + protobuf openssl nlohmann_json gtest @@ -63,11 +63,6 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ENABLE_FUNC_TESTS" false) ]; - patches = [ - # Fix toolchain environment variable handling and the Darwin SIP check. - ./fix-functional-tests.patch - ]; - postPatch = '' patchShebangs test/bin diff --git a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch b/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch deleted file mode 100644 index 99d64f26d077..000000000000 --- a/pkgs/development/tools/build-managers/bear/fix-functional-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/test/lit.cfg b/test/lit.cfg -index 118c979..b69fecc 100644 ---- a/test/lit.cfg -+++ b/test/lit.cfg -@@ -207,13 +207,8 @@ def is_preload_disabled(): - if is_windows: - return True - elif sys.platform == 'darwin': -- command = ['csrutil', 'status'] -- pattern = re.compile(r'System Integrity Protection status:\s+enabled') -- try: -- output = subprocess.check_output(command, stderr=subprocess.STDOUT) -- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) -- except (OSError, subprocess.CalledProcessError): -- return False -+ # csrutil(8) isn't available in the Nix build sandbox. -+ return True - else: - return False - -@@ -221,6 +216,11 @@ def is_preload_disabled(): - if not is_preload_disabled(): - config.available_features.add('preload') - -+# Preserve the variables required for the Nix toolchain wrappers. -+for var, value in os.environ.items(): -+ if var.startswith('NIX_'): -+ config.environment[var] = value -+ - print(config.substitutions) - print(config.environment) - print(config.available_features) From 43da99888c0d82825b868e5091467f0d7a286f8a Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:35:45 +0300 Subject: [PATCH 040/151] bear: re-enable tests Apply patch to run unit/lit tests in checkPhase instead of buildPhase. Move test dependencies to nativeCheckInputs/checkInputs. Use finalAttrs to make doCheck overridable. Disable failings tests from lit test suite. --- .../bear/0001-exclude-tests-from-all.patch | 25 +++++++++ .../tools/build-managers/bear/default.nix | 54 +++++++++++++++---- 2 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch diff --git a/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch b/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch new file mode 100644 index 000000000000..041ab7246eed --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f1ecfe0..9056f9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,8 +83,9 @@ ExternalProject_Add(BearSource + -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS} + -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} + ${CMAKE_CACHE_ARGS_EXTRA} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN + 1 ++ STEP_TARGETS test + TEST_COMMAND + ctest # or `ctest -T memcheck` + ) +@@ -100,7 +101,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} +- TEST_BEFORE_INSTALL ++ TEST_EXCLUDE_FROM_MAIN ++ STEP_TARGETS test + 1 + INSTALL_COMMAND + "" diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6595c143084f..01d7560b9302 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -20,14 +20,14 @@ coreutils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bear"; version = "3.1.5"; src = fetchFromGitHub { owner = "rizsotto"; - repo = pname; - rev = version; + repo = "bear"; + rev = finalAttrs.version; hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c="; }; @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { cmake ninja pkg-config - - # Used for functional tests, which run during buildPhase. - lit - python3 ]; buildInputs = [ @@ -46,7 +42,6 @@ stdenv.mkDerivation rec { protobuf openssl nlohmann_json - gtest spdlog c-ares zlib @@ -54,15 +49,52 @@ stdenv.mkDerivation rec { re2 ]; + patches = [ + # This patch is necessary to run tests in a separate phase. By default + # test targets are run with ALL, which is not what we want. This patch creates + # separate 'test' step targets for each cmake ExternalProject: + # - BearTest-test (functional lit tests) + # - BearSource-test (unit tests via gtest) + ./0001-exclude-tests-from-all.patch + ]; + + nativeCheckInputs = [ + lit + python3 + ]; + + checkInputs = [ + gtest + ]; + cmakeFlags = [ # Build system and generated files concatenate install prefix and # CMAKE_INSTALL_{BIN,LIB}DIR, which breaks if these are absolute paths. "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" - (lib.cmakeBool "ENABLE_UNIT_TESTS" false) - (lib.cmakeBool "ENABLE_FUNC_TESTS" false) + (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_FUNC_TESTS" finalAttrs.doCheck) ]; + checkTarget = lib.concatStringsSep " " [ + "BearTest-test" + "BearSource-test" + ]; + + doCheck = true; + + env = { + # Disable failing tests. The cause is not immediately clear. + LIT_FILTER_OUT = lib.concatStringsSep "|" [ + "cases/compilation/output/config/filter_compilers.sh" + "cases/intercept/preload/posix/execvpe/success_to_resolve.c" + "cases/intercept/preload/posix/popen/success.c" + "cases/intercept/preload/posix/posix_spawnp/success_to_resolve.c" + "cases/intercept/preload/posix/system/success.c" + "cases/intercept/preload/shell_commands_intercepted_without_shebang.sh" + ]; + }; + postPatch = '' patchShebangs test/bin @@ -87,4 +119,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ DieracDelta ]; }; -} +}) From 7281ff8a09af2cc30b8c648c8dff843934026812 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:59:48 +0300 Subject: [PATCH 041/151] bear: move to pkgs/by-name --- .../be}/bear/0001-exclude-tests-from-all.patch | 0 .../bear/default.nix => by-name/be/bear/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/build-managers => by-name/be}/bear/0001-exclude-tests-from-all.patch (100%) rename pkgs/{development/tools/build-managers/bear/default.nix => by-name/be/bear/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch b/pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch similarity index 100% rename from pkgs/development/tools/build-managers/bear/0001-exclude-tests-from-all.patch rename to pkgs/by-name/be/bear/0001-exclude-tests-from-all.patch diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/by-name/be/bear/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/bear/default.nix rename to pkgs/by-name/be/bear/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5e6adaedd9d..de335d5cd018 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17027,8 +17027,6 @@ with pkgs; buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { }; - bear = callPackage ../development/tools/build-managers/bear { }; - bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { From 2dd171d32108ea09ebbe861f3c4d6f692889c1cd Mon Sep 17 00:00:00 2001 From: scrufulufugus Date: Thu, 17 Oct 2024 15:24:18 -0400 Subject: [PATCH 042/151] maintainers: add smonson --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73b917770384..48e5f2783a43 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19997,6 +19997,12 @@ githubId = 7091399; keys = [ { fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; } ]; }; + smonson = { + name = "Samuel Monson"; + email = "smonson@irbash.net"; + github = "sjmonson"; + githubId = 17662218; + }; smrehman = { name = "Syed Moiz Ur Rehman"; email = "smrehman@proton.me"; From 6652ec3ddbf1e621b5e8c3731c4ad32ded28fcb3 Mon Sep 17 00:00:00 2001 From: scrufulufugus Date: Thu, 17 Oct 2024 15:16:08 -0400 Subject: [PATCH 043/151] system76-power: 1.1.23 -> 1.2.1 --- pkgs/by-name/sy/system76-power/Cargo.lock | 1774 ++++++++++++++++++++ pkgs/by-name/sy/system76-power/package.nix | 13 +- 2 files changed, 1783 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/sy/system76-power/Cargo.lock diff --git a/pkgs/by-name/sy/system76-power/Cargo.lock b/pkgs/by-name/sy/system76-power/Cargo.lock new file mode 100644 index 000000000000..82292ac66c79 --- /dev/null +++ b/pkgs/by-name/sy/system76-power/Cargo.lock @@ -0,0 +1,1774 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +dependencies = [ + "concurrent-queue", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.0.2", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "async-signal" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +dependencies = [ + "async-io 2.3.2", + "async-lock 3.3.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.2", + "futures-io", + "futures-lite 2.3.0", + "piper", + "tracing", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cc" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concat-in-place" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b80dba65d26e0c4b692ad0312b837f1177e8175031af57fd1de4f3bc36b430" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.60", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hidapi" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7" +dependencies = [ + "cc", + "libc", + "pkg-config", + "winapi", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "futures-core", + "inotify-sys", + "libc", + "tokio", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intel-pstate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c22b01d00d25089087e403d1d2533cce061f90ca9cc460d0049be94a3e1d563" +dependencies = [ + "derive_setters", + "smart-default", + "thiserror", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "numtoa" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.2", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "serde" +version = "1.0.199" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.199" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "serde_json" +version = "1.0.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysfs-class" +version = "0.1.3" +source = "git+https://github.com/pop-os/sysfs-class#ab63e7f638aadfaf896a02e53cf330343d331337" +dependencies = [ + "numtoa", +] + +[[package]] +name = "system76-power" +version = "1.2.1" +dependencies = [ + "anyhow", + "clap", + "concat-in-place", + "fern", + "futures-lite 2.3.0", + "hidapi", + "inotify", + "intel-pstate", + "libc", + "log", + "once_cell", + "serde", + "serde_json", + "sysfs-class", + "system76-power-zbus", + "thiserror", + "tokio", + "zbus", + "zbus_polkit", + "zvariant", +] + +[[package]] +name = "system76-power-zbus" +version = "1.2.1" +dependencies = [ + "serde", + "zbus", + "zvariant", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.0.2", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.6", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zbus_polkit" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07eb69d4b17d69f78632d4f9b03500f057e80764df8e17ed327f74ac67447813" +dependencies = [ + "enumflags2", + "serde", + "serde_repr", + "static_assertions", + "zbus", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix index 850fac9f6c72..5220534d87e0 100644 --- a/pkgs/by-name/sy/system76-power/package.nix +++ b/pkgs/by-name/sy/system76-power/package.nix @@ -2,19 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.23"; + version = "1.2.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-RuYDG4eZE599oa04xUR+W5B3/IPOpQUss1x7hzoydUQ="; + sha256 = "sha256-kYDrSfpOuRigDX792w3hATXoxX6PWpYWXkxw9Q28P5s="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoHash = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "sysfs-class-0.1.3" = "sha256-ztfwfCRAkxUd/LLNG5fpVuFdgX+tCKL3F35qYJ2GDm8="; + }; + }; postInstall = '' install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf @@ -28,6 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/system76-power"; license = licenses.gpl3Plus; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ ]; + maintainers = [ maintainers.smonson ]; }; } From 58d3118e612e65d7a19ad7dd76132b9ed0a20767 Mon Sep 17 00:00:00 2001 From: Petr Kozorezov Date: Thu, 10 Oct 2024 15:55:04 +0300 Subject: [PATCH 044/151] couchbase-shell: init at 1.0.0 --- pkgs/by-name/co/couchbase-shell/package.nix | 52 +++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/co/couchbase-shell/package.nix diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix new file mode 100644 index 000000000000..1b610b641b28 --- /dev/null +++ b/pkgs/by-name/co/couchbase-shell/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + testers, + nix-update-script, + couchbase-shell, +}: + +rustPlatform.buildRustPackage rec { + pname = "couchbase-shell"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "couchbaselabs"; + repo = "couchbase-shell"; + rev = "v${version}"; + hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE="; + }; + + cargoHash = "sha256-efy1M4Q9dBfEq0YYUKn4y1Rz/dPbBYLapcPXJLI9X+Q="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + # tests need couchbase server + doCheck = false; + + passthru = { + tests.version = testers.testVersion { + package = couchbase-shell; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Shell for Couchbase Server and Cloud"; + homepage = "https://couchbase.sh/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ petrkozorezov ]; + mainProgram = "cbsh"; + platforms = lib.platforms.linux; + }; +} From 1f08575e3aed1e7adb0a24c47d9919c10cae01d7 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 9 Jan 2024 23:50:13 +0000 Subject: [PATCH 045/151] nixos/sshd: Disable `authorizedKeysInHomedir` if `stateVersion` >= 24.11 Co-authored-by: Valentin Gagarin --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/modules/services/networking/ssh/sshd.nix | 3 ++- nixos/tests/openssh.nix | 11 +++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 1b0c29f3809f..dbcfecac6922 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -390,6 +390,9 @@ * from `/var/log/private/gns3` to `/var/log/gns3` and to change the ownership of these directories and their contents to `gns3` (including `/etc/gns3`). +- The `sshd` module now doesn't include `%h/.ssh/authorized_keys` as `AuthorizedKeysFile` unless + `services.openssh.authorizedKeysInHomedir` is set to `true` (the default is `false` for `stateVersion` 24.11 onwards). + - Legacy package `stalwart-mail_0_6` was dropped, please note the [manual upgrade process](https://github.com/stalwartlabs/mail-server/blob/main/UPGRADING.md) before changing the package to `pkgs.stalwart-mail` in diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 26ca39f73d39..b968da777a44 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -302,7 +302,8 @@ in authorizedKeysInHomedir = lib.mkOption { type = lib.types.bool; - default = true; + default = lib.versionOlder config.system.stateVersion "24.11"; + defaultText = lib.literalMD "`false` unless [](#opt-system.stateVersion) is 24.05 or older"; description = '' Enables the use of the `~/.ssh/authorized_keys` file. diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index d420c482ca7f..b4aacd60c81b 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -14,7 +14,10 @@ in { { ... }: { - services.openssh.enable = true; + services.openssh = { + enable = true; + authorizedKeysInHomedir = true; + }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; users.users.root.openssh.authorizedKeys.keys = [ @@ -39,7 +42,11 @@ in { { ... }: { - services.openssh = { enable = true; startWhenNeeded = true; }; + services.openssh = { + enable = true; + startWhenNeeded = true; + authorizedKeysInHomedir = true; + }; security.pam.services.sshd.limits = [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; users.users.root.openssh.authorizedKeys.keys = [ From 6c62fbf53937270614ea6937af551ad2c6fe293b Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Sep 2024 16:46:24 +0000 Subject: [PATCH 046/151] nixos/sshd: warn if no authorized keys, and no authentication method other than pubkeys, were configured --- nixos/modules/services/networking/ssh/sshd.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b968da777a44..c90164b21ccb 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -108,6 +108,10 @@ let }; + usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u: + lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0 + )); + authKeysFiles = let mkAuthKeyFile = u: lib.nameValuePair "ssh/authorized_keys.d/${u.name}" { mode = "0444"; @@ -116,9 +120,6 @@ let ${lib.concatMapStrings (f: lib.readFile f + "\n") u.openssh.authorizedKeys.keyFiles} ''; }; - usersWithKeys = lib.attrValues (lib.flip lib.filterAttrs config.users.users (n: u: - lib.length u.openssh.authorizedKeys.keys != 0 || lib.length u.openssh.authorizedKeys.keyFiles != 0 - )); in lib.listToAttrs (map mkAuthKeyFile usersWithKeys); authPrincipalsFiles = let @@ -545,6 +546,17 @@ in config = lib.mkIf cfg.enable { + warnings = lib.optional (with cfg; lib.all lib.id [ + # ~/.ssh/authorized_keys is ignored and no custom file locations were set + (authorizedKeysFiles == [ "/etc/ssh/authorized_keys.d/%u" ]) + # no command provides authorized keys + (authorizedKeysCommand == "none") + # no users have keys in declarative configuration + (usersWithKeys == []) + # no authentication methods other than public keys are configured + ((settings.PasswordAuthentication == false && !package.withKerberos) || settings.AuthenticationMethods == [ "publickey" ]) + ]) "services.openssh: no keys were set in `users.users.*.openssh.authorizedKeys` and `~/.ssh/authorized_keys` will be ignored"; + users.users.sshd = { isSystemUser = true; From 8de11b252d4a0239d7bbbf4eba74754b508119ce Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:45:14 +0300 Subject: [PATCH 047/151] tests.cc-wrapper: Run CC CXX with an empty path Ensure our wrappers hardcode all the necessary tools --- pkgs/test/cc-wrapper/default.nix | 49 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 3de359d15b4a..9e25be460e25 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -11,6 +11,9 @@ let emulator = stdenv.hostPlatform.emulator buildPackages; isCxx = stdenv.cc.libcxx != null; libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; + CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}"; + CXX = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}c++"}"; + READELF = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}readelf"}"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -20,38 +23,38 @@ in stdenv.mkDerivation { echo "With libc: ${stdenv.cc.libc.name}" >&2 set -o pipefail - NIX_DEBUG=1 $CC -v - NIX_DEBUG=1 $CXX -v + NIX_DEBUG=1 ${CC} -v + NIX_DEBUG=1 ${CXX} -v echo "checking whether compiler builds valid C binaries... " >&2 - $CC -o cc-check ${./cc-main.c} + ${CC} -o cc-check ${./cc-main.c} ${emulator} ./cc-check echo "checking whether compiler builds valid C++ binaries... " >&2 - $CXX -o cxx-check ${./cxx-main.cc} + ${CXX} -o cxx-check ${./cxx-main.cc} ${emulator} ./cxx-check # test for https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1431745905 # .../include/cxxabi.h:20:10: fatal error: '__cxxabi_config.h' file not found # in libcxxStdenv echo "checking whether cxxabi.h can be included... " >&2 - $CXX -o include-cxxabi ${./include-cxxabi.cc} + ${CXX} -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi # cxx doesn't have libatomic.so ${lib.optionalString (!isCxx) '' # https://github.com/NixOS/nixpkgs/issues/91285 echo "checking whether libatomic.so can be linked... " >&2 - $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} - $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 + ${CXX} -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + ${READELF} -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 ''} # Test that linking libc++ works, and statically. ${lib.optionalString isCxx '' echo "checking whether can link with libc++... " >&2 - NIX_DEBUG=1 $CXX ${./cxx-main.cc} -c -o cxx-main.o - NIX_DEBUG=1 $CC cxx-main.o -lc++ -o cxx-main - NIX_DEBUG=1 $CC cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static + NIX_DEBUG=1 ${CXX} ${./cxx-main.cc} -c -o cxx-main.o + NIX_DEBUG=1 ${CC} cxx-main.o -lc++ -o cxx-main + NIX_DEBUG=1 ${CC} cxx-main.o ${lib.getLib stdenv.cc.libcxx}/lib/libc++.a -o cxx-main-static ${emulator} ./cxx-main ${emulator} ./cxx-main-static rm cxx-main{,-static,.o} @@ -60,18 +63,18 @@ in stdenv.mkDerivation { ${lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib - $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} + ${CC} -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} ${emulator} ./core-foundation-check ''} ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' echo "checking whether compiler builds valid static C binaries... " >&2 - $CC ${staticLibc} -static -o cc-static ${./cc-main.c} + ${CC} ${staticLibc} -static -o cc-static ${./cc-main.c} ${emulator} ./cc-static ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") '' echo "checking whether compiler builds valid static pie C binaries... " >&2 - $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} + ${CC} ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ${emulator} ./cc-static-pie ''} ''} @@ -84,47 +87,47 @@ in stdenv.mkDerivation { # Make sure `--` is not parsed as a "non flag arg"; we should get an # input file error here and *not* a linker error. - { ! $CC --; } |& grep -q "no input files" + { ! ${CC} --; } |& grep -q "no input files" # And that positional file args _must_ be files (this is just testing # that we remembered to put the `--` back in the args to the compiler): - { ! $CC -c -- -o foo ${./foo.c}; } \ + { ! ${CC} -c -- -o foo ${./foo.c}; } \ |& grep -q "no such file or directory: '-o'" # Now check that we accept single and multiple positional file args: - $CC -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} - $CC -o positional/main -- positional/foo.o ${./ldflags-main.c} + ${CC} -c -DVALUE=42 -o positional/foo.o -- ${./foo.c} + ${CC} -o positional/main -- positional/foo.o ${./ldflags-main.c} ${emulator} ./positional/main ''} echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h - NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c} + NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" ${CC} -o cflags-check ${./cflags-main.c} ${emulator} ./cflags-check echo "checking whether compiler uses NIX_LDFLAGS... " >&2 mkdir -p foo/lib - $CC -shared \ + ${CC} -shared \ ${lib.optionalString stdenv.hostPlatform.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \ -DVALUE=42 \ -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \ ${./foo.c} - NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" ${CC} -lfoo -o ldflags-check ${./ldflags-main.c} ${emulator} ./ldflags-check echo "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2 mkdir -p std-include cp ${./stdio.h} std-include/stdio.h - NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} + NIX_DEBUG=1 ${CC} -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c} ${emulator} ./nostdinc-main - $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} + ${CXX} -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c} ${emulator} ./nostdinc-main++ ${lib.optionalString sanitizersWorking '' echo "checking whether sanitizers are fully functional... ">&2 - $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} + ${CC} -o sanitizers -fsanitize=address,undefined ${./sanitizers.c} ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} From 8a874c4dc816600e32850ea3d422de2f751d6749 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:59:08 +0300 Subject: [PATCH 048/151] tests-cc-wrapper: Ignore gcc aliases --- pkgs/test/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b34add94830e..e300672ddcac 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -30,6 +30,8 @@ with pkgs; (filter (lib.hasPrefix "gcc")) (filter (lib.hasSuffix "Stdenv")) (filter (n: n != "gccCrossLibcStdenv")) + (filter (n: n != "gcc49Stdenv")) + (filter (n: n != "gcc6Stdenv")) ] ++ lib.optionals (!( (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64) && (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) From fc8ab329cc616798382d2a4c82603d97d83468f8 Mon Sep 17 00:00:00 2001 From: areif-dev Date: Fri, 18 Oct 2024 21:53:16 -0400 Subject: [PATCH 049/151] maintainers: add areif-dev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6cea23ca0c44..4cfb1c1fa109 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1708,6 +1708,12 @@ githubId = 718812; name = "Antoine R. Dumont"; }; + areif-dev = { + email = "aj@ajreifsnyder.com"; + github = "areif-dev"; + githubId = 53097078; + name = "AJ Reifsnyder"; + }; arezvov = { email = "alex@rezvov.ru"; github = "arezvov"; From b15f2f77f28a04c3f1a52590fce97734b3540f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Oct 2024 20:44:15 -0700 Subject: [PATCH 050/151] librewolf-unwrapped: 131.0.2-1 -> 131.0.3 --- .../networking/browsers/librewolf/librewolf.nix | 2 +- .../networking/browsers/librewolf/src.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index 46e9b1f77dd2..9ca55de722c8 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -30,7 +30,7 @@ rec { cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences - cat ${source}/patches/pref-pane/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl + cat ${source}/browser/preferences/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl ''; extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index fc7600f56fea..32941d8d58a2 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "131.0.2-1", + "packageVersion": "131.0.3-1", "source": { - "rev": "131.0.2-1", - "sha256": "1knx485kdjv8d0rn5ai1x1jp0403dvxz9m7lpim1y2d2ilyi26x7" + "rev": "131.0.3-1", + "sha256": "0ayl43nq3h9a3b4nl7sfmil43v0k3x1bmxl7c7ws8710dj2674rc" }, "firefox": { - "version": "131.0.2", - "sha512": "fb1a1179a8c62de975c93e1ac6f058cb5492e955bbb7ac2d4b83cdd14ba17bdb2450078bd6f626124b14542f3fda9514bea476aaa34ff4f5a2bee6b1625ec963" + "version": "131.0.3", + "sha512": "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce" } } From 9fa3379a6138433e9239b357b199d9d433c55521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Oct 2024 20:55:05 -0700 Subject: [PATCH 051/151] librewolf: remove dotlambda from maintainers --- pkgs/applications/networking/browsers/librewolf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 04c253f7d4f1..cb83dcfab639 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -17,7 +17,7 @@ in meta = { description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ dotlambda squalus ]; + maintainers = with lib.maintainers; [ squalus ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". From f9bd834055a24d6d776d7331357cf9745e511407 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 19 Oct 2024 11:13:31 +0530 Subject: [PATCH 052/151] opengist: 1.6.1 -> 1.7.5 Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 40 +++++++++++++++++++++------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 03b23225ada8..c19fc6fcc702 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -1,20 +1,37 @@ -{ lib, buildGoModule, buildNpmPackage, fetchFromGitHub, moreutils, jq, git }: +{ + lib, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + moreutils, + npm-lockfile-fix, + jq, + git, +}: let # finalAttrs when 🥺 (buildGoModule does not support them) # https://github.com/NixOS/nixpkgs/issues/273815 - version = "1.6.1"; + version = "1.7.5"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; rev = "v${version}"; - hash = "sha256-rJ8oiH08kSSFNgPHKGo68Oi1i3L1SEJyHuzoxKMOZME="; + hash = "sha256-mZ4j9UWdKa3nygcRO5ceyONetkks3ZGWxvzD34eOXew="; + + # follow https://github.com/thomiceli/opengist/pull/350 and remove here + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; }; frontend = buildNpmPackage { pname = "opengist-frontend"; inherit version src; - nativeBuildInputs = [ moreutils jq ]; + nativeBuildInputs = [ + moreutils + jq + ]; # npm complains of "invalid package". shrug. we can give it a version. preBuild = '' @@ -33,15 +50,17 @@ let cp -R public $out ''; - npmDepsHash = "sha256-Sy321tIQOOrypk+EOGGixEzrPdhA9U8Hak+DOS+d00A="; + npmDepsHash = "sha256-cITkgRvWOml6uH77WkiNgFedEuPNze63Gntet09uS5w="; }; in buildGoModule { pname = "opengist"; inherit version src; - vendorHash = "sha256-IorqXJKzUTUL5zfKRipZaJtRlwVOmTwolJXFG/34Ais="; - tags = [ - "fs_embed" + vendorHash = "sha256-6PpS/dsonc/akBn8NwUIVFNe2FjynAhF1TYIYT9K/ws="; + tags = [ "fs_embed" ]; + ldflags = [ + "-s" + "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" ]; # required for tests @@ -62,10 +81,11 @@ buildGoModule { meta = { description = "Self-hosted pastebin powered by Git"; - mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = [ ]; + changelog = "https://github.com/thomiceli/opengist/blob/master/CHANGELOG.md"; platforms = lib.platforms.unix; + maintainers = [ ]; + mainProgram = "opengist"; }; } From 5d5243fb98a1a3828b7ac56331e75be2f2339c0b Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 19 Oct 2024 11:16:27 +0530 Subject: [PATCH 053/151] opengist: add phanirithvij as maintainer Signed-off-by: phanirithvij --- pkgs/by-name/op/opengist/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index c19fc6fcc702..ef8c6f5b8232 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -85,7 +85,7 @@ buildGoModule { license = lib.licenses.agpl3Only; changelog = "https://github.com/thomiceli/opengist/blob/master/CHANGELOG.md"; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "opengist"; }; } From b9c2a2ca2a85347a704465251592fb4f5078d75b Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 14 Oct 2024 16:38:22 +0800 Subject: [PATCH 054/151] qcm: 1.0.5 -> 1.1.2 Diff: https://github.com/hypengw/Qcm/compare/v1.0.5...v1.1.1 Changelog: https://github.com/hypengw/Qcm/releases/tag/v1.1.0 https://github.com/hypengw/Qcm/releases/tag/v1.1.1 --- pkgs/by-name/qc/qcm/package.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix index c3a6bd8ca47d..9b8d9c92caa7 100644 --- a/pkgs/by-name/qc/qcm/package.nix +++ b/pkgs/by-name/qc/qcm/package.nix @@ -1,27 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, qt6 -, curl -, ffmpeg -, cubeb +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + qt6, + curl, + ffmpeg, + cubeb, }: stdenv.mkDerivation (finalAttrs: { pname = "qcm"; - version = "1.0.5"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hypengw"; repo = "Qcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-/FOT2xK01JbJbTd5AT5Dk/5EF9qUyLvPTnw8PMtHYoQ="; + hash = "sha256-41GsG+NKCMw+LuRUf31ilRso/SkKYVV3IrMSviOZdWs="; }; - patches = [ ./remove_cubeb_vendor.patch ]; + patches = [ + ./remove_cubeb_vendor.patch + ]; nativeBuildInputs = [ cmake @@ -32,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6.qtbase qt6.qtdeclarative + qt6.qtsvg qt6.qtwayland curl ffmpeg @@ -40,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # Correct qml import path postInstall = '' - mkdir $out/lib/qt-6 - mv $out/lib/qml $out/lib/qt-6/qml + mv $out/lib/qt6 $out/lib/qt-6 ''; qtWrapperArgs = [ From 2830c0a2cb0c1b66f12619e9c960f221b0e4ce56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 12:39:04 +0000 Subject: [PATCH 055/151] python312Packages.mkdocstrings: 0.26.1 -> 0.26.2 --- pkgs/development/python-modules/mkdocstrings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b0bfc0ca1554..721c0358fbc9 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-YV9Cncry+RXXGxRYN4dXp5E2msGA4Kq2QSvcPywWV2c="; + hash = "sha256-xZKE8+bNHL+GSQS00MlShOl/3p7+mRV558Pel50ipOI="; }; postPatch = '' From 660836b95cd34befad709bdaa9a4772595c2dfc1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:11:51 +0200 Subject: [PATCH 056/151] msolve: format with nixfmt --- pkgs/by-name/ms/msolve/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index b4e43dbe5cfc..e6c05abfca82 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, flint -, gmp -, mpfr +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + flint, + gmp, + mpfr, }: stdenv.mkDerivation (finalAttrs: { @@ -34,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { description = "Library for polynomial system solving through algebraic methods"; mainProgram = "msolve"; homepage = "https://msolve.lip6.fr"; changelog = "https://github.com/algebraic-solving/msolve/releases/tag/${finalAttrs.src.rev}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ wegank ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.unix; }; }) From c4a560de85d51c52161b8af6732a625dc2aac907 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:31:25 +0200 Subject: [PATCH 057/151] msolve: 0.7.2 -> 0.7.3 --- pkgs/by-name/ms/msolve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index e6c05abfca82..152b610d7bd5 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-p7fD954aMApyBP58cvGrPwHEqhkxWlaiDHUlQT7kX4c="; + hash = "sha256-F4jEZ3+bA3FADiVZMDNE0T9kd1K1ZBInIaORqQtv+sY="; }; postPatch = '' From 54db2d51cc4da32bbfde8f2e88cf7786f70baa95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Oct 2024 16:03:08 +0200 Subject: [PATCH 058/151] python312Packages.mkdocstrings: update disabled --- pkgs/development/python-modules/mkdocstrings/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 721c0358fbc9..2cc0277d6cc6 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "0.26.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mkdocstrings"; From ceedd5924d84542e794511fc6d395dd6dfce1a12 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Oct 2024 16:22:08 +0200 Subject: [PATCH 059/151] sarasa-gothic: 1.0.21 -> 1.0.22 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 5fa852a6d1da..3b6c2e372a8d 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.21"; + version = "1.0.22"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-zoTZ0JwkV6zaKHw1PegzE6NiGGVptBZgCgD8O9ZHHGc="; + hash = "sha256-356T39GotzLj4lu5KYulpFn2RmS7fZOgjz6Yy9M2T6Y="; }; sourceRoot = "."; From 3dd4dedc787998535ba9da6d89c4658fe78f3443 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 14:23:13 +0000 Subject: [PATCH 060/151] diamond: 2.1.9 -> 2.1.10 --- pkgs/applications/science/biology/diamond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index f3afff0f5eb7..314cbd56b67b 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-cTg9TEpz3FSgX2tpfU4y55cCgFY5+mQY86FziHAwd+s="; + sha256 = "sha256-rNwoHb2jbQwL1bnP5KsI/SsHNN9EeXzsGnMpFhXrc1o="; }; From 7a020d9dc33053fc630a38b88cec81d870fb595f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 31 Mar 2024 17:24:35 +0800 Subject: [PATCH 061/151] cyrus-imapd: init at 3.10.0 Co-authored-by: jtbx Co-authored-by: drupol --- pkgs/by-name/cy/cyrus-imapd/package.nix | 204 ++++++++++++++++++++++++ test | 0 2 files changed, 204 insertions(+) create mode 100644 pkgs/by-name/cy/cyrus-imapd/package.nix create mode 100644 test diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix new file mode 100644 index 000000000000..860eaf162016 --- /dev/null +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -0,0 +1,204 @@ +{ + # build tools + stdenv, + autoreconfHook, + makeWrapper, + pkg-config, + + # check hook + versionCheckHook, + + # fetchers + fetchFromGitHub, + fetchpatch, + fetchurl, + + # build inputs + bison, + brotli, + coreutils, + cunit, + cyrus_sasl, + fig2dev, + flex, + icu, + jansson, + lib, + libbsd, + libcap, + libchardet, + libical, + libmysqlclient, + libsrs2, + libuuid, + libxml2, + nghttp2, + openssl, + pcre2, + perl, + postgresql, + rsync, + shapelib, + sqlite, + unixtools, + valgrind, + wslay, + xapian, + zlib, + + # feature flags + enableAutoCreate ? true, + enableBackup ? true, + enableCalalarmd ? true, + enableHttp ? true, + enableIdled ? true, + enableJMAP ? true, + enableMurder ? true, + enableNNTP ? false, + enableReplication ? true, + enableSrs ? true, + enableUnitTests ? true, + enableXapian ? true, + withLibcap ? true, + withMySQL ? false, + withOpenssl ? true, + withPgSQL ? false, + withSQLite ? true, + withZlib ? true, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "cyrus-imapd"; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "cyrusimap"; + repo = "cyrus-imapd"; + rev = "refs/tags/cyrus-imapd-${finalAttrs.version}"; + hash = "sha256-dyybRqmrVX+ERGpToS5JjGC6S/B0t967dLCWfeUrLKA="; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + autoreconfHook + ]; + buildInputs = + [ + unixtools.xxd + pcre2 + flex + valgrind + fig2dev + perl + cyrus_sasl.dev + icu + jansson + libbsd + libuuid + openssl + zlib + bison + libsrs2 + ] + ++ lib.optionals stdenv.isLinux [ libcap ] + ++ lib.optionals (enableHttp || enableCalalarmd || enableJMAP) [ + brotli.dev + libical.dev + libxml2.dev + nghttp2.dev + shapelib + ] + ++ lib.optionals enableJMAP [ + libchardet + wslay + ] + ++ lib.optionals enableXapian [ + rsync + xapian + ] + ++ lib.optionals withMySQL [ libmysqlclient ] + ++ lib.optionals withPgSQL [ postgresql ] + ++ lib.optionals withSQLite [ sqlite ]; + + enableParallelBuilding = true; + + postPatch = + let + managesieveLibs = + [ + zlib + cyrus_sasl + ] + # Darwin doesn't have libuuid, try to build without it + ++ lib.optional (!stdenv.isDarwin) libuuid; + imapLibs = managesieveLibs ++ [ pcre2 ]; + mkLibsString = lib.strings.concatMapStringsSep " " (l: "-L${lib.getLib l}/lib"); + in + '' + patchShebangs cunit/*.pl + patchShebangs imap/promdatagen + patchShebangs tools/* + + echo ${finalAttrs.version} > VERSION + + substituteInPlace cunit/command.testc \ + --replace-fail /usr/bin/touch ${lib.getExe' coreutils "touch"} \ + --replace-fail /bin/echo ${lib.getExe' coreutils "echo"} \ + --replace-fail /usr/bin/tr ${lib.getExe' coreutils "tr"} \ + --replace-fail /bin/sh ${stdenv.shell} + + # fix for https://github.com/cyrusimap/cyrus-imapd/issues/3893 + substituteInPlace perl/imap/Makefile.PL.in \ + --replace-fail '"$LIB_SASL' '"${mkLibsString imapLibs} -lpcre2-posix $LIB_SASL' + substituteInPlace perl/sieve/managesieve/Makefile.PL.in \ + --replace-fail '"$LIB_SASL' '"${mkLibsString managesieveLibs} $LIB_SASL' + ''; + + postFixup = '' + wrapProgram $out/bin/cyradm --set PERL5LIB $(find $out/lib/perl5 -type d | tr "\\n" ":") + ''; + + configureFlags = [ + "--with-pidfile=/run/cyrus/master.pid" + (lib.enableFeature enableAutoCreate "autocreate") + (lib.enableFeature enableSrs "srs") + (lib.enableFeature enableIdled "idled") + (lib.enableFeature enableMurder "murder") + (lib.enableFeature enableBackup "backup") + (lib.enableFeature enableReplication "replication") + (lib.enableFeature enableUnitTests "unit-tests") + (lib.enableFeature (enableHttp || enableCalalarmd || enableJMAP) "http") + (lib.enableFeature enableJMAP "jmap") + (lib.enableFeature enableNNTP "nntp") + (lib.enableFeature enableXapian "xapian") + (lib.enableFeature enableCalalarmd "calalarmd") + (lib.withFeature withZlib "zlib=${zlib}") + (lib.withFeature withOpenssl "openssl") + (lib.withFeature withLibcap "libcap=${libcap}") + (lib.withFeature withMySQL "mysql") + (lib.withFeature withPgSQL "pgsql") + (lib.withFeature withSQLite "sqlite") + ]; + + checkInputs = [ cunit ]; + doCheck = true; + + versionCheckProgram = "${builtins.placeholder "out"}/libexec/master"; + versionCheckProgramArg = "-V"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + homepage = "https://www.cyrusimap.org"; + description = "Email, contacts and calendar server"; + license = with lib.licenses; [ bsdOriginal ]; + mainProgram = "cyrus"; + maintainers = with lib.maintainers; [ + moraxyc + pingiun + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/test b/test new file mode 100644 index 000000000000..e69de29bb2d1 From 8d90446d39dba6ce3f1f15af5430a4e2ce368f16 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 10 May 2024 10:29:44 +0800 Subject: [PATCH 062/151] nixos/cyrus-imap: init module Co-authored-by: jtbx Co-authored-by: pluiedev --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/cyrus-imap.nix | 379 +++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/cyrus-imap.nix | 120 +++++++ test | 0 5 files changed, 501 insertions(+) create mode 100644 nixos/modules/services/mail/cyrus-imap.nix create mode 100644 nixos/tests/cyrus-imap.nix delete mode 100644 test diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6a1fd5a45dc2..b97db06ebb3a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -660,6 +660,7 @@ ./services/logging/ulogd.nix ./services/mail/automx2.nix ./services/mail/clamsmtp.nix + ./services/mail/cyrus-imap.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix new file mode 100644 index 000000000000..f5ace168b045 --- /dev/null +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -0,0 +1,379 @@ +{ + pkgs, + lib, + config, + ... +}: +let + cfg = config.services.cyrus-imap; + cyrus-imapdPkg = pkgs.cyrus-imapd; + inherit (lib) + mkEnableOption + mkIf + mkOption + optionalAttrs + optionalString + generators + mapAttrsToList + ; + inherit (lib.strings) concatStringsSep; + inherit (lib.types) + attrsOf + submodule + listOf + oneOf + str + int + bool + nullOr + path + ; + + mkCyrusConfig = + settings: + let + mkCyrusOptionsList = + v: + mapAttrsToList ( + p: q: + if (q != null) then + if builtins.isInt q then + "${p}=${builtins.toString q}" + else + "${p}=\"${if builtins.isList q then (concatStringsSep " " q) else q}\"" + else + "" + ) v; + mkCyrusOptionsString = v: concatStringsSep " " (mkCyrusOptionsList v); + in + concatStringsSep "\n " (mapAttrsToList (n: v: n + " " + (mkCyrusOptionsString v)) settings); + + cyrusConfig = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + ${n} { + ${mkCyrusConfig v} + } + '') cfg.cyrusSettings + ); + + imapdConfig = + with generators; + toKeyValue { + mkKeyValue = mkKeyValueDefault { + mkValueString = + v: + if builtins.isBool v then + if v then "yes" else "no" + else if builtins.isList v then + concatStringsSep " " v + else + mkValueStringDefault { } v; + } ": "; + } cfg.imapdSettings; +in +{ + options.services.cyrus-imap = { + enable = mkEnableOption "Cyrus IMAP, an email, contacts and calendar server"; + debug = mkEnableOption "debugging messages for the Cyrus master process"; + + listenQueue = mkOption { + type = int; + default = 32; + description = '' + Socket listen queue backlog size. See listen(2) for more information about a backlog. + Default is 32, which may be increased if you have a very high connection rate. + ''; + }; + tmpDBDir = mkOption { + type = path; + default = "/run/cyrus/db"; + description = '' + Location where DB files are stored. + Databases in this directory are recreated upon startup, so ideally they should live in ephemeral storage for best performance. + ''; + }; + cyrusSettings = mkOption { + type = submodule { + freeformType = attrsOf ( + attrsOf (oneOf [ + bool + int + (listOf str) + ]) + ); + options = { + START = mkOption { + default = { + recover = { + cmd = [ + "ctl_cyrusdb" + "-r" + ]; + }; + }; + description = '' + This section lists the processes to run before any SERVICES are spawned. + This section is typically used to initialize databases. + Master itself will not startup until all tasks in START have completed, so put no blocking commands here. + ''; + }; + SERVICES = mkOption { + default = { + imap = { + cmd = [ "imapd" ]; + listen = "imap"; + prefork = 0; + }; + pop3 = { + cmd = [ "pop3d" ]; + listen = "pop3"; + prefork = 0; + }; + lmtpunix = { + cmd = [ "lmtpd" ]; + listen = "/run/cyrus/lmtp"; + prefork = 0; + }; + notify = { + cmd = [ "notifyd" ]; + listen = "/run/cyrus/notify"; + proto = "udp"; + prefork = 0; + }; + }; + description = '' + This section is the heart of the cyrus.conf file. It lists the processes that should be spawned to handle client connections made on certain Internet/UNIX sockets. + ''; + }; + EVENTS = mkOption { + default = { + tlsprune = { + cmd = [ "tls_prune" ]; + at = 400; + }; + delprune = { + cmd = [ + "cyr_expire" + "-E" + "3" + ]; + at = 400; + }; + deleteprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-D" + "28" + ]; + at = 430; + }; + expungeprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-X" + "28" + ]; + at = 445; + }; + checkpoint = { + cmd = [ + "ctl_cyrusdb" + "-c" + ]; + period = 30; + }; + }; + description = '' + This section lists processes that should be run at specific intervals, similar to cron jobs. This section is typically used to perform scheduled cleanup/maintenance. + ''; + }; + DAEMON = mkOption { + default = { }; + description = '' + This section lists long running daemons to start before any SERVICES are spawned. master(8) will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when master(8) is exiting. + ''; + }; + }; + }; + description = "Cyrus configuration settings. See [cyrus.conf(5)](https://www.cyrusimap.org/imap/reference/manpages/configs/cyrus.conf.html)"; + }; + imapdSettings = mkOption { + type = submodule { + freeformType = attrsOf (oneOf [ + str + int + bool + (listOf str) + ]); + options = { + configdirectory = mkOption { + type = path; + default = "/var/lib/cyrus"; + description = '' + The pathname of the IMAP configuration directory. + ''; + }; + lmtpsocket = mkOption { + type = path; + default = "/run/cyrus/lmtp"; + description = '' + Unix socket that lmtpd listens on, used by deliver(8). This should match the path specified in cyrus.conf(5). + ''; + }; + idlesocket = mkOption { + type = path; + default = "/run/cyrus/idle"; + description = '' + Unix socket that idled listens on. + ''; + }; + notifysocket = mkOption { + type = path; + default = "/run/cyrus/notify"; + description = '' + Unix domain socket that the mail notification daemon listens on. + ''; + }; + }; + }; + default = { + admins = [ "cyrus" ]; + allowplaintext = true; + defaultdomain = "localhost"; + defaultpartition = "default"; + duplicate_db_path = "/run/cyrus/db/deliver.db"; + hashimapspool = true; + httpmodules = [ + "carddav" + "caldav" + ]; + mboxname_lockpath = "/run/cyrus/lock"; + partition-default = "/var/lib/cyrus/storage"; + popminpoll = 1; + proc_path = "/run/cyrus/proc"; + ptscache_db_path = "/run/cyrus/db/ptscache.db"; + sasl_auto_transition = true; + sasl_pwcheck_method = [ "saslauthd" ]; + sievedir = "/var/lib/cyrus/sieve"; + statuscache_db_path = "/run/cyrus/db/statuscache.db"; + syslog_prefix = "cyrus"; + tls_client_ca_dir = "/etc/ssl/certs"; + tls_session_timeout = 1440; + tls_sessions_db_path = "/run/cyrus/db/tls_sessions.db"; + virtdomains = "on"; + }; + description = "IMAP configuration settings. See [imapd.conf(5)](https://www.cyrusimap.org/imap/reference/manpages/configs/imapd.conf.html)"; + }; + + user = mkOption { + type = nullOr str; + default = null; + description = "Cyrus IMAP user name. If this is not set, a user named `cyrus` will be created."; + }; + + group = mkOption { + type = nullOr str; + default = null; + description = "Cyrus IMAP group name. If this is not set, a group named `cyrus` will be created."; + }; + + imapdConfigFile = mkOption { + type = nullOr path; + default = null; + description = "Path to the configuration file used for cyrus-imap."; + apply = v: if v != null then v else pkgs.writeText "imapd.conf" imapdConfig; + }; + + cyrusConfigFile = mkOption { + type = nullOr path; + default = null; + description = "Path to the configuration file used for Cyrus."; + apply = v: if v != null then v else pkgs.writeText "cyrus.conf" cyrusConfig; + }; + + sslCACert = mkOption { + type = nullOr str; + default = null; + description = "File path which containing one or more CA certificates to use."; + }; + + sslServerCert = mkOption { + type = nullOr str; + default = null; + description = "File containing the global certificate used for all services (IMAP, POP3, LMTP, Sieve)"; + }; + + sslServerKey = mkOption { + type = nullOr str; + default = null; + description = "File containing the private key belonging to the global server certificate."; + }; + }; + + config = mkIf cfg.enable { + users.users.cyrus = optionalAttrs (cfg.user == null) { + description = "Cyrus IMAP user"; + isSystemUser = true; + group = optionalString (cfg.group == null) "cyrus"; + }; + + users.groups.cyrus = optionalAttrs (cfg.group == null) { }; + + environment.etc."imapd.conf".source = cfg.imapdConfigFile; + environment.etc."cyrus.conf".source = cfg.cyrusConfigFile; + + systemd.services.cyrus-imap = { + description = "Cyrus IMAP server"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ + "/etc/imapd.conf" + "/etc/cyrus.conf" + ]; + + startLimitIntervalSec = 60; + environment = { + CYRUS_VERBOSE = mkIf cfg.debug "1"; + LISTENQUEUE = builtins.toString cfg.listenQueue; + }; + serviceConfig = { + User = if (cfg.user == null) then "cyrus" else cfg.user; + Group = if (cfg.group == null) then "cyrus" else cfg.group; + Type = "simple"; + ExecStart = "${cyrus-imapdPkg}/libexec/master -l $LISTENQUEUE -C /etc/imapd.conf -M /etc/cyrus.conf -p /run/cyrus/master.pid -D"; + Restart = "on-failure"; + RestartSec = "1s"; + RuntimeDirectory = "cyrus"; + StateDirectory = "cyrus"; + + # Hardening + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "full"; + CapabilityBoundingSet = [ "~CAP_NET_ADMIN CAP_SYS_ADMIN CAP_SYS_BOOT CAP_SYS_MODULE" ]; + MemoryDenyWriteExecute = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + }; + preStart = '' + mkdir -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock + ''; + }; + environment.systemPackages = [ cyrus-imapdPkg ]; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8ddcc779ea90..8b26b710dfad 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -245,6 +245,7 @@ in { curl-impersonate = handleTest ./curl-impersonate.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; + cyrus-imap = runTest ./cyrus-imap.nix; darling = handleTest ./darling.nix {}; darling-dmg = runTest ./darling-dmg.nix; dae = handleTest ./dae.nix {}; diff --git a/nixos/tests/cyrus-imap.nix b/nixos/tests/cyrus-imap.nix new file mode 100644 index 000000000000..36145ed4748e --- /dev/null +++ b/nixos/tests/cyrus-imap.nix @@ -0,0 +1,120 @@ +{ lib, pkgs, ... }: +{ + name = "cyrus-imap"; + + meta = { + maintainers = with lib.maintainers; [ moraxyc ]; + }; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + curl + sudo + ]; + services.saslauthd = { + enable = true; + config = '' + DESC="SASL Authentication Daemon" + NAME="saslauthd" + MECH_OPTIONS="" + THREADS=5 + START=yes + OPTIONS="-c -m /run/saslauthd" + ''; + }; + services.cyrus-imap = { + enable = true; + cyrusSettings = { + START = { + recover = { + cmd = [ + "ctl_cyrusdb" + "-r" + ]; + }; + }; + EVENTS = { + tlsprune = { + cmd = [ "tls_prune" ]; + at = 400; + }; + delprune = { + cmd = [ + "cyr_expire" + "-E" + "3" + ]; + at = 400; + }; + deleteprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-D" + "28" + ]; + at = 430; + }; + expungeprune = { + cmd = [ + "cyr_expire" + "-E" + "4" + "-X" + "28" + ]; + at = 445; + }; + checkpoint = { + cmd = [ + "ctl_cyrusdb" + "-c" + ]; + period = 30; + }; + }; + SERVICES = { + http = { + cmd = [ "httpd" ]; + listen = "80"; + prefork = 0; + }; + imap = { + cmd = [ "imapd" ]; + listen = "143"; + prefork = 0; + }; + lmtpunix = { + cmd = [ "lmtpd" ]; + listen = "/run/cyrus/lmtp"; + prefork = 0; + }; + notify = { + cmd = [ "notifyd" ]; + listen = "/run/cyrus/notify"; + proto = "udp"; + prefork = 0; + }; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("saslauthd.service") + machine.wait_for_unit("cyrus-imap.service") + + machine.wait_for_open_port(80) + machine.wait_for_open_port(143) + + machine.succeed("echo 'secret' | ${lib.getExe' pkgs.cyrus_sasl.bin "saslpasswd2"} -p -c cyrus") + machine.succeed("chown cyrus /etc/sasldb2") + + machine.succeed("sudo -ucyrus curl --fail --max-time 10 imap://cyrus:secret@localhost:143") + machine.fail("curl --fail --max-time 10 imap://cyrus:wrongsecret@localhost:143") + machine.fail("curl --fail --max-time 10 -X PROPFIND -H 'Depth: 1' 'http://localhost/dav/addressbooks/user/cyrus@localhost/Default'") + ''; +} diff --git a/test b/test deleted file mode 100644 index e69de29bb2d1..000000000000 From cc1aeb4fbd903132ee2203c21b047d812439edf9 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 19 Oct 2024 21:54:20 +0800 Subject: [PATCH 063/151] nixos/docs: add services.cyrus-imap to rl-2411 --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 371d338a3418..f3810842723d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -73,6 +73,8 @@ ## New Modules {#sec-release-24.11-new-modules} +- [Cyrus IMAP](https://github.com/cyrusimap/cyrus-imapd), an email, contacts and calendar server. Available as [services.cyrus-imap](#opt-services.cyrus-imap.enable) service. + - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwarrior 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver). - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. From c5eb288cc7c4ef49f10edf4a393b61c8d57dbf18 Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Thu, 18 Jul 2024 22:21:57 +0200 Subject: [PATCH 064/151] python312Packages.triton-bin: 2.1.0 -> 3.1.0 --- .../development/python-modules/triton/bin.nix | 2 +- .../python-modules/triton/binary-hashes.nix | 31 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix index cbec8d0ceae6..fd6693b556d0 100644 --- a/pkgs/development/python-modules/triton/bin.nix +++ b/pkgs/development/python-modules/triton/bin.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "triton"; - version = "2.1.0"; + version = "3.1.0"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix index 5c542ac187ee..0ce7ee85b1ca 100644 --- a/pkgs/development/python-modules/triton/binary-hashes.nix +++ b/pkgs/development/python-modules/triton/binary-hashes.nix @@ -7,26 +7,31 @@ version: builtins.getAttr version { - "2.1.0" = { + "3.1.0" = { x86_64-linux-38 = { - name = "triton-2.1.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-Ofb7a9zLPpjzFS4/vqck8a6ufXSUErux+pxEHUdOuiY="; + name = "triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-ba2sp/wk3jThgCcbXPhkwWdVcC6fY6FvYt9xSoCZEmo="; }; x86_64-linux-39 = { - name = "triton-2.1.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-IVROUiwCAFpibIrWPTm9/y8x1BBpWSkZ7ygelk7SZEY="; + name = "triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-qvqaIM0Nn+5SPNRQSqcTGAeoZM133Pbv5+mB8YuMbBE="; }; x86_64-linux-310 = { - name = "triton-2.1.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-ZkOZI6MNXUg5mwip6uEDcPbCYaXshkpkmDuuYxUtOdc="; + name = "triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl "; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-aw3RCpJSY6u+n6N9zeZ6Xpsjg/wmn99Z9WV8rDjF0dg="; }; x86_64-linux-311 = { - name = "triton-2.1.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-kZsGRT8AM+pSwT6veDPeDlfbMXjSPU4E+fxxxPLDK/g="; + name = "triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-DzT254hdG/Dqr3uodaXwzm88E7qY+VA2UcHm3GdX7Vw="; + }; + x86_64-linux-312 = { + name = "triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-3.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + hash = "sha256-yBgvQv2AgKfTnWZoFPo2xeMMwA6n7usaKYPbtMmaD9w="; }; }; } From 0e6c70a9fd6ee77c8b822a5510986dcc5314fb77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 17:14:02 +0000 Subject: [PATCH 065/151] android-udev-rules: 20240829 -> 20241019 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b0a4c378ecd6..4f755d71fcb4 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240829"; + version = "20241019"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-QrWEvNcPKSEJghQc0tqb/L71IqeMUmuJLyA0NtzacyY="; + hash = "sha256-ZKJhGobW3F339PBsIezMTbzouomYGxDJyFbJMGIeim4="; }; installPhase = '' From 6252e0ea767537a097308faf5a14c48770b52149 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 17:28:08 +0000 Subject: [PATCH 066/151] srgn: 0.13.2 -> 0.13.3 --- pkgs/by-name/sr/srgn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index cb1e0fc66bdd..9e39aa27b3c8 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-yVjxNTftrtKb/KHRZG7E3JcsCEtixhfBiHl/6zdcLMo="; + hash = "sha256-JjO4ZH4CYu2qwYfUrwTASYuxyBjObLb9ydPPbObew0g="; }; - cargoHash = "sha256-Z8y5gN4CzfllUzSMUyCc7TZKeIYVZtATnaIQIga5cAk="; + cargoHash = "sha256-/Y85FbmHfape2K8tdu/amjW8Q5Eg19HOPCE/x8qZ8uY="; nativeBuildInputs = [ installShellFiles ]; From 76c7c2dd88be617a8a9fdda78f2845eafbb40088 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 19 Oct 2024 06:56:32 +0000 Subject: [PATCH 067/151] nodePackages.shout: drop shout has been deprecated since 2016: https://github.com/erming/shout/commit/90a62c56af4412c6b0e0ae51fe84f3825f49e226 Also, move the top-level `shout` alias to `pkgs/top-level/aliases.nix`. Part of #229475 --- .../manual/release-notes/rl-2411.section.md | 4 + nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/networking/shout.nix | 115 -------- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 247 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 10 files changed, 8 insertions(+), 367 deletions(-) delete mode 100644 nixos/modules/services/networking/shout.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 929017a5e550..4b5d70c03ab6 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -509,6 +509,10 @@ - `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured. +- The `nodePackages.shout` package has been removed because it was deprecated upstream in favor of `thelounge`. + The `shout` top-level attribute was an alias to this package. + The associated `services.shout` module has also been removed. + - The `indi-full` package no longer contains non-free drivers. To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers. E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}` diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8b0127dc29f7..ab3568c4d992 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -236,7 +236,7 @@ in riemanntools = 203; subsonic = 204; # riak = 205; # unused, remove 2022-07-22 - #shout = 206; # dynamically allocated as of 2021-09-18 + #shout = 206; # dynamically allocated as of 2021-09-18, module removed 2024-10-19 gateone = 207; namecoin = 208; #lxd = 210; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6ac03cca94e9..54d9e8a104ea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1204,7 +1204,6 @@ ./services/networking/shellhub-agent.nix ./services/networking/shorewall.nix ./services/networking/shorewall6.nix - ./services/networking/shout.nix ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 762c3ddbae9a..9fdcf7c7281a 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -102,6 +102,7 @@ in (mkRemovedOptionModule [ "services" "railcar" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "replay-sorcery" ] "the corresponding package has been removed from nixpkgs as it is unmaintained upstream. Consider using `gpu-screen-recorder` or `obs-studio` instead.") (mkRemovedOptionModule [ "services" "seeks" ] "") + (mkRemovedOptionModule [ "services" "shout" ] "shout was removed because it was deprecated upstream in favor of thelounge.") (mkRemovedOptionModule [ "services" "ssmtp" ] '' The ssmtp package and the corresponding module have been removed due to the program being unmaintained. The options `programs.msmtp.*` can be diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix deleted file mode 100644 index 017b8590197a..000000000000 --- a/nixos/modules/services/networking/shout.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ pkgs, lib, config, ... }: - -with lib; - -let - cfg = config.services.shout; - shoutHome = "/var/lib/shout"; - - defaultConfig = pkgs.runCommand "config.js" { preferLocalBuild = true; } '' - EDITOR=true ${pkgs.shout}/bin/shout config --home $PWD - mv config.js $out - ''; - - finalConfigFile = if (cfg.configFile != null) then cfg.configFile else '' - var _ = require('${pkgs.shout}/lib/node_modules/shout/node_modules/lodash') - - module.exports = _.merge( - {}, - require('${defaultConfig}'), - ${builtins.toJSON cfg.config} - ) - ''; - -in { - options.services.shout = { - enable = mkEnableOption "Shout web IRC client"; - - private = mkOption { - type = types.bool; - default = false; - description = '' - Make your shout instance private. You will need to configure user - accounts by adding entries in {file}`${shoutHome}/users`. - ''; - }; - - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "IP interface to listen on for http connections."; - }; - - port = mkOption { - type = types.port; - default = 9000; - description = "TCP port to listen on for http connections."; - }; - - configFile = mkOption { - type = types.nullOr types.lines; - default = null; - description = '' - Contents of Shout's {file}`config.js` file. - - Used for backward compatibility, recommended way is now to use - the `config` option. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - - config = mkOption { - default = {}; - type = types.attrs; - example = { - displayNetwork = false; - defaults = { - name = "Your Network"; - host = "localhost"; - port = 6697; - }; - }; - description = '' - Shout {file}`config.js` contents as attribute set (will be - converted to JSON to generate the configuration file). - - The options defined here will be merged to the default configuration file. - - Documentation: http://shout-irc.com/docs/server/configuration.html - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.shout = { - isSystemUser = true; - group = "shout"; - description = "Shout daemon user"; - home = shoutHome; - createHome = true; - }; - users.groups.shout = {}; - - systemd.services.shout = { - description = "Shout web IRC client"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - preStart = "ln -sf ${pkgs.writeText "config.js" finalConfigFile} ${shoutHome}/config.js"; - script = concatStringsSep " " [ - "${pkgs.shout}/bin/shout" - (if cfg.private then "--private" else "--public") - "--port" (toString cfg.port) - "--host" (toString cfg.listenAddress) - "--home" shoutHome - ]; - serviceConfig = { - User = "shout"; - ProtectHome = "true"; - ProtectSystem = "full"; - PrivateTmp = "true"; - }; - }; - }; -} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 648d045ffd05..c0ac63577954 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -158,6 +158,7 @@ mapAliases { inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 inherit (pkgs) serverless; # Added 2023-11-29 + shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19 inherit (pkgs) snyk; # Added 2023-08-30 inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ad85e2054447..446c0d4fe6cb 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -174,7 +174,6 @@ , "sass" , "semver" , "serve" -, "shout" , "sloc" , "smartdc" , "socket.io" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 726b4bd7e1c5..0d5ce792d47b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -79540,253 +79540,6 @@ in bypassCache = true; reconstructLock = true; }; - shout = nodeEnv.buildNodePackage { - name = "shout"; - packageName = "shout"; - version = "0.53.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shout/-/shout-0.53.0.tgz"; - sha512 = "WX6Be8BtHxMskOZkxEx96cy7Qs+DTsasvmITJDa28OMkGQS59EuR7LPVq4BB1O5uvvjxvIi1rF1WqZwbF/PfKQ=="; - }; - dependencies = [ - sources."CSSselect-0.4.1" - sources."CSSwhat-0.4.7" - sources."accepts-1.3.8" - sources."after-0.8.1" - sources."ajv-6.12.6" - sources."array-flatten-1.1.1" - sources."arraybuffer.slice-0.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."base64-arraybuffer-0.1.2" - sources."base64id-0.1.0" - sources."bcrypt-nodejs-0.0.3" - sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."blob-0.0.2" - sources."body-parser-1.20.3" - sources."bytes-3.1.2" - sources."call-bind-1.0.7" - sources."callsite-1.0.0" - sources."caseless-0.12.0" - sources."cheerio-0.17.0" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."component-bind-1.0.0" - sources."component-emitter-1.1.2" - sources."component-inherit-0.0.3" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."define-data-property-1.1.4" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - (sources."dom-serializer-0.0.1" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.2.1" - sources."domutils-1.4.3" - sources."duplexer-0.1.2" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."encodeurl-2.0.0" - (sources."engine.io-1.3.1" // { - dependencies = [ - sources."debug-0.6.0" - ]; - }) - (sources."engine.io-client-1.3.1" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."engine.io-parser-1.0.6" - sources."entities-1.1.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."event-stream-3.3.5" - sources."express-4.21.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."finalhandler-1.3.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."from-0.1.7" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" - sources."getpass-0.1.7" - sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" - sources."gopd-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-binary-data-0.1.1" - sources."has-cors-1.0.3" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" - (sources."htmlparser2-3.7.3" // { - dependencies = [ - sources."domutils-1.5.1" - sources."entities-1.0.0" - ]; - }) - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."irc-replies-2.0.1" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."json3-3.2.6" - sources."jsprim-1.4.2" - sources."linewise-0.0.3" - sources."lodash-2.4.2" - sources."map-stream-0.0.7" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.7.0" - sources."ms-2.0.0" - sources."mute-stream-0.0.8" - sources."nan-0.3.2" - sources."negotiator-0.6.3" - sources."oauth-sign-0.9.0" - sources."object-component-0.0.3" - sources."object-inspect-1.13.2" - sources."on-finished-2.4.1" - sources."options-0.0.6" - sources."parsejson-0.0.1" - sources."parseqs-0.0.2" - sources."parseuri-0.0.2" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.10" - sources."pause-stream-0.0.11" - sources."performance-now-2.1.0" - sources."proxy-addr-2.0.7" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."read-1.0.7" - sources."readable-stream-1.1.14" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - (sources."send-0.19.0" // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.16.2" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.6" - sources."slate-irc-0.7.3" - (sources."slate-irc-parser-0.0.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-adapter-0.2.0" // { - dependencies = [ - sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - sources."socket.io-parser-2.1.2" - ]; - }) - (sources."socket.io-client-1.0.6" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - (sources."socket.io-parser-2.2.0" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."split-1.0.1" - sources."sshpk-1.18.0" - sources."statuses-2.0.1" - sources."stream-combiner-0.2.2" - sources."string_decoder-0.10.31" - sources."through-2.3.8" - sources."tinycolor-0.0.1" - sources."to-array-0.1.3" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."utf8-2.0.0" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - (sources."ws-0.4.31" // { - dependencies = [ - sources."commander-0.6.1" - ]; - }) - sources."xmlhttprequest-https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The self-hosted Web IRC client"; - homepage = "https://github.com/erming/shout#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87cec31134e5..e2c7787e0381 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1489,6 +1489,7 @@ mapAliases { inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shhgit = throw "shhgit is broken and is no longer maintained. See https://github.com/eth0izzle/shhgit#-shhgit-is-no-longer-maintained-"; # Added 2023-08-08 shipyard = jumppad; # Added 2023-06-06 + shout = nodePackages.shout; # Added unknown; moved 2024-10-19 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c09f725ab1..cefdfa0b311e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12175,8 +12175,6 @@ with pkgs; shotwell = callPackage ../applications/graphics/shotwell { }; - shout = nodePackages.shout; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; From e9830b4520a75ed42d7d22555d330b1a1c041b95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 18:33:57 +0000 Subject: [PATCH 068/151] polyphone: 2.4.0 -> 2.4.1 --- pkgs/applications/audio/polyphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 2a38222949f6..436a690ffd62 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs="; + hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0="; }; nativeBuildInputs = [ From 209bada01b29c2a7fef06c645807dd488ad5719e Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Sat, 19 Oct 2024 20:48:09 +0200 Subject: [PATCH 069/151] python3Packages.parselmouth: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/parselmouth/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix index 43e718c133ae..78417fe48c0b 100644 --- a/pkgs/development/python-modules/parselmouth/default.nix +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -14,17 +14,16 @@ buildPythonPackage rec { pname = "parselmouth"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YannickJadoul"; repo = "Parselmouth"; - # Stable branch with cherry picked changes to fit to the newer dependencies versions https://github.com/YannickJadoul/Parselmouth/issues/130 - rev = "c2cbecc0ce4a0b5d3052cc6c6fbddf4bf133655d"; + rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+6id0PVfpiVjee7O4ZoskNK0dz5ZmTYRTtum3B3tIgE="; + hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU="; }; configurePhase = '' From 6c47ba6fda41ad43b670be941b64c4092adb38f8 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 21:25:16 +0200 Subject: [PATCH 070/151] tigervnc: fix a regression in VncAuth security type tigervnc v1.14.0 introduced a regression in its list of supported security types: Due to a missing comma in the code, the VncAuth security type (i.e. simple password check) isn't tried unless it is explicitely requested on the command line: https://github.com/TigerVNC/tigervnc/issues/1789 The commit at hand adds a patch from upstream (which will most likely be part of the next release) to fix this oversight. --- pkgs/tools/admin/tigervnc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index c54ce8bfe142..0e6e1daa66e2 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , xorg , xkeyboard_config , zlib @@ -33,6 +34,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o="; }; + patches = [ + (fetchpatch { + name = "vncauth-security-type.patch"; + url = "https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582.diff"; + hash = "sha256-lSkR8e+jsBwkQUJZmA0tb8nM5iSbYtO8uVXtgk5wdF8="; + }) + ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= From ed4014cdecb8d73d4fed22a087a22159ec094b2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 19:59:24 +0000 Subject: [PATCH 071/151] python312Packages.griffe: 1.4.1 -> 1.5.1 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 208f6a7c827b..aed63cf3ef41 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "1.4.1"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-DgfoaRvgU4WWbCirbLld8f/C2bPrW576aX0HglaRjEU="; + hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY="; }; build-system = [ pdm-backend ]; From bbbd930f123b6042fd6b00c7ad7b2db05c72b26f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 20:00:49 +0000 Subject: [PATCH 072/151] obs-cmd: 0.17.8 -> 0.17.9 --- pkgs/by-name/ob/obs-cmd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 466d776194c6..a0a495247172 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "obs-cmd"; - version = "0.17.8"; + version = "0.17.9"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; rev = "v${version}"; - hash = "sha256-IOGdy3X0/r/kuEXAvLeJk2HXtcGI+vbh4Dn1/yOpkmM="; + hash = "sha256-R3zGYVa5ux3pcniuXzKwxJK/5/7YrVOrqC2H42P2fK0="; }; - cargoHash = "sha256-oCu/ygjZxEqxE+5Vca3l1mZP3hd+r+5gi2iogQMnEcU="; + cargoHash = "sha256-bFOaR48xdc4+DvlFnXCWtzqMbE1cTo7xrsf/aIBlRX0="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; From 018cdd0ad5fc333c8bcfa597d406c1c0089a0922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 20:09:48 +0000 Subject: [PATCH 073/151] istioctl: 1.23.1 -> 1.23.2 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index c62448908418..55536c840e67 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-ksTtjPzEY//JMLKzTMqkeqZqD92euvqV0iXziYQvFGg="; + hash = "sha256-Vyd32T19dw0j7PfuAcs6cuDlAhtMnRcUZXvYtEM7D4w="; }; - vendorHash = "sha256-4zNPI5tefOgLwbzxRM9NS/szlUjGo2BiruqP92qmwBU="; + vendorHash = "sha256-Sh/SsVIque5xdyOGCNU188pi0JCDXv90LlV7NCmgpGQ="; nativeBuildInputs = [ installShellFiles ]; From a1cba1a4a1fb971dba2ac3679cefa0e235da6c69 Mon Sep 17 00:00:00 2001 From: areif-dev Date: Fri, 18 Oct 2024 21:54:53 -0400 Subject: [PATCH 074/151] river-bsp-layout: init at 2.1.0 --- pkgs/by-name/ri/river-bsp-layout/package.nix | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/ri/river-bsp-layout/package.nix diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix new file mode 100644 index 000000000000..a5c64c60fe6a --- /dev/null +++ b/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "river-bsp-layout"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "areif-dev"; + repo = "river-bsp-layout"; + rev = "v${version}"; + hash = "sha256-LRVZPAS4V5PtrqyOkKUfrZuwLqPZbLoyjn2DPxCFE2o="; + }; + + cargoHash = "sha256-CtVyRwfIS8R48LUecKXoak+HHB5yNZ5RgguIWOhyFA8="; + + meta = { + homepage = "https://github.com/areif-dev/river-bsp-layout"; + description = "Binary space partition / grid layout manager for River WM"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ areif-dev ]; + mainProgram = "river-bsp-layout"; + platforms = lib.platforms.linux; + }; +} From c33a48f49c82072334dad3c6f5a435832348e8fa Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 19 Oct 2024 15:52:24 -0500 Subject: [PATCH 075/151] vimPlugins.cmp-nixpkgs-maintainers: 2024-10-15 -> 2024-10-19 Some important bug fixes --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4f59990f42c8..3b135a0ac326 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1915,12 +1915,12 @@ final: prev: cmp-nixpkgs-maintainers = buildVimPlugin { pname = "cmp-nixpkgs-maintainers"; - version = "2024-10-15"; + version = "2024-10-19"; src = fetchFromGitHub { owner = "GaetanLepage"; repo = "cmp-nixpkgs-maintainers"; - rev = "828040c309972f044346e0bf43d0f92623b60d65"; - sha256 = "0wnqhsfinzz3xf746sd731gy6sj05c5z7c09w4lrdchbrxx3zgrb"; + rev = "86711e7d3e92097b26e53f0b146b93863176377d"; + sha256 = "sha256-NZuDbrKL/ukLIMxbqVzVgzKkKTnw2Zu1/qD/MTIVO2Q="; }; meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/"; }; From 80af6cbc2097531d9a260eadde971ca5393886c1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 19 Oct 2024 23:18:54 +0200 Subject: [PATCH 076/151] pgmodeler: add desktop file --- pkgs/applications/misc/pgmodeler/default.nix | 21 ++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 35777a0b2563..08835ba6a08a 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,6 +1,8 @@ { lib , stdenv +, copyDesktopItems , fetchFromGitHub +, makeDesktopItem , wrapQtAppsHook , pkg-config , qmake @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ="; }; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PGSQL_INC=${lib.getDev postgresql}/include" "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" @@ -36,7 +38,22 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + desktopItems = [ + (makeDesktopItem { + name = "pgModeler"; + exec = "pgmodeler"; + icon = "pgmodeler"; + desktopName = "PgModeler"; + genericName = "PgModeler"; + comment = meta.description; + categories = [ "Development" ]; + startupWMClass = "pgmodeler"; + }) + ]; + + postInstall = '' + install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin for item in pgmodeler pgmodeler-{cli,se,ch} do From 61dab424a56efd008508bed9db90816f6da4db28 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Thu, 17 Oct 2024 21:43:28 +0530 Subject: [PATCH 077/151] vimPlugins.unimpaired-nvim: init at 2024-10-17 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 01c5e79950e4..595f3d8587da 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18624,6 +18624,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; + unimpaired-nvim = buildVimPlugin { + pname = "unimpaired.nvim"; + version = "2024-10-17"; + src = fetchFromGitHub { + owner = "tummetott"; + repo = "unimpaired.nvim"; + rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; + sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; + }; + meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; + }; + vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2024-08-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c4d547e962e4..dc82bcb5c0bb 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1053,6 +1053,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/tummetott/unimpaired.nvim/,HEAD, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, https://github.com/sontungexpt/url-open/,HEAD, From 338743fe345037a185a3e9abf9a98f95a8066a32 Mon Sep 17 00:00:00 2001 From: Philip White Date: Fri, 18 Oct 2024 20:07:43 -0700 Subject: [PATCH 078/151] rustic: 0.9.1 -> 0.9.3 --- pkgs/by-name/ru/rustic/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 07d8ddd6da76..9dc223823145 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-hkkylXJOhPOC4p+MOuYCzfcmCoHmm+/8afsaPFwD1/s="; + hash = "sha256-5Zr3ZxKUT8S8vfHNaCResF+S2UcHrk5pGwJH4riTzIw="; }; - cargoHash = "sha256-Rh96vPLAxz8KCIk9y9TFB2fP0JngnM9LSsClWfgYUG0="; + cargoHash = "sha256-HOpBBXJk8bHjXfRq8UczfMjr3bM91lB62taTlUGUC+M="; nativeBuildInputs = [ installShellFiles ]; @@ -49,6 +49,9 @@ rustPlatform.buildRustPackage rec { lib.licenses.mit lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.nobbz ]; + maintainers = [ + lib.maintainers.nobbz + lib.maintainers.pmw + ]; }; } From 1cdd25c9cdd78dcb9d0ae97c6fbc919045a3d191 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:59:55 -0400 Subject: [PATCH 079/151] calibre: 7.16.0 -> 7.20.0 --- pkgs/applications/misc/calibre/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b5e8c469b408..9285a2bacd51 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -3,6 +3,7 @@ , fetchurl , cmake , fetchpatch +, ffmpeg , fontconfig , hunspell , hyphen @@ -14,6 +15,7 @@ , libstemmer , libuchardet , libusb1 +, piper-tts , pkg-config , podofo , poppler_utils @@ -33,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.16.0"; + version = "7.20.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-EWQfaoTwO9BdZQgJQrxfj6b8tmtukvlW5hFo/USjNhU="; + hash = "sha256-BhJEJsQKk/kJxycm/1mbtlrSaeFQPvWGGB9DUMidgII="; }; patches = [ @@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg="; + hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; @@ -75,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + ffmpeg fontconfig hunspell hyphen @@ -86,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { libstemmer libuchardet libusb1 + piper-tts podofo poppler_utils qtbase @@ -148,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: { export PODOFO_LIB_DIR=${podofo.lib}/lib export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" + export PIPER_TTS_DIR=${piper-tts}/bin python setup.py install --root=$out \ --prefix=$out \ From 38de1728fb360376c4c168691b499bd92caa03df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 22:37:36 +0000 Subject: [PATCH 080/151] python312Packages.django-modeltranslation: 0.19.9 -> 0.19.10 --- .../python-modules/django-modeltranslation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 3b7cd55b494c..1fb63c59cd4c 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -13,7 +13,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.9"; + version = "0.19.10"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -23,7 +23,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A="; + hash = "sha256-E3CaQx5SGOnxqjLFY0opcKZF4DMl2HKSUD0gOnA25RA="; }; disabled = pythonOlder "3.6"; From 3a2b3c7ae37c5ca3afcb96a24ed05c8ffa172fa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 23:55:13 +0000 Subject: [PATCH 081/151] kclvm_cli: 0.10.0 -> 0.10.3 --- pkgs/by-name/kc/kclvm_cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 100c892f39a1..12a8c5935681 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-OMPo2cT0ngwHuGghVSfGoDgf+FThj2GsZ3Myb1wSxQM="; + hash = "sha256-qIaDc10NxQKBH7WRzzkQ6bQfkSqsDrFxSwSX+Hf7qS8="; }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-2694O2q6UbNySgn76aBTjdqt2Hh1GrdRaro064fGBrI="; + cargoHash = "sha256-mB4qOUj9qZmbstvBIyaWHEzX3DQ7tLhQKDEvea4Bnyk="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm rustc ] ++ ( From 7d1cb8d6a24a1564a005b82eba7772b1159d6ea3 Mon Sep 17 00:00:00 2001 From: aftix Date: Sat, 19 Oct 2024 17:21:26 -0500 Subject: [PATCH 082/151] maintainers: add aftix --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bf22ce202add..92aab142d919 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -662,6 +662,13 @@ githubId = 4296804; name = "Alex Franchuk"; }; + aftix = { + name = "Wyatt Campbell"; + email = "aftix@aftix.xyz"; + matrix = "@aftix:matrix.org"; + github = "aftix"; + githubId = 4008299; + }; agbrooks = { email = "andrewgrantbrooks@gmail.com"; github = "agbrooks"; From 4522ebfc6a13e932cbc9a98414cfd563038625fe Mon Sep 17 00:00:00 2001 From: aftix Date: Sat, 19 Oct 2024 17:35:16 -0500 Subject: [PATCH 083/151] nushellPlugins.dbus: init at 0.12.0 --- pkgs/shells/nushell/plugins/dbus.nix | 52 +++++++++++++++++++++++++ pkgs/shells/nushell/plugins/default.nix | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/shells/nushell/plugins/dbus.nix diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix new file mode 100644 index 000000000000..374f008548e7 --- /dev/null +++ b/pkgs/shells/nushell/plugins/dbus.nix @@ -0,0 +1,52 @@ +{ + stdenv, + runCommand, + lib, + rustPlatform, + pkg-config, + nix-update-script, + fetchFromGitHub, + dbus, + nushell, + nushell_plugin_dbus, +}: + +rustPlatform.buildRustPackage rec { + pname = "nu_plugin_dbus"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "devyn"; + repo = pname; + rev = version; + hash = "sha256-I6FB2Hu/uyA6lBGRlC6Vwxad7jrl2OtlngpmiyhblKs="; + }; + + cargoHash = "sha256-WwdeDiFVyk8ixxKS1v3P274E1wp+v70qCk+rNEpoce4="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; + buildInputs = [ dbus ]; + + passthru = { + updateScript = nix-update-script { }; + tests.check = + let + nu = lib.getExe nushell; + plugin = lib.getExe nushell_plugin_dbus; + in + runCommand "${pname}-test" { } '' + touch $out + ${nu} -n -c "plugin add --plugin-config $out ${plugin}" + ${nu} -n -c "plugin use --plugin-config $out dbus" + ''; + }; + + meta = with lib; { + description = "Nushell plugin for communicating with D-Bus"; + mainProgram = "nu_plugin_dbus"; + homepage = "https://github.com/devyn/nu_plugin_dbus"; + license = licenses.mit; + maintainers = with maintainers; [ aftix ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index 5cfa7c3ed3ff..7aa271e82e3b 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, newScope, IOKit, CoreFoundation, Foundation, Security }: +{ lib, newScope, dbus, IOKit, CoreFoundation, Foundation, Security }: lib.makeScope newScope (self: with self; { gstat = callPackage ./gstat.nix { inherit Security; }; @@ -9,4 +9,5 @@ lib.makeScope newScope (self: with self; { net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; units = callPackage ./units.nix { }; highlight = callPackage ./highlight.nix { }; + dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; }; }) From eaaca55ee2cf64f83f7c6a5a35e22990e804b177 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 19 Oct 2024 20:19:24 -0400 Subject: [PATCH 084/151] calibre: migrate to by-name --- .../ca}/calibre/dont_build_unrar_plugin.patch | 0 .../default.nix => by-name/ca/calibre/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{applications/misc => by-name/ca}/calibre/dont_build_unrar_plugin.patch (100%) rename pkgs/{applications/misc/calibre/default.nix => by-name/ca/calibre/package.nix} (98%) diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch similarity index 100% rename from pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch rename to pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/by-name/ca/calibre/package.nix similarity index 98% rename from pkgs/applications/misc/calibre/default.nix rename to pkgs/by-name/ca/calibre/package.nix index 9285a2bacd51..41479111b2ae 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -20,12 +20,9 @@ , podofo , poppler_utils , python3Packages -, qmake -, qtbase -, qtwayland +, qt6 , speechd-minimal , sqlite -, wrapQtAppsHook , xdg-utils , wrapGAppsHook3 , popplerSupport ? true @@ -71,9 +68,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - qmake + qt6.qmake + qt6.wrapQtAppsHook wrapGAppsHook3 - wrapQtAppsHook ]; buildInputs = [ @@ -92,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { piper-tts podofo poppler_utils - qtbase - qtwayland + qt6.qtbase + qt6.qtwayland sqlite (python3Packages.python.withPackages (ps: with ps; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a80d2fc17fa1..72d2ea9f345a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28365,7 +28365,7 @@ with pkgs; calculix = callPackage ../applications/science/math/calculix { }; - calibre = qt6Packages.callPackage ../applications/misc/calibre { + calibre = callPackage ../by-name/ca/calibre/package.nix { podofo = podofo010; }; From 74af7e5c2279f0fc368f6677dcf6f87668ab1dcf Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 19 Oct 2024 20:20:42 -0400 Subject: [PATCH 085/151] calibre: format with nixfmt-rfc-style --- pkgs/by-name/ca/calibre/package.nix | 92 +++++++++++++++-------------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 41479111b2ae..d0b604fd2f1c 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, fetchurl -, cmake -, fetchpatch -, ffmpeg -, fontconfig -, hunspell -, hyphen -, icu -, imagemagick -, libjpeg -, libmtp -, libpng -, libstemmer -, libuchardet -, libusb1 -, piper-tts -, pkg-config -, podofo -, poppler_utils -, python3Packages -, qt6 -, speechd-minimal -, sqlite -, xdg-utils -, wrapGAppsHook3 -, popplerSupport ? true -, speechSupport ? true -, unrarSupport ? false +{ + lib, + stdenv, + fetchurl, + cmake, + fetchpatch, + ffmpeg, + fontconfig, + hunspell, + hyphen, + icu, + imagemagick, + libjpeg, + libmtp, + libpng, + libstemmer, + libuchardet, + libusb1, + piper-tts, + pkg-config, + podofo, + poppler_utils, + python3Packages, + qt6, + speechd-minimal, + sqlite, + xdg-utils, + wrapGAppsHook3, + popplerSupport ? true, + speechSupport ? true, + unrarSupport ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -51,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8="; }) - ] - ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; + ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \ @@ -92,8 +92,10 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtwayland sqlite - (python3Packages.python.withPackages - (ps: with ps; [ + (python3Packages.python.withPackages ( + ps: + with ps; + [ (apsw.overrideAttrs (oldAttrs: { setupPyBuildFlags = [ "--enable=load_extension" ]; })) @@ -125,13 +127,17 @@ stdenv.mkDerivation (finalAttrs: { xxhash # the following are distributed with calibre, but we use upstream instead odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll) - ) + ] + ++ + lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) + [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] + ++ lib.optional (unrarSupport) unrardll + )) xdg-utils ] ++ lib.optional (speechSupport) speechd-minimal; @@ -221,9 +227,7 @@ stdenv.mkDerivation (finalAttrs: { free and open source and great for both casual users and computer experts. ''; changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}"; - license = if unrarSupport - then lib.licenses.unfreeRedistributable - else lib.licenses.gpl3Plus; + license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; From 882ec7cbd959f82eb2be23f9e3a460d9f8fa926d Mon Sep 17 00:00:00 2001 From: Marcelo Giles Date: Sat, 19 Oct 2024 18:02:51 -0700 Subject: [PATCH 086/151] maintainers: add mrgiles --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bf22ce202add..2451cfe3abf2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14537,6 +14537,12 @@ name = "Arthur Outhenin-Chalandre"; githubId = 3845213; }; + mrgiles = { + email = "marcelogiles@gmail.com"; + github = "mrgiles"; + githubId = 4009450; + name = "Marcelo Giles"; + }; mrityunjaygr8 = { email = "mrityunjaysaxena1996@gmail.com"; github = "mrityunjaygr8"; From e33713134923c0f0d593597cd76086c36f4facf4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 19 Oct 2024 18:51:48 -0700 Subject: [PATCH 087/151] linux-firmware: fix build when cross-compiling Using `findutils` in such a way where `callPackage` cannot splice it to use the `buildPlatform`'s package-set breaks building `linux-firmware` when `buildPlatform` != `hostPlatform`. Since `findutils` is already included in all `stdenv.mkDerivation` calls, we can get rid of pulling in the different `findutils` and re-use the one that works on `buildPlatform`. --- pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index a3fa3f511b19..a1e13be4febe 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,6 +1,5 @@ { stdenvNoCC , fetchzip -, findutils , lib , python3 , rdfind @@ -13,7 +12,7 @@ let # in a perfectly pristine tree, so we can fake just enough of git to run it. gitStub = writeShellScriptBin "git" '' if [ "$1" == "ls-files" ]; then - ${lib.getExe findutils} -type f -printf "%P\n" + find -type f -printf "%P\n" else echo "Git stub called with unexpected arguments $@" >&2 exit 1 From 2676fb552f43df2b6cae9076797d72cc480ddd87 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sun, 20 Oct 2024 07:19:35 +0800 Subject: [PATCH 088/151] imgui: 1.90.6 -> 1.91.4 https://github.com/ocornut/imgui/releases/tag/v1.91.4 --- pkgs/development/libraries/imgui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 315a73171067..16f9976e2df5 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.6"; + version = "1.91.4"; outputs = [ # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake # into different prefixes but expects the merged layout at import time @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - sha256 = "sha256-FSob6FPfg0tF0n72twA5/moLvEaB251BPkIDJUXhYbg="; + rev = "refs/tags/v${version}"; + hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM="; }; cmakeRules = "${vcpkgSource}/ports/imgui"; From 606d7e72ae7c9f536938d25e1659445058b59e0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 02:34:28 +0000 Subject: [PATCH 089/151] cargo-sort: 1.0.9 -> 1.1.0 --- pkgs/development/tools/rust/cargo-sort/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index 53f941e788d0..51994805f3dd 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; + sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; + cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; From c19599e33de9a9efd59c8d0441e71883d92a0b58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 02:34:32 +0000 Subject: [PATCH 090/151] spacectl: 1.5.0 -> 1.6.0 --- pkgs/by-name/sp/spacectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index 7fe0fc2bbf0a..2684a7708f15 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "spacectl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${version}"; - hash = "sha256-wEu7AmFn1782XTKKb7JxQWn/ZSHrQbuZ/SDldn6pUNo="; + hash = "sha256-pO+jYuCyP6YrU9vE3//O0EyTDXYQ1WSpFI/8WbneDCA="; }; vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo="; From 66a1bc5b06b91fa3101207495867c85e71b33d23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:13:18 +0000 Subject: [PATCH 091/151] python312Packages.xdg-base-dirs: 6.0.1 -> 6.0.2 --- pkgs/development/python-modules/xdg-base-dirs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix index e65785377a57..fa8aa9860de3 100644 --- a/pkgs/development/python-modules/xdg-base-dirs/default.nix +++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xdg-base-dirs"; - version = "6.0.1"; + version = "6.0.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "srstevenson"; repo = "xdg-base-dirs"; - rev = version; - hash = "sha256-nbdF1tjVqlxwiGW0pySS6HyJbmNuQ7mVdQYfhofO4Dk="; + rev = "refs/tags/${version}"; + hash = "sha256-iXK9WURTfmpl5vd7RsT0ptwfrb5UQQFqMMCu3+vL+EY="; }; nativeBuildInputs = [ poetry-core ]; From e72ffb739e048120772314100169d3033626e555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:13:36 +0000 Subject: [PATCH 092/151] python312Packages.eq3btsmart: 1.1.9 -> 1.2.0 --- pkgs/development/python-modules/eq3btsmart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix index 5fc267fe2e21..908dc2ac979e 100644 --- a/pkgs/development/python-modules/eq3btsmart/default.nix +++ b/pkgs/development/python-modules/eq3btsmart/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eq3btsmart"; - version = "1.1.9"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "EuleMitKeule"; repo = "eq3btsmart"; rev = "refs/tags/${version}"; - hash = "sha256-7kJqPygX2Oc7fz31qZWrS1ZA+kANZr8vxOwarUzgp/M="; + hash = "sha256-Z3GfUTh3qp5ICJAYsCO6ufw/Jd5FDjOaQE9SaD3H0IU="; }; build-system = [ poetry-core ]; From 77a6d673c6bcaff8facb411909e0bf82ccc9b3bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:18:16 +0000 Subject: [PATCH 093/151] vouch-proxy: 0.40.0 -> 0.41.0 --- pkgs/servers/vouch-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 28a06b0e0216..bae680cf78bc 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-/B7MMRkI5DhDBWa53mgFUME1CR3FSxxQ8UWjlN19EmQ="; + hash = "sha256-HQ1NaAHY1YRbNUThW983V8x3ptzTc/zNP6yIMyDiq1s="; }; vendorHash = "sha256-1k9YFdackF10iJWJ22XlaENlOfRkZMs+IedDWnd/h8E="; From 7a604034801ce95a07a421ce0857ecf1539edbff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 03:48:50 +0000 Subject: [PATCH 094/151] python312Packages.python-roborock: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 289a4e41005e..1385f887bd12 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Mszy1p7TOEynCePCEiLhwdWiKXfFnlo3/a3vc9TxGeY="; + hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI="; }; postPatch = '' From 536bceb64b46f1e2fed23986ef108504b1412da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Oct 2024 21:23:00 -0700 Subject: [PATCH 095/151] python312Packages.insightface: clean up dependencies --- .../python-modules/insightface/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 1199e09eae0d..4b4787d0a418 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -7,16 +7,18 @@ fetchPypi, insightface, matplotlib, - mxnet, numpy, onnx, onnxruntime, opencv4, + pillow, prettytable, pythonOlder, + requests, + setuptools, + scipy, scikit-image, scikit-learn, - tensorboard, testers, tqdm, stdenv, @@ -34,22 +36,26 @@ buildPythonPackage rec { hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; }; - build-system = [ cython ]; + build-system = [ + cython + setuptools + ]; dependencies = [ + albumentations easydict matplotlib - mxnet numpy onnx onnxruntime opencv4 + pillow + prettytable + requests scikit-learn scikit-image - tensorboard + scipy tqdm - albumentations - prettytable ]; pythonImportsCheck = [ From 092d68b3234674c58be7b6c57f704980824faff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:30:45 +0000 Subject: [PATCH 096/151] vals: 0.37.5 -> 0.37.7 --- pkgs/tools/security/vals/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 6ffb4d48253f..1487b5caa891 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.5"; + version = "0.37.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-ezF8cV3JPE/GObpTc4wPw/YcQrOKNi2bsRs3svLWpV8="; + sha256 = "sha256-iRXBT3VpEVHna3GkMxVSVRqQ2HTK7gCd6LkthwrBMx4="; }; - vendorHash = "sha256-jwxKFgUhBilX/HxwjtHwLzmyUFrM8snM6Sq1CdY7oOY="; + vendorHash = "sha256-1iyJ56YKu/WVb7dPP7YE07kdbJte2/Sww8cQu+epFNc="; proxyVendor = true; From f3a06cef2b577358818495431a7a69813ff8d3e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:40:49 +0000 Subject: [PATCH 097/151] opensearch: 2.17.0 -> 2.17.1 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 4177c8a2e570..7a9cf1ce2efc 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-I5CI9t5jsayE58O3lGRLQ2zj5lClWldKNsPBS4tNtfs="; + hash = "sha256-9m7Vt+x4SPOBAqVL88gufSmqhvAiCcnOi7bL43XzCiU="; }; nativeBuildInputs = [ From f89d012c5006a501455f529c4f32541a7c01fbfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:45:22 +0000 Subject: [PATCH 098/151] litmusctl: 1.10.0 -> 1.11.0 --- pkgs/by-name/li/litmusctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index fdc95da3a70f..5fd5b3ad54d4 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.10.0"; + version = "1.11.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-0I07qgl/yyNAG19eAkZAXh7TkK3V1lnQTPXskF6k/L0="; + hash = "sha256-ByDtmKLdPSFGIPCdFlNr2yv3gnyfdjiuIuKcryvKwkY="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; From 8b59a0848a8a8afd0a4abdb8499a13fc8bca046d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:46:08 +0000 Subject: [PATCH 099/151] julia-mono: 0.057 -> 0.058 --- pkgs/data/fonts/julia-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 1a447908192c..132d0b87a247 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.057"; + version = "0.058"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-SSTv/cyZ+7nK0VvQPqQ+T5JXDXOZgLmv++cjHLlObb8="; + hash = "sha256-QKMTU6ISP983Kg4ZxyPV4IgiuO0ZXMiOtvZPwP7dF7k="; }; installPhase = '' From babd3fd21cf4a95ed5c07fd41f93a4d88b399359 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 05:44:40 +0000 Subject: [PATCH 100/151] python312Packages.pyais: 2.8.0 -> 2.8.1 --- pkgs/development/python-modules/pyais/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 2ed166b9a78b..7fe8e47b694f 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8="; + hash = "sha256-aIpIeDJGMfNVzeXY8GaPOYKam2HxcdHgSOhOoGmGDoc="; }; build-system = [ setuptools ]; From 138bb97c3fd11fcd89a732af87244fac6dbf0557 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:10:24 +0000 Subject: [PATCH 101/151] mountpoint-s3: 1.9.1 -> 1.10.0 --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 68533127f9ba..4fff930fc22f 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0="; + hash = "sha256-sMxggPe3m1fzfcfwsr2lUECswZ7pFSAJ8b0cURwXFmw="; fetchSubmodules = true; }; - cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E="; + cargoHash = "sha256-Gsp/AmxSobEut0jYakK0ymmSpStriAop+Abnl3GlSF4="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From 2f601a4c87611f5929feb5ec0eb13d7fd16651e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:18:34 +0000 Subject: [PATCH 102/151] home-assistant-custom-lovelace-modules.hourly-weather: 6.2.0 -> 6.4.0 --- .../custom-lovelace-modules/hourly-weather/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix index f8fa78acf18d..0595fa25ed88 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-dDWdVAVrZrZIyGG9gOyLohxRZ3DGfjbvW3gGCLqZr+A="; + hash = "sha256-Aaeo3dL7N2vRTQU6bEj+jfxUAclI+8ROAUuF0PeOdw8="; }; - npmDepsHash = "sha256-UzbMDlVOef6dO+tOeTHBBeuT578brklibbfma+VVYD8="; + npmDepsHash = "sha256-unTZvllmfEBXWgEbObJWMPpEJzgrihKKK1eMREWpbVE="; env.CYPRESS_INSTALL_BINARY = "0"; From 4004d99628ccc6e193d9e1cf1517b9b3fd0468a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:21:42 +0000 Subject: [PATCH 103/151] patch2pr: 0.28.0 -> 0.29.0 --- pkgs/by-name/pa/patch2pr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 93188ebfc558..b58f84ed1003 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-Pr2h5iezn//oyvuUoq5B49wEL1cUXOHhHjR3ylMXowQ="; + hash = "sha256-eWOzK08ZlNORaRRtDumxOhsQWNXxk48jxcanwhEOChY="; }; - vendorHash = "sha256-6w49XQNElSHpOamEZNpvvr67vYrZYXy2Sm7dWMh6OiU="; + vendorHash = "sha256-x2w1HYrJo0HqyGGlIaxKqy1XYj/akQm0ijbYuK7qg58="; ldflags = [ "-X main.version=${version}" From 0660912af86ed7142124d82c74a287aa7b4ddb4e Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Sun, 20 Oct 2024 13:01:14 +0900 Subject: [PATCH 104/151] rdkafka: use finalAttrs pattern, ensure downloaded source is from a tag --- pkgs/development/libraries/rdkafka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 0f9cf4466261..569752ceaa81 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; version = "2.5.3"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ commandodev ]; }; -} +}) From 544a89f00e33f0f57f2a52b5f5b452ecf710585c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:29:09 +0000 Subject: [PATCH 105/151] prometheus-sql-exporter: 0.5.6 -> 0.5.7 --- pkgs/servers/monitoring/prometheus/sql-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 1ebd2be3c4ba..c0dd2e133f9d 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kNIf8HwqNPGJAR8+/IkGn/5ryMEd6rGCixjnKG63xcY="; + sha256 = "sha256-9e3prTe7mHQJfSeIL+bEkW6GykvxA8ryD3GHgxk56Us="; }; vendorHash = null; From 5021f069552a4bf024076fb9dac08088b41e9502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:30:02 +0000 Subject: [PATCH 106/151] argocd: 2.12.4 -> 2.12.6 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 985c0e3bebdc..3fbe1924e956 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.12.4"; + version = "2.12.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-CxxaNm6O0wGvh1V0RmU4eA654u2ooL41EmlNX49KEE0="; + hash = "sha256-Lu0RUCSOrNNQ17CZGv/+ic3jPz4+3433JjwnjVzYzF4="; }; proxyVendor = true; # darwin/linux hash mismatch From 14cdc1dfb008996aa0b339ff5aeeb9af0331f431 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:42:20 +0000 Subject: [PATCH 107/151] eksctl: 0.191.0 -> 0.193.0 --- pkgs/by-name/ek/eksctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 4122de8675c4..646b18a5c178 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.191.0"; + version = "0.193.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-ypHBvaCvQ1FZiQmKTkQ5h024pLBOpISZooSkIDa1OeQ="; + hash = "sha256-Le/RDF4vhHmCdzuOJaIehqWYnfGH1tHAlSCjwgHXMiE="; }; vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; From 2b52772e9610b981205be77cc01b687516ce2b44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 06:49:29 +0000 Subject: [PATCH 108/151] nsc: 2.9.0 -> 2.10.0 --- pkgs/tools/system/nsc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index deefe7056929..fb9783a99806 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-pzUjcezzZ3Fo9b7nuPV08ZSxrk7cBufQL6Dbfvmjkg4="; + hash = "sha256-iobC5qhrQg/vy161atU0NqqKnvsr1CGaiXAe6Ln+Tn8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-tZTrjIax3zofrRuSJQO7VA7rlTXN/GT1KTcsLpvB+2Q="; + vendorHash = "sha256-CirTiIQD3Xvt+ly7Ll3THLwImqbyQDDIz092ihosejY="; nativeBuildInputs = [ installShellFiles ]; @@ -46,7 +46,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.9.0.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.10.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. From 9a1c9681018f9d73317661dcc4b25cfb8c1c0b2b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 15:07:44 +0800 Subject: [PATCH 109/151] maintainers: update Guanran928 --- maintainers/maintainer-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d2d0e1c0e9f..1e22fc7eab36 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8182,7 +8182,8 @@ email = "guanran928@outlook.com"; github = "Guanran928"; githubId = 68757440; - name = "Guanran928"; + name = "Guanran Wang"; + keys = [ { fingerprint = "7835 BC13 4560 0660 0448 5A2C 91F9 7D9E D126 39CF"; } ]; }; guekka = { github = "Guekka"; From d7981a51883aadd18cda092608726b47ac407e89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:14:03 +0000 Subject: [PATCH 110/151] podman-tui: 1.2.2 -> 1.2.3 --- pkgs/by-name/po/podman-tui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index c92ea01778d0..6b21ebe35345 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-ldFlW0QNjOvuJGyd2SzmMWA3ofS2ZW5krvCJRU83NXs="; + hash = "sha256-IINxDP0ajQdqbHTjeUeFqPbLTSCTl9gEhPxUWOe6zQs="; }; vendorHash = null; From 470908bd5d24fb7dd555849d24dffa6e17350738 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:14:55 +0000 Subject: [PATCH 111/151] pipet: 0.2.2 -> 0.3.0 --- pkgs/by-name/pi/pipet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix index 335b6256d969..0fe776b6837a 100644 --- a/pkgs/by-name/pi/pipet/package.nix +++ b/pkgs/by-name/pi/pipet/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pipet"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "pipet"; rev = version; - hash = "sha256-NhqrNehmL6LLLEOVT/s2PdQ7HtSCfoM4MST1IHVrJXE="; + hash = "sha256-pu+2sHdLz9TvYHBwvGTtFr/oAD+CreOR8io82YQANxc="; }; vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4="; From 458d9e29fd71efd9f0582c4a44037c13ba478cf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:14:56 +0000 Subject: [PATCH 112/151] kubedb-cli: 0.48.0 -> 0.48.1 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index f70dcee4682d..bcded90dc8a3 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.48.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; + sha256 = "sha256-jk+IUqM0/7qVKBMFntQFr52B3TJYEGrmT/DKcgfrw3Q="; }; vendorHash = null; From b2c657cae5b053e38e3b1a50b8296f5d3dca657c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:15:46 +0000 Subject: [PATCH 113/151] stackql: 0.5.742 -> 0.5.748 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index fb0b02d559cd..b670497d4a42 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.742"; + version = "0.5.748"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-GMc22n0y4lKv4DlG9069p/TrMJLyw0Zdiykuo41Tgys="; + hash = "sha256-3nt0hGBbS99WCRs3WnaB+0T/DS/uWROigYhXJw0fms8="; }; - vendorHash = "sha256-dssGqcS9l3VipEypKErlCeRs087Tb5Kx4VXvkErZar4="; + vendorHash = "sha256-oIpkhZHqg02qs68/ljuhNkw0BiIkY++du/pJRHXlPs0="; ldflags = [ "-s" From 64d3fc6e4f7333e5c3fa91bd5e19a56bbb378997 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Sat, 19 Oct 2024 20:29:37 +0200 Subject: [PATCH 114/151] waycorner: add missing updateScript --- pkgs/by-name/wa/waycorner/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix index 4ca5ca58b04c..6be599fbd96d 100644 --- a/pkgs/by-name/wa/waycorner/package.nix +++ b/pkgs/by-name/wa/waycorner/package.nix @@ -5,6 +5,7 @@ pkg-config, fetchFromGitHub, wayland, + gitUpdater, }: rustPlatform.buildRustPackage rec { pname = "waycorner"; @@ -30,6 +31,8 @@ rustPlatform.buildRustPackage rec { --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]} ''; + passthru.updateScript = gitUpdater { }; + meta = { description = "Hot corners for Wayland"; mainProgram = "waycorner"; From c3e243641cc893a1c005ebe09c00319fef20ee88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 01:18:42 +0000 Subject: [PATCH 115/151] libthreadar: 1.4.0 -> 1.5.0 --- pkgs/development/libraries/libthreadar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 8c93e414ed5d..bd6a7b1a49b5 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.5.0"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E="; + sha256 = "sha256-wJAkIUGK7Ud6n2p1275vNkSx/W7LlgKWXQaDevetPko="; }; outputs = [ "out" "dev" ]; From cc080216d3108ee0f4bc66bdc0c148407eebcd87 Mon Sep 17 00:00:00 2001 From: Saturn745 Date: Sat, 12 Oct 2024 12:05:40 -0700 Subject: [PATCH 116/151] netbird: 0.30.0 -> 0.30.2 Diff: https://github.com/netbirdio/netbird/compare/v0.30.1...0.30.2 Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.30.2 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 31214a2295a7..07a1e906dad3 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-YtKGiF45fNoiYQFTE3NReUaosRGDJOyjfqtc+tBKopI="; + hash = "sha256-8PIReuWnD7iMesSWAo6E4J+mWNAa7lHKwBWsCsXUG+E="; }; - vendorHash = "sha256-t6kqEmL2lKKYlqxaQ1OsAvB3BSmmyfogghGoE9jw+AI="; + vendorHash = "sha256-KScynPcMZ90XZy/N5X3aQfKuVl/JOCJmd8luNxChkZk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 23c4c1954152235eea57502366dab58ac6e49899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 17:29:32 +0000 Subject: [PATCH 117/151] monetdb: 11.49.11 -> 11.51.3 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 9e9b2b7f95c1..deb1f13f48c4 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.49.11"; + version = "11.51.3"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-tnGRNTx/SH7Yj8xvaFUxKr8af+7b8ZouU4PdmKEMkKk="; + hash = "sha256-ql6J4e62sL/g6s6cr2xMoxmlsLyovapaGtpcQIZ9tOU="; }; nativeBuildInputs = [ bison cmake python3 ]; From f6a6ae5cc05fe2b63c638c38a60a43659491dbae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:40:40 +0000 Subject: [PATCH 118/151] prometheus-mongodb-exporter: 0.41.1 -> 0.41.2 --- pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index 5df77a26541e..f2811a8c53e3 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-2/oYfeybXnaoccyhriCHEY5lZcojLnk9qoiSlt4TDZY="; + hash = "sha256-d2/N/NqtRglRN/3E7B5FOMpcQXP/taKFYodc6mhW7A4="; }; - vendorHash = "sha256-xKqt4JdHbFxMvFMa/zi8qGm9OZ3YFjGJQrMXfBfj4xA="; + vendorHash = "sha256-hy2w1Ix202gSJyp/EQ6uKJC8y16nw8Y78kDaP9LbU/4="; ldflags = [ "-s" From bd5d0f489dc6a16d0730020159e111c07b23ae15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:40:49 +0000 Subject: [PATCH 119/151] buildkite-cli: 3.1.0 -> 3.2.0 --- .../tools/continuous-integration/buildkite-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index f59f783231eb..d8b40e0ca30d 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fidE4MSZS53Odv5tlNPFJEhcb8JTmILVRNmcVF9Z9Oc="; + sha256 = "sha256-lmsL73jck3vt6oDP699BrMq0RyrXAUuTjKtvHcNtcZc="; }; - vendorHash = "sha256-stxsMJPBUclLlmR88c7OwAhsw9dhyBIhStuxLVu00bo="; + vendorHash = "sha256-PZHMJpyZ2w3GFHQW56m+9POyXR6wMt3TmNaQENg9lWw="; doCheck = false; From 3ca92ac2258051f7b2e8baca65aeaa1e4a9149c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Oct 2024 19:14:46 +0200 Subject: [PATCH 120/151] global-platform-pro: 20.01.23 -> 24.10.15 * Update jdk from v8 to v11 to keep it building. * There are no jreMAJOR_headless versions above MAJOR=8 and jre_minimal doesn't work[1], so switch to jre_headless (currently v21 on nixpkgs-unstable) to keep it running. The newer jre causes a big package closure size difference: 153 MiB -> 627 MiB. * Upstream changed the way `git describe` info gets built into the artifacts, so add a postPatch snippet to handle that. (Fixes `Error: inStream parameter is null` issue that happens otherwise.) Upstream asked for a suffix to the version string to differentiate from official builds; use "-nixpkgs" for that. [1] $ gp -i Error: Unable to initialize main class pro.javacard.gptool.GPTool Caused by: java.lang.NoClassDefFoundError: javax/smartcardio/CardException --- .../tools/global-platform-pro/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index b35cc4998f67..4a55908214c6 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: +{ lib, stdenv, fetchFromGitHub, jdk11, maven, makeWrapper, jre_headless, pcsclite, proot, zlib }: let defineMvnWrapper = '' @@ -14,20 +14,20 @@ let in maven.buildMavenPackage rec { pname = "global-platform-pro"; - version = "20.01.23"; - GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty + version = "24.10.15"; + GPPRO_VERSION = "v24.10.15-0-gf2af9ef"; # git describe --tags --always --long --dirty src = fetchFromGitHub { owner = "martinpaljak"; repo = "GlobalPlatformPro"; rev = "v${version}"; - sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; + sha256 = "sha256-yy2WOLDetBrbNRf6HvvPdNPD51ujXomI2a2Hj6eVx1Q="; }; - mvnJdk = jdk8; - mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; + mvnJdk = jdk11; + mvnHash = "sha256-vTlOxFBjEZRD23ldMF+VRKZx6jyZ6YvgvZM353FWrWQ="; - nativeBuildInputs = [ jdk8 makeWrapper ]; + nativeBuildInputs = [ jdk11 makeWrapper ]; # Fix build error due to missing .git directory: # Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1] @@ -37,12 +37,20 @@ maven.buildMavenPackage rec { preConfigure = defineMvnWrapper; }; + postPatch = '' + git_properties_file="./library/target/classes/pro/javacard/gp/git.properties" + mkdir -p "$(dirname "$git_properties_file")" + # Suffix to differentiate from upstream builds. + distro_suffix=-nixpkgs + echo "git.commit.id.describe=''${GPPRO_VERSION}''${distro_suffix}" > "$git_properties_file" + ''; + preConfigure = defineMvnWrapper; installPhase = '' mkdir -p "$out/lib/java" "$out/share/java" cp tool/target/gp.jar "$out/share/java" - makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ + makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \ --add-flags "-jar '$out/share/java/gp.jar'" \ --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib" ''; From bfc41e8ba30fe4513918c733f048ddf9cad1845b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 07:59:15 +0000 Subject: [PATCH 121/151] warp-terminal: 0.2024.10.15.08.02.stable_02 -> 0.2024.10.15.08.02.stable_03 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 705fb3478892..bc420f89b33c 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-5SAOjGlMD9Lt+z6NjtIbZM7ES2xw8PBudG10lD4DnVk=", - "version": "0.2024.10.15.08.02.stable_02" + "hash": "sha256-6cPn6ukGPpEdzCcENGUT5h+UPSo8rrEZEjeLEHJTG/4=", + "version": "0.2024.10.15.08.02.stable_03" }, "linux_x86_64": { - "hash": "sha256-i5YWruFxbKNC0PxeUCb3uhWpcr0ukiQFdPuJBzwLwR0=", - "version": "0.2024.10.15.08.02.stable_02" + "hash": "sha256-ftTBelAaGWxrOlpDGtEeNT9GjtS4XZdvzUsWxEnrGzs=", + "version": "0.2024.10.15.08.02.stable_03" }, "linux_aarch64": { - "hash": "sha256-hnn7DGPKi0wDtpY4HYJxgO5TbkSAZVmaPfB0S2oTJ2E=", - "version": "0.2024.10.15.08.02.stable_02" + "hash": "sha256-y7oSCc+bsRj7BSF8MiYpNJ73M5xBBTIRhotHdRPsfqk=", + "version": "0.2024.10.15.08.02.stable_03" } } From 0653083b486f897a5794d9d9cb888735b4ff4083 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 04:23:30 +0000 Subject: [PATCH 122/151] yggdrasil: 0.5.8 -> 0.5.9 --- pkgs/by-name/yg/yggdrasil/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 73df89af5295..f1f15c9d3bee 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - hash = "sha256-3sX1xNfblmIXI1hiXL9bhA4+CobUZ5xhpJFKugzwlGE="; + hash = "sha256-Xyuqvz3/3RgSY6LSXUSNX0f6SuRdmmgScW8URVOPijo="; }; - vendorHash = "sha256-HBl30BnSERivIHb3dbfhDwwBvs3MUkltDf+R790vSGE="; + vendorHash = "sha256-EO+ab4bptcDxGTx7y1rEvYJLtiTalXyyR71U6O9OkEA="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; From 04a6c3b4567e14c29dfde43c4b1a6fc213478e09 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:01:55 +0800 Subject: [PATCH 123/151] dbip-country-lite: move to by-name --- .../db/dbip-country-lite/package.nix} | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/{data/misc/dbip-country-lite/default.nix => by-name/db/dbip-country-lite/package.nix} (80%) diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/by-name/db/dbip-country-lite/package.nix similarity index 80% rename from pkgs/data/misc/dbip-country-lite/default.nix rename to pkgs/by-name/db/dbip-country-lite/package.nix index cda4a19d26c8..74f9ce977067 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -1,8 +1,8 @@ -{ lib -, stdenvNoCC -, fetchurl +{ + lib, + stdenvNoCC, + fetchurl, }: - stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; version = "2024-10"; @@ -25,11 +25,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb"; - meta = with lib; { + meta = { description = "Free IP to Country Lite database by DB-IP"; homepage = "https://db-ip.com/db/download/ip-to-country-lite"; - license = licenses.cc-by-40; - maintainers = with maintainers; [ nickcao ]; - platforms = platforms.all; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ nickcao ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68d3c47aac5e..691d4554a222 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -528,8 +528,6 @@ with pkgs; databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { }; - dbip-country-lite = callPackage ../data/misc/dbip-country-lite { }; - dcgm = callPackage ../os-specific/linux/dcgm { }; deck = callPackage ../by-name/de/deck/package.nix { From 6ed737602113d086ef3417dbcbe69d94b7c516e4 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:02:09 +0800 Subject: [PATCH 124/151] dbip-asn-lite: init at 2024-10 --- pkgs/by-name/db/dbip-asn-lite/package.nix | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/db/dbip-asn-lite/package.nix diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix new file mode 100644 index 000000000000..8d844d3972d4 --- /dev/null +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-asn-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-asn-lite.mmdb + install -Dm444 dbip-asn-lite.mmdb "$out/share/dbip/dbip-asn-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-asn-lite.mmdb"; + + meta = { + description = "Free IP to ASN Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-asn-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) From 91f8d1a84cddeb15fbe36a928e06994577c1f7a0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 20 Oct 2024 16:02:15 +0800 Subject: [PATCH 125/151] dbip-city-lite: init at 2024-10 --- pkgs/by-name/db/dbip-city-lite/package.nix | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/db/dbip-city-lite/package.nix diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix new file mode 100644 index 000000000000..b0e3e4260cbe --- /dev/null +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "dbip-city-lite"; + version = "2024-10"; + + src = fetchurl { + url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; + hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preBuild + + gzip -c -d "$src" > dbip-city-lite.mmdb + install -Dm444 dbip-city-lite.mmdb "$out/share/dbip/dbip-city-lite.mmdb" + + runHook postBuild + ''; + + passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-city-lite.mmdb"; + + meta = { + description = "Free IP to City Lite database by DB-IP"; + homepage = "https://db-ip.com/db/download/ip-to-city-lite"; + license = lib.licenses.cc-by-40; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) From ac39748d1423ff519e62c8d89e9968e23634ac50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Oct 2024 10:11:15 +0200 Subject: [PATCH 126/151] python312Packages.types-beautifulsoup4: 4.12.0.20240907 -> 4.12.0.20241020 --- .../python-modules/types-beautifulsoup4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 6bdcf999bed7..17cc87e26b01 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240907"; + version = "4.12.0.20241020"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jQI7hlMJIgcEF6HUxNkWeKsP8kObOyss/6O2KLSeurE="; + hash = "sha256-FYNw0I0M1Ei9EbEypQ/1J5I3pdS1g3vroHTeFSpRMFk="; }; build-system = [ setuptools ]; From f6aa7397ac8364e8f2bea969cfa853a2f79c44ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Oct 2024 10:12:36 +0200 Subject: [PATCH 127/151] python312Packages.pyexploitdb: 0.2.39 -> 0.2.40 Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 25e9078d5c1b..a23a0ce879e8 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.39"; + version = "0.2.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-Q7fql+IEEdfGlY8Uq3D7Y0+17Hg5oLjMn8Nq1HA2HMQ="; + hash = "sha256-3o4KnWau2Sxkj18ZoY6EsSszm0Z0Z1Gz/KWr1ZH7FTs="; }; build-system = [ setuptools ]; From 2b54f256dc69bb874429c20d91c00c192609a1c3 Mon Sep 17 00:00:00 2001 From: oli Date: Sat, 19 Oct 2024 21:14:30 +0100 Subject: [PATCH 128/151] maintainers: update olifloof --- maintainers/maintainer-list.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a1764bd8f054..561763c52299 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15910,6 +15910,12 @@ githubId = 72201; name = "Ole Jørgen Brønner"; }; + olifloof = { + email = "benmoreosm@gmail.com"; + github = "olifloof"; + githubId = 35699052; + name = "oli"; + }; oliver-koss = { email = "oliver.koss06@gmail.com"; github = "oliver-koss"; @@ -16840,12 +16846,6 @@ name = "Jelle Besseling"; keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; } ]; }; - pinkcreeper100 = { - email = "benmoreosm@gmail.com"; - github = "pinkcreeper100"; - githubId = 35699052; - name = "Oliver Samuel Morris"; - }; pinpox = { email = "mail@pablo.tools"; github = "pinpox"; From 60b972f0082d623cfacce44ef94016d558d85fbe Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 19 Oct 2024 15:34:24 +0200 Subject: [PATCH 129/151] aliases: keep the `utillinux` alias until `node2nix` is phased out The code generated by `node2nix` checks that `pkgs.utillinux` exist and uses it over `pkgs.util-linux`. Replacing the alias by a `throw`, as was done in commit a9e1f4e0abe8f8b5f6b6169323d990a0954280e4, makes packages generated using `node2nix` fail. This removes the alias removal until `node2nix` has been phased out, which is a work in progress started in https://github.com/NixOS/nixpkgs/issues/229475. --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4c0b5ec8dee..e81c4ed0645b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1674,7 +1674,7 @@ mapAliases { usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29 util-linuxCurses = util-linux; # Added 2022-04-12 - utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2024-10-17 + utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475 ### V ### From c304b7a22f52c1b397233ba0cf17ecf8eef488b6 Mon Sep 17 00:00:00 2001 From: lukts30 Date: Sat, 19 Oct 2024 16:37:59 +0200 Subject: [PATCH 130/151] virt-v2v: init at 2.6.0 --- pkgs/by-name/vi/virt-v2v/package.nix | 106 +++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 pkgs/by-name/vi/virt-v2v/package.nix diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix new file mode 100644 index 000000000000..4d6ce4e63f54 --- /dev/null +++ b/pkgs/by-name/vi/virt-v2v/package.nix @@ -0,0 +1,106 @@ +{ + stdenv, + lib, + testers, + fetchurl, + pkg-config, + makeWrapper, + autoreconfHook, + bash-completion, + OVMF, + qemu, + ocamlPackages, + perl, + cpio, + getopt, + libosinfo, + pcre2, + libxml2, + jansson, + glib, + libguestfs-with-appliance, + cdrkit, + nbdkit, + withWindowsGuestSupport ? true, + pkgsCross, # for rsrvany + virtio-win, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "virt-v2v"; + version = "2.6.0"; + + src = fetchurl { + url = "https://download.libguestfs.org/virt-v2v/${lib.versions.majorMinor finalAttrs.version}-stable/virt-v2v-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-W7t/n1QO9UebyH85abtnSY5i7kH/6h8JIAlFQoD1vkU="; + }; + + postPatch = '' + substituteInPlace common/mlv2v/uefi.ml \ + --replace-fail '/usr/share/OVMF/OVMF_CODE.fd' "${OVMF.firmware}" \ + --replace-fail '/usr/share/OVMF/OVMF_VARS.fd' "${OVMF.variables}" + + patchShebangs . + ''; + + nativeBuildInputs = + [ + pkg-config + autoreconfHook + makeWrapper + bash-completion + perl + libguestfs-with-appliance + qemu + cpio + cdrkit + getopt + ] + ++ (with ocamlPackages; [ + ocaml + findlib + ]); + + buildInputs = + [ + libosinfo + pcre2 + libxml2 + jansson + glib + ] + ++ (with ocamlPackages; [ + ocaml_libvirt + nbd + ]); + + postInstall = + '' + for bin in $out/bin/*; do + wrapProgram "$bin" \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + nbdkit + qemu + ] + }" + done + '' + + lib.optionalString withWindowsGuestSupport '' + ln -s "${virtio-win}" $out/share/virtio-win + ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools + ''; + + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + + meta = { + homepage = "https://github.com/libguestfs/virt-v2v"; + description = "Convert guests from foreign hypervisors to run on KVM"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lukts30 ]; + platforms = lib.platforms.linux; + mainProgram = "virt-v2v"; + }; +}) From e592a523114e3f2d02d61717e4cb9c514710c3db Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sun, 20 Oct 2024 21:12:09 +1100 Subject: [PATCH 131/151] Substitute reference to `elixir` --- pkgs/development/beam-modules/elixir-ls/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 8d4eba70cc00..cfda8d21a495 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -56,7 +56,8 @@ mixRelease { substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ - --replace "exec elixir" "exec ${elixir}/bin/elixir" + --replace "exec elixir" "exec ${elixir}/bin/elixir" \ + --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" runHook postInstall ''; From 3696366989265ae4a36848ca177e993c51dcd697 Mon Sep 17 00:00:00 2001 From: Jan Kremer Date: Thu, 17 Oct 2024 19:33:32 +0200 Subject: [PATCH 132/151] prettier-plugin-go-template: fix install script --- .../pr/prettier-plugin-go-template/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix index 79161f56c481..02edecce4a52 100644 --- a/pkgs/by-name/pr/prettier-plugin-go-template/package.nix +++ b/pkgs/by-name/pr/prettier-plugin-go-template/package.nix @@ -6,7 +6,7 @@ buildNpmPackage rec { pname = "prettier-plugin-go-template"; - version = "0-unstable-2023-07-26"; + version = "0.0.15-unstable-2023-07-26"; src = fetchFromGitHub { owner = "NiklasPor"; @@ -17,6 +17,15 @@ buildNpmPackage rec { npmDepsHash = "sha256-PpJnVZFRxpUHux2jIBDtyBS4qNo6IJY4kwTAq6stEVQ="; + dontNpmPrune = true; + + # Fixes error: Cannot find module 'prettier' + postInstall = '' + pushd "$nodeModulesPath" + find -mindepth 1 -maxdepth 1 -type d -print0 | grep --null-data -Exv "\./(ulid|prettier)" | xargs -0 rm -rfv + popd + ''; + meta = { description = "Fixes prettier formatting for go templates"; mainProgram = "prettier-plugin-go-template"; From 435051f990d1cbf724a8973e6d8449f686cba18f Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sun, 20 Oct 2024 21:32:10 +1100 Subject: [PATCH 133/151] Also patch `zsh` launcher --- pkgs/development/beam-modules/elixir-ls/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index cfda8d21a495..3bf8c57b7543 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -52,12 +52,14 @@ mixRelease { substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-debug-adapter - # prepare the launcher + # prepare the launchers substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ "ERL_LIBS=$out/lib:\$ERL_LIBS" \ --replace "exec elixir" "exec ${elixir}/bin/elixir" \ --replace 'echo "" | elixir' "echo \"\" | ${elixir}/bin/elixir" + substituteInPlace $out/lib/exec.zsh \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" runHook postInstall ''; From fbf1cda2adb58810ce89a3b4f941636dac31f80c Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Sat, 19 Oct 2024 14:13:42 +0200 Subject: [PATCH 134/151] meilisearch: 1.9.0 -> 1.10.2 --- pkgs/servers/search/meilisearch/Cargo.lock | 1753 ++++++++++------- pkgs/servers/search/meilisearch/default.nix | 9 +- .../search/meilisearch/time-crate.patch | 28 - 3 files changed, 1055 insertions(+), 735 deletions(-) delete mode 100644 pkgs/servers/search/meilisearch/time-crate.patch diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 51df0ea7bbb1..e6cf59d4cadf 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -36,18 +36,18 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash", + "ahash 0.8.11", "base64 0.22.1", - "bitflags 2.5.0", + "bitflags 2.6.0", "brotli", "bytes", "bytestring", @@ -55,7 +55,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.11", "httparse", "httpdate", @@ -92,7 +92,6 @@ dependencies = [ "bytestring", "cfg-if", "http 0.2.11", - "regex", "regex-lite", "serde", "tracing", @@ -100,9 +99,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "actix-macros", "futures-core", @@ -150,11 +149,11 @@ dependencies = [ "futures-core", "impl-more", "pin-project-lite", + "rustls-pki-types", "tokio", "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.3", ] [[package]] @@ -169,9 +168,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.6.0" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -183,7 +182,7 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash", + "ahash 0.8.11", "bytes", "bytestring", "cfg-if", @@ -210,26 +209,14 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "actix-web-static-files" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" -dependencies = [ - "actix-web", - "derive_more", - "futures-util", - "static-files", + "syn 2.0.60", ] [[package]] @@ -258,6 +245,17 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.8.11" @@ -265,6 +263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -273,9 +272,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -357,9 +356,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -379,6 +378,12 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "arroy" version = "0.4.0" @@ -389,7 +394,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.4", + "memmap2", "ordered-float", "rand", "rayon", @@ -408,33 +413,11 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -442,19 +425,10 @@ dependencies = [ ] [[package]] -name = "atomic" -version = "0.5.3" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -495,15 +469,9 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "benchmarks" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "bytes", @@ -546,16 +514,16 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", @@ -598,13 +566,25 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -614,6 +594,30 @@ dependencies = [ "generic-array", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", + "syn_derive", +] + [[package]] name = "brotli" version = "6.0.0" @@ -637,9 +641,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -648,7 +652,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "time", @@ -657,20 +661,43 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-unit" -version = "4.0.19" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" dependencies = [ + "rust_decimal", "serde", "utf8-width", ] +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "bytecount" version = "0.6.3" @@ -705,9 +732,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -750,16 +777,16 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00" +checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", "half 2.4.0", - "memmap2 0.9.4", + "memmap2", "num-traits", "num_cpus", "rand", @@ -768,23 +795,23 @@ dependencies = [ "safetensors", "thiserror", "yoke", - "zip", + "zip 1.1.4", ] [[package]] name = "candle-kernels" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5845911a44164ebb73b56a0e23793ba1b583bad102af7400fe4768babc5815b2" +checksum = "8bc0a71be8b2f0950b63fd602a5e10a74a4f94a5fd63059ae455e96163389488" dependencies = [ "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a27533c8edfc915a6459f9850641ef523a829fa1a181c670766c1f752d873a" +checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" dependencies = [ "candle-core", "half 2.4.0", @@ -797,13 +824,14 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5847699f0643da05e57fc473672566e93dc36d82c1b7eeb970c6154d3434fe1" +checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" dependencies = [ "byteorder", "candle-core", "candle-nn", + "fancy-regex 0.13.0", "num-traits", "rand", "rayon", @@ -838,9 +866,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.18.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" +checksum = "4895c018bb228aa6b3ba1a0285543fcb4b704734c3fb1f72afaa75aa769500c1" dependencies = [ "serde", "toml", @@ -854,12 +882,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -886,6 +915,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "change-detection" version = "1.2.0" @@ -898,20 +933,17 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.11" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a09ae38cfcc153f01576c3f579dfd916e0320f1b474f298c8d680b2dd92eb6" +checksum = "55ff52497324e7d168505a16949ae836c14595606fab94687238d2f6c8d4c798" dependencies = [ "aho-corasick", - "cow-utils", "csv", - "deunicode", "either", "fst", "irg-kvariants", "jieba-rs", "lindera", - "litemap", "once_cell", "pinyin", "serde", @@ -919,7 +951,6 @@ dependencies = [ "unicode-normalization", "wana_kana", "whatlang", - "zerovec", ] [[package]] @@ -972,9 +1003,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -982,23 +1013,23 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.17" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.60", @@ -1006,9 +1037,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "color-spantrace" @@ -1053,10 +1084,30 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-random" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1084,28 +1135,12 @@ dependencies = [ "version_check", ] -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "cow-utils" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" - [[package]] name = "cpufeatures" version = "0.2.12" @@ -1116,10 +1151,25 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.4.0" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1160,12 +1210,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam" version = "0.8.4" @@ -1181,9 +1225,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1218,9 +1262,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1261,11 +1305,12 @@ dependencies = [ [[package]] name = "cudarc" -version = "0.10.0" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" +checksum = "56ee2a3fbbd981e1c7ea73cc2af136e754eb22d17436de37155227ee4dbe0cf4" dependencies = [ "half 2.4.0", + "libloading", ] [[package]] @@ -1338,6 +1383,24 @@ dependencies = [ "syn 2.0.60", ] +[[package]] +name = "deadpool" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" + [[package]] name = "debugid" version = "0.8.0" @@ -1347,6 +1410,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + [[package]] name = "deranged" version = "0.3.11" @@ -1377,15 +1446,6 @@ dependencies = [ "derive_builder_macro 0.12.0", ] -[[package]] -name = "derive_builder" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f59169f400d8087f238c5c0c7db6a28af18681717f3b623227d92f397e938c7" -dependencies = [ - "derive_builder_macro 0.13.1", -] - [[package]] name = "derive_builder" version = "0.20.0" @@ -1407,18 +1467,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ec317cc3e7ef0928b0ca6e4a634a4d6c001672ae210438cf114a83e56b018d" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_builder_core" version = "0.20.0" @@ -1441,16 +1489,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870368c3fb35b8031abb378861d4460f573b92238ec2152c927a21f77e3e0127" -dependencies = [ - "derive_builder_core 0.13.1", - "syn 1.0.109", -] - [[package]] name = "derive_builder_macro" version = "0.20.0" @@ -1476,9 +1514,9 @@ dependencies = [ [[package]] name = "deserr" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418e814bb893a61b25a60db71dccab7cb70035d94ffe58c9b4a70387ac42083" +checksum = "bfe971a2a48625fda3198032f35de60939828c4aed47d76715c21698801b985c" dependencies = [ "actix-http", "actix-utils", @@ -1488,14 +1526,14 @@ dependencies = [ "serde-cs", "serde_json", "serde_urlencoded", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "deserr-internal" -version = "0.7.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadd9624c995ecbd6d6c81ec0804fbbb335e3acba5326a06067ccd33295a37e" +checksum = "aae89f00c97a75940185084a826c0aace055774ad57a58211625606449ea0bd8" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -1503,12 +1541,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "deunicode" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" - [[package]] name = "digest" version = "0.10.7" @@ -1562,6 +1594,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1579,15 +1622,14 @@ dependencies = [ [[package]] name = "dump" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "big_s", "flate2", - "http 0.2.11", + "http 1.1.0", "maplit", "meili-snap", - "meilisearch-auth", "meilisearch-types", "once_cell", "regex", @@ -1614,9 +1656,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1715,7 +1757,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.60", @@ -1723,18 +1765,18 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.5.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", @@ -1773,40 +1815,27 @@ dependencies = [ "regex", ] +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "faux" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b55a7f424e532314115b5cdc6d9711b15ac453bfe0dcfa212baebc5efacd60" -dependencies = [ - "faux_macros", - "paste", -] - -[[package]] -name = "faux_macros" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15473d7f83b54a44826907af16ae5727eaacaf6e53b51474016d3efd9aa35d5" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.60", - "uuid", -] +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "file-store" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "faux", "tempfile", "thiserror", "tracing", @@ -1827,7 +1856,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "nom", @@ -1837,9 +1866,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1847,7 +1876,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -1874,6 +1903,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.3.30" @@ -1965,7 +2000,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arbitrary", "clap", @@ -1987,14 +2022,15 @@ dependencies = [ [[package]] name = "fxprof-processed-profile" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +checksum = "ce20bbb48248608ba4908b45fe36e17e40f56f8c6bb385ecf5d3c4a1e8b05a22" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", + "serde_derive", "serde_json", ] @@ -2165,11 +2201,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2184,9 +2220,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grenad" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c297f45167e6d543eb728e12ff284283e4ba2182a25c6cdcec883fda3316c7e7" +checksum = "350d89047298d3b1b40050acd11ab76e487b854a104b760ebc5a7f375093de77" dependencies = [ "bytemuck", "byteorder", @@ -2213,6 +2249,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.2" @@ -2235,33 +2290,39 @@ dependencies = [ [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash", + "ahash 0.8.11", "allocator-api2", ] [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin", "stable_deref_trait", ] @@ -2272,19 +2333,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "heed" -version = "0.20.2" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60d7cff16094be9627830b399c087a25017e93fb3768b87cd656a68ccb1ebe8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "heed" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc30da4a93ff8cb98e535d595d6de42731d4719d707bc1c86f579158751a24e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "heed-traits", "heed-types", "libc", "lmdb-master-sys", "once_cell", - "page_size 0.6.0", + "page_size", "synchronoise", "url", ] @@ -2297,9 +2364,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff" [[package]] name = "heed-types" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb0d6ba3700c9a57e83c013693e3eddb68a6d9b6781cacafc62a0d992e8ddb3" +checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114" dependencies = [ "bincode", "byteorder", @@ -2326,7 +2393,7 @@ version = "0.3.2" source = "git+https://github.com/dureuill/hf-hub.git?branch=rust_tls#88d4f11cb9fa079f2912bacb96f5080b16825ce8" dependencies = [ "dirs", - "http 1.0.0", + "http 1.1.0", "indicatif", "log", "rand", @@ -2358,9 +2425,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2369,12 +2436,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 0.2.11", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body", "pin-project-lite", ] @@ -2392,40 +2471,61 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.27" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http 0.2.11", + "h2 0.4.5", + "http 1.1.0", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 0.2.11", + "http 1.1.0", "hyper", - "rustls 0.21.12", + "hyper-util", + "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2452,7 +2552,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "arroy", @@ -2460,7 +2560,7 @@ dependencies = [ "bincode", "crossbeam", "csv", - "derive_builder 0.12.0", + "derive_builder 0.20.0", "dump", "enum-iterator", "file-store", @@ -2470,7 +2570,7 @@ dependencies = [ "meili-snap", "meilisearch-auth", "meilisearch-types", - "page_size 0.5.0", + "page_size", "rayon", "roaring", "serde", @@ -2491,7 +2591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", "serde", ] @@ -2519,9 +2619,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -2530,7 +2630,6 @@ dependencies = [ "pest_derive", "serde", "similar", - "yaml-rust", ] [[package]] @@ -2542,17 +2641,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -2561,9 +2649,9 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "irg-kvariants" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78" +checksum = "ef2af7c331f2536964a32b78a7d2e0963d78b42f4a76323b16cc7d94b1ddce26" dependencies = [ "csv", "once_cell", @@ -2572,12 +2660,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.31", + "libc", "windows-sys 0.52.0", ] @@ -2608,6 +2696,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -2616,13 +2713,13 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jieba-rs" -version = "0.6.8" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e" +checksum = "c1e2b0210dc78b49337af9e49d7ae41a39dceac6e5985613f1cf7763e2f76a25" dependencies = [ "cedarwood", + "derive_builder 0.20.0", "fxhash", - "hashbrown", "lazy_static", "phf", "phf_codegen", @@ -2631,9 +2728,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2649,7 +2746,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.9.0" +version = "1.10.2" dependencies = [ "criterion", "serde_json", @@ -2657,9 +2754,9 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "9.2.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", "js-sys", @@ -2697,9 +2794,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2718,15 +2815,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2736,12 +2833,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -2752,9 +2849,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2762,9 +2859,9 @@ dependencies = [ [[package]] name = "libproc" -version = "0.14.2" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229004ebba9d1d5caf41623f1523b6d52abb47d9f6ab87f7e6fc992e3b854aef" +checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" dependencies = [ "bindgen", "errno", @@ -2785,9 +2882,9 @@ dependencies = [ [[package]] name = "lindera" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd4fa369654517f72c10b24adf03ad4ce69d19facb79c3cb3cf9b4580ac352f" +checksum = "c6cbc1aad631a7da0a7e9bc4b8669fa92ac9ca8eeb7b35a807376dd3034443ff" dependencies = [ "lindera-analyzer", "lindera-core", @@ -2798,9 +2895,9 @@ dependencies = [ [[package]] name = "lindera-analyzer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cba7fe275cb8ec4c594cfee9cc39e48b71e02a089457d52f3e70dc146a8133" +checksum = "74508ffbb24e36905d1718b261460e378a748029b07bcd7e06f0d18500b8194c" dependencies = [ "anyhow", "bincode", @@ -2827,10 +2924,23 @@ dependencies = [ ] [[package]] -name = "lindera-cc-cedict" -version = "0.31.0" +name = "lindera-assets" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240adf9faba3f09ad16557aefcd316dd00ebb940ac94334a629660d772f118c1" +checksum = "6a677c371ecb3bd02b751be306ea09876cd47cf426303ad5f10a3fd6f9a4ded6" +dependencies = [ + "encoding", + "flate2", + "lindera-core", + "tar", + "ureq", +] + +[[package]] +name = "lindera-cc-cedict" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35944000d05a177e981f037b5f0805f283b32f05a0c35713003bef136ca8cb4" dependencies = [ "bincode", "byteorder", @@ -2842,9 +2952,9 @@ dependencies = [ [[package]] name = "lindera-cc-cedict-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12241f9e74babe708a0b9441d9f3fa67cb29fd01257918f30ffd480ca568820" +checksum = "85b8f642bc9c9130682569975772a17336c6aab26d11fc0f823f3e663167ace6" dependencies = [ "anyhow", "lindera-core", @@ -2854,9 +2964,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f9f7a858d70ff9e4383cbd507ca9e98c8faf0319e08c10df4c30cb58c9ca6c" +checksum = "a7825d8d63592aa5727d67bd209170ac82df56c369533efbf0ddbac277bb68ec" dependencies = [ "anyhow", "flate2", @@ -2865,9 +2975,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f09810ab98ce2a084d788ac38fbb7b31697f34bc47c61de0d880320a674bd15" +checksum = "0c28191456debc98af6aa5f7db77872471983e9fa2a737b1c232b6ef543aed62" dependencies = [ "anyhow", "bincode", @@ -2882,9 +2992,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53400c9b2dd6b45f82d9fa5b5efe079f3acaf6ce609dba8d42c8a76baaa2b12" +checksum = "4788a1ead2f63f3fc2888109272921dedd86a87b7d0bf05e9daab46600daac51" dependencies = [ "anyhow", "flate2", @@ -2893,9 +3003,9 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2053d064a515839250438b8dfa6cf445e2b97633232ded34a54f267e945d196e" +checksum = "bdf5f91725e32b9a21b1656baa7030766c9bafc4de4b4ddeb8ffdde7224dd2f6" dependencies = [ "anyhow", "bincode", @@ -2918,9 +3028,9 @@ dependencies = [ [[package]] name = "lindera-dictionary-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f486924055f8bedcc5877572e4dc91fbc10370862430ac2e5f7f0d671a18c8" +checksum = "e41f00ba7ac541b0ffd8c30e7a73f2dd197546cc5780462ec4f2e4782945a780" dependencies = [ "anyhow", "bincode", @@ -2940,9 +3050,9 @@ dependencies = [ [[package]] name = "lindera-filter" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3904fc279f0297f6fd6210435adab1f8c82ba84eba8635407c791af51c0d8a" +checksum = "273d27e01e1377e2647314a4a5b9bdca4b52a867b319069ebae8c10191146eca" dependencies = [ "anyhow", "csv", @@ -2965,9 +3075,9 @@ dependencies = [ [[package]] name = "lindera-ipadic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa3ef2f1f6838b0fa2e2fca2896242bb83bc877c1760cdb6fa23449ab95d664" +checksum = "b97a52ff0af5acb700093badaf7078051ab9ffd9071859724445a60193995f1f" dependencies = [ "bincode", "byteorder", @@ -2979,9 +3089,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41287db18eadb58d73a04d49778d41c161549fbbbe155d4338976b7b8541c7d" +checksum = "bf5031c52686128db13f774b2c5a8abfd52b4cc1f904041d8411aa19d630ce4d" dependencies = [ "anyhow", "lindera-core", @@ -2991,9 +3101,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49382256f245078400bf7e72663f9eb30afcd9ed54cd46f29d7db1be529678e1" +checksum = "d6b36764b27b169aa11d24888141f206a6c246a5b195c1e67127485bac512fb6" dependencies = [ "bincode", "byteorder", @@ -3005,9 +3115,9 @@ dependencies = [ [[package]] name = "lindera-ipadic-neologd-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9cfd2fda68ef526ef0c7b50c5d4d5582a4daa6ecd0cea9e2b0b62564a2a5d" +checksum = "abf36e40ace904741efdd883ed5c4dba6425f65156a0fb5d3f73a386335950dc" dependencies = [ "anyhow", "lindera-core", @@ -3017,27 +3127,24 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f86d03a863f3ae1d269e7b7d4dd2cce9385a53463479bafc5d7aa48719f36db" +checksum = "4c92a1a3564b531953f0238cbcea392f2905f7b27b449978cf9e702a80e1086d" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-ko-dic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-ko-dic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0f44f2e56358c5879dfb5e7f76cc6ba7853ec31082c4e3f8fb65fb2d849c51" +checksum = "9f2c60425abc1548570c2568858f74a1f042105ecd89faa39c651b4315350fd9" dependencies = [ "anyhow", "lindera-core", @@ -3047,9 +3154,9 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5182735cdc2832ac757b31e8a5b150a3514357a30efe3dec212f8dcb06ba14" +checksum = "903e558981bcb6f59870aa7d6b4bcb09e8f7db778886a6a70f67fd74c9fa2ca3" dependencies = [ "bincode", "lindera-core", @@ -3061,27 +3168,24 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c63da104728dd1cf14bfa564753cbfa996f6078ed2e23e31475bd1d639fc597" +checksum = "d227c3ce9cbd905f865c46c65a0470fd04e89b71104d7f92baa71a212ffe1d4b" dependencies = [ "bincode", "byteorder", - "encoding", - "flate2", + "lindera-assets", "lindera-core", "lindera-decompress", "lindera-unidic-builder", "once_cell", - "tar", - "ureq", ] [[package]] name = "lindera-unidic-builder" -version = "0.31.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04acecbc068dac21766a1b7ed1f2608b6f250d10b4f8bff67abc2a00437a0974" +checksum = "99e2c50015c242e02c451acb6748667ac6fd1d3d667cd7db48cd89e2f2d2377e" dependencies = [ "anyhow", "lindera-core", @@ -3095,12 +3199,6 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.4.12" @@ -3109,9 +3207,9 @@ checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "liquid" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f68ae1011499ae2ef879f631891f21c78e309755f4a5e483c4a8f12e10b609" +checksum = "10929f201279ba14da3297b957dcda1e0bf7a6f3bb5115688be684aa8864e9cc" dependencies = [ "doc-comment", "liquid-core", @@ -3122,12 +3220,12 @@ dependencies = [ [[package]] name = "liquid-core" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e0724dfcaad5cfb7965ea0f178ca0870b8d7315178f4a7179f5696f7f04d5f" +checksum = "3aef4b2160791f456eb880c990a97746f693746f92302ef5f1d06111cf14b768" dependencies = [ "anymap2", - "itertools 0.10.5", + "itertools 0.12.1", "kstring", "liquid-derive", "num-traits", @@ -3140,9 +3238,9 @@ dependencies = [ [[package]] name = "liquid-derive" -version = "0.26.4" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" +checksum = "915f6d0a2963a27cd5205c1902f32ddfe3bc035816afd268cf88c0fc0f8d287e" dependencies = [ "proc-macro2", "quote", @@ -3151,11 +3249,11 @@ dependencies = [ [[package]] name = "liquid-lib" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a17e273a6fb1fb6268f7a5867ddfd0bd4683c7e19b51084f3d567fad4348c0" +checksum = "73f48fc446873f74d869582f5c4b8cbf3248c93395e410a67af5809b3731e44a" dependencies = [ - "itertools 0.10.5", + "itertools 0.12.1", "liquid-core", "once_cell", "percent-encoding", @@ -3164,17 +3262,11 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "litemap" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" - [[package]] name = "lmdb-master-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5142795c220effa4c8f4813537bd4c88113a07e45e93100ccb2adc5cec6c7f3" +checksum = "57640c190703d5ccf4a86aff4aeb749b2d287a8cb1723c76b51f39d77ab53b24" dependencies = [ "cc", "doxygen-rs", @@ -3209,12 +3301,28 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc", +] + [[package]] name = "macro_rules_attribute" version = "0.2.0" @@ -3257,7 +3365,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.9.0" +version = "1.10.2" dependencies = [ "insta", "md5", @@ -3266,17 +3374,14 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-cors", "actix-http", "actix-rt", "actix-utils", "actix-web", - "actix-web-static-files", "anyhow", - "assert-json-diff", - "async-stream", "async-trait", "brotli", "bstr", @@ -3295,12 +3400,11 @@ dependencies = [ "futures", "futures-util", "hex", - "http 0.2.11", "index-scheduler", "indexmap", "insta", "is-terminal", - "itertools 0.11.0", + "itertools 0.13.0", "jsonwebtoken", "lazy_static", "manifest-dir-macros", @@ -3323,15 +3427,17 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.21.12", + "roaring", + "rustls", "rustls-pemfile", + "rustls-pki-types", "segment", "serde", "serde_json", "serde_urlencoded", "sha-1", "sha2", - "siphasher 1.0.0", + "siphasher 1.0.1", "slice-group-by", "static-files", "sysinfo", @@ -3342,7 +3448,6 @@ dependencies = [ "thiserror", "time", "tokio", - "tokio-stream", "toml", "tracing", "tracing-actix-web", @@ -3351,16 +3456,16 @@ dependencies = [ "url", "urlencoding", "uuid", - "walkdir", + "wiremock", "yaup", - "zip", + "zip 2.1.3", ] [[package]] name = "meilisearch-auth" -version = "1.9.0" +version = "1.10.2" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "enum-iterator", "hmac", "maplit", @@ -3377,7 +3482,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.9.0" +version = "1.10.2" dependencies = [ "actix-web", "anyhow", @@ -3391,7 +3496,7 @@ dependencies = [ "fst", "insta", "meili-snap", - "memmap2 0.7.1", + "memmap2", "milli", "roaring", "serde", @@ -3407,7 +3512,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "clap", @@ -3421,18 +3526,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memmap2" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" -dependencies = [ - "libc", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3446,7 +3542,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.9.0" +version = "1.10.2" dependencies = [ "arroy", "big_s", @@ -3474,21 +3570,23 @@ dependencies = [ "hf-hub", "indexmap", "insta", - "itertools 0.11.0", + "itertools 0.13.0", "json-depth-checker", "levenshtein_automata", "liquid", "maplit", "md5", "meili-snap", - "memmap2 0.7.1", + "memchr", + "memmap2", "mimalloc", "obkv", "once_cell", "ordered-float", "rand", - "rand_pcg", "rayon", + "rayon-par-bridge", + "rhai", "roaring", "rstar", "serde", @@ -3510,9 +3608,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -3684,6 +3782,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "num_threads" version = "0.1.7" @@ -3710,9 +3829,9 @@ dependencies = [ [[package]] name = "obkv" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c459142426056c639ff88d053ebaaaeca0ee1411c94362892398ef4ccd81080" +checksum = "a2e27bcfe835a379d32352112f6b8dbae2d99d16a5fff42abe6e5ba5386c1e5a" [[package]] name = "once_cell" @@ -3756,9 +3875,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" dependencies = [ "num-traits", ] @@ -3775,16 +3894,6 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -[[package]] -name = "page_size" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b7663cbd190cfd818d08efa8497f6cd383076688c49a391ef7c0d03cd12b561" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "page_size" version = "0.6.0" @@ -3797,9 +3906,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3818,17 +3927,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "paste" version = "1.0.14" @@ -3852,22 +3950,14 @@ checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.3" @@ -3886,7 +3976,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.9.0" +version = "1.10.2" dependencies = [ "big_s", "serde_json", @@ -4010,9 +4100,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4087,6 +4177,15 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.0", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4122,22 +4221,32 @@ dependencies = [ [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.6.0", "hex", "lazy_static", - "rustix 0.36.16", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.6.0", + "hex", ] [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -4156,6 +4265,26 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "pulp" version = "0.18.9" @@ -4168,6 +4297,53 @@ dependencies = [ "reborrow", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.5", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -4177,6 +4353,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" @@ -4217,16 +4399,6 @@ dependencies = [ "rand", ] -[[package]] -name = "rand_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core", - "serde", -] - [[package]] name = "raw-cpuid" version = "10.7.0" @@ -4267,6 +4439,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rayon-par-bridge" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6a14d8f65834aca6b0fe4cbbd7a27e639cd3efb1f2a32de9942368f1991de8" +dependencies = [ + "rayon", +] + [[package]] name = "reborrow" version = "0.5.5" @@ -4304,9 +4485,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -4327,9 +4508,9 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" @@ -4338,21 +4519,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "reqwest" -version = "0.11.23" +name = "rend" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ - "base64 0.21.7", + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.11", + "http 1.1.0", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4360,12 +4551,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", + "quinn", + "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-util", @@ -4375,10 +4568,39 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots", "winreg", ] +[[package]] +name = "rhai" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61797318be89b1a268a018a92a7657096d83f3ecb31418b9e9c16dcbb043b702" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "instant", + "num-traits", + "once_cell", + "rhai_codegen", + "serde", + "smallvec", + "smartstring", + "thin-vec", +] + +[[package]] +name = "rhai_codegen" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "ring" version = "0.17.8" @@ -4395,10 +4617,39 @@ dependencies = [ ] [[package]] -name = "roaring" -version = "0.10.5" +name = "rkyv" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "roaring" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" dependencies = [ "bytemuck", "byteorder", @@ -4407,9 +4658,9 @@ dependencies = [ [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" dependencies = [ "heapless", "num-traits", @@ -4417,6 +4668,22 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -4438,89 +4705,55 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.36.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - [[package]] name = "rustix" version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki", "subtle", "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -4529,9 +4762,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" @@ -4565,20 +4798,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "segment" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" +checksum = "5bdca318192c89bb31bffa2ef8e9e9898bc80f15a78db2fdd41cd051f1b41d01" dependencies = [ "async-trait", "reqwest", @@ -4605,9 +4834,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -4623,9 +4852,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4634,9 +4863,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap", "itoa", @@ -4655,9 +4884,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4731,6 +4960,18 @@ dependencies = [ "libc", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + [[package]] name = "similar" version = "2.2.1" @@ -4757,9 +4998,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "siphasher" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -4788,9 +5029,12 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -4799,6 +5043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ "autocfg", + "serde", "static_assertions", "version_check", ] @@ -4839,9 +5084,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spm_precompiled" @@ -4863,9 +5105,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "static-files" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" +checksum = "4e8590e848e1c53be9258210bcd4a8f4118e08988f03a4e2d63b62e4ad9f7ced" dependencies = [ "change-detection", "mime_guess", @@ -4905,7 +5147,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4940,6 +5182,24 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synchronoise" version = "1.0.1" @@ -4966,7 +5226,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "enum-as-inner", "libc", @@ -4976,9 +5236,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.5" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4990,31 +5250,16 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -5038,7 +5283,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.31", + "rustix", "windows-sys 0.52.0", ] @@ -5051,6 +5296,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" +dependencies = [ + "serde", +] + [[package]] name = "thiserror" version = "1.0.61" @@ -5083,14 +5337,14 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" dependencies = [ "anyhow", "base64 0.21.7", "bstr", - "fancy-regex", + "fancy-regex 0.12.0", "lazy_static", "parking_lot", "rustc-hash", @@ -5129,6 +5383,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -5186,9 +5449,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5205,9 +5468,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -5216,56 +5479,45 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", + "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.15", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -5275,14 +5527,46 @@ name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5419,9 +5703,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unescaper" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" +checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" dependencies = [ "thiserror", ] @@ -5497,29 +5781,28 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.4", + "rustls", "rustls-pki-types", - "rustls-webpki 0.102.2", "serde", "serde_json", "socks", "url", - "webpki-roots 0.26.1", + "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5547,11 +5830,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "atomic", "getrandom", "serde", ] @@ -5570,25 +5852,24 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "9.0.0-beta.2" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107dc53b443fe8cc380798abb75ad6b7038281165109afea1f1b28bb47047ed5" +checksum = "c32e7318e93a9ac53693b6caccfb05ff22e04a44c7cf8a279051f24c09da286f" dependencies = [ "anyhow", - "derive_builder 0.13.1", - "getset", + "derive_builder 0.20.0", "rustversion", "vergen-lib", ] [[package]] name = "vergen-git2" -version = "1.0.0-beta.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8875c5d71074bb67118774e3d795ab6fe77c3ae3161cb54e19104cabc49487f1" +checksum = "a62c52cd2b2b8b7ec75fc20111b3022ac3ff83e4fc14b9497cfcfd39c54f9c67" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "git2", "rustversion", "time", @@ -5598,12 +5879,12 @@ dependencies = [ [[package]] name = "vergen-lib" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ebfba72ba904559f25f41ea1512335b5a46459084258cea0857549d9645187" +checksum = "e06bee42361e43b60f363bad49d63798d0f42fb1768091812270eca00c784720" dependencies = [ "anyhow", - "derive_builder 0.13.1", + "derive_builder 0.20.0", "getset", "rustversion", ] @@ -5718,9 +5999,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5739,12 +6020,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - [[package]] name = "webpki-roots" version = "0.26.1" @@ -5760,7 +6035,7 @@ version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown", + "hashbrown 0.14.3", "once_cell", ] @@ -6022,27 +6297,71 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "xattr" -version = "1.0.1" +name = "wiremock" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.7", + "deadpool", + "futures", + "http 1.1.0", + "http-body-util", + "hyper", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xtask" -version = "1.9.0" +version = "1.10.2" dependencies = [ "anyhow", "build-info", @@ -6069,23 +6388,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yaup" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a59e7d27bed43f7c37c25df5192ea9d435a8092a902e02203359ac9ce3e429d9" +checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ + "form_urlencoded", "serde", - "url", + "thiserror", ] [[package]] @@ -6155,55 +6466,97 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] [[package]] -name = "zerovec" -version = "0.10.1" +name = "zeroize_derive" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "zerofrom", + "proc-macro2", + "quote", + "syn 2.0.60", ] [[package]] name = "zip" -version = "0.6.6" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zip" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", + "zeroize", + "zopfli", "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ - "libc", "zstd-sys", ] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index a58af212b20a..9d83354b6d32 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.9.0"; + version = "1.10.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,14 +20,9 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "meiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-fPXhayS8OKiiiDvVvBry3njZ74/W6oVL0p85Z5qf3KA=="; + hash = "sha256-gI0Azbb4gYFf4E/oIoJbln/mkbJIenSPzGUVliGzOzE="; }; - cargoPatches = [ - # fix build with Rust 1.80 - ./time-crate.patch - ]; - cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = { diff --git a/pkgs/servers/search/meilisearch/time-crate.patch b/pkgs/servers/search/meilisearch/time-crate.patch deleted file mode 100644 index b0b81f65026d..000000000000 --- a/pkgs/servers/search/meilisearch/time-crate.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3c728f348..51df0ea7b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -5098,9 +5098,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -5121,9 +5121,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", From e00474e398d2173c3e519e36cf920652e7f16142 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 20 Oct 2024 21:10:35 +1000 Subject: [PATCH 135/151] virt-what: 1.26 -> 1.27 (#348760) --- pkgs/applications/virtualization/virt-what/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index 3d553acd48ff..05c5268b087e 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-qoap0xO1yQSK+a2aA4fkr/I4uw6kLzuDARTotQzTFTU="; + sha256 = "sha256-1Nm9nUrlkJVZdEP6xmNJUxXH60MwuHKqXwYt84rGm/E="; }; meta = with lib; { From 3af7e9a4c4f5f94fd05173214388de3bd63a1596 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Sat, 19 Oct 2024 14:26:46 +0200 Subject: [PATCH 136/151] meilisearch: add bbenno as maintainer --- pkgs/servers/search/meilisearch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9d83354b6d32..a7e8c7f8cbc0 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -59,7 +59,10 @@ rustPlatform.buildRustPackage { homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ happysalada ]; + maintainers = with lib.maintainers; [ + happysalada + bbenno + ]; platforms = [ "aarch64-linux" "aarch64-darwin" From 6066650cb46fd24368506d558b354040a3ad3042 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Thu, 18 Jul 2024 15:12:58 +0300 Subject: [PATCH 137/151] dut: init at 0-unstable-2024-07-31 --- pkgs/by-name/du/dut/package.nix | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/du/dut/package.nix diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix new file mode 100644 index 000000000000..9557adfbe5a5 --- /dev/null +++ b/pkgs/by-name/du/dut/package.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + fetchFromGitea, +}: + +stdenv.mkDerivation { + pname = "dut"; + version = "0-unstable-2024-07-31"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "201984"; + repo = "dut"; + rev = "041c6f26162c2286776fac246ddbda312da1563d"; + hash = "sha256-YrBV5rG9rASI/5pwG3kcHoOvXBHhLJHvFFrvNhmGq2Y="; + }; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = { + platforms = lib.platforms.all; + broken = stdenv.isDarwin; + description = "A disk usage calculator for Linux"; + homepage = "https://codeberg.org/201984/dut"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ errnoh ]; + mainProgram = "dut"; + }; +} From 9193757c8e491d87a67c27b6c7ca1617737c2555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 11:27:04 +0000 Subject: [PATCH 138/151] motoc: 0.3.1 -> 0.3.3 --- pkgs/by-name/mo/motoc/Cargo.lock | 2 +- pkgs/by-name/mo/motoc/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/motoc/Cargo.lock b/pkgs/by-name/mo/motoc/Cargo.lock index e6b1027f6726..a5badfc41f7d 100644 --- a/pkgs/by-name/mo/motoc/Cargo.lock +++ b/pkgs/by-name/mo/motoc/Cargo.lock @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "motoc" -version = "0.3.1" +version = "0.3.3" dependencies = [ "anyhow", "bindgen 0.70.1", diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix index 23b0b6b135a4..d33e2c60670a 100644 --- a/pkgs/by-name/mo/motoc/package.nix +++ b/pkgs/by-name/mo/motoc/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "motoc"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "galister"; repo = "motoc"; rev = "refs/tags/v${version}"; - hash = "sha256-119RWsAM5kKjsxA6wGdjhB99G31QaYlZBRaFCg5TtmI="; + hash = "sha256-AmHTnCUTHoeLsOJrD35BooU9mZr5ctoCJmjW5CaTYBY="; }; cargoLock = { From d455bca0cd8321a619d0c3a3bb2b9ef3484d1921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Thu, 3 Oct 2024 18:17:02 +0200 Subject: [PATCH 139/151] taterclient-ddnet: init at 8.6.0 --- pkgs/by-name/ta/taterclient-ddnet/package.nix | 136 ++++++++++++++++++ pkgs/games/ddnet/default.nix | 5 + 2 files changed, 141 insertions(+) create mode 100644 pkgs/by-name/ta/taterclient-ddnet/package.nix diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix new file mode 100644 index 000000000000..95799e7b64fb --- /dev/null +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -0,0 +1,136 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + cmake, + ninja, + pkg-config, + rustPlatform, + rustc, + curl, + freetype, + libGLU, + libnotify, + libogg, + libX11, + opusfile, + pcre, + python3, + SDL2, + sqlite, + wavpack, + ffmpeg, + x264, + vulkan-headers, + vulkan-loader, + glslang, + spirv-tools, + gtest, + darwin, +}: +let + clientExecutable = "TaterClient-DDNet"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "taterclient-ddnet"; + version = "8.6.0"; + + src = fetchFromGitHub { + owner = "sjrc6"; + repo = "taterclient-ddnet"; + rev = finalAttrs.version; + hash = "sha256-IfTQRMC2wcEH+KhlADHVIhfavlTN4mfTtlN5+/KojA0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname src version; + hash = "sha256-L6NsLC5hg4/MlTfnOITBNoPIoKxlDx5BwXWnV7W4uT0="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustc + cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ gtest ]; + + buildInputs = + [ + curl + libnotify + pcre + python3 + sqlite + freetype + libGLU + libogg + opusfile + SDL2 + wavpack + ffmpeg + x264 + vulkan-loader + vulkan-headers + glslang + spirv-tools + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Carbon + Cocoa + OpenGL + Security + ] + ); + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace-fail /usr/ $out/ + ''; + + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + "-DCLIENT=ON" + "-DSERVER=OFF" + "-DTOOLS=OFF" + "-DCLIENT_EXECUTABLE=${clientExecutable}" + ]; + + # Tests loop forever on Darwin for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + checkTarget = "run_tests"; + + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Upstream links against /lib while it installs this library in /lib/ddnet + install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/${clientExecutable}" + ''; + + postInstall = '' + # Desktop application conflicts with the ddnet package + mv "$out/share/applications/ddnet.desktop" "$out/share/applications/taterclient-ddnet.desktop" + + substituteInPlace $out/share/applications/taterclient-ddnet.desktop \ + --replace-fail "Exec=DDNet" "Exec=${clientExecutable}" \ + --replace-fail "Name=DDNet" "Name=TaterClient (DDNet)" \ + --replace-fail "Comment=Launch DDNet" "Comment=Launch ${clientExecutable}" + ''; + + meta = { + description = "Modification of DDNet teeworlds client"; + homepage = "https://github.com/sjrc6/taterclient-ddnet"; + changelog = "https://github.com/sjrc6/taterclient-ddnet/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + melon + theobori + ]; + mainProgram = clientExecutable; + }; +}) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index baeabd63ebe4..6cd0c0c2f88b 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -122,6 +122,11 @@ stdenv.mkDerivation rec { rm -rf $out/share/metainfo ''; + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Upstream links against /lib while it installs this library in /lib/ddnet + install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet" + ''; + meta = with lib; { description = "Teeworlds modification with a unique cooperative gameplay"; longDescription = '' From 3c1d64dade2ab7469b96c429d256ce264aba444a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 12:37:15 +0000 Subject: [PATCH 140/151] python312Packages.pypoint: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/pypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix index d7062da6c80b..c144811f9a03 100644 --- a/pkgs/development/python-modules/pypoint/default.nix +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pypoint"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "fredrike"; repo = "pypoint"; - rev = "v${version}"; - hash = "sha256-Ri+vf/vnjQQ+9eZ1Gzt+v68FAxVGt0IY9S3SpeVem3A="; + rev = "refs/tags/v${version}"; + hash = "sha256-9z9VcY42uHIksIvDU1Vz+kvXNmrCu08fGB/waQahmyg="; }; build-system = [ setuptools ]; From ec6950e63a7400ff86847d9a2cb2a33a0b34325e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 27 Sep 2024 11:40:39 +0200 Subject: [PATCH 141/151] tcl-9_0: init --- pkgs/development/interpreters/tcl/9.0.nix | 16 ++++++++++++ pkgs/development/interpreters/tcl/generic.nix | 26 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/tcl/9.0.nix diff --git a/pkgs/development/interpreters/tcl/9.0.nix b/pkgs/development/interpreters/tcl/9.0.nix new file mode 100644 index 000000000000..48a9570675a1 --- /dev/null +++ b/pkgs/development/interpreters/tcl/9.0.nix @@ -0,0 +1,16 @@ +{ callPackage, fetchzip, ... }@args: + +callPackage ./generic.nix ( + args + // rec { + release = "9.0"; + version = "${release}.0"; + + # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated! + + src = fetchzip { + url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; + sha256 = "sha256-QaPSY6kfxyc3x+2ptzEmN2puZ0gSFSeeNjPuxsVKXYE="; + }; + } +) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 5df6fb28a304..7746034c357d 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, makeSetupHook, runCommand -, tzdata +, tzdata, zip, zlib # Version specific stuff , release, version, src @@ -24,17 +24,39 @@ let --replace "/usr/local/etc/zoneinfo" "" ''; + nativeBuildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + + buildInputs = lib.optionals (lib.versionAtLeast version "9.0") [ + zlib + ]; + preConfigure = '' cd unix ''; - configureFlags = [ + # Note: pre-9.0 flags are temporarily interspersed to avoid a mass rebuild. + configureFlags = lib.optionals (lib.versionOlder version "9.0") [ "--enable-threads" + ] ++ [ # Note: using $out instead of $man to prevent a runtime dependency on $man. "--mandir=${placeholder "out"}/share/man" + ] ++ lib.optionals (lib.versionOlder version "9.0") [ "--enable-man-symlinks" # Don't install tzdata because NixOS already has a more up-to-date copy. "--with-tzdata=no" + ] ++ lib.optionals (lib.versionAtLeast version "9.0") [ + # By default, tcl libraries get zipped and embedded into libtcl*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs" + ] ++ [ "tcl_cv_strtod_unbroken=ok" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4e0b8b7236..26bab338401a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16619,6 +16619,7 @@ with pkgs; tcl = tcl-8_6; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { }; tclreadline = callPackage ../development/interpreters/tclreadline { }; From 291d0cdc27a226c72a1903b9e6482b4767f27361 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 27 Sep 2024 11:41:39 +0200 Subject: [PATCH 142/151] tk-9_0: init --- pkgs/development/libraries/tk/9.0.nix | 23 +++++++++++++++++++++ pkgs/development/libraries/tk/generic.nix | 25 ++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/tk/9.0.nix diff --git a/pkgs/development/libraries/tk/9.0.nix b/pkgs/development/libraries/tk/9.0.nix new file mode 100644 index 000000000000..ff99ca8b4f63 --- /dev/null +++ b/pkgs/development/libraries/tk/9.0.nix @@ -0,0 +1,23 @@ +{ + callPackage, + fetchzip, + tcl, + ... +}@args: + +callPackage ./generic.nix ( + args + // { + + src = fetchzip { + url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; + sha256 = "sha256-jQ9kZuFx6ikQ+SpY7kSbvXJ5hjw4WB9VgRaNlQLtG0s="; + }; + + patches = [ + # https://core.tcl-lang.org/tk/tktview/765642ffffffffffffff + ./tk-8_6_13-find-library.patch + ]; + + } +) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 8094ed169fa3..7a4b0a76d3b4 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, src, pkg-config, tcl, libXft, patches ? [] +{ stdenv, lib, src, pkg-config, tcl, libXft, zip, zlib, patches ? [] , enableAqua ? stdenv.hostPlatform.isDarwin, darwin , ... }: @@ -39,9 +39,26 @@ tcl.mkTclDerivation { configureFlags = [ "--enable-threads" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit" - ++ lib.optional enableAqua "--enable-aqua"; + ++ lib.optional enableAqua "--enable-aqua" + ++ lib.optional (lib.versionAtLeast tcl.version "9.0") + # By default, tk libraries get zipped and embedded into libtcl9tk*.so, + # which gets `zipfs mount`ed at runtime. This is fragile (for example + # stripping the .so removes the zip trailer), so we install them as + # traditional files. + # This might make tcl slower to start from slower storage on cold cache, + # however according to my benchmarks on fast storage and warm cache + # tcl built with --disable-zipfs actually starts in half the time. + "--disable-zipfs"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + # Only used to detect the presence of zlib. Could be replaced with a stub. + zip + ]; + buildInputs = lib.optionals (lib.versionAtLeast tcl.version "9.0") [ + zlib + ]; propagatedBuildInputs = [ libXft @@ -69,5 +86,7 @@ tcl.mkTclDerivation { license = licenses.tcltk; platforms = platforms.all; maintainers = [ ]; + broken = stdenv.hostPlatform.isDarwin + && lib.elem (lib.versions.majorMinor tcl.version) ["8.5" "9.0"]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26bab338401a..26cb83569c11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23277,6 +23277,7 @@ with pkgs; tk = tk-8_6; + tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; }; tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { }; tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; }; From 52942d8d48ebbc3d1bc5bb7a3bcceec34ae8dd6d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 5 Oct 2024 16:59:04 +0800 Subject: [PATCH 143/151] hashes: init at 1.1.0 --- pkgs/by-name/ha/hashes/package.nix | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/ha/hashes/package.nix diff --git a/pkgs/by-name/ha/hashes/package.nix b/pkgs/by-name/ha/hashes/package.nix new file mode 100644 index 000000000000..a1937d82f5b7 --- /dev/null +++ b/pkgs/by-name/ha/hashes/package.nix @@ -0,0 +1,73 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + adwaita-icon-theme, + gtk4, + libadwaita, + desktop-file-utils, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + cmake, + python3Packages, + appstream, + fetchPypi, + gobject-introspection, + glib, +}: + +python3Packages.buildPythonApplication rec { + pname = "hashes"; + version = "1.1.0"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "zefr0x"; + repo = "hashes"; + rev = "refs/tags/v${version}"; + hash = "sha256-BmfSCHs+JcpsAG8AhaYf+SDFI+LdJKMKgBIodd66qmw="; + }; + + nativeBuildInputs = [ + meson + ninja + desktop-file-utils + cmake + pkg-config + appstream + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + libadwaita + glib + adwaita-icon-theme + ]; + + dependencies = with python3Packages; [ + name-that-hash + pygobject3 + ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/zefr0x/hashes/tree/main"; + changelog = "https://github.com/zefr0x/hashes/releases/tag/v${version}"; + description = "Simple hash algorithm identification GUI"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Plus; + mainProgram = "hashes"; + platforms = lib.platforms.unix; + }; +} From 35c38039443a6f02b9effd35ef9db3f69bc43bc7 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 23 Aug 2024 18:15:21 +0200 Subject: [PATCH 144/151] sscep: init at 0.10.0 --- pkgs/by-name/ss/sscep/package.nix | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ss/sscep/package.nix diff --git a/pkgs/by-name/ss/sscep/package.nix b/pkgs/by-name/ss/sscep/package.nix new file mode 100644 index 000000000000..52e97fe18f7e --- /dev/null +++ b/pkgs/by-name/ss/sscep/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + openssl, + autoreconfHook, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sscep"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "certnanny"; + repo = "sscep"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wlxQONOCLPuNdI6AyMJoLP09cs+ak7Jv9idhXTT5RWA="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Client-only implementation of the SCEP (Cisco System's Simple Certificate Enrollment Protocol)"; + homepage = "https://github.com/certnanny/sscep"; + maintainers = [ lib.maintainers.stv0g ]; + license = [ + lib.licenses.bsd2 + lib.licenses.openssl + ]; + platforms = lib.platforms.all; + }; +}) From ed8c856ebfc87f211e60c1699e091c39540e93b1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:30:58 +0300 Subject: [PATCH 145/151] kdePackages.plasma-workspace: fix substituteAll usage --- pkgs/kde/plasma/plasma-workspace/default.nix | 4 ++-- pkgs/kde/plasma/plasma-workspace/dependency-paths.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 2dd596efffa5..6225f7c3b77c 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -24,8 +24,8 @@ mkKdeDerivation { patches = [ (substituteAll { src = ./dependency-paths.patch; - dbus-send = lib.getExe' dbus "dbus-send"; - fc-match = lib.getExe' fontconfig "fc-match"; + dbusSend = lib.getExe' dbus "dbus-send"; + fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; xmessage = lib.getExe xorg.xmessage; diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index d84e6dda7278..561655dde280 100644 --- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -46,7 +46,7 @@ index f5034455c9..8ea57813a1 100644 connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); - m_proc->start(u"fc-match"_s, args); -+ m_proc->start(u"@fc-match@"_s, args); ++ m_proc->start(u"@fcMatch@"_s, args); } void CFcQuery::procExited() @@ -143,5 +143,5 @@ index 1e903130a9..1d807a8526 100644 [Service] Type=oneshot -ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready -+ExecStart=@dbus-send@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready ++ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready Slice=session.slice From 8a9b8cd39e28342b0f051ec139f96b3ab2df7233 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:45:02 +0300 Subject: [PATCH 146/151] isc-cron: fix substituteAll usage --- pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff | 4 ++-- pkgs/by-name/is/isc-cron/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff b/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff index 0bf0a9bd6177..9bf9f89ddee2 100644 --- a/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff +++ b/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff @@ -35,10 +35,10 @@ diff -Naur cron-old/pathnames.h cron-new/pathnames.h +#define _PATH_SENDMAIL "@sendmailPath@" + +#undef _PATH_VI -+#define _PATH_VI "@VIPATH@" ++#define _PATH_VI "@viPath@" + +#undef _PATH_DEFPATH -+#define _PATH_DEFPATH "@DEFPATH@" ++#define _PATH_DEFPATH "@defPath@" + +/* Nixpkgs-specific patch end */ + diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index b52086fca473..61633c6c9c88 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { (substituteAll { src = ./0000-nixpkgs-specific.diff; inherit sendmailPath; - VIPATH = lib.getExe' vim "vim"; - DEFPATH = lib.concatStringsSep ":" [ + viPath = lib.getExe' vim "vim"; + defPath = lib.concatStringsSep ":" [ "/run/wrappers/bin" "/nix/var/nix/profiles/default/bin" "/run/current-system/sw/bin" From 359cf4b159beb299ad6663bd1c44a3e866e9713d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:51:21 +0300 Subject: [PATCH 147/151] luaformatter: fix substituteAll usage --- pkgs/by-name/lu/luaformatter/fix-lib-paths.patch | 2 +- pkgs/by-name/lu/luaformatter/package.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch b/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch index 610a313ca27c..c2931c17628c 100644 --- a/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch +++ b/pkgs/by-name/lu/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + @libargs@/include + @catch2@/include -+ @yaml-cpp@/include ++ @yamlCpp@/include + @antlr4RuntimeCpp@/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix index 963d00991bc5..06bb68264588 100644 --- a/pkgs/by-name/lu/luaformatter/package.nix +++ b/pkgs/by-name/lu/luaformatter/package.nix @@ -27,7 +27,8 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-lib-paths.patch; antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 yaml-cpp; + yamlCpp = yaml-cpp; + inherit libargs catch2; }) ]; From 3c7d6adcc82b40d251b5217921019a28e71a4a74 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:51:44 +0300 Subject: [PATCH 148/151] oh-my-fish: fix substituteAll usage --- pkgs/by-name/oh/oh-my-fish/omf-install | 4 ++-- pkgs/by-name/oh/oh-my-fish/package.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-fish/omf-install b/pkgs/by-name/oh/oh-my-fish/omf-install index 0b8be218e38a..36cc440e13a0 100644 --- a/pkgs/by-name/oh/oh-my-fish/omf-install +++ b/pkgs/by-name/oh/oh-my-fish/omf-install @@ -1,6 +1,6 @@ #!@runtimeShell@ @fish@/bin/fish \ - @OMF@/share/oh-my-fish/bin/install \ + @omf@/share/oh-my-fish/bin/install \ --noninteractive \ - --offline=@OMF@/share/oh-my-fish + --offline=@omf@/share/oh-my-fish diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix index d18465609d91..019979bf9f39 100644 --- a/pkgs/by-name/oh/oh-my-fish/package.nix +++ b/pkgs/by-name/oh/oh-my-fish/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cp -v ${substituteAll { name = "omf-install"; src = ./omf-install; - OMF = placeholder "out"; + omf = placeholder "out"; inherit fish runtimeShell; }} $out/bin/omf-install From 1f0044428f5ae1c58504e07aed930095c18410dc Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:51:57 +0300 Subject: [PATCH 149/151] libsForQt5.libqofono: fix substituteAll usage --- ...01-NixOS-provide-mobile-broadband-provider-info-path.patch | 4 ++-- pkgs/development/libraries/libqofono/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch index 94b4c61befe5..825c9e0c3825 100644 --- a/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch +++ b/pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index b5877ed..455167c 100644 QString provider = providerString; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); if (provider.contains("\'")) { provider = provider.replace("\'", "'"); @@ -25,7 +25,7 @@ index b5877ed..455167c 100644 #ifdef QOFONO_PROVISIONING QXmlQuery query; - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); -+ query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); ++ query.setFocus(QUrl("@mobileBroadbandProviderInfo@/share/mobile-broadband-provider-info/serviceproviders.xml")); QString providerStr = provider; if (providerStr.contains("\'")) { diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix index a7d7868f30b3..f337de228a3e 100644 --- a/pkgs/development/libraries/libqofono/default.nix +++ b/pkgs/development/libraries/libqofono/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { patches = [ (substituteAll { src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; - inherit mobile-broadband-provider-info; + mobileBroadbandProviderInfo = mobile-broadband-provider-info; }) ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch ]; From c46a2c35ab346bdb9015b780a77229b972d7a841 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:52:20 +0300 Subject: [PATCH 150/151] gnomeExtensions.gtk4-desktop-icons-ng-ding: fix substituteAll usage --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index ca96a3831325..e45aa28bd526 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -103,7 +103,7 @@ super: lib.trivial.pipe super [ nativeBuildInputs = [ wrapGAppsHook3 ]; patches = [ (substituteAll { - inherit gjs util-linux xdg-utils; + inherit gjs; util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; From 05624e48e28d1243aed7b0282f0cfdd9d988a8fd Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Oct 2024 18:31:12 +0300 Subject: [PATCH 151/151] substituteAll: validate arguments So no one can repeat my mistakes. --- .../substitute/substitute-all.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index f49d56041f7e..c6fc688d50e6 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -1,12 +1,22 @@ -{ stdenvNoCC }: - -args: - +{ lib, stdenvNoCC }: # see the substituteAll in the nixpkgs documentation for usage and constraints -stdenvNoCC.mkDerivation ({ - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = ./substitute-all.sh; - inherit (args) src; - preferLocalBuild = true; - allowSubstitutes = false; -} // args) +args: +let + # keep this in sync with substituteAll + isInvalidArgName = x: builtins.match "^[a-z][a-zA-Z0-9_]*$" x == null; + invalidArgs = builtins.filter isInvalidArgName (builtins.attrNames args); +in + if invalidArgs == [] then + stdenvNoCC.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute-all.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; + } // args) + else throw '' + Argument names for `pkgs.substituteAll` must: + - start with a lower case ASCII letter + - only contain ASCII letters, digits and underscores + Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. + ''