lol

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
738e64a2 c0b9a616

+1223 -1140
+2 -2
README.md
··· 52 52 system, [Hydra](https://hydra.nixos.org/). 53 53 54 54 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) 55 - * [Continuous package builds for the NixOS 23.11 release](https://hydra.nixos.org/jobset/nixos/release-23.11) 55 + * [Continuous package builds for the NixOS 24.05 release](https://hydra.nixos.org/jobset/nixos/release-24.05) 56 56 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) 57 - * [Tests for the NixOS 23.11 release](https://hydra.nixos.org/job/nixos/release-23.11/tested#tabs-constituents) 57 + * [Tests for the NixOS 24.05 release](https://hydra.nixos.org/job/nixos/release-24.05/tested#tabs-constituents) 58 58 59 59 Artifacts successfully built with Hydra are published to cache at 60 60 https://cache.nixos.org/. When successful build and test criteria are
+1 -1
nixos/README.md
··· 48 48 - Description, default and example should be provided. 49 49 - Ensure that option changes are backward compatible. 50 50 - `mkRenamedOptionModuleWith` provides a way to make renamed option backward compatible. 51 - - Use `lib.versionAtLeast config.system.stateVersion "23.11"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups. 51 + - Use `lib.versionAtLeast config.system.stateVersion "24.05"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups. 52 52 - Ensure that removed options are declared with `mkRemovedOptionModule`. 53 53 - Ensure that changes that are not backward compatible are mentioned in release notes. 54 54 - Ensure that documentations affected by the change is updated.
+8 -8
nixos/doc/manual/installation/upgrading.chapter.md
··· 6 6 automatically from NixOS's Git repository after certain tests have 7 7 passed and all packages have been built. These channels are: 8 8 9 - - *Stable channels*, such as [`nixos-23.11`](https://channels.nixos.org/nixos-23.11). 9 + - *Stable channels*, such as [`nixos-24.05`](https://channels.nixos.org/nixos-24.05). 10 10 These only get conservative bug fixes and package upgrades. For 11 11 instance, a channel update may cause the Linux kernel on your system 12 12 to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not ··· 19 19 radical changes between channel updates. It's not recommended for 20 20 production systems. 21 21 22 - - *Small channels*, such as [`nixos-23.11-small`](https://channels.nixos.org/nixos-23.11-small) 22 + - *Small channels*, such as [`nixos-24.05-small`](https://channels.nixos.org/nixos-24.05-small) 23 23 or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small). 24 24 These are identical to the stable and unstable channels described above, 25 25 except that they contain fewer binary packages. This means they get updated ··· 38 38 39 39 When you first install NixOS, you're automatically subscribed to the 40 40 NixOS channel that corresponds to your installation source. For 41 - instance, if you installed from a 23.11 ISO, you will be subscribed to 42 - the `nixos-23.11` channel. To see which NixOS channel you're subscribed 41 + instance, if you installed from a 24.05 ISO, you will be subscribed to 42 + the `nixos-24.05` channel. To see which NixOS channel you're subscribed 43 43 to, run the following as root: 44 44 45 45 ```ShellSession ··· 54 54 ``` 55 55 56 56 (Be sure to include the `nixos` parameter at the end.) For instance, to 57 - use the NixOS 23.11 stable channel: 57 + use the NixOS 24.05 stable channel: 58 58 59 59 ```ShellSession 60 - # nix-channel --add https://channels.nixos.org/nixos-23.11 nixos 60 + # nix-channel --add https://channels.nixos.org/nixos-24.05 nixos 61 61 ``` 62 62 63 63 If you have a server, you may want to use the "small" channel instead: 64 64 65 65 ```ShellSession 66 - # nix-channel --add https://channels.nixos.org/nixos-23.11-small nixos 66 + # nix-channel --add https://channels.nixos.org/nixos-24.05-small nixos 67 67 ``` 68 68 69 69 And if you want to live on the bleeding edge: ··· 117 117 118 118 ```nix 119 119 { 120 - system.autoUpgrade.channel = "https://channels.nixos.org/nixos-23.11"; 120 + system.autoUpgrade.channel = "https://channels.nixos.org/nixos-24.05"; 121 121 } 122 122 ```
+1 -1
nixos/doc/manual/release-notes/rl-2405.section.md
··· 1 - # Release 24.05 (“Uakari”, 2024.05/??) {#sec-release-24.05} 1 + # Release 24.05 (“Uakari”, 2024.05/31) {#sec-release-24.05} 2 2 3 3 Support is planned until the end of December 2024, handing over to 24.11. 4 4
+50 -51
nixos/modules/services/mail/stalwart-mail.nix
··· 76 76 }; 77 77 }; 78 78 79 - systemd.services.stalwart-mail = { 80 - wantedBy = [ "multi-user.target" ]; 81 - after = [ "local-fs.target" "network.target" ]; 79 + systemd = { 80 + packages = [ cfg.package ]; 81 + services.stalwart-mail = { 82 + wantedBy = [ "multi-user.target" ]; 83 + after = [ "local-fs.target" "network.target" ]; 82 84 83 - preStart = if useLegacyStorage then '' 84 - mkdir -p ${dataDir}/{queue,reports,data/blobs} 85 - '' else '' 86 - mkdir -p ${dataDir}/{queue,reports,db} 87 - ''; 85 + preStart = if useLegacyStorage then '' 86 + mkdir -p ${dataDir}/{queue,reports,data/blobs} 87 + '' else '' 88 + mkdir -p ${dataDir}/{queue,reports,db} 89 + ''; 88 90 89 - serviceConfig = { 90 - ExecStart = 91 - "${cfg.package}/bin/stalwart-mail --config=${configFile}"; 91 + serviceConfig = { 92 + ExecStart = [ 93 + "" 94 + "${cfg.package}/bin/stalwart-mail --config=${configFile}" 95 + ]; 92 96 93 - # Base from template resources/systemd/stalwart-mail.service 94 - Type = "simple"; 95 - LimitNOFILE = 65536; 96 - KillMode = "process"; 97 - KillSignal = "SIGINT"; 98 - Restart = "on-failure"; 99 - RestartSec = 5; 100 - StandardOutput = "journal"; 101 - StandardError = "journal"; 102 - SyslogIdentifier = "stalwart-mail"; 97 + StandardOutput = "journal"; 98 + StandardError = "journal"; 103 99 104 - User = "stalwart-mail"; 105 - Group = "stalwart-mail"; 106 - StateDirectory = "stalwart-mail"; 100 + StateDirectory = "stalwart-mail"; 107 101 108 - # Bind standard privileged ports 109 - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; 110 - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; 102 + # Bind standard privileged ports 103 + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; 104 + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; 111 105 112 - # Hardening 113 - DeviceAllow = [ "" ]; 114 - LockPersonality = true; 115 - MemoryDenyWriteExecute = true; 116 - PrivateDevices = true; 117 - PrivateUsers = false; # incompatible with CAP_NET_BIND_SERVICE 118 - ProcSubset = "pid"; 119 - PrivateTmp = true; 120 - ProtectClock = true; 121 - ProtectControlGroups = true; 122 - ProtectHome = true; 123 - ProtectHostname = true; 124 - ProtectKernelLogs = true; 125 - ProtectKernelModules = true; 126 - ProtectKernelTunables = true; 127 - ProtectProc = "invisible"; 128 - ProtectSystem = "strict"; 129 - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; 130 - RestrictNamespaces = true; 131 - RestrictRealtime = true; 132 - RestrictSUIDSGID = true; 133 - SystemCallArchitectures = "native"; 134 - SystemCallFilter = [ "@system-service" "~@privileged" ]; 135 - UMask = "0077"; 106 + # Hardening 107 + DeviceAllow = [ "" ]; 108 + LockPersonality = true; 109 + MemoryDenyWriteExecute = true; 110 + PrivateDevices = true; 111 + PrivateUsers = false; # incompatible with CAP_NET_BIND_SERVICE 112 + ProcSubset = "pid"; 113 + PrivateTmp = true; 114 + ProtectClock = true; 115 + ProtectControlGroups = true; 116 + ProtectHome = true; 117 + ProtectHostname = true; 118 + ProtectKernelLogs = true; 119 + ProtectKernelModules = true; 120 + ProtectKernelTunables = true; 121 + ProtectProc = "invisible"; 122 + ProtectSystem = "strict"; 123 + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; 124 + RestrictNamespaces = true; 125 + RestrictRealtime = true; 126 + RestrictSUIDSGID = true; 127 + SystemCallArchitectures = "native"; 128 + SystemCallFilter = [ "@system-service" "~@privileged" ]; 129 + UMask = "0077"; 130 + }; 131 + unitConfig.ConditionPathExists = [ 132 + "" 133 + "${configFile}" 134 + ]; 136 135 }; 137 136 }; 138 137
+1 -2
nixos/modules/services/web-apps/mealie.nix
··· 28 28 Configuration of the Mealie service. 29 29 30 30 See [the mealie documentation](https://nightly.mealie.io/documentation/getting-started/installation/backend-config/) for available options and default values. 31 - 32 - In addition to the official documentation, you can set {env}`MEALIE_LOG_FILE`. 33 31 ''; 34 32 example = { 35 33 ALLOW_SIGNUP = "false"; ··· 61 59 PRODUCTION = "true"; 62 60 ALEMBIC_CONFIG_FILE="${pkg}/config/alembic.ini"; 63 61 API_PORT = toString cfg.port; 62 + BASE_URL = "http://localhost:${cfg.port}"; 64 63 DATA_DIR = "/var/lib/mealie"; 65 64 CRF_MODEL_PATH = "/var/lib/mealie/model.crfmodel"; 66 65 } // (builtins.mapAttrs (_: val: toString val) cfg.settings);
+1 -1
nixos/tests/mealie.nix
··· 3 3 { 4 4 name = "mealie"; 5 5 meta = with pkgs.lib.maintainers; { 6 - maintainers = [ litchipi ]; 6 + maintainers = [ litchipi anoa ]; 7 7 }; 8 8 9 9 nodes = {
+17 -2
pkgs/applications/editors/vscode/extensions/default.nix
··· 406 406 mktplcRef = { 407 407 name = "vscode-neovim"; 408 408 publisher = "asvetliakov"; 409 - version = "1.11.4"; 410 - hash = "sha256-dAovrYfA5muPNhFIHycxuO0CIWPT4T9hsEzri1JDOUI="; 409 + version = "1.14.1"; 410 + hash = "sha256-taO9jxNC4mvli08Gbl8oO70T+RkfZkztoVZYWeVY4Bs="; 411 411 }; 412 412 meta = { 413 413 changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; ··· 1026 1026 meta = { 1027 1027 description = "Database Client For Visual Studio Code"; 1028 1028 homepage = "https://marketplace.visualstudio.com/items?itemName=cweijan.vscode-mysql-client2"; 1029 + license = lib.licenses.mit; 1030 + }; 1031 + }; 1032 + 1033 + danielgavin.ols = buildVscodeMarketplaceExtension { 1034 + mktplcRef = { 1035 + publisher = "DanielGavin"; 1036 + name = "ols"; 1037 + version = "0.1.28"; 1038 + hash = "sha256-yVXltjvtLc+zqela/Jyg+g66PU61+YTMX1hWPW8fIkk="; 1039 + }; 1040 + meta = { 1041 + description = "A Visual Studio Code extension for Odin language"; 1042 + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DanielGavin.ols"; 1043 + homepage = "https://github.com/DanielGavin/ols"; 1029 1044 license = lib.licenses.mit; 1030 1045 }; 1031 1046 };
+2 -2
pkgs/applications/misc/gpxsee/default.nix
··· 18 18 in 19 19 stdenv.mkDerivation (finalAttrs: { 20 20 pname = "gpxsee"; 21 - version = "13.20"; 21 + version = "13.21"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "tumic0"; 25 25 repo = "GPXSee"; 26 26 rev = finalAttrs.version; 27 - hash = "sha256-zZjE1mXZPPda4CjkOeKtLvFZO31ta4kucpzsriR2+Nw="; 27 + hash = "sha256-rg4czTni8toAwzppgNdi/lfUDudKkEqZUZziiIiyJm0="; 28 28 }; 29 29 30 30 buildInputs = [
+12 -7
pkgs/applications/misc/notesnook/default.nix
··· 1 - { lib, stdenv, appimageTools, fetchurl, undmg }: 1 + { lib, stdenv, appimageTools, fetchurl, _7zz }: 2 2 3 3 let 4 4 pname = "notesnook"; 5 - version = "2.6.1"; 5 + version = "3.0.6"; 6 6 7 7 inherit (stdenv.hostPlatform) system; 8 8 throwSystem = throw "Unsupported system: ${system}"; ··· 16 16 src = fetchurl { 17 17 url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; 18 18 hash = { 19 - x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; 20 - x86_64-darwin = "sha256-gOUL3qLSM+/pr519Gc0baUtbmhA40lG6XzuCRyGILkc="; 21 - aarch64-darwin = "sha256-d1nXdCv1mK4+4Gef1upIkHS3J2d9qzTLXbBWabsJwpw="; 19 + x86_64-linux = "sha256-606+8euLnZdIPUwi+wilJgvnNQNwBCj6AGZFmp9HOWs="; 20 + x86_64-darwin = "sha256-A0Rbm6boYI2B3Ne+FczAM3qmtM2KwNWD+C2N0sgWRtg="; 21 + aarch64-darwin = "sha256-Jm7rZWEsMspjKrMODGPBGJP0I5fF3aj+WXdBNsmv4jw="; 22 22 }.${system} or throwSystem; 23 23 }; 24 24 ··· 36 36 ''; 37 37 homepage = "https://notesnook.com"; 38 38 license = licenses.gpl3Only; 39 - maintainers = with maintainers; [ j0lol ]; 39 + maintainers = with maintainers; [ cig0 j0lol ]; 40 40 platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; 41 41 mainProgram = "notesnook"; 42 42 }; ··· 59 59 darwin = stdenv.mkDerivation { 60 60 inherit pname version src meta; 61 61 62 - nativeBuildInputs = [ undmg ]; 62 + nativeBuildInputs = [ _7zz ]; 63 63 64 64 sourceRoot = "Notesnook.app"; 65 + 66 + # 7zz did not unpack in setup hook for some reason, done manually here 67 + unpackPhase = '' 68 + 7zz x $src 69 + ''; 65 70 66 71 installPhase = '' 67 72 mkdir -p $out/Applications/Notesnook.app
+2 -2
pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
··· 5 5 6 6 buildGoPackage rec { 7 7 pname = "ssm-session-manager-plugin"; 8 - version = "1.2.553.0"; 8 + version = "1.2.633.0"; 9 9 10 10 goPackagePath = "github.com/aws/session-manager-plugin"; 11 11 ··· 13 13 owner = "aws"; 14 14 repo = "session-manager-plugin"; 15 15 rev = version; 16 - hash = "sha256-jyCHhD3KyHob7z200tEkAUR9ALJVsGsRQ7Wx4B6jBnQ="; 16 + hash = "sha256-dwNCTJOxpothAcJSfch2jkxdgXg6xDd/fDQCQo2Xd+8="; 17 17 }; 18 18 19 19 postPatch = ''
+5 -5
pkgs/applications/networking/instant-messengers/jami/default.nix
··· 64 64 65 65 stdenv.mkDerivation rec { 66 66 pname = "jami"; 67 - version = "20240430.0"; 67 + version = "20240529.0"; 68 68 69 69 src = fetchFromGitLab { 70 70 domain = "git.jami.net"; 71 71 owner = "savoirfairelinux"; 72 72 repo = "jami-client-qt"; 73 73 rev = "stable/${version}"; 74 - hash = "sha256-v7558m2h3RqvLLhf3BdYO9LKCFKuMTtPIXgH6OXiiY4="; 74 + hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U="; 75 75 fetchSubmodules = true; 76 76 }; 77 77 ··· 128 128 129 129 dhtnet = stdenv.mkDerivation { 130 130 pname = "dhtnet"; 131 - version = "unstable-2022-04-26"; 131 + version = "unstable-2024-05-17"; 132 132 133 133 src = fetchFromGitLab { 134 134 domain = "git.jami.net"; 135 135 owner = "savoirfairelinux"; 136 136 repo = "dhtnet"; 137 - rev = "d7976982d24867c6faaf8103504ec8a10d932fa0"; 138 - hash = "sha256-vazFDMIu/3AWeOz0LZhZD9NFO8cd5AK41zBpqpQrqnc="; 137 + rev = "77331098ff663a5ac54fae7d0bedafe076c575a1"; 138 + hash = "sha256-55LEnI1YgVujCtv1dGOFtJdvnzB2SKqwEptaHasZB7I="; 139 139 }; 140 140 141 141 nativeBuildInputs = [
+2 -2
pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
··· 17 17 18 18 buildPythonApplication rec { 19 19 pname = "matrix-commander"; 20 - version = "7.2.0"; 20 + version = "7.6.2"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "8go"; 24 24 repo = "matrix-commander"; 25 25 rev = "v${version}"; 26 - hash = "sha256-qL6ARkAWu0FEuYK2e9Z9hMSfK4TW0kGgoIFUfJ8Dgwk="; 26 + hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc="; 27 27 }; 28 28 29 29 format = "pyproject";
+3 -3
pkgs/applications/networking/scaleft/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "scaleft"; 5 - version = "1.67.4"; 5 + version = "1.80.1"; 6 6 7 7 src = 8 8 fetchurl { 9 - url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; 10 - sha256 = "kRCShTMKf5qKFth/8H8XHLj12YIVQ9G5f2MvVJRtyDs="; 9 + url = "https://dist.scaleft.com/repos/rpm/stable/centos/9/x86_64/1.80.1/scaleft-client-tools-${version}-1.x86_64.rpm"; 10 + sha256 = "sha256-QrkqAgkplFF6Tp6FWKb2TJaqeOw8ec4zd9pymDP2IyY="; 11 11 }; 12 12 13 13 nativeBuildInputs = [ patchelf rpmextract ];
+4 -4
pkgs/applications/office/roam-research/common.nix
··· 1 1 { fetchurl }: 2 2 let 3 3 pname = "roam-research"; 4 - version = "0.0.18"; 4 + version = "0.0.19"; 5 5 in 6 6 { 7 7 inherit pname version; 8 8 sources = { 9 9 x86_64-darwin = fetchurl { 10 10 url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; 11 - hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; 11 + hash = "sha256-pIH4p7dnmyOgGyruSJ39xB8iJ45wtxcIQmfUeBLlDes="; 12 12 }; 13 13 aarch64-darwin = fetchurl { 14 14 url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; 15 - hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; 15 + hash = "sha256-iQRaaSU033t3WVWZSKuXCPJbMoNpwLnDHBz5QURu6Gw="; 16 16 }; 17 17 x86_64-linux = fetchurl { 18 18 url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; 19 - hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; 19 + hash = "sha256-eDN+hrAc+ePRELcXAs5WypzPlJ+Wtg3kUarf8rq5CnA="; 20 20 }; 21 21 }; 22 22 }
+3 -3
pkgs/applications/version-management/git-mit/default.nix
··· 10 10 }: 11 11 12 12 let 13 - version = "5.12.202"; 13 + version = "5.12.203"; 14 14 in 15 15 rustPlatform.buildRustPackage { 16 16 pname = "git-mit"; ··· 20 20 owner = "PurpleBooth"; 21 21 repo = "git-mit"; 22 22 rev = "v${version}"; 23 - hash = "sha256-f2RiOdJVGfYzMYtgA0diz67h+h7DfTfqTOIpNObNrVc="; 23 + hash = "sha256-8sxC8peASy13Q582DbHHpQUj0AZN0soJrOocuPyJeHI="; 24 24 }; 25 25 26 - cargoHash = "sha256-1xtTgIFaG2KUevxdZyu2IqgBLDgmeBMb7xCOECkieYc="; 26 + cargoHash = "sha256-zDUANe5zQNufPepbFoADkfjtEAE48GkMCpmG41OP2og="; 27 27 28 28 nativeBuildInputs = [ pkg-config ]; 29 29
+8 -1
pkgs/applications/version-management/gitnuro/default.nix
··· 5 5 , copyDesktopItems 6 6 , makeDesktopItem 7 7 , jre 8 + , libGL 8 9 }: 9 10 10 11 stdenv.mkDerivation rec { ··· 30 31 31 32 installPhase = '' 32 33 runHook preInstall 33 - makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" 34 + 35 + makeWrapper ${jre}/bin/java $out/bin/gitnuro \ 36 + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ 37 + --add-flags "-jar $src" 38 + 34 39 install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg 40 + 35 41 runHook postInstall 36 42 ''; 37 43 ··· 51 57 homepage = "https://gitnuro.com/"; 52 58 license = licenses.gpl3Plus; 53 59 platforms = [ "x86_64-linux" ]; 60 + sourceProvenance = with sourceTypes; [ binaryBytecode ]; 54 61 maintainers = with maintainers; [ zendo ]; 55 62 mainProgram = "gitnuro"; 56 63 };
+11 -10
pkgs/applications/video/simplescreenrecorder/default.nix
··· 1 1 { lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras 2 - , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja 2 + , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script 3 3 }: 4 4 5 5 mkDerivation rec { 6 6 pname = "simplescreenrecorder"; 7 - version = "0.4.3"; 7 + version = "0.4.4"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "MaartenBaert"; 11 11 repo = "ssr"; 12 12 rev = version; 13 - sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8"; 13 + sha256 = "sha256-cVjQmyk+rCqmDJzdnDk7bQ8kpyD3HtTw3wLVx2thHok="; 14 14 }; 15 15 16 16 cmakeFlags = [ ··· 18 18 "-DWITH_GLINJECT=${if stdenv.hostPlatform.isx86 then "TRUE" else "FALSE"}" 19 19 ]; 20 20 21 - patches = [ ./fix-paths.patch ]; 21 + postPatch = '' 22 + substituteInPlace scripts/ssr-glinject \ 23 + --replace-fail "libssr-glinject.so" "$out/lib/libssr-glinject.so" 22 24 23 - postPatch = '' 24 - for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do 25 - substituteInPlace $i \ 26 - --subst-var out \ 27 - --subst-var-by sh ${stdenv.shell} 28 - done 25 + substituteInPlace src/AV/Input/GLInjectInput.cpp \ 26 + --replace-fail "/bin/sh" "${stdenv.shell}" \ 27 + --replace-fail "libssr-glinject.so" "$out/lib/libssr-glinject.so" 29 28 ''; 30 29 31 30 nativeBuildInputs = [ pkg-config cmake ninja ]; ··· 33 32 alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL 34 33 libpulseaudio libv4l qtbase qttools qtx11extras 35 34 ]; 35 + 36 + passthru.updateScript = nix-update-script { }; 36 37 37 38 meta = with lib; { 38 39 description = "A screen recorder for Linux";
-35
pkgs/applications/video/simplescreenrecorder/fix-paths.patch
··· 1 - diff --git a/scripts/ssr-glinject b/scripts/ssr-glinject 2 - index 48be48d..5038d4c 100755 3 - --- a/scripts/ssr-glinject 4 - +++ b/scripts/ssr-glinject 5 - @@ -59,6 +59,6 @@ do 6 - fi 7 - done 8 - 9 - -echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:libssr-glinject.so" 10 - +echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:@out@/lib/libssr-glinject.so" 11 - echo "ssr-glinject: command = $@" 12 - -LD_PRELOAD="$LD_PRELOAD:libssr-glinject.so" "$@" 13 - +LD_PRELOAD="$LD_PRELOAD:@out@/lib/libssr-glinject.so" "$@" 14 - diff --git a/src/AV/Input/GLInjectInput.cpp b/src/AV/Input/GLInjectInput.cpp 15 - index fc98f31..18f5196 100644 16 - --- a/src/AV/Input/GLInjectInput.cpp 17 - +++ b/src/AV/Input/GLInjectInput.cpp 18 - @@ -113,7 +113,7 @@ bool ExecuteDetached(const char* command, const char* working_directory) { 19 - 20 - // try to execute command 21 - do { 22 - - res = execl("/bin/sh", "/bin/sh", "-c", command, (char*) NULL); 23 - + res = execl("@sh@", "@sh@", "-c", command, (char*) NULL); 24 - } while(res == -1 and errno == EINTR); 25 - 26 - // failed, send feedback 27 - @@ -207,7 +207,7 @@ void GLInjectInput::SetCapturing(bool capturing) { 28 - bool GLInjectInput::LaunchApplication(const QString& channel, bool relax_permissions, const QString& command, const QString& working_directory) { 29 - 30 - // prepare command 31 - - QString full_command = "LD_PRELOAD=\"libssr-glinject.so\" "; 32 - + QString full_command = "LD_PRELOAD=\"@out@/lib/libssr-glinject.so\" "; 33 - full_command += "SSR_CHANNEL=\"" + ShellEscape(channel) + "\" "; 34 - if(relax_permissions) 35 - full_command += "SSR_STREAM_RELAX_PERMISSIONS=1 ";
+24 -8
pkgs/build-support/emacs/melpa.nix
··· 35 35 pname 36 36 /* 37 37 ename: Original Emacs package name, possibly containing special symbols. 38 + Default: pname 38 39 */ 39 - , ename ? null 40 + , ename ? pname 40 41 , version 41 - , recipe 42 + /* 43 + commit: Optional package history commit. 44 + Default: src.rev or "unknown" 45 + This will be written into the generated package but it is not needed during 46 + the build process. 47 + */ 48 + , commit ? (args.src.rev or "unknown") 49 + /* 50 + files: Optional recipe property specifying the files used to build the package. 51 + If null, do not set it in recipe, keeping the default upstream behaviour. 52 + Default: null 53 + */ 54 + , files ? null 55 + /* 56 + recipe: Optional MELPA recipe. 57 + Default: a minimally functional recipe 58 + */ 59 + , recipe ? (writeText "${pname}-recipe" '' 60 + (${ename} :fetcher git :url "" 61 + ${lib.optionalString (files != null) ":files ${files}"}) 62 + '') 42 63 , meta ? {} 43 64 , ... 44 65 }@args: 45 66 46 67 genericBuild ({ 47 68 48 - ename = 49 - if ename == null 50 - then pname 51 - else ename; 52 - 53 69 elpa2nix = ./elpa2nix.el; 54 70 melpa2nix = ./melpa2nix.el; 55 71 56 - inherit packageBuild; 72 + inherit packageBuild commit ename recipe; 57 73 58 74 preUnpack = '' 59 75 mkdir -p "$NIX_BUILD_TOP/recipes"
+2 -2
pkgs/by-name/au/audiness/package.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "audiness"; 9 - version = "0.4.0"; 9 + version = "0.5.0"; 10 10 pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "audiusGmbH"; 14 14 repo = "audiness"; 15 15 rev = "refs/tags/${version}"; 16 - hash = "sha256-UJe4ZawjAuUoSKEdIgjh8zZu/amYLZ8rpUDahSHokKA="; 16 + hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI="; 17 17 }; 18 18 19 19 pythonRelaxDeps = [
+8 -7
pkgs/by-name/bi/bicep/package.nix
··· 1 - { lib 2 - , stdenv 3 - , buildDotnetModule 4 - , fetchFromGitHub 5 - , dotnetCorePackages 6 - , mono 1 + { 2 + lib, 3 + stdenv, 4 + buildDotnetModule, 5 + fetchFromGitHub, 6 + dotnetCorePackages, 7 + mono, 7 8 }: 8 9 9 10 buildDotnetModule rec { ··· 34 35 passthru.updateScript = ./updater.sh; 35 36 36 37 meta = { 37 - broken = stdenv.isDarwin; 38 38 description = "Domain Specific Language (DSL) for deploying Azure resources declaratively"; 39 39 homepage = "https://github.com/Azure/bicep/"; 40 40 changelog = "https://github.com/Azure/bicep/releases/tag/v${version}"; 41 41 license = lib.licenses.mit; 42 42 maintainers = with lib.maintainers; [ khaneliman ]; 43 + mainProgram = "bicep"; 43 44 }; 44 45 }
+107 -75
pkgs/by-name/cc/ccache/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , substituteAll 5 - , binutils 6 - , asciidoctor 7 - , cmake 8 - , perl 9 - , zstd 10 - , bashInteractive 11 - , xcodebuild 12 - , makeWrapper 13 - , nix-update-script 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + substituteAll, 6 + binutils, 7 + asciidoctor, 8 + cmake, 9 + perl, 10 + fmt, 11 + hiredis, 12 + xxHash, 13 + zstd, 14 + bashInteractive, 15 + doctest, 16 + xcodebuild, 17 + makeWrapper, 18 + nix-update-script, 14 19 }: 15 20 16 21 stdenv.mkDerivation (finalAttrs: { 17 22 pname = "ccache"; 18 - version = "4.9.1"; 23 + version = "4.10"; 19 24 20 25 src = fetchFromGitHub { 21 26 owner = "ccache"; 22 27 repo = "ccache"; 23 28 rev = "refs/tags/v${finalAttrs.version}"; 24 - sha256 = "sha256-n0MTq8x6KNkgwhJQG7F+e3iCOS644nLkMsiRztJe8QU="; 29 + sha256 = "sha256-0T9iJXnDX8LffhB/5hsfBNyZQ211f0lL/7dvTrjmiE0="; 25 30 }; 26 31 27 - outputs = [ "out" "man" ]; 32 + outputs = [ 33 + "out" 34 + "man" 35 + ]; 28 36 29 37 patches = [ 30 38 # When building for Darwin, test/run uses dwarfdump, whereas on ··· 39 47 }) 40 48 ]; 41 49 42 - nativeBuildInputs = [ asciidoctor cmake perl ]; 43 - buildInputs = [ zstd ]; 50 + strictDeps = true; 51 + 52 + nativeBuildInputs = [ 53 + asciidoctor 54 + cmake 55 + perl 56 + ]; 44 57 45 - cmakeFlags = [ 46 - # Build system does not autodetect redis library presence. 47 - # Requires explicit flag. 48 - "-DREDIS_STORAGE_BACKEND=OFF" 58 + buildInputs = [ 59 + fmt 60 + hiredis 61 + xxHash 62 + zstd 49 63 ]; 50 64 65 + cmakeFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-DENABLE_TESTING=OFF"; 66 + 51 67 doCheck = true; 68 + 52 69 nativeCheckInputs = [ 53 70 # test/run requires the compgen function which is available in 54 71 # bashInteractive, but not bash. 55 72 bashInteractive 56 73 ] ++ lib.optional stdenv.isDarwin xcodebuild; 57 74 75 + checkInputs = [ 76 + doctest 77 + ]; 78 + 58 79 checkPhase = 59 80 let 60 - badTests = [ 61 - "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) 62 - ] ++ lib.optionals stdenv.isDarwin [ 63 - "test.basedir" 64 - "test.fileclone" # flaky on hydra (possibly filesystem-specific?) 65 - "test.multi_arch" 66 - "test.nocpp2" 67 - ]; 81 + badTests = 82 + [ 83 + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) 84 + ] 85 + ++ lib.optionals stdenv.isDarwin [ 86 + "test.basedir" 87 + "test.fileclone" # flaky on hydra (possibly filesystem-specific?) 88 + "test.multi_arch" 89 + "test.nocpp2" 90 + ]; 68 91 in 69 92 '' 70 93 runHook preCheck ··· 76 99 passthru = { 77 100 # A derivation that provides gcc and g++ commands, but that 78 101 # will end up calling ccache for the given cacheDir 79 - links = { unwrappedCC, extraConfig }: stdenv.mkDerivation { 80 - pname = "ccache-links"; 81 - inherit (finalAttrs) version; 82 - passthru = { 83 - isClang = unwrappedCC.isClang or false; 84 - isGNU = unwrappedCC.isGNU or false; 85 - isCcache = true; 86 - }; 87 - inherit (unwrappedCC) lib; 88 - nativeBuildInputs = [ makeWrapper ]; 89 - # Unwrapped clang does not have a targetPrefix because it is multi-target 90 - # target is decided with argv0. 91 - buildCommand = let 92 - targetPrefix = if unwrappedCC.isClang or false 93 - then 94 - "" 95 - else 96 - (lib.optionalString (unwrappedCC ? targetConfig && unwrappedCC.targetConfig != null && unwrappedCC.targetConfig != "") "${unwrappedCC.targetConfig}-"); 97 - in '' 98 - mkdir -p $out/bin 102 + links = 103 + { unwrappedCC, extraConfig }: 104 + stdenv.mkDerivation { 105 + pname = "ccache-links"; 106 + inherit (finalAttrs) version; 107 + passthru = { 108 + isClang = unwrappedCC.isClang or false; 109 + isGNU = unwrappedCC.isGNU or false; 110 + isCcache = true; 111 + }; 112 + inherit (unwrappedCC) lib; 113 + nativeBuildInputs = [ makeWrapper ]; 114 + # Unwrapped clang does not have a targetPrefix because it is multi-target 115 + # target is decided with argv0. 116 + buildCommand = 117 + let 118 + targetPrefix = 119 + if unwrappedCC.isClang or false then 120 + "" 121 + else 122 + (lib.optionalString ( 123 + unwrappedCC ? targetConfig && unwrappedCC.targetConfig != null && unwrappedCC.targetConfig != "" 124 + ) "${unwrappedCC.targetConfig}-"); 125 + in 126 + '' 127 + mkdir -p $out/bin 99 128 100 - wrap() { 101 - local cname="${targetPrefix}$1" 102 - if [ -x "${unwrappedCC}/bin/$cname" ]; then 103 - makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ 104 - --run ${lib.escapeShellArg extraConfig} \ 105 - --add-flags ${unwrappedCC}/bin/$cname 106 - fi 107 - } 129 + wrap() { 130 + local cname="${targetPrefix}$1" 131 + if [ -x "${unwrappedCC}/bin/$cname" ]; then 132 + makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ 133 + --run ${lib.escapeShellArg extraConfig} \ 134 + --add-flags ${unwrappedCC}/bin/$cname 135 + fi 136 + } 108 137 109 - wrap cc 110 - wrap c++ 111 - wrap gcc 112 - wrap g++ 113 - wrap clang 114 - wrap clang++ 138 + wrap cc 139 + wrap c++ 140 + wrap gcc 141 + wrap g++ 142 + wrap clang 143 + wrap clang++ 115 144 116 - for executable in $(ls ${unwrappedCC}/bin); do 117 - if [ ! -x "$out/bin/$executable" ]; then 118 - ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable 119 - fi 120 - done 121 - for file in $(ls ${unwrappedCC} | grep -vw bin); do 122 - ln -s ${unwrappedCC}/$file $out/$file 123 - done 124 - ''; 125 - }; 145 + for executable in $(ls ${unwrappedCC}/bin); do 146 + if [ ! -x "$out/bin/$executable" ]; then 147 + ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable 148 + fi 149 + done 150 + for file in $(ls ${unwrappedCC} | grep -vw bin); do 151 + ln -s ${unwrappedCC}/$file $out/$file 152 + done 153 + ''; 154 + }; 126 155 127 156 updateScript = nix-update-script { }; 128 157 }; ··· 136 165 }"; 137 166 license = licenses.gpl3Plus; 138 167 mainProgram = "ccache"; 139 - maintainers = with maintainers; [ kira-bruneau r-burns ]; 168 + maintainers = with maintainers; [ 169 + kira-bruneau 170 + r-burns 171 + ]; 140 172 platforms = platforms.unix; 141 173 }; 142 174 })
+19 -12
pkgs/by-name/cl/cloudlogoffline/package.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , qt5 4 + , qt6 5 5 , makeDesktopItem 6 6 , copyDesktopItems 7 7 }: 8 8 stdenv.mkDerivation (self: { 9 9 pname = "cloudlogoffline"; 10 - version = "1.1.4"; 11 - rev = "185f294ec36d7ebe40e37d70148b15f58d60bf0d"; 12 - hash = "sha256-UEi7q3NbTgkg4tSjiksEO05YE4yjRul4qB9hFPswnK0="; 10 + version = "1.1.5"; 11 + rev = self.version; 12 + hash = "sha256-CF56yk7hsM4M43le+CLy93oLyZ9kaqaRTFWtjJuF6Vo="; 13 13 14 14 src = fetchFromGitHub { 15 15 inherit (self) rev hash; ··· 18 18 }; 19 19 20 20 nativeBuildInputs = [ 21 - qt5.qmake 22 - qt5.wrapQtAppsHook 21 + qt6.qmake 22 + qt6.wrapQtAppsHook 23 23 ] 24 24 ++ lib.optionals (!stdenv.isDarwin) [ 25 25 copyDesktopItems 26 26 ]; 27 27 28 28 buildInputs = [ 29 - qt5.qtbase 30 - qt5.qtgraphicaleffects 31 - qt5.qtlocation 32 - qt5.qtpositioning 33 - qt5.qtquickcontrols2 34 - qt5.qtsvg 29 + qt6.qtbase 30 + qt6.qtlocation 31 + qt6.qtpositioning 32 + qt6.qtsvg 35 33 ]; 36 34 37 35 postPatch = let ··· 44 42 postInstall = lib.optionalString (!stdenv.isDarwin) '' 45 43 install -d $out/share/pixmaps 46 44 install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg 45 + '' + lib.optionalString stdenv.isDarwin '' 46 + # FIXME: For some reason, the Info.plist isn't copied correctly to 47 + # the application bundle when building normally, instead creating an 48 + # empty file. This doesn't happen when building in a dev shell with 49 + # genericBuild. 50 + # So, just copy the file manually. 51 + plistPath="$out/Applications/CloudLogOffline.app/Contents/Info.plist" 52 + [[ -s "$plistPath" ]] && { echo "expected Info.plist to be empty; workaround no longer needed?"; exit 1; } 53 + install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist 47 54 ''; 48 55 49 56 desktopItems = lib.optionals (!stdenv.isDarwin) [
+2 -2
pkgs/by-name/gm/gmic-qt/package.nix
··· 49 49 50 50 stdenv.mkDerivation (finalAttrs: { 51 51 pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; 52 - version = "3.3.5"; 52 + version = "3.3.6"; 53 53 54 54 src = fetchFromGitHub { 55 55 owner = "c-koi"; 56 56 repo = "gmic-qt"; 57 57 rev = "v.${finalAttrs.version}"; 58 - hash = "sha256-WApuIWqVgVJAM2WdfOiqoQ2U+9kIuq8fy6wvJ55KoIc="; 58 + hash = "sha256-0MtQTc2nUF8N1IDIcRxGqfXKULl9ZjnqDt4q84jA5ow="; 59 59 }; 60 60 61 61 nativeBuildInputs = [
+3 -3
pkgs/by-name/gr/grafana-kiosk/package.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "grafana-kiosk"; 5 - version = "1.0.6"; 5 + version = "1.0.7"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "grafana"; 9 9 repo = "grafana-kiosk"; 10 10 rev = "v${version}"; 11 - hash = "sha256-KXEbhRFD++VeVI1Fbrai+IYb3lyGKs+plYPoKIZD0JM="; 11 + hash = "sha256-JTz3EaedJFWE3YqsBLjKH4hWI7+dNeMlp0sZ2kW8IR8="; 12 12 }; 13 13 14 - vendorHash = "sha256-sXaxyPNuHDUOkYcWYm94YvJmr1mGe4HdzttWrNSK2Pw="; 14 + vendorHash = "sha256-8sxfbSj0Jq5f0oJoe8PtP72PDWvLzgOeRiP7I/Pfam4="; 15 15 16 16 nativeBuildInputs = [ makeWrapper ]; 17 17 postFixup = ''
+3 -3
pkgs/by-name/he/hermitcli/package.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "hermit"; 8 - version = "0.39.1"; 8 + version = "0.39.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 rev = "v${version}"; 12 12 owner = "cashapp"; 13 13 repo = "hermit"; 14 - hash = "sha256-ukg/KQTLG2F7mDNgoUr8GEKnkFHEJtVpwDs+DiLXvlM="; 14 + hash = "sha256-By6ZWOiv1A7wghIGD6+oGoBic9puo4M+DzsM/7fOpy8="; 15 15 }; 16 16 17 - vendorHash = "sha256-1QMZvxy6cCJVoIP8mG7s4V0nBAGhrHoPbiKKyYDDL2g="; 17 + vendorHash = "sha256-vEv/sciynvxQE7KpxqpaSO1p5R3xYBK6o4EeuJ2JYmg="; 18 18 19 19 subPackages = [ "cmd/hermit" ]; 20 20
+2 -2
pkgs/by-name/hu/hugo/package.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "hugo"; 13 - version = "0.126.1"; 13 + version = "0.126.2"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "gohugoio"; 17 17 repo = "hugo"; 18 18 rev = "refs/tags/v${version}"; 19 - hash = "sha256-c421kzgD6PFM/9Rn+NmZGyRlJPWhQPraW/4HcuRoEUU="; 19 + hash = "sha256-ySXnJJJDjZqZkWOiq9ByflfUG6bg+0GSzuXpNnuyMZc="; 20 20 }; 21 21 22 22 vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs=";
+3 -3
pkgs/by-name/ma/matugen/package.nix
··· 7 7 8 8 rustPlatform.buildRustPackage rec { 9 9 pname = "matugen"; 10 - version = "2.2.0"; 10 + version = "2.3.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "InioX"; 14 14 repo = "matugen"; 15 15 rev = "v${version}"; 16 - hash = "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc="; 16 + hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU="; 17 17 }; 18 18 19 - cargoHash = "sha256-axBdOzCUwseV2ltgarmIS3IOYLX3q3rXeA2y6y7aNFI="; 19 + cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; 20 20 21 21 buildInputs = lib.optionals stdenv.isDarwin [ 22 22 darwin.apple_sdk.frameworks.Security
+1 -1
pkgs/by-name/me/mealie/mealie-frontend.nix
··· 6 6 7 7 yarnOfflineCache = fetchYarnDeps { 8 8 yarnLock = "${src}/frontend/yarn.lock"; 9 - hash = "sha256-zQUD/PQWzp2Q6fiVmLicvSusXffu6s9q3x/aAUnCN38="; 9 + hash = "sha256-a2kIOQHaMzaMWId6+SSYN+SPQM2Ipa+F1ztFZgo3R6A="; 10 10 }; 11 11 12 12 nativeBuildInputs = [
-103
pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch
··· 1 - diff --git a/mealie/core/root_logger.py b/mealie/core/root_logger.py 2 - index 29db504f..3da5ef84 100644 3 - --- a/mealie/core/root_logger.py 4 - +++ b/mealie/core/root_logger.py 5 - @@ -9,7 +9,6 @@ DATA_DIR = determine_data_dir() 6 - 7 - from .config import get_app_settings # noqa E402 8 - 9 - -LOGGER_FILE = DATA_DIR.joinpath("mealie.log") 10 - DATE_FORMAT = "%d-%b-%y %H:%M:%S" 11 - LOGGER_FORMAT = "%(levelname)s: %(asctime)s \t%(message)s" 12 - 13 - @@ -40,19 +39,17 @@ def get_logger_config(): 14 - level=log_level, 15 - ) 16 - 17 - - output_file_handler = logging.FileHandler(LOGGER_FILE) 18 - handler_format = logging.Formatter(LOGGER_FORMAT, datefmt=DATE_FORMAT) 19 - - output_file_handler.setFormatter(handler_format) 20 - 21 - # Stdout 22 - stdout_handler = logging.StreamHandler(sys.stdout) 23 - stdout_handler.setFormatter(handler_format) 24 - 25 - return LoggerConfig( 26 - - handlers=[output_file_handler, stdout_handler], 27 - + handlers=[stdout_handler], 28 - format="%(levelname)s: %(asctime)s \t%(message)s", 29 - date_format="%d-%b-%y %H:%M:%S", 30 - - logger_file=LOGGER_FILE, 31 - + logger_file=None, 32 - level=log_level, 33 - ) 34 - 35 - diff --git a/mealie/routes/admin/admin_log.py b/mealie/routes/admin/admin_log.py 36 - index ac12c12e..0de98b99 100644 37 - --- a/mealie/routes/admin/admin_log.py 38 - +++ b/mealie/routes/admin/admin_log.py 39 - @@ -1,6 +1,5 @@ 40 - from fastapi import APIRouter 41 - 42 - -from mealie.core.root_logger import LOGGER_FILE 43 - from mealie.core.security import create_file_token 44 - 45 - router = APIRouter(prefix="/logs") 46 - @@ -9,15 +8,13 @@ router = APIRouter(prefix="/logs") 47 - @router.get("/{num}") 48 - async def get_log(num: int): 49 - """Doc Str""" 50 - - with open(LOGGER_FILE, "rb") as f: 51 - - log_text = tail(f, num) 52 - - return log_text 53 - + return "" 54 - 55 - 56 - @router.get("") 57 - async def get_log_file(): 58 - """Returns a token to download a file""" 59 - - return {"fileToken": create_file_token(LOGGER_FILE)} 60 - + return {"fileToken": create_file_token("nofile")} 61 - 62 - 63 - def tail(f, lines=20): 64 - diff --git a/mealie/routes/admin/admin_maintenance.py b/mealie/routes/admin/admin_maintenance.py 65 - index 23ef8369..322b580f 100644 66 - --- a/mealie/routes/admin/admin_maintenance.py 67 - +++ b/mealie/routes/admin/admin_maintenance.py 68 - @@ -6,7 +6,6 @@ from pathlib import Path 69 - 70 - from fastapi import APIRouter, HTTPException 71 - 72 - -from mealie.core.root_logger import LOGGER_FILE 73 - from mealie.pkgs.stats import fs_stats 74 - from mealie.routes._base import BaseAdminController, controller 75 - from mealie.schema.admin import MaintenanceSummary 76 - @@ -73,8 +72,6 @@ class AdminMaintenanceController(BaseAdminController): 77 - Get the maintenance summary 78 - """ 79 - log_file_size = 0 80 - - with contextlib.suppress(FileNotFoundError): 81 - - log_file_size = os.path.getsize(LOGGER_FILE) 82 - 83 - return MaintenanceSummary( 84 - data_dir_size=fs_stats.pretty_size(fs_stats.get_dir_size(self.folders.DATA_DIR)), 85 - @@ -85,7 +82,7 @@ class AdminMaintenanceController(BaseAdminController): 86 - 87 - @router.get("/logs", response_model=MaintenanceLogs) 88 - def get_logs(self, lines: int = 200): 89 - - return MaintenanceLogs(logs=tail_log(LOGGER_FILE, lines)) 90 - + return MaintenanceLogs(logs="") 91 - 92 - @router.get("/storage", response_model=MaintenanceStorageDetails) 93 - def get_storage_details(self): 94 - @@ -137,9 +134,6 @@ class AdminMaintenanceController(BaseAdminController): 95 - Purges the logs 96 - """ 97 - try: 98 - - with contextlib.suppress(FileNotFoundError): 99 - - os.remove(LOGGER_FILE) 100 - - LOGGER_FILE.touch() 101 - return SuccessResponse.respond("Logs cleaned") 102 - except Exception as e: 103 - raise HTTPException(status_code=500, detail=ErrorResponse.respond("Failed to clean logs")) from e
+9 -35
pkgs/by-name/me/mealie/package.nix
··· 1 1 { lib 2 2 , callPackage 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , makeWrapper 6 5 , nixosTests 7 6 , python3Packages ··· 10 9 }: 11 10 12 11 let 13 - version = "1.2.0"; 12 + version = "1.7.0"; 14 13 src = fetchFromGitHub { 15 14 owner = "mealie-recipes"; 16 15 repo = "mealie"; 17 16 rev = "v${version}"; 18 - sha256 = "sha256-Kc49XDWcZLeJaYgiAO2/mHeVSOLMeiPr3U32e0IYfdU="; 17 + hash = "sha256-z7kLBDzvzPWY7XmpROMpw3LcDpsl+hA+w1SdhrD/yNU="; 19 18 }; 20 19 21 20 frontend = callPackage (import ./mealie-frontend.nix src version) { }; 22 21 23 - pythonpkgs = python3Packages.override { 24 - overrides = self: super: { 25 - pydantic = python3Packages.pydantic_1; 26 - }; 27 - }; 22 + pythonpkgs = python3Packages; 28 23 python = pythonpkgs.python; 29 24 30 25 crfpp = stdenv.mkDerivation { ··· 37 32 hash = "sha256-XNps3ZApU8m07bfPEnvip1w+3hLajdn9+L5+IpEaP0c="; 38 33 }; 39 34 }; 40 - 41 - mealie_patch = { name, commit, hash }: fetchpatch { 42 - inherit name hash; 43 - url = "https://github.com/mealie-recipes/mealie/commit/${commit}.patch"; 44 - }; 45 - 46 35 in pythonpkgs.buildPythonPackage rec { 47 36 pname = "mealie"; 48 37 inherit version src; 49 38 pyproject = true; 50 39 51 - patches = [ 52 - # See https://github.com/mealie-recipes/mealie/pull/3102 53 - # Replace hardcoded paths in code with environment variables (meant for inside Docker only) 54 - # So we can configure easily where the data is stored on the server 55 - (mealie_patch { 56 - name = "model-path.patch"; 57 - commit = "e445705c5d26b895d806b96b2f330d4e9aac3723"; 58 - hash = "sha256-cf0MwvT81lNBTjvag8UUEbXkBu8Jyi/LFwUcs4lBVcY="; 59 - }) 60 - (mealie_patch { 61 - name = "alembic-cfg-path.patch"; 62 - commit = "06c528bfac0708af66aa0629f2e2232ddf07768f"; 63 - hash = "sha256-IOgdZK7dmWeX2ox16J9v+bOS7nHgCMvCJy6RNJLj0p8="; 64 - }) 65 - ./mealie-logs-to-stdout.patch 66 - ]; 67 - 68 40 nativeBuildInputs = [ 69 41 pythonpkgs.poetry-core 70 42 pythonpkgs.pythonRelaxDepsHook ··· 82 54 aniso8601 83 55 appdirs 84 56 apprise 57 + authlib 85 58 bcrypt 86 59 extruct 87 60 fastapi ··· 90 63 httpx 91 64 jinja2 92 65 lxml 66 + openai 93 67 orjson 94 68 paho-mqtt 95 - passlib 96 69 pillow 70 + pillow-heif 97 71 psycopg2 72 + pydantic-settings 98 73 pyhumps 99 - pytesseract 74 + pyjwt 100 75 python-dotenv 101 - python-jose 102 76 python-ldap 103 77 python-multipart 104 78 python-slugify ··· 160 134 homepage = "https://mealie.io"; 161 135 changelog = "https://github.com/mealie-recipes/mealie/releases/tag/${src.rev}"; 162 136 license = licenses.agpl3Only; 163 - maintainers = with maintainers; [ litchipi ]; 137 + maintainers = with maintainers; [ litchipi anoa ]; 164 138 mainProgram = "mealie"; 165 139 }; 166 140 }
+3 -3
pkgs/by-name/me/mercure/package.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "mercure"; 11 - version = "0.15.11"; 11 + version = "0.16.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "dunglas"; 15 15 repo = "mercure"; 16 16 rev = "v${version}"; 17 - hash = "sha256-qPKfF0awRsMfXu7N/xNwFVmmuqTMGsDDqrVgt6LwviI="; 17 + hash = "sha256-HHErk1KX8HgAt4UrBuchK6ysNsxEsrf5uBzzvSNz+to="; 18 18 }; 19 19 20 20 sourceRoot = "${src.name}/caddy"; 21 21 22 - vendorHash = "sha256-evUGa1kFWbj0ynDQruBRDx2opzh7Tc7eHnWn3H4xwxY="; 22 + vendorHash = "sha256-aO0EvxZNOCAaqEWN1VIdPpS+y8KcsuXo7o8msicspNE="; 23 23 24 24 subPackages = [ "mercure" ]; 25 25 excludedPackages = [ "../cmd/mercure" ];
+7
pkgs/by-name/me/meson/package.nix
··· 4 4 , installShellFiles 5 5 , coreutils 6 6 , darwin 7 + , libblocksruntime 8 + , llvmPackages 7 9 , libxcrypt 8 10 , openldap 9 11 , ninja ··· 100 102 OpenAL 101 103 OpenGL 102 104 openldap 105 + ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.isDarwin) [ 106 + # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build 107 + llvmPackages.openmp 108 + # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build 109 + libblocksruntime 103 110 ]; 104 111 105 112 checkPhase = lib.concatStringsSep "\n" ([
+4 -4
pkgs/by-name/ne/neovide/package.nix
··· 26 26 27 27 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { 28 28 pname = "neovide"; 29 - version = "0.13.0"; 29 + version = "0.13.1"; 30 30 31 31 src = fetchFromGitHub { 32 32 owner = "neovide"; 33 33 repo = "neovide"; 34 34 rev = version; 35 - sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw="; 35 + hash = "sha256-vN4LwJdVU0OWBuG7omDYY3Q6QZ2pTyCxWxFzv9Z1/6I="; 36 36 }; 37 37 38 - cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc="; 38 + cargoHash = "sha256-TiGEAwNXBNTXVU/CyKrUkjy8eIypYiLtoTyjskMpWvs="; 39 39 40 40 SKIA_SOURCE_DIR = 41 41 let ··· 44 44 repo = "skia"; 45 45 # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia 46 46 rev = "m124-0.72.3"; 47 - sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; 47 + hash = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; 48 48 }; 49 49 # The externals for skia are taken from skia/DEPS 50 50 externals = linkFarm "skia-externals" (lib.mapAttrsToList
+3 -3
pkgs/by-name/oh/oh-my-posh/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "oh-my-posh"; 9 - version = "20.2.0"; 9 + version = "21.0.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "jandedobbeleer"; 13 13 repo = pname; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-OkLQpU9FN7R+W8zNd3UMmNVgmEVzSVibZ/cl5mN8TU8="; 15 + hash = "sha256-fN1vkDk9u4NWVnaNuFVjcKQ7rEMhOMxBlvTxrp8G1d8="; 16 16 }; 17 17 18 - vendorHash = "sha256-PDMmiU6NoJiCRZxJNKxt30sH+a14Snvk/CrD/+QpEEU="; 18 + vendorHash = "sha256-MdHWAC46694hgCi1i/syNPdn4t+kY2ZhCAnE7aD8+8Y="; 19 19 20 20 sourceRoot = "${src.name}/src"; 21 21
+2 -2
pkgs/by-name/ri/ricochet-refresh/package.nix
··· 13 13 in 14 14 stdenv.mkDerivation (finalAttrs: { 15 15 pname = "ricochet-refresh"; 16 - version = "3.0.22"; 16 + version = "3.0.23"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "blueprint-freespeech"; 20 20 repo = "ricochet-refresh"; 21 21 rev = "v${finalAttrs.version}-release"; 22 - hash = "sha256-xPOAtH+K3WTPjbDw4ZhwpO2+wUYe5JdqKdtfNKQbgSM="; 22 + hash = "sha256-Wz53KeI3t12MqnvGuGS8Jd9gDY4eCTc5wcXBDHp5m0U="; 23 23 fetchSubmodules = true; 24 24 }; 25 25
+7
pkgs/by-name/st/stalwart-mail/package.nix
··· 62 62 ROCKSDB_LIB_DIR = "${rocksdb}/lib"; 63 63 }; 64 64 65 + postInstall = '' 66 + mkdir -p $out/lib/systemd/system 67 + 68 + substitute resources/systemd/stalwart-mail.service $out/lib/systemd/system/stalwart-mail.service \ 69 + --replace "__PATH__" "$out" 70 + ''; 71 + 65 72 # Tests require reading to /etc/resolv.conf 66 73 doCheck = false; 67 74
+3 -3
pkgs/by-name/tr/tradingview/package.nix
··· 22 22 23 23 stdenv.mkDerivation (finalAttrs: { 24 24 pname = "tradingview"; 25 - version = "2.7.2"; 26 - revision = "49"; 25 + version = "2.7.7"; 26 + revision = "53"; 27 27 28 28 src = fetchurl { 29 29 url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap"; 30 - hash = "sha256-GU5vWjZz8FBMtYawfP8cVmKp8X7bhJnLa0ft7Ku8czw="; 30 + hash = "sha256-izASQXx/wTPKvPxWRh0csKsXoQlsFaOsLsNthepwW64="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+3 -3
pkgs/by-name/ux/uxn/package.nix
··· 7 7 8 8 stdenv.mkDerivation (finalAttrs: { 9 9 pname = "uxn"; 10 - version = "1.0-unstable-2024-05-10"; 10 + version = "1.0-unstable-2024-05-30"; 11 11 12 12 src = fetchFromSourcehut { 13 13 owner = "~rabbits"; 14 14 repo = "uxn"; 15 - rev = "bb57b85f5724ccabdb081ff83080c2e3e0e122f7"; 16 - hash = "sha256-S/lTa6nQ7qIIibYaLfaS4l2dEKgOwXuMryvK9j7FD9Y="; 15 + rev = "987a3348a64be19fd7cd75bec7fa08c2619b478b"; 16 + hash = "sha256-Yrlfnh9OuIEXEowM86UxkvX40522oP+yyQphmaQcY+s="; 17 17 }; 18 18 19 19 outputs = [ "out" "projects" ];
+5 -2
pkgs/data/icons/flat-remix-icon-theme/default.nix
··· 2 2 3 3 stdenvNoCC.mkDerivation rec { 4 4 pname = "flat-remix-icon-theme"; 5 - version = "20220525"; 5 + version = "20240201"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "daniruiz"; 9 9 repo = "flat-remix"; 10 10 rev = version; 11 - sha256 = "sha256-JpUa2nxZxrLTd80qdiGpob4Trq41ONthsPA4zFj/6nk="; 11 + sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ ··· 22 22 hicolor-icon-theme 23 23 ]; 24 24 25 + dontFixup = true; 25 26 dontDropIconThemeCache = true; 26 27 27 28 installPhase = '' ··· 31 32 for theme in $out/share/icons/*; do 32 33 gtk-update-icon-cache $theme 33 34 done 35 + symlinkParentIconThemes 36 + recordPropagatedDependencies 34 37 ''; 35 38 36 39 meta = with lib; {
+18 -14
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchurl 4 - , meson 5 - , ninja 6 - , gettext 7 - , pkg-config 8 - , glib 9 - , gnome 10 - , gnome-menus 11 - , substituteAll 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + meson, 6 + ninja, 7 + gettext, 8 + pkg-config, 9 + libgtop, 10 + glib, 11 + gnome, 12 + gnome-menus, 13 + substituteAll, 12 14 }: 13 15 14 16 stdenv.mkDerivation (finalAttrs: { ··· 25 27 src = ./fix_gmenu.patch; 26 28 gmenu_path = "${gnome-menus}/lib/girepository-1.0"; 27 29 }) 30 + (substituteAll { 31 + src = ./fix_gtop.patch; 32 + gtop_path = "${libgtop}/lib/girepository-1.0"; 33 + }) 28 34 ]; 29 35 30 36 nativeBuildInputs = [ ··· 35 41 glib 36 42 ]; 37 43 38 - mesonFlags = [ 39 - "-Dextension_set=all" 40 - ]; 44 + mesonFlags = [ "-Dextension_set=all" ]; 41 45 42 46 preFixup = '' 43 47 # Since we do not install the schemas to central location,
+25
pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch
··· 1 + diff --git a/extensions/system-monitor/extension.js b/extensions/system-monitor/extension.js 2 + index 37d2eb1..232d0d5 100644 3 + --- a/extensions/system-monitor/extension.js 4 + +++ b/extensions/system-monitor/extension.js 5 + @@ -6,9 +6,9 @@ 6 + 7 + import Clutter from 'gi://Clutter'; 8 + import Gio from 'gi://Gio'; 9 + +import GIRepository from "gi://GIRepository"; 10 + import GLib from 'gi://GLib'; 11 + import GObject from 'gi://GObject'; 12 + -import GTop from 'gi://GTop'; 13 + import Pango from 'gi://Pango'; 14 + import Shell from 'gi://Shell'; 15 + import St from 'gi://St'; 16 + @@ -19,6 +19,9 @@ import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; 17 + 18 + import * as Main from 'resource:///org/gnome/shell/ui/main.js'; 19 + 20 + +GIRepository.Repository.prepend_search_path('@gtop_path@'); 21 + +const GTop = (await import("gi://GTop")).default; 22 + + 23 + const THRESHOLD_HIGH = 0.80; 24 + 25 + // adapted from load-graph.cpp in gnome-system-monitor
+4 -2
pkgs/development/coq-modules/mathcomp-word/default.nix
··· 18 18 19 19 releaseRev = v: "v${v}"; 20 20 21 + release."3.2".sha256 = "sha256-4HOFFQzKbHIq+ktjJaS5b2Qr8WL1eQ26YxF4vt1FdWM="; 21 22 release."3.1".sha256 = "sha256-qQHis6554sG7NpCpWhT2wvelnxsrbEPVNv3fpxwxHMU="; 22 23 release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4="; 24 + release."2.4".sha256 = "sha256-OG99PfjhtKikxM9aBKRsej1gTo1O/llAdXdiiyjZf2Q="; 23 25 release."2.3".sha256 = "sha256-whU1yvFFuxpwQutW41B/WBg5DrVZJW/Do/GuHtzuI3U="; 24 26 release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8="; 25 27 release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA="; ··· 27 29 28 30 inherit version; 29 31 defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ 30 - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.1"; } 31 - { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.3"; } 32 + { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } 33 + { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.4"; } 32 34 ] null; 33 35 34 36 propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];
+4 -1
pkgs/development/julia-modules/depot.nix
··· 52 52 # for finding the extra packages we need to add 53 53 python ${./python}/find_package_implications.py "${closureYaml}" '${lib.generators.toJSON {} packageImplications}' extra_package_names.txt 54 54 55 - # git config --global --add safe.directory '/nix' 55 + # Work around new git security features added in git 2.44.1 56 + # See https://github.com/NixOS/nixpkgs/issues/315890 57 + git config --global --add safe.directory '*' 58 + 56 59 export JULIA_PKG_USE_CLI_GIT="true" 57 60 58 61 # At time of writing, this appears to be the only way to turn precompiling's
+5 -1
pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs
··· 4 4 {-# LANGUAGE FlexibleContexts #-} 5 5 {-# LANGUAGE LambdaCase #-} 6 6 {-# LANGUAGE OverloadedStrings #-} 7 + {-# LANGUAGE QuasiQuotes #-} 7 8 {-# LANGUAGE RecordWildCards #-} 8 9 {-# LANGUAGE ScopedTypeVariables #-} 9 10 {-# LANGUAGE ViewPatterns #-} ··· 17 18 import qualified Data.Aeson.KeyMap as HM 18 19 import qualified Data.ByteString.Lazy.Char8 as BL8 19 20 import qualified Data.List as L 21 + import Data.String.Interpolate 20 22 import Data.Text as T 21 23 import qualified Data.Vector as V 22 24 import qualified Data.Yaml as Yaml ··· 33 35 countFilePath :: FilePath 34 36 , topN :: Int 35 37 , parallelism :: Int 38 + , juliaAttr :: Text 36 39 } 37 40 38 41 argsParser :: Parser Args ··· 40 43 <$> strOption (long "count-file" <> short 'c' <> help "YAML file containing package names and counts") 41 44 <*> option auto (long "top-n" <> short 'n' <> help "How many of the top packages to build" <> showDefault <> value 100 <> metavar "INT") 42 45 <*> option auto (long "parallelism" <> short 'p' <> help "How many builds to run at once" <> showDefault <> value 10 <> metavar "INT") 46 + <*> strOption (long "julia-attr" <> short 'a' <> help "Which Julia attr to build with" <> showDefault <> value "julia" <> metavar "STRING") 43 47 44 48 data NameAndCount = NameAndCount { 45 49 name :: Text ··· 69 73 introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do 70 74 it "Builds" $ do 71 75 let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr" 72 - , "with import ../../../../. {}; julia.withPackages [\"" <> T.unpack name <> "\"]" 76 + , [i|with import ../../../../. {}; #{juliaAttr}.withPackages ["#{name}"]|] 73 77 ] 74 78 output <- readCreateProcessWithLogging cp "" 75 79 juliaPath <- case A.eitherDecode (BL8.pack output) of
+1
pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal
··· 27 27 , filepath 28 28 , optparse-applicative 29 29 , sandwich 30 + , string-interpolate 30 31 , text 31 32 , unliftio 32 33 , vector
+1
pkgs/development/julia-modules/tests/julia-top-n/package.yaml
··· 11 11 - filepath 12 12 - optparse-applicative 13 13 - sandwich 14 + - string-interpolate 14 15 - text 15 16 - unliftio 16 17 - vector
-29
pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch
··· 1 - From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> 3 - Date: Tue, 28 Nov 2023 11:28:11 +0100 4 - Subject: [PATCH] fix setuptools installation 5 - MIME-Version: 1.0 6 - Content-Type: text/plain; charset=UTF-8 7 - Content-Transfer-Encoding: 8bit 8 - 9 - Signed-off-by: Jörg Thalheim <joerg@thalheim.io> 10 - --- 11 - python/Makefile | 2 +- 12 - 1 file changed, 1 insertion(+), 1 deletion(-) 13 - 14 - diff --git a/python/Makefile b/python/Makefile 15 - index f835daa..b41995a 100644 16 - --- a/python/Makefile 17 - +++ b/python/Makefile 18 - @@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) 19 - endif 20 - 21 - ifneq ($(CONFIG_PYDIR),) 22 - -setup_cmd += --install-purelib $(CONFIG_PYDIR) 23 - +setup_cmd += --root / --prefix $(CONFIG_PYDIR) 24 - purelibdir := $(CONFIG_PYDIR) 25 - else 26 - purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") 27 - -- 28 - 2.42.0 29 -
+13 -7
pkgs/development/libraries/spdk/default.nix
··· 4 4 , python3 5 5 , cunit 6 6 , dpdk 7 + , fuse3 7 8 , libaio 8 9 , libbsd 9 10 , libuuid ··· 22 23 stdenv.mkDerivation rec { 23 24 pname = "spdk"; 24 25 25 - version = "23.09"; 26 + version = "24.01"; 26 27 27 28 src = fetchFromGitHub { 28 29 owner = "spdk"; 29 30 repo = "spdk"; 30 31 rev = "v${version}"; 31 - sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; 32 + sha256 = "sha256-5znYELR6WvVXbfFKAcRtJnSwAE5WHmA8v1rvZUtszS4="; 32 33 fetchSubmodules = true; 33 34 }; 34 35 35 36 nativeBuildInputs = [ 36 37 python3 38 + python3.pkgs.pip 37 39 python3.pkgs.setuptools 40 + python3.pkgs.wheel 41 + python3.pkgs.wrapPython 38 42 pkg-config 39 43 ensureNewerSourcesForZipFilesHook 40 44 ]; ··· 42 46 buildInputs = [ 43 47 cunit 44 48 dpdk 49 + fuse3 45 50 jansson 46 51 libaio 47 52 libbsd ··· 56 61 zstd 57 62 ]; 58 63 59 - patches = [ 60 - # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 61 - ./setuptools.patch 62 - ./0001-fix-setuptools-installation.patch 64 + propagatedBuildInputs = [ 65 + python3.pkgs.configshell 63 66 ]; 64 67 65 68 postPatch = '' ··· 70 73 71 74 configureFlags = [ 72 75 "--with-dpdk=${dpdk}" 73 - "--pydir=${placeholder "out"}" 74 76 ]; 75 77 76 78 postCheck = '' 77 79 python3 -m spdk 80 + ''; 81 + 82 + postFixup = '' 83 + wrapPythonPrograms 78 84 ''; 79 85 80 86 env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile.
-25
pkgs/development/libraries/spdk/setuptools.patch
··· 1 - From 3a72290ba7e2d71ca887225fc0eb8792ca863be2 Mon Sep 17 00:00:00 2001 2 - From: Jörg Thalheim <joerg@thalheim.io> 3 - Date: Tue, 24 Oct 2023 14:30:53 +0200 4 - Subject: [PATCH] python: drop deprecated distutils 5 - 6 - This is scheduled for removal in python 3.12: https://docs.python.org/3/whatsnew/3.12.html 7 - 8 - Change-Id: I728dc0cf4ed20f22016d3d58cca8aee3af2bcd8b 9 - Signed-off-by: Jörg Thalheim <joerg@thalheim.io> 10 - --- 11 - 12 - diff --git a/python/setup.py b/python/setup.py 13 - index 47e2104..ae4dff7 100755 14 - --- a/python/setup.py 15 - +++ b/python/setup.py 16 - @@ -2,8 +2,7 @@ 17 - # SPDX-License-Identifier: BSD-3-Clause 18 - # Copyright (C) 2023 Intel Corporation. All rights reserved. 19 - 20 - -from distutils.core import setup 21 - -from setuptools import find_packages 22 - +from setuptools import setup, find_packages 23 - from spdk import __version__ 24 - 25 -
+2 -2
pkgs/development/python-modules/httpauth/default.nix
··· 5 5 }: 6 6 7 7 buildPythonPackage rec { 8 - version = "0.4"; 8 + version = "0.4.1"; 9 9 format = "setuptools"; 10 10 pname = "httpauth"; 11 11 12 12 src = fetchPypi { 13 13 inherit pname version; 14 - sha256 = "sha256-lehPEuxYV4SQsdL1RWBqTNFIGz2pSoTs+nlkQ5fPX8M="; 14 + sha256 = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; 15 15 }; 16 16 17 17 doCheck = false;
+4 -1
pkgs/development/python-modules/python-musicpd/default.nix
··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchPypi, 5 + setuptools, 5 6 }: 6 7 7 8 buildPythonPackage rec { ··· 14 15 sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; 15 16 }; 16 17 17 - format = "setuptools"; 18 + pyproject = true; 19 + 20 + build-system = [ setuptools ]; 18 21 19 22 doCheck = true; 20 23
+2 -2
pkgs/development/python-modules/pytun/default.nix
··· 6 6 7 7 buildPythonPackage rec { 8 8 pname = "pytun"; 9 - version = "2.3.0"; 9 + version = "2.4.1"; 10 10 format = "setuptools"; 11 11 12 12 src = fetchFromGitHub { 13 13 rev = "v${version}"; 14 14 owner = "montag451"; 15 15 repo = "pytun"; 16 - sha256 = "1cqq8aci38058fjh4a0xf21wac177fw576p2yjl2b8jd9rnsqbl5"; 16 + sha256 = "sha256-DZ7CoLi6LPhuc55HF9dtek+/N4A29ecnZn7bk7jweuI="; 17 17 }; 18 18 19 19 # Test directory contains examples, not tests.
+10 -8
pkgs/development/python-modules/qutip/default.nix
··· 1 1 { 2 2 lib, 3 - stdenv, 4 3 buildPythonPackage, 5 4 cvxopt, 6 5 cvxpy, ··· 9 8 ipython, 10 9 matplotlib, 11 10 numpy, 11 + oldest-supported-numpy, 12 12 packaging, 13 13 pytest-rerunfailures, 14 14 pytestCheckHook, 15 15 python, 16 16 pythonOlder, 17 17 scipy, 18 + setuptools, 18 19 }: 19 20 20 21 buildPythonPackage rec { 21 22 pname = "qutip"; 22 - version = "4.7.5"; 23 - format = "setuptools"; 23 + version = "5.0.2"; 24 + pyproject = true; 24 25 25 26 disabled = pythonOlder "3.7"; 26 27 ··· 28 29 owner = pname; 29 30 repo = pname; 30 31 rev = "refs/tags/v${version}"; 31 - hash = "sha256-4nXZPZFu9L+Okha3qvPil1KvLGO1EbrzotQjqQ8r9l8="; 32 + hash = "sha256-lMPzgmUaoEQB5TzmqEJFiFTuS3AGpyMMjPHlPUKTLvk="; 32 33 }; 33 34 34 - nativeBuildInputs = [ cython_0 ]; 35 + nativeBuildInputs = [ 36 + cython_0 37 + setuptools 38 + oldest-supported-numpy 39 + ]; 35 40 36 41 propagatedBuildInputs = [ 37 42 numpy ··· 43 48 pytestCheckHook 44 49 pytest-rerunfailures 45 50 ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); 46 - 47 - # Disabling OpenMP support on Darwin. 48 - setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [ "--with-openmp" ]; 49 51 50 52 # QuTiP tries to access the home directory to create an rc file for us. 51 53 # We need to go to another directory to run the tests from there.
-5
pkgs/development/python-modules/stringly/default.nix
··· 1 1 { 2 2 lib, 3 - python, 4 3 buildPythonPackage, 5 4 fetchPypi, 6 5 typing-extensions, ··· 19 18 pythonImportsCheck = [ "stringly" ]; 20 19 21 20 propagatedBuildInputs = [ typing-extensions ]; 22 - 23 - checkPhase = '' 24 - ${python.interpreter} -m unittest 25 - ''; 26 21 27 22 meta = with lib; { 28 23 description = "Stringly: Human Readable Object Serialization";
-5
pkgs/development/python-modules/treelog/default.nix
··· 1 1 { 2 2 lib, 3 - python, 4 3 buildPythonPackage, 5 4 fetchPypi, 6 5 typing-extensions, ··· 19 18 pythonImportsCheck = [ "treelog" ]; 20 19 21 20 propagatedBuildInputs = [ typing-extensions ]; 22 - 23 - checkPhase = '' 24 - ${python.interpreter} -m unittest 25 - ''; 26 21 27 22 meta = with lib; { 28 23 description = "Logging framework that organizes messages in a tree structure";
+9 -1
pkgs/development/python-modules/wasserstein/default.nix
··· 2 2 lib, 3 3 buildPythonPackage, 4 4 fetchFromGitHub, 5 + fetchpatch, 5 6 numpy, 6 7 llvmPackages, 7 8 wurlitzer, ··· 16 17 src = fetchFromGitHub { 17 18 owner = "pkomiske"; 18 19 repo = "Wasserstein"; 19 - rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1 20 + rev = "v${version}"; 20 21 hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE="; 21 22 }; 23 + 24 + patches = [ 25 + (fetchpatch { 26 + url = "https://github.com/thaler-lab/Wasserstein/commit/8667d59dfdf89eabf01f3ae93b23a30a27c21c58.patch"; 27 + hash = "sha256-jp5updB3E1MYgLhBJwmBMTwBiFXtABMwTxt0G6xhoyA="; 28 + }) 29 + ]; 22 30 23 31 buildInputs = [ llvmPackages.openmp ]; 24 32 propagatedBuildInputs = [
+2 -2
pkgs/development/tools/air/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "air"; 5 - version = "1.52.0"; 5 + version = "1.52.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cosmtrek"; 9 9 repo = "air"; 10 10 rev = "v${version}"; 11 - hash = "sha256-7iqS8p53Pyk2WQVkbTVA7eJNnD2KvO41S+JJBTFOToQ="; 11 + hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08="; 12 12 }; 13 13 14 14 vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw=";
+1
pkgs/development/tools/cmake-format/default.nix
··· 31 31 homepage = "https://github.com/cheshirekow/cmake_format"; 32 32 license = licenses.gpl3; 33 33 maintainers = [ maintainers.tobim ]; 34 + mainProgram = "cmake-format"; 34 35 platforms = platforms.all; 35 36 }; 36 37 }
+2 -2
pkgs/development/tools/doctl/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "doctl"; 5 - version = "1.106.0"; 5 + version = "1.107.0"; 6 6 7 7 vendorHash = null; 8 8 ··· 31 31 owner = "digitalocean"; 32 32 repo = "doctl"; 33 33 rev = "v${version}"; 34 - sha256 = "sha256-Un1qBQbrgdudAfnviP8d6A7nNwi1ZGAFPN33NLKXNwI="; 34 + sha256 = "sha256-svwFIM1lJI60bdmzZS/QZSzy30HtOf498GgnqLFGKAQ="; 35 35 }; 36 36 37 37 meta = with lib; {
+3 -3
pkgs/development/tools/language-servers/jq-lsp/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "jq-lsp"; 8 - version = "0.1.2"; 8 + version = "0.1.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "wader"; 12 12 repo = "jq-lsp"; 13 13 rev = "refs/tags/v${version}"; 14 - hash = "sha256-a3ZqVWG7kjWQzL1efrKc4s4D14qD/+6JM26vaduxhWg="; 14 + hash = "sha256-c7uK8WPM/h2PLVLFGeN66SztvzjBCgJje7L14+oErVU="; 15 15 }; 16 16 17 - vendorHash = "sha256-bIe006I1ryvIJ4hC94Ux2YVdlmDIM4oZaK/qXafYYe0="; 17 + vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY="; 18 18 19 19 # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml 20 20 CGO_ENABLED = 0;
+7 -2
pkgs/development/tools/misc/premake/5.nix
··· 19 19 --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" 20 20 '' + lib.optionalString stdenv.isDarwin '' 21 21 substituteInPlace premake5.lua \ 22 - --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 22 + --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ 23 + --replace-fail '"-arch arm64"' '""' \ 24 + --replace-fail '"-arch x86_64"' '""' 23 25 '' + lib.optionalString stdenv.hostPlatform.isStatic '' 24 26 substituteInPlace \ 25 27 binmodules/example/premake5.lua \ ··· 34 36 make -f Bootstrap.mak linux 35 37 ''; 36 38 39 + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ 40 + "-Wno-error=implicit-function-declaration" 41 + ]); 42 + 37 43 installPhase = '' 38 44 install -Dm755 bin/release/premake5 $out/bin/premake5 39 45 ''; ··· 47 53 mainProgram = "premake5"; 48 54 license = lib.licenses.bsd3; 49 55 platforms = lib.platforms.darwin ++ lib.platforms.linux; 50 - broken = stdenv.isDarwin && stdenv.isAarch64; 51 56 }; 52 57 }
+6 -6
pkgs/development/tools/misc/seer/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, gdb, qtcharts, qtbase, wrapQtAppsHook }: 1 + { lib, stdenv, fetchFromGitHub, cmake, gdb, kdePackages, wrapQtAppsHook }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "seer"; 5 - version = "1.17"; 5 + version = "2.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "epasveer"; 9 9 repo = "seer"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-lM6w+QwIRYP/2JDx4yynJxhVXt8SouOWgsLGXSwolIw="; 11 + sha256 = "sha256-ZvoRC34496fUldL3jOdxcO/TVmfPNmmr2GkJG4gJXzk="; 12 12 }; 13 13 14 14 preConfigure = '' ··· 17 17 18 18 patchPhase = '' 19 19 substituteInPlace src/{SeerGdbConfigPage,SeerMainWindow,SeerGdbWidget}.cpp \ 20 - --replace "/usr/bin/gdb" "${gdb}/bin/gdb" 20 + --replace-fail "/usr/bin/gdb" "${gdb}/bin/gdb" 21 21 ''; 22 22 23 - buildInputs = [ qtbase qtcharts ]; 24 - nativeBuildInputs = [ cmake wrapQtAppsHook ]; 23 + buildInputs = with kdePackages; [ qtbase qtcharts qtsvg ]; 24 + nativeBuildInputs = [ cmake kdePackages.wrapQtAppsHook ]; 25 25 26 26 meta = with lib; { 27 27 description = "A Qt gui frontend for GDB";
+3 -3
pkgs/development/tools/squawk/default.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "squawk"; 14 - version = "0.28.0"; 14 + version = "0.29.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "sbdchd"; 18 18 repo = pname; 19 19 rev = "v${version}"; 20 - hash = "sha256-RnY41G0ombqJewv+kxvg8AwQeRaVb+frZjmU/Cd28Jo="; 20 + hash = "sha256-YKwoMZkr+UWri4WLm+a44DA8sygy67UkSm160OqDGus="; 21 21 }; 22 22 23 - cargoHash = "sha256-YR2ZSwrCkX8eyHTj1Dtk9f01/y9fDtknouige68kS8I="; 23 + cargoHash = "sha256-pX87ccAyMkR7qA/k3zLgqYEIhNLFa5yrrVZVtWUKfyc="; 24 24 25 25 nativeBuildInputs = [ 26 26 pkg-config
+3 -3
pkgs/os-specific/linux/nvidia-x11/default.nix
··· 62 62 # Vulkan developer beta driver 63 63 # See here for more information: https://developer.nvidia.com/vulkan-driver 64 64 vulkan_beta = generic rec { 65 - version = "550.40.61"; 65 + version = "550.40.63"; 66 66 persistencedVersion = "550.54.14"; 67 67 settingsVersion = "550.54.14"; 68 - sha256_64bit = "sha256-JNVeA5/u5/ictU3QpPnbXIHDKOtwou8wGmMt3We4FJY="; 69 - openSha256 = "sha256-kWGTj3eAvwLTJ7zgzRFvyhXmfpxQbUMmyxWxER9i9m0="; 68 + sha256_64bit = "sha256-YvlNgxcFsCl3DzHFpKe+VXzfc0QIgf3N/hTKsWZ7gDE="; 69 + openSha256 = "sha256-mITh1kdSPtB+jP6TDHw04EN7gRx48KGbzbLO0wTSS/U="; 70 70 settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; 71 71 persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; 72 72 url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
+2 -2
pkgs/servers/dns/pdns/default.nix
··· 23 23 24 24 stdenv.mkDerivation (finalAttrs: { 25 25 pname = "pdns"; 26 - version = "4.9.0"; 26 + version = "4.9.1"; 27 27 28 28 src = fetchurl { 29 29 url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; 30 - hash = "sha256-/h1UM8iERu1w2TFgXG7Dd9qZg5xOFRuQtxqiEb1u6pI="; 30 + hash = "sha256-MNlnG48IR3Tby6IPWlOjE00IIqsu3D75aNoDDmMN0Jo="; 31 31 }; 32 32 # redact configure flags from version output to reduce closure size 33 33 patches = [ ./version.patch ];
+10
pkgs/servers/home-assistant/default.nix
··· 267 267 patches = []; 268 268 }); 269 269 270 + pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: { 271 + version = "2.5.9"; 272 + src = fetchFromGitHub { 273 + owner = "vilppuvuorinen"; 274 + repo = "pymelcloud"; 275 + rev = "33a827b6cd0b34f276790faa49bfd0994bb7c2e4"; # 2.5.x branch 276 + sha256 = "sha256-Q3FIo9YJwtWPHfukEBjBANUQ1N1vr/DMnl1dgiN7vYg="; 277 + }; 278 + }); 279 + 270 280 notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { 271 281 version = "0.1.5"; 272 282 format = "setuptools";
+2 -2
pkgs/servers/home-automation/evcc/default.nix
··· 21 21 22 22 buildGoModule rec { 23 23 pname = "evcc"; 24 - version = "0.126.4"; 24 + version = "0.126.5"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "evcc-io"; 28 28 repo = "evcc"; 29 29 rev = version; 30 - hash = "sha256-GDAj85zIrhu6XsY/XV1wKPtHNkj3bm3ooDcQaQeMHW0="; 30 + hash = "sha256-hw8DImLXFwTEAyPEFUVnyNPXrQTfEk7OOk+w/izJz9s="; 31 31 }; 32 32 33 33 vendorHash = "sha256-gfKJiZ7wSFWEEB/UCAbH18jdZdgG/58q3Yj0FQqMH8E=";
+2 -2
pkgs/servers/http/nginx/mainline.nix
··· 1 1 { callPackage, ... }@args: 2 2 3 3 callPackage ./generic.nix args { 4 - version = "1.25.4"; 5 - hash = "sha256-dgcpkBrLqlF5luaB7m6iWQMpheN8J2i+74DfOod97tk="; 4 + version = "1.27.0"; 5 + hash = "sha256-tyMOPPh+qi1LC8VqrckgqWDHhzuZkaG2b/zAj8ZQEpw="; 6 6 }
+2 -2
pkgs/servers/http/nginx/stable.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix args { 4 - version = "1.26.0"; 5 - hash = "sha256-0ubIQ51sbbUBXY6qskcKtSrvhae/NjGCh5l34IQ3BJc="; 4 + version = "1.26.1"; 5 + hash = "sha256-+Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s="; 6 6 }
+2 -2
pkgs/servers/mail/smtprelay/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "smtprelay"; 8 - version = "1.11.0"; 8 + version = "1.11.1"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "decke"; 12 12 repo = "smtprelay"; 13 13 rev = "refs/tags/v${version}"; 14 - hash = "sha256-8N+JJp0/d59s8rU7t0YtrTepVXpxXc8PET1f+AgEpG0="; 14 + hash = "sha256-2fZA2vYJ6c5oaNImvS0KKZo1+Eu7LFO6jCRnChReMcE="; 15 15 }; 16 16 17 17 vendorHash = "sha256-BX1Ll0EEo59p+Pe5oM6+6zT6fvnv1RsfX8YEh9RKkWU=";
+9 -9
pkgs/servers/sqlpage/default.nix
··· 11 11 12 12 let 13 13 apexcharts = fetchurl { 14 - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js"; 15 - sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI="; 14 + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js"; 15 + sha256 = "sha256-StFDdV+DR9yItbCXAGTK6EUcu613N3vM0i5ngrYZlz4="; 16 16 }; 17 17 tablerCss = fetchurl { 18 18 url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; ··· 31 31 sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; 32 32 }; 33 33 tablerIcons = fetchurl { 34 - url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg"; 35 - sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY="; 34 + url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.47.0/tabler-sprite.svg"; 35 + sha256 = "sha256-dphCRqfQZmC7finy/HU9QnJQESwgWoUxRHkz7On877I="; 36 36 }; 37 37 in 38 38 39 39 rustPlatform.buildRustPackage rec { 40 40 pname = "sqlpage"; 41 - version = "0.15.1"; 41 + version = "0.20.0"; 42 42 43 43 src = fetchFromGitHub { 44 44 owner = "lovasoa"; 45 45 repo = "SQLpage"; 46 46 rev = "v${version}"; 47 - hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc="; 47 + sha256 = "sha256-zmAnlsYL36qqO2cLSVdsnUG47xHslOvDzcGICNxG/5c="; 48 48 }; 49 49 50 50 postPatch = '' 51 51 substituteInPlace sqlpage/apexcharts.js \ 52 - --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \ 52 + --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js */' \ 53 53 "$(cat ${apexcharts})" 54 54 substituteInPlace sqlpage/sqlpage.css \ 55 55 --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ ··· 64 64 --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ 65 65 "$(cat ${listJsFixed})" 66 66 substituteInPlace sqlpage/tabler-icons.svg \ 67 - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \ 67 + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.47.0/tabler-sprite.svg */' \ 68 68 "$(cat ${tablerIcons})" 69 69 ''; 70 70 71 - cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY="; 71 + cargoHash = "sha256-dPqO+yychyOybdTvdhWkcXyDlxIXO39KUZ80v+7Syqg="; 72 72 73 73 nativeBuildInputs = [ 74 74 pkg-config
+1 -1
pkgs/test/check-by-name/README.md
··· 13 13 and we can also rely on the local Git history to do the mergeability check. 14 14 15 15 Arguments: 16 - - `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11 16 + - `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05 17 17 - `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git 18 18 19 19 ## `./update-pinned-tool.sh`
+684 -555
pkgs/tools/filesystems/httm/Cargo.lock
··· 4 4 5 5 [[package]] 6 6 name = "ahash" 7 - version = "0.8.3" 7 + version = "0.3.8" 8 8 source = "registry+https://github.com/rust-lang/crates.io-index" 9 - checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" 9 + checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" 10 + 11 + [[package]] 12 + name = "ahash" 13 + version = "0.8.11" 14 + source = "registry+https://github.com/rust-lang/crates.io-index" 15 + checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" 10 16 dependencies = [ 11 17 "cfg-if", 12 18 "once_cell", 13 19 "version_check", 20 + "zerocopy", 14 21 ] 15 22 16 23 [[package]] 17 24 name = "aho-corasick" 18 - version = "0.7.20" 25 + version = "1.0.1" 19 26 source = "registry+https://github.com/rust-lang/crates.io-index" 20 - checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" 27 + checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" 21 28 dependencies = [ 22 29 "memchr", 23 30 ] 24 31 25 32 [[package]] 26 - name = "android_system_properties" 27 - version = "0.1.5" 33 + name = "ansi_term" 34 + version = "0.12.1" 28 35 source = "registry+https://github.com/rust-lang/crates.io-index" 29 - checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" 36 + checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" 30 37 dependencies = [ 31 - "libc", 38 + "winapi", 32 39 ] 33 40 34 41 [[package]] 35 - name = "ansi_term" 36 - version = "0.12.1" 42 + name = "anstream" 43 + version = "0.6.13" 37 44 source = "registry+https://github.com/rust-lang/crates.io-index" 38 - checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" 45 + checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" 39 46 dependencies = [ 40 - "winapi", 47 + "anstyle", 48 + "anstyle-parse", 49 + "anstyle-query", 50 + "anstyle-wincon", 51 + "colorchoice", 52 + "utf8parse", 41 53 ] 42 54 43 55 [[package]] 44 - name = "arrayvec" 45 - version = "0.7.2" 56 + name = "anstyle" 57 + version = "1.0.6" 46 58 source = "registry+https://github.com/rust-lang/crates.io-index" 47 - checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" 59 + checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" 60 + 61 + [[package]] 62 + name = "anstyle-parse" 63 + version = "0.2.3" 64 + source = "registry+https://github.com/rust-lang/crates.io-index" 65 + checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" 66 + dependencies = [ 67 + "utf8parse", 68 + ] 69 + 70 + [[package]] 71 + name = "anstyle-query" 72 + version = "1.0.2" 73 + source = "registry+https://github.com/rust-lang/crates.io-index" 74 + checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" 75 + dependencies = [ 76 + "windows-sys 0.52.0", 77 + ] 78 + 79 + [[package]] 80 + name = "anstyle-wincon" 81 + version = "3.0.2" 82 + source = "registry+https://github.com/rust-lang/crates.io-index" 83 + checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" 84 + dependencies = [ 85 + "anstyle", 86 + "windows-sys 0.52.0", 87 + ] 48 88 49 89 [[package]] 50 90 name = "atty" ··· 64 104 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 65 105 66 106 [[package]] 67 - name = "beef" 68 - version = "0.5.2" 69 - source = "registry+https://github.com/rust-lang/crates.io-index" 70 - checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" 71 - 72 - [[package]] 73 107 name = "bitflags" 74 108 version = "1.3.2" 75 109 source = "registry+https://github.com/rust-lang/crates.io-index" 76 110 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" 77 111 78 112 [[package]] 79 - name = "bumpalo" 80 - version = "3.11.1" 113 + name = "bitflags" 114 + version = "2.5.0" 81 115 source = "registry+https://github.com/rust-lang/crates.io-index" 82 - checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" 116 + checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" 83 117 84 118 [[package]] 85 - name = "cc" 86 - version = "1.0.77" 119 + name = "blake2" 120 + version = "0.9.2" 87 121 source = "registry+https://github.com/rust-lang/crates.io-index" 88 - checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" 122 + checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" 123 + dependencies = [ 124 + "crypto-mac", 125 + "digest", 126 + "opaque-debug", 127 + ] 89 128 90 129 [[package]] 91 130 name = "cfg-if" ··· 94 133 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 95 134 96 135 [[package]] 97 - name = "chrono" 98 - version = "0.4.23" 136 + name = "cfg_aliases" 137 + version = "0.1.1" 99 138 source = "registry+https://github.com/rust-lang/crates.io-index" 100 - checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" 101 - dependencies = [ 102 - "iana-time-zone", 103 - "js-sys", 104 - "num-integer", 105 - "num-traits", 106 - "time 0.1.45", 107 - "wasm-bindgen", 108 - "winapi", 109 - ] 139 + checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" 110 140 111 141 [[package]] 112 142 name = "clap" 113 - version = "3.2.23" 143 + version = "2.34.0" 114 144 source = "registry+https://github.com/rust-lang/crates.io-index" 115 - checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" 145 + checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" 116 146 dependencies = [ 147 + "ansi_term", 117 148 "atty", 118 - "bitflags", 119 - "clap_lex", 120 - "indexmap", 121 - "once_cell", 122 - "strsim", 123 - "termcolor", 149 + "bitflags 1.3.2", 150 + "strsim 0.8.0", 124 151 "textwrap", 152 + "unicode-width", 153 + "vec_map", 154 + "yaml-rust", 125 155 ] 126 156 127 157 [[package]] 128 - name = "clap_lex" 129 - version = "0.2.4" 158 + name = "clap" 159 + version = "4.5.4" 130 160 source = "registry+https://github.com/rust-lang/crates.io-index" 131 - checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" 161 + checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" 132 162 dependencies = [ 133 - "os_str_bytes", 163 + "clap_builder", 134 164 ] 135 165 136 166 [[package]] 137 - name = "codespan-reporting" 138 - version = "0.11.1" 167 + name = "clap_builder" 168 + version = "4.5.2" 139 169 source = "registry+https://github.com/rust-lang/crates.io-index" 140 - checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" 170 + checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" 141 171 dependencies = [ 142 - "termcolor", 143 - "unicode-width", 172 + "anstream", 173 + "anstyle", 174 + "clap_lex", 175 + "strsim 0.11.1", 144 176 ] 145 177 146 178 [[package]] 147 - name = "console" 148 - version = "0.15.2" 179 + name = "clap_lex" 180 + version = "0.7.0" 149 181 source = "registry+https://github.com/rust-lang/crates.io-index" 150 - checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" 151 - dependencies = [ 152 - "encode_unicode", 153 - "lazy_static", 154 - "libc", 155 - "terminal_size 0.1.17", 156 - "winapi", 157 - ] 182 + checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" 158 183 159 184 [[package]] 160 - name = "core-foundation-sys" 161 - version = "0.8.3" 185 + name = "colorchoice" 186 + version = "1.0.0" 162 187 source = "registry+https://github.com/rust-lang/crates.io-index" 163 - checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" 188 + checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" 164 189 165 190 [[package]] 166 - name = "crossbeam" 167 - version = "0.8.2" 191 + name = "console" 192 + version = "0.15.5" 168 193 source = "registry+https://github.com/rust-lang/crates.io-index" 169 - checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" 194 + checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" 170 195 dependencies = [ 171 - "cfg-if", 172 - "crossbeam-channel", 173 - "crossbeam-deque", 174 - "crossbeam-epoch", 175 - "crossbeam-queue", 176 - "crossbeam-utils", 196 + "encode_unicode", 197 + "lazy_static", 198 + "libc", 199 + "unicode-width", 200 + "windows-sys 0.42.0", 177 201 ] 178 202 179 203 [[package]] 180 204 name = "crossbeam-channel" 181 - version = "0.5.6" 205 + version = "0.5.12" 182 206 source = "registry+https://github.com/rust-lang/crates.io-index" 183 - checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" 207 + checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" 184 208 dependencies = [ 185 - "cfg-if", 186 209 "crossbeam-utils", 187 210 ] 188 211 189 212 [[package]] 190 213 name = "crossbeam-deque" 191 - version = "0.8.2" 214 + version = "0.8.3" 192 215 source = "registry+https://github.com/rust-lang/crates.io-index" 193 - checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" 216 + checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" 194 217 dependencies = [ 195 218 "cfg-if", 196 219 "crossbeam-epoch", ··· 199 222 200 223 [[package]] 201 224 name = "crossbeam-epoch" 202 - version = "0.9.13" 225 + version = "0.9.14" 203 226 source = "registry+https://github.com/rust-lang/crates.io-index" 204 - checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" 227 + checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" 205 228 dependencies = [ 206 229 "autocfg", 207 230 "cfg-if", 208 231 "crossbeam-utils", 209 - "memoffset 0.7.1", 232 + "memoffset", 210 233 "scopeguard", 211 234 ] 212 235 213 236 [[package]] 214 - name = "crossbeam-queue" 215 - version = "0.3.8" 216 - source = "registry+https://github.com/rust-lang/crates.io-index" 217 - checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" 218 - dependencies = [ 219 - "cfg-if", 220 - "crossbeam-utils", 221 - ] 222 - 223 - [[package]] 224 237 name = "crossbeam-utils" 225 - version = "0.8.14" 238 + version = "0.8.19" 226 239 source = "registry+https://github.com/rust-lang/crates.io-index" 227 - checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" 228 - dependencies = [ 229 - "cfg-if", 230 - ] 240 + checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" 231 241 232 242 [[package]] 233 - name = "cxx" 234 - version = "1.0.83" 243 + name = "crypto-mac" 244 + version = "0.8.0" 235 245 source = "registry+https://github.com/rust-lang/crates.io-index" 236 - checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" 246 + checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" 237 247 dependencies = [ 238 - "cc", 239 - "cxxbridge-flags", 240 - "cxxbridge-macro", 241 - "link-cplusplus", 242 - ] 243 - 244 - [[package]] 245 - name = "cxx-build" 246 - version = "1.0.83" 247 - source = "registry+https://github.com/rust-lang/crates.io-index" 248 - checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" 249 - dependencies = [ 250 - "cc", 251 - "codespan-reporting", 252 - "once_cell", 253 - "proc-macro2", 254 - "quote", 255 - "scratch", 256 - "syn", 257 - ] 258 - 259 - [[package]] 260 - name = "cxxbridge-flags" 261 - version = "1.0.83" 262 - source = "registry+https://github.com/rust-lang/crates.io-index" 263 - checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" 264 - 265 - [[package]] 266 - name = "cxxbridge-macro" 267 - version = "1.0.83" 268 - source = "registry+https://github.com/rust-lang/crates.io-index" 269 - checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" 270 - dependencies = [ 271 - "proc-macro2", 272 - "quote", 273 - "syn", 248 + "generic-array", 249 + "subtle", 274 250 ] 275 251 276 252 [[package]] 277 253 name = "darling" 278 - version = "0.14.2" 254 + version = "0.20.8" 279 255 source = "registry+https://github.com/rust-lang/crates.io-index" 280 - checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" 256 + checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" 281 257 dependencies = [ 282 258 "darling_core", 283 259 "darling_macro", ··· 285 261 286 262 [[package]] 287 263 name = "darling_core" 288 - version = "0.14.2" 264 + version = "0.20.8" 289 265 source = "registry+https://github.com/rust-lang/crates.io-index" 290 - checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" 266 + checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" 291 267 dependencies = [ 292 268 "fnv", 293 269 "ident_case", 294 270 "proc-macro2", 295 271 "quote", 296 - "strsim", 297 - "syn", 272 + "strsim 0.10.0", 273 + "syn 2.0.48", 298 274 ] 299 275 300 276 [[package]] 301 277 name = "darling_macro" 302 - version = "0.14.2" 278 + version = "0.20.8" 303 279 source = "registry+https://github.com/rust-lang/crates.io-index" 304 - checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" 280 + checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" 305 281 dependencies = [ 306 282 "darling_core", 307 283 "quote", 308 - "syn", 284 + "syn 2.0.48", 309 285 ] 310 286 311 287 [[package]] 312 - name = "defer-drop" 313 - version = "1.3.0" 288 + name = "deranged" 289 + version = "0.3.11" 314 290 source = "registry+https://github.com/rust-lang/crates.io-index" 315 - checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57" 291 + checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" 316 292 dependencies = [ 317 - "crossbeam-channel", 318 - "once_cell", 293 + "powerfmt", 319 294 ] 320 295 321 296 [[package]] 322 297 name = "derive_builder" 323 - version = "0.11.2" 298 + version = "0.20.0" 324 299 source = "registry+https://github.com/rust-lang/crates.io-index" 325 - checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" 300 + checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" 326 301 dependencies = [ 327 302 "derive_builder_macro", 328 303 ] 329 304 330 305 [[package]] 331 306 name = "derive_builder_core" 332 - version = "0.11.2" 307 + version = "0.20.0" 333 308 source = "registry+https://github.com/rust-lang/crates.io-index" 334 - checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" 309 + checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" 335 310 dependencies = [ 336 311 "darling", 337 312 "proc-macro2", 338 313 "quote", 339 - "syn", 314 + "syn 2.0.48", 340 315 ] 341 316 342 317 [[package]] 343 318 name = "derive_builder_macro" 344 - version = "0.11.2" 319 + version = "0.20.0" 345 320 source = "registry+https://github.com/rust-lang/crates.io-index" 346 - checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" 321 + checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" 347 322 dependencies = [ 348 323 "derive_builder_core", 349 - "syn", 324 + "syn 2.0.48", 325 + ] 326 + 327 + [[package]] 328 + name = "digest" 329 + version = "0.9.0" 330 + source = "registry+https://github.com/rust-lang/crates.io-index" 331 + checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" 332 + dependencies = [ 333 + "generic-array", 350 334 ] 351 335 352 336 [[package]] ··· 372 356 373 357 [[package]] 374 358 name = "either" 375 - version = "1.8.0" 359 + version = "1.9.0" 376 360 source = "registry+https://github.com/rust-lang/crates.io-index" 377 - checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" 361 + checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" 378 362 379 363 [[package]] 380 364 name = "encode_unicode" ··· 383 367 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" 384 368 385 369 [[package]] 386 - name = "errno" 387 - version = "0.2.8" 370 + name = "env_logger" 371 + version = "0.7.1" 388 372 source = "registry+https://github.com/rust-lang/crates.io-index" 389 - checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" 373 + checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" 390 374 dependencies = [ 391 - "errno-dragonfly", 392 - "libc", 393 - "winapi", 375 + "atty", 376 + "humantime", 377 + "log", 378 + "regex", 379 + "termcolor", 394 380 ] 395 381 396 382 [[package]] 397 - name = "errno-dragonfly" 398 - version = "0.1.2" 383 + name = "equivalent" 384 + version = "1.0.1" 385 + source = "registry+https://github.com/rust-lang/crates.io-index" 386 + checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" 387 + 388 + [[package]] 389 + name = "errno" 390 + version = "0.3.8" 399 391 source = "registry+https://github.com/rust-lang/crates.io-index" 400 - checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" 392 + checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" 401 393 dependencies = [ 402 - "cc", 403 394 "libc", 395 + "windows-sys 0.52.0", 404 396 ] 405 397 406 398 [[package]] 407 399 name = "exacl" 408 - version = "0.10.0" 400 + version = "0.12.0" 409 401 source = "registry+https://github.com/rust-lang/crates.io-index" 410 - checksum = "1cfeb22a59deb24c3262c43ffcafd1eb807180f371f9fcc99098d181b5d639be" 402 + checksum = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" 411 403 dependencies = [ 412 - "bitflags", 404 + "bitflags 2.5.0", 413 405 "log", 414 406 "scopeguard", 415 407 "uuid", ··· 422 414 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" 423 415 424 416 [[package]] 425 - name = "fuzzy-matcher" 426 - version = "0.3.7" 417 + name = "fuzzy-muff" 418 + version = "0.3.23" 427 419 source = "registry+https://github.com/rust-lang/crates.io-index" 428 - checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" 420 + checksum = "d9b471332520d987f877cd86f529817c3c537b477199aa856e3b29012a4e37d2" 429 421 dependencies = [ 430 422 "thread_local", 431 423 ] 432 424 433 425 [[package]] 426 + name = "generic-array" 427 + version = "0.14.7" 428 + source = "registry+https://github.com/rust-lang/crates.io-index" 429 + checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" 430 + dependencies = [ 431 + "typenum", 432 + "version_check", 433 + ] 434 + 435 + [[package]] 434 436 name = "getrandom" 435 - version = "0.2.8" 437 + version = "0.2.9" 436 438 source = "registry+https://github.com/rust-lang/crates.io-index" 437 - checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" 439 + checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" 438 440 dependencies = [ 439 441 "cfg-if", 440 442 "libc", 441 - "wasi 0.11.0+wasi-snapshot-preview1", 443 + "wasi", 442 444 ] 443 445 444 446 [[package]] 445 447 name = "hashbrown" 446 - version = "0.12.3" 448 + version = "0.8.2" 447 449 source = "registry+https://github.com/rust-lang/crates.io-index" 448 - checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" 450 + checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" 451 + dependencies = [ 452 + "ahash 0.3.8", 453 + "autocfg", 454 + "rayon", 455 + ] 449 456 450 457 [[package]] 451 458 name = "hashbrown" 452 - version = "0.13.1" 459 + version = "0.14.3" 453 460 source = "registry+https://github.com/rust-lang/crates.io-index" 454 - checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" 461 + checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" 455 462 dependencies = [ 456 - "ahash", 463 + "ahash 0.8.11", 457 464 "rayon", 458 465 ] 459 466 ··· 467 474 ] 468 475 469 476 [[package]] 477 + name = "home" 478 + version = "0.5.9" 479 + source = "registry+https://github.com/rust-lang/crates.io-index" 480 + checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" 481 + dependencies = [ 482 + "windows-sys 0.52.0", 483 + ] 484 + 485 + [[package]] 470 486 name = "httm" 471 - version = "0.23.3" 487 + version = "0.38.1" 472 488 dependencies = [ 473 - "ansi_term", 474 - "chrono", 475 - "clap", 476 - "crossbeam", 489 + "ahash 0.8.11", 490 + "clap 4.5.4", 491 + "crossbeam-channel", 477 492 "exacl", 478 - "hashbrown 0.13.1", 479 - "indicatif", 493 + "hashbrown 0.14.3", 494 + "indicatif 0.17.8", 495 + "itertools", 496 + "libc", 497 + "lms", 480 498 "lscolors", 481 - "nix 0.26.1", 482 - "number_prefix", 499 + "nix 0.28.0", 500 + "nu-ansi-term", 501 + "number_prefix 0.4.0", 483 502 "once_cell", 484 503 "proc-mounts", 485 504 "rayon", 505 + "realpath-ext", 486 506 "serde", 487 507 "serde_json", 488 - "simd-adler32", 489 - "skim", 490 - "terminal_size 0.2.3", 491 - "time 0.3.17", 508 + "terminal_size", 509 + "time", 510 + "two_percent", 492 511 "which", 493 512 "xattr", 494 513 ] 495 514 496 515 [[package]] 497 - name = "iana-time-zone" 498 - version = "0.1.53" 516 + name = "humantime" 517 + version = "1.3.0" 499 518 source = "registry+https://github.com/rust-lang/crates.io-index" 500 - checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" 519 + checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" 501 520 dependencies = [ 502 - "android_system_properties", 503 - "core-foundation-sys", 504 - "iana-time-zone-haiku", 505 - "js-sys", 506 - "wasm-bindgen", 507 - "winapi", 508 - ] 509 - 510 - [[package]] 511 - name = "iana-time-zone-haiku" 512 - version = "0.1.1" 513 - source = "registry+https://github.com/rust-lang/crates.io-index" 514 - checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" 515 - dependencies = [ 516 - "cxx", 517 - "cxx-build", 521 + "quick-error", 518 522 ] 519 523 520 524 [[package]] ··· 525 529 526 530 [[package]] 527 531 name = "indexmap" 528 - version = "1.9.2" 532 + version = "2.2.3" 529 533 source = "registry+https://github.com/rust-lang/crates.io-index" 530 - checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" 534 + checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" 531 535 dependencies = [ 532 - "autocfg", 533 - "hashbrown 0.12.3", 536 + "equivalent", 537 + "hashbrown 0.14.3", 534 538 ] 535 539 536 540 [[package]] 537 541 name = "indicatif" 538 - version = "0.17.2" 542 + version = "0.15.0" 539 543 source = "registry+https://github.com/rust-lang/crates.io-index" 540 - checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" 544 + checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" 541 545 dependencies = [ 542 546 "console", 543 - "number_prefix", 544 - "portable-atomic", 547 + "lazy_static", 548 + "number_prefix 0.3.0", 549 + "regex", 545 550 ] 546 551 547 552 [[package]] 548 - name = "io-lifetimes" 549 - version = "1.0.3" 553 + name = "indicatif" 554 + version = "0.17.8" 550 555 source = "registry+https://github.com/rust-lang/crates.io-index" 551 - checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" 556 + checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" 552 557 dependencies = [ 553 - "libc", 554 - "windows-sys", 558 + "console", 559 + "instant", 560 + "number_prefix 0.4.0", 561 + "portable-atomic", 555 562 ] 556 563 557 564 [[package]] 558 - name = "itoa" 559 - version = "1.0.4" 565 + name = "instant" 566 + version = "0.1.12" 560 567 source = "registry+https://github.com/rust-lang/crates.io-index" 561 - checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" 568 + checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" 569 + dependencies = [ 570 + "cfg-if", 571 + ] 562 572 563 573 [[package]] 564 - name = "js-sys" 565 - version = "0.3.60" 574 + name = "itertools" 575 + version = "0.12.1" 566 576 source = "registry+https://github.com/rust-lang/crates.io-index" 567 - checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" 577 + checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" 568 578 dependencies = [ 569 - "wasm-bindgen", 579 + "either", 570 580 ] 571 581 572 582 [[package]] 583 + name = "itoa" 584 + version = "1.0.6" 585 + source = "registry+https://github.com/rust-lang/crates.io-index" 586 + checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" 587 + 588 + [[package]] 573 589 name = "lazy_static" 574 590 version = "1.4.0" 575 591 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 577 593 578 594 [[package]] 579 595 name = "libc" 580 - version = "0.2.138" 596 + version = "0.2.153" 581 597 source = "registry+https://github.com/rust-lang/crates.io-index" 582 - checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" 598 + checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" 583 599 584 600 [[package]] 585 - name = "link-cplusplus" 586 - version = "1.0.7" 601 + name = "linux-raw-sys" 602 + version = "0.4.13" 587 603 source = "registry+https://github.com/rust-lang/crates.io-index" 588 - checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" 589 - dependencies = [ 590 - "cc", 591 - ] 604 + checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" 592 605 593 606 [[package]] 594 - name = "linux-raw-sys" 595 - version = "0.1.3" 607 + name = "lms" 608 + version = "0.4.0" 596 609 source = "registry+https://github.com/rust-lang/crates.io-index" 597 - checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" 610 + checksum = "164b6100e88b387adf64d289e247bebae8f77810566f58159f119d0be90ed958" 611 + dependencies = [ 612 + "bitflags 1.3.2", 613 + "blake2", 614 + "clap 2.34.0", 615 + "env_logger", 616 + "hashbrown 0.8.2", 617 + "indicatif 0.15.0", 618 + "lazy_static", 619 + "log", 620 + "rayon", 621 + "seahash", 622 + ] 598 623 599 624 [[package]] 600 625 name = "log" 601 - version = "0.4.17" 626 + version = "0.4.21" 602 627 source = "registry+https://github.com/rust-lang/crates.io-index" 603 - checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" 604 - dependencies = [ 605 - "cfg-if", 606 - ] 628 + checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" 607 629 608 630 [[package]] 609 631 name = "lscolors" 610 - version = "0.13.0" 632 + version = "0.17.0" 611 633 source = "registry+https://github.com/rust-lang/crates.io-index" 612 - checksum = "c2dedc85d67baf5327114fad78ab9418f8893b1121c17d5538dd11005ad1ddf2" 634 + checksum = "53304fff6ab1e597661eee37e42ea8c47a146fca280af902bb76bff8a896e523" 613 635 dependencies = [ 614 - "ansi_term", 615 636 "nu-ansi-term", 616 637 ] 617 638 618 639 [[package]] 619 640 name = "memchr" 620 - version = "2.5.0" 641 + version = "2.6.4" 621 642 source = "registry+https://github.com/rust-lang/crates.io-index" 622 - checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" 643 + checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" 623 644 624 645 [[package]] 625 646 name = "memoffset" 626 - version = "0.6.5" 627 - source = "registry+https://github.com/rust-lang/crates.io-index" 628 - checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" 629 - dependencies = [ 630 - "autocfg", 631 - ] 632 - 633 - [[package]] 634 - name = "memoffset" 635 - version = "0.7.1" 647 + version = "0.8.0" 636 648 source = "registry+https://github.com/rust-lang/crates.io-index" 637 - checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" 649 + checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" 638 650 dependencies = [ 639 651 "autocfg", 640 652 ] ··· 645 657 source = "registry+https://github.com/rust-lang/crates.io-index" 646 658 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" 647 659 dependencies = [ 648 - "bitflags", 660 + "bitflags 1.3.2", 649 661 "cfg-if", 650 662 "libc", 651 663 ] 652 664 653 665 [[package]] 654 666 name = "nix" 655 - version = "0.25.1" 667 + version = "0.28.0" 656 668 source = "registry+https://github.com/rust-lang/crates.io-index" 657 - checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" 669 + checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" 658 670 dependencies = [ 659 - "autocfg", 660 - "bitflags", 671 + "bitflags 2.5.0", 661 672 "cfg-if", 673 + "cfg_aliases", 662 674 "libc", 663 - "memoffset 0.6.5", 664 - "pin-utils", 665 675 ] 666 676 667 677 [[package]] 668 - name = "nix" 669 - version = "0.26.1" 678 + name = "nohash" 679 + version = "0.2.0" 670 680 source = "registry+https://github.com/rust-lang/crates.io-index" 671 - checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" 672 - dependencies = [ 673 - "bitflags", 674 - "cfg-if", 675 - "libc", 676 - "memoffset 0.7.1", 677 - "pin-utils", 678 - "static_assertions", 679 - ] 681 + checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" 680 682 681 683 [[package]] 682 684 name = "nu-ansi-term" 683 - version = "0.46.0" 685 + version = "0.50.0" 684 686 source = "registry+https://github.com/rust-lang/crates.io-index" 685 - checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" 687 + checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" 686 688 dependencies = [ 687 - "overload", 688 - "winapi", 689 + "windows-sys 0.48.0", 689 690 ] 690 691 691 692 [[package]] 692 - name = "num-integer" 693 - version = "0.1.45" 694 - source = "registry+https://github.com/rust-lang/crates.io-index" 695 - checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" 696 - dependencies = [ 697 - "autocfg", 698 - "num-traits", 699 - ] 700 - 701 - [[package]] 702 - name = "num-traits" 703 - version = "0.2.15" 693 + name = "num-conv" 694 + version = "0.1.0" 704 695 source = "registry+https://github.com/rust-lang/crates.io-index" 705 - checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" 706 - dependencies = [ 707 - "autocfg", 708 - ] 696 + checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" 709 697 710 698 [[package]] 711 - name = "num_cpus" 712 - version = "1.14.0" 699 + name = "num_threads" 700 + version = "0.1.6" 713 701 source = "registry+https://github.com/rust-lang/crates.io-index" 714 - checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" 702 + checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" 715 703 dependencies = [ 716 - "hermit-abi", 717 704 "libc", 718 705 ] 719 706 720 707 [[package]] 721 - name = "num_threads" 722 - version = "0.1.6" 708 + name = "number_prefix" 709 + version = "0.3.0" 723 710 source = "registry+https://github.com/rust-lang/crates.io-index" 724 - checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" 725 - dependencies = [ 726 - "libc", 727 - ] 711 + checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" 728 712 729 713 [[package]] 730 714 name = "number_prefix" ··· 734 718 735 719 [[package]] 736 720 name = "once_cell" 737 - version = "1.16.0" 738 - source = "registry+https://github.com/rust-lang/crates.io-index" 739 - checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" 740 - 741 - [[package]] 742 - name = "os_str_bytes" 743 - version = "6.4.1" 721 + version = "1.19.0" 744 722 source = "registry+https://github.com/rust-lang/crates.io-index" 745 - checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" 723 + checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" 746 724 747 725 [[package]] 748 - name = "overload" 749 - version = "0.1.1" 726 + name = "opaque-debug" 727 + version = "0.3.0" 750 728 source = "registry+https://github.com/rust-lang/crates.io-index" 751 - checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" 729 + checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" 752 730 753 731 [[package]] 754 732 name = "partition-identity" ··· 760 738 ] 761 739 762 740 [[package]] 763 - name = "pin-utils" 764 - version = "0.1.0" 741 + name = "portable-atomic" 742 + version = "1.5.1" 765 743 source = "registry+https://github.com/rust-lang/crates.io-index" 766 - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 744 + checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" 767 745 768 746 [[package]] 769 - name = "portable-atomic" 770 - version = "0.3.15" 747 + name = "powerfmt" 748 + version = "0.2.0" 771 749 source = "registry+https://github.com/rust-lang/crates.io-index" 772 - checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" 750 + checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" 773 751 774 752 [[package]] 775 753 name = "proc-macro2" 776 - version = "1.0.47" 754 + version = "1.0.76" 777 755 source = "registry+https://github.com/rust-lang/crates.io-index" 778 - checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" 756 + checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" 779 757 dependencies = [ 780 758 "unicode-ident", 781 759 ] ··· 790 768 ] 791 769 792 770 [[package]] 771 + name = "quick-error" 772 + version = "1.2.3" 773 + source = "registry+https://github.com/rust-lang/crates.io-index" 774 + checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" 775 + 776 + [[package]] 793 777 name = "quote" 794 - version = "1.0.21" 778 + version = "1.0.35" 795 779 source = "registry+https://github.com/rust-lang/crates.io-index" 796 - checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" 780 + checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" 797 781 dependencies = [ 798 782 "proc-macro2", 799 783 ] 800 784 801 785 [[package]] 802 786 name = "rayon" 803 - version = "1.6.0" 787 + version = "1.10.0" 804 788 source = "registry+https://github.com/rust-lang/crates.io-index" 805 - checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" 789 + checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" 806 790 dependencies = [ 807 - "crossbeam-deque", 808 791 "either", 809 792 "rayon-core", 810 793 ] 811 794 812 795 [[package]] 813 796 name = "rayon-core" 814 - version = "1.10.1" 797 + version = "1.12.1" 815 798 source = "registry+https://github.com/rust-lang/crates.io-index" 816 - checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" 799 + checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" 817 800 dependencies = [ 818 - "crossbeam-channel", 819 801 "crossbeam-deque", 820 802 "crossbeam-utils", 821 - "num_cpus", 803 + ] 804 + 805 + [[package]] 806 + name = "realpath-ext" 807 + version = "0.1.3" 808 + source = "registry+https://github.com/rust-lang/crates.io-index" 809 + checksum = "692f72862a0d532b44a0f4965fb10f17e7659eaedf24d2ce3c989ca778bd092f" 810 + dependencies = [ 811 + "bitflags 1.3.2", 812 + "errno", 813 + "libc", 822 814 ] 823 815 824 816 [[package]] ··· 827 819 source = "registry+https://github.com/rust-lang/crates.io-index" 828 820 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" 829 821 dependencies = [ 830 - "bitflags", 822 + "bitflags 1.3.2", 831 823 ] 832 824 833 825 [[package]] ··· 843 835 844 836 [[package]] 845 837 name = "regex" 846 - version = "1.7.0" 838 + version = "1.10.4" 839 + source = "registry+https://github.com/rust-lang/crates.io-index" 840 + checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" 841 + dependencies = [ 842 + "aho-corasick", 843 + "memchr", 844 + "regex-automata", 845 + "regex-syntax", 846 + ] 847 + 848 + [[package]] 849 + name = "regex-automata" 850 + version = "0.4.6" 847 851 source = "registry+https://github.com/rust-lang/crates.io-index" 848 - checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" 852 + checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" 849 853 dependencies = [ 850 854 "aho-corasick", 851 855 "memchr", ··· 854 858 855 859 [[package]] 856 860 name = "regex-syntax" 857 - version = "0.6.28" 861 + version = "0.8.2" 858 862 source = "registry+https://github.com/rust-lang/crates.io-index" 859 - checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" 863 + checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" 860 864 861 865 [[package]] 862 866 name = "rustix" 863 - version = "0.36.5" 867 + version = "0.38.30" 864 868 source = "registry+https://github.com/rust-lang/crates.io-index" 865 - checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" 869 + checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" 866 870 dependencies = [ 867 - "bitflags", 871 + "bitflags 2.5.0", 868 872 "errno", 869 - "io-lifetimes", 870 873 "libc", 871 874 "linux-raw-sys", 872 - "windows-sys", 875 + "windows-sys 0.52.0", 873 876 ] 874 877 875 878 [[package]] 876 879 name = "rustversion" 877 - version = "1.0.9" 880 + version = "1.0.12" 878 881 source = "registry+https://github.com/rust-lang/crates.io-index" 879 - checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" 882 + checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" 880 883 881 884 [[package]] 882 885 name = "ryu" 883 - version = "1.0.12" 886 + version = "1.0.16" 884 887 source = "registry+https://github.com/rust-lang/crates.io-index" 885 - checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" 888 + checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" 886 889 887 890 [[package]] 888 891 name = "scopeguard" 889 - version = "1.1.0" 892 + version = "1.2.0" 890 893 source = "registry+https://github.com/rust-lang/crates.io-index" 891 - checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 894 + checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" 892 895 893 896 [[package]] 894 - name = "scratch" 895 - version = "1.0.2" 897 + name = "seahash" 898 + version = "4.1.0" 896 899 source = "registry+https://github.com/rust-lang/crates.io-index" 897 - checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" 900 + checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" 898 901 899 902 [[package]] 900 903 name = "serde" 901 - version = "1.0.152" 904 + version = "1.0.197" 905 + source = "registry+https://github.com/rust-lang/crates.io-index" 906 + checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" 907 + dependencies = [ 908 + "serde_derive", 909 + ] 910 + 911 + [[package]] 912 + name = "serde_derive" 913 + version = "1.0.197" 902 914 source = "registry+https://github.com/rust-lang/crates.io-index" 903 - checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" 915 + checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" 916 + dependencies = [ 917 + "proc-macro2", 918 + "quote", 919 + "syn 2.0.48", 920 + ] 904 921 905 922 [[package]] 906 923 name = "serde_json" 907 - version = "1.0.93" 924 + version = "1.0.115" 908 925 source = "registry+https://github.com/rust-lang/crates.io-index" 909 - checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" 926 + checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" 910 927 dependencies = [ 911 928 "indexmap", 912 929 "itoa", ··· 915 932 ] 916 933 917 934 [[package]] 918 - name = "simd-adler32" 919 - version = "0.3.4" 935 + name = "strsim" 936 + version = "0.8.0" 920 937 source = "registry+https://github.com/rust-lang/crates.io-index" 921 - checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18" 938 + checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" 922 939 923 940 [[package]] 924 - name = "skim" 925 - version = "0.10.2" 926 - source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#00b10497101d206340919f3ae411bdc0342484e7" 927 - dependencies = [ 928 - "beef", 929 - "bitflags", 930 - "chrono", 931 - "crossbeam", 932 - "defer-drop", 933 - "derive_builder", 934 - "fuzzy-matcher", 935 - "lazy_static", 936 - "log", 937 - "nix 0.25.1", 938 - "once_cell", 939 - "rayon", 940 - "regex", 941 - "time 0.3.17", 942 - "timer", 943 - "tuikit", 944 - "unicode-width", 945 - "vte", 946 - ] 941 + name = "strsim" 942 + version = "0.10.0" 943 + source = "registry+https://github.com/rust-lang/crates.io-index" 944 + checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" 947 945 948 946 [[package]] 949 - name = "static_assertions" 950 - version = "1.1.0" 947 + name = "strsim" 948 + version = "0.11.1" 951 949 source = "registry+https://github.com/rust-lang/crates.io-index" 952 - checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" 950 + checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" 953 951 954 952 [[package]] 955 - name = "strsim" 956 - version = "0.10.0" 953 + name = "subtle" 954 + version = "2.5.0" 957 955 source = "registry+https://github.com/rust-lang/crates.io-index" 958 - checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" 956 + checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" 959 957 960 958 [[package]] 961 959 name = "syn" 962 - version = "1.0.105" 960 + version = "1.0.109" 963 961 source = "registry+https://github.com/rust-lang/crates.io-index" 964 - checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" 962 + checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" 963 + dependencies = [ 964 + "proc-macro2", 965 + "quote", 966 + "unicode-ident", 967 + ] 968 + 969 + [[package]] 970 + name = "syn" 971 + version = "2.0.48" 972 + source = "registry+https://github.com/rust-lang/crates.io-index" 973 + checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" 965 974 dependencies = [ 966 975 "proc-macro2", 967 976 "quote", ··· 981 990 982 991 [[package]] 983 992 name = "termcolor" 984 - version = "1.1.3" 993 + version = "1.4.0" 985 994 source = "registry+https://github.com/rust-lang/crates.io-index" 986 - checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" 995 + checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" 987 996 dependencies = [ 988 997 "winapi-util", 989 998 ] 990 999 991 1000 [[package]] 992 1001 name = "terminal_size" 993 - version = "0.1.17" 1002 + version = "0.3.0" 994 1003 source = "registry+https://github.com/rust-lang/crates.io-index" 995 - checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" 1004 + checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" 996 1005 dependencies = [ 997 - "libc", 998 - "winapi", 1006 + "rustix", 1007 + "windows-sys 0.48.0", 999 1008 ] 1000 1009 1001 1010 [[package]] 1002 - name = "terminal_size" 1003 - version = "0.2.3" 1011 + name = "textwrap" 1012 + version = "0.11.0" 1004 1013 source = "registry+https://github.com/rust-lang/crates.io-index" 1005 - checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" 1014 + checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" 1006 1015 dependencies = [ 1007 - "rustix", 1008 - "windows-sys", 1016 + "unicode-width", 1009 1017 ] 1010 1018 1011 1019 [[package]] 1012 - name = "textwrap" 1013 - version = "0.16.0" 1014 - source = "registry+https://github.com/rust-lang/crates.io-index" 1015 - checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" 1016 - 1017 - [[package]] 1018 1020 name = "thiserror" 1019 - version = "1.0.37" 1021 + version = "1.0.39" 1020 1022 source = "registry+https://github.com/rust-lang/crates.io-index" 1021 - checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" 1023 + checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" 1022 1024 dependencies = [ 1023 1025 "thiserror-impl", 1024 1026 ] 1025 1027 1026 1028 [[package]] 1027 1029 name = "thiserror-impl" 1028 - version = "1.0.37" 1030 + version = "1.0.39" 1029 1031 source = "registry+https://github.com/rust-lang/crates.io-index" 1030 - checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" 1032 + checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" 1031 1033 dependencies = [ 1032 1034 "proc-macro2", 1033 1035 "quote", 1034 - "syn", 1036 + "syn 1.0.109", 1035 1037 ] 1036 1038 1037 1039 [[package]] 1038 1040 name = "thread_local" 1039 - version = "1.1.4" 1041 + version = "1.1.8" 1040 1042 source = "registry+https://github.com/rust-lang/crates.io-index" 1041 - checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" 1043 + checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" 1042 1044 dependencies = [ 1045 + "cfg-if", 1043 1046 "once_cell", 1044 1047 ] 1045 1048 1046 1049 [[package]] 1047 1050 name = "time" 1048 - version = "0.1.45" 1051 + version = "0.3.36" 1049 1052 source = "registry+https://github.com/rust-lang/crates.io-index" 1050 - checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" 1053 + checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" 1051 1054 dependencies = [ 1052 - "libc", 1053 - "wasi 0.10.0+wasi-snapshot-preview1", 1054 - "winapi", 1055 - ] 1056 - 1057 - [[package]] 1058 - name = "time" 1059 - version = "0.3.17" 1060 - source = "registry+https://github.com/rust-lang/crates.io-index" 1061 - checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" 1062 - dependencies = [ 1055 + "deranged", 1063 1056 "itoa", 1064 1057 "libc", 1058 + "num-conv", 1065 1059 "num_threads", 1060 + "powerfmt", 1066 1061 "serde", 1067 1062 "time-core", 1068 1063 "time-macros", ··· 1070 1065 1071 1066 [[package]] 1072 1067 name = "time-core" 1073 - version = "0.1.0" 1068 + version = "0.1.2" 1074 1069 source = "registry+https://github.com/rust-lang/crates.io-index" 1075 - checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" 1070 + checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" 1076 1071 1077 1072 [[package]] 1078 1073 name = "time-macros" 1079 - version = "0.2.6" 1074 + version = "0.2.18" 1080 1075 source = "registry+https://github.com/rust-lang/crates.io-index" 1081 - checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" 1076 + checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" 1082 1077 dependencies = [ 1078 + "num-conv", 1083 1079 "time-core", 1084 1080 ] 1085 1081 1086 1082 [[package]] 1087 - name = "timer" 1088 - version = "0.2.0" 1089 - source = "registry+https://github.com/rust-lang/crates.io-index" 1090 - checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" 1091 - dependencies = [ 1092 - "chrono", 1093 - ] 1094 - 1095 - [[package]] 1096 1083 name = "tuikit" 1097 1084 version = "0.5.0" 1098 1085 source = "registry+https://github.com/rust-lang/crates.io-index" 1099 1086 checksum = "5e19c6ab038babee3d50c8c12ff8b910bdb2196f62278776422f50390d8e53d8" 1100 1087 dependencies = [ 1101 - "bitflags", 1088 + "bitflags 1.3.2", 1102 1089 "lazy_static", 1103 1090 "log", 1104 1091 "nix 0.24.3", ··· 1107 1094 ] 1108 1095 1109 1096 [[package]] 1097 + name = "two_percent" 1098 + version = "0.11.12" 1099 + source = "registry+https://github.com/rust-lang/crates.io-index" 1100 + checksum = "84167b95c58bc7cdd169699ab51938076616cee3a9c5c7a7292e0498361e868a" 1101 + dependencies = [ 1102 + "ahash 0.8.11", 1103 + "bitflags 2.5.0", 1104 + "crossbeam-channel", 1105 + "derive_builder", 1106 + "fuzzy-muff", 1107 + "hashbrown 0.14.3", 1108 + "libc", 1109 + "log", 1110 + "nohash", 1111 + "once_cell", 1112 + "rayon", 1113 + "regex", 1114 + "tuikit", 1115 + "unicode-width", 1116 + "vte", 1117 + "which", 1118 + ] 1119 + 1120 + [[package]] 1121 + name = "typenum" 1122 + version = "1.17.0" 1123 + source = "registry+https://github.com/rust-lang/crates.io-index" 1124 + checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" 1125 + 1126 + [[package]] 1110 1127 name = "unicode-ident" 1111 - version = "1.0.5" 1128 + version = "1.0.8" 1112 1129 source = "registry+https://github.com/rust-lang/crates.io-index" 1113 - checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" 1130 + checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" 1114 1131 1115 1132 [[package]] 1116 1133 name = "unicode-width" 1117 - version = "0.1.10" 1134 + version = "0.1.11" 1118 1135 source = "registry+https://github.com/rust-lang/crates.io-index" 1119 - checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" 1136 + checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" 1120 1137 1121 1138 [[package]] 1122 1139 name = "utf8parse" 1123 - version = "0.2.0" 1140 + version = "0.2.1" 1124 1141 source = "registry+https://github.com/rust-lang/crates.io-index" 1125 - checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" 1142 + checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" 1126 1143 1127 1144 [[package]] 1128 1145 name = "uuid" 1129 - version = "1.2.2" 1146 + version = "1.7.0" 1130 1147 source = "registry+https://github.com/rust-lang/crates.io-index" 1131 - checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" 1148 + checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" 1149 + 1150 + [[package]] 1151 + name = "vec_map" 1152 + version = "0.8.2" 1153 + source = "registry+https://github.com/rust-lang/crates.io-index" 1154 + checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" 1132 1155 1133 1156 [[package]] 1134 1157 name = "version_check" ··· 1138 1161 1139 1162 [[package]] 1140 1163 name = "vte" 1141 - version = "0.11.0" 1164 + version = "0.13.0" 1142 1165 source = "registry+https://github.com/rust-lang/crates.io-index" 1143 - checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" 1166 + checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" 1144 1167 dependencies = [ 1145 - "arrayvec", 1146 1168 "utf8parse", 1147 1169 "vte_generate_state_changes", 1148 1170 ] ··· 1159 1181 1160 1182 [[package]] 1161 1183 name = "wasi" 1162 - version = "0.10.0+wasi-snapshot-preview1" 1184 + version = "0.11.0+wasi-snapshot-preview1" 1163 1185 source = "registry+https://github.com/rust-lang/crates.io-index" 1164 - checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" 1186 + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" 1165 1187 1166 1188 [[package]] 1167 - name = "wasi" 1168 - version = "0.11.0+wasi-snapshot-preview1" 1189 + name = "which" 1190 + version = "6.0.1" 1169 1191 source = "registry+https://github.com/rust-lang/crates.io-index" 1170 - checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" 1192 + checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" 1193 + dependencies = [ 1194 + "either", 1195 + "home", 1196 + "rustix", 1197 + "winsafe", 1198 + ] 1171 1199 1172 1200 [[package]] 1173 - name = "wasm-bindgen" 1174 - version = "0.2.83" 1201 + name = "winapi" 1202 + version = "0.3.9" 1175 1203 source = "registry+https://github.com/rust-lang/crates.io-index" 1176 - checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" 1204 + checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" 1177 1205 dependencies = [ 1178 - "cfg-if", 1179 - "wasm-bindgen-macro", 1206 + "winapi-i686-pc-windows-gnu", 1207 + "winapi-x86_64-pc-windows-gnu", 1180 1208 ] 1181 1209 1182 1210 [[package]] 1183 - name = "wasm-bindgen-backend" 1184 - version = "0.2.83" 1211 + name = "winapi-i686-pc-windows-gnu" 1212 + version = "0.4.0" 1213 + source = "registry+https://github.com/rust-lang/crates.io-index" 1214 + checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 1215 + 1216 + [[package]] 1217 + name = "winapi-util" 1218 + version = "0.1.6" 1185 1219 source = "registry+https://github.com/rust-lang/crates.io-index" 1186 - checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" 1220 + checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" 1187 1221 dependencies = [ 1188 - "bumpalo", 1189 - "log", 1190 - "once_cell", 1191 - "proc-macro2", 1192 - "quote", 1193 - "syn", 1194 - "wasm-bindgen-shared", 1222 + "winapi", 1195 1223 ] 1196 1224 1197 1225 [[package]] 1198 - name = "wasm-bindgen-macro" 1199 - version = "0.2.83" 1226 + name = "winapi-x86_64-pc-windows-gnu" 1227 + version = "0.4.0" 1228 + source = "registry+https://github.com/rust-lang/crates.io-index" 1229 + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 1230 + 1231 + [[package]] 1232 + name = "windows-sys" 1233 + version = "0.42.0" 1200 1234 source = "registry+https://github.com/rust-lang/crates.io-index" 1201 - checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" 1235 + checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" 1202 1236 dependencies = [ 1203 - "quote", 1204 - "wasm-bindgen-macro-support", 1237 + "windows_aarch64_gnullvm 0.42.2", 1238 + "windows_aarch64_msvc 0.42.2", 1239 + "windows_i686_gnu 0.42.2", 1240 + "windows_i686_msvc 0.42.2", 1241 + "windows_x86_64_gnu 0.42.2", 1242 + "windows_x86_64_gnullvm 0.42.2", 1243 + "windows_x86_64_msvc 0.42.2", 1205 1244 ] 1206 1245 1207 1246 [[package]] 1208 - name = "wasm-bindgen-macro-support" 1209 - version = "0.2.83" 1247 + name = "windows-sys" 1248 + version = "0.48.0" 1210 1249 source = "registry+https://github.com/rust-lang/crates.io-index" 1211 - checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" 1250 + checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" 1212 1251 dependencies = [ 1213 - "proc-macro2", 1214 - "quote", 1215 - "syn", 1216 - "wasm-bindgen-backend", 1217 - "wasm-bindgen-shared", 1252 + "windows-targets 0.48.0", 1218 1253 ] 1219 1254 1220 1255 [[package]] 1221 - name = "wasm-bindgen-shared" 1222 - version = "0.2.83" 1256 + name = "windows-sys" 1257 + version = "0.52.0" 1223 1258 source = "registry+https://github.com/rust-lang/crates.io-index" 1224 - checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" 1259 + checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 1260 + dependencies = [ 1261 + "windows-targets 0.52.0", 1262 + ] 1225 1263 1226 1264 [[package]] 1227 - name = "which" 1228 - version = "4.3.0" 1265 + name = "windows-targets" 1266 + version = "0.48.0" 1229 1267 source = "registry+https://github.com/rust-lang/crates.io-index" 1230 - checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" 1268 + checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" 1231 1269 dependencies = [ 1232 - "either", 1233 - "libc", 1234 - "once_cell", 1270 + "windows_aarch64_gnullvm 0.48.0", 1271 + "windows_aarch64_msvc 0.48.0", 1272 + "windows_i686_gnu 0.48.0", 1273 + "windows_i686_msvc 0.48.0", 1274 + "windows_x86_64_gnu 0.48.0", 1275 + "windows_x86_64_gnullvm 0.48.0", 1276 + "windows_x86_64_msvc 0.48.0", 1235 1277 ] 1236 1278 1237 1279 [[package]] 1238 - name = "winapi" 1239 - version = "0.3.9" 1280 + name = "windows-targets" 1281 + version = "0.52.0" 1240 1282 source = "registry+https://github.com/rust-lang/crates.io-index" 1241 - checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" 1283 + checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" 1242 1284 dependencies = [ 1243 - "winapi-i686-pc-windows-gnu", 1244 - "winapi-x86_64-pc-windows-gnu", 1285 + "windows_aarch64_gnullvm 0.52.0", 1286 + "windows_aarch64_msvc 0.52.0", 1287 + "windows_i686_gnu 0.52.0", 1288 + "windows_i686_msvc 0.52.0", 1289 + "windows_x86_64_gnu 0.52.0", 1290 + "windows_x86_64_gnullvm 0.52.0", 1291 + "windows_x86_64_msvc 0.52.0", 1245 1292 ] 1246 1293 1247 1294 [[package]] 1248 - name = "winapi-i686-pc-windows-gnu" 1249 - version = "0.4.0" 1295 + name = "windows_aarch64_gnullvm" 1296 + version = "0.42.2" 1250 1297 source = "registry+https://github.com/rust-lang/crates.io-index" 1251 - checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 1298 + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" 1252 1299 1253 1300 [[package]] 1254 - name = "winapi-util" 1255 - version = "0.1.5" 1301 + name = "windows_aarch64_gnullvm" 1302 + version = "0.48.0" 1256 1303 source = "registry+https://github.com/rust-lang/crates.io-index" 1257 - checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" 1258 - dependencies = [ 1259 - "winapi", 1260 - ] 1304 + checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" 1261 1305 1262 1306 [[package]] 1263 - name = "winapi-x86_64-pc-windows-gnu" 1264 - version = "0.4.0" 1307 + name = "windows_aarch64_gnullvm" 1308 + version = "0.52.0" 1265 1309 source = "registry+https://github.com/rust-lang/crates.io-index" 1266 - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 1310 + checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" 1267 1311 1268 1312 [[package]] 1269 - name = "windows-sys" 1270 - version = "0.42.0" 1313 + name = "windows_aarch64_msvc" 1314 + version = "0.42.2" 1271 1315 source = "registry+https://github.com/rust-lang/crates.io-index" 1272 - checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" 1273 - dependencies = [ 1274 - "windows_aarch64_gnullvm", 1275 - "windows_aarch64_msvc", 1276 - "windows_i686_gnu", 1277 - "windows_i686_msvc", 1278 - "windows_x86_64_gnu", 1279 - "windows_x86_64_gnullvm", 1280 - "windows_x86_64_msvc", 1281 - ] 1316 + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" 1282 1317 1283 1318 [[package]] 1284 - name = "windows_aarch64_gnullvm" 1285 - version = "0.42.0" 1319 + name = "windows_aarch64_msvc" 1320 + version = "0.48.0" 1286 1321 source = "registry+https://github.com/rust-lang/crates.io-index" 1287 - checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" 1322 + checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" 1288 1323 1289 1324 [[package]] 1290 1325 name = "windows_aarch64_msvc" 1291 - version = "0.42.0" 1326 + version = "0.52.0" 1327 + source = "registry+https://github.com/rust-lang/crates.io-index" 1328 + checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" 1329 + 1330 + [[package]] 1331 + name = "windows_i686_gnu" 1332 + version = "0.42.2" 1292 1333 source = "registry+https://github.com/rust-lang/crates.io-index" 1293 - checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" 1334 + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" 1294 1335 1295 1336 [[package]] 1296 1337 name = "windows_i686_gnu" 1297 - version = "0.42.0" 1338 + version = "0.48.0" 1339 + source = "registry+https://github.com/rust-lang/crates.io-index" 1340 + checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" 1341 + 1342 + [[package]] 1343 + name = "windows_i686_gnu" 1344 + version = "0.52.0" 1298 1345 source = "registry+https://github.com/rust-lang/crates.io-index" 1299 - checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" 1346 + checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" 1300 1347 1301 1348 [[package]] 1302 1349 name = "windows_i686_msvc" 1303 - version = "0.42.0" 1350 + version = "0.42.2" 1304 1351 source = "registry+https://github.com/rust-lang/crates.io-index" 1305 - checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" 1352 + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" 1353 + 1354 + [[package]] 1355 + name = "windows_i686_msvc" 1356 + version = "0.48.0" 1357 + source = "registry+https://github.com/rust-lang/crates.io-index" 1358 + checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" 1359 + 1360 + [[package]] 1361 + name = "windows_i686_msvc" 1362 + version = "0.52.0" 1363 + source = "registry+https://github.com/rust-lang/crates.io-index" 1364 + checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" 1306 1365 1307 1366 [[package]] 1308 1367 name = "windows_x86_64_gnu" 1309 - version = "0.42.0" 1368 + version = "0.42.2" 1310 1369 source = "registry+https://github.com/rust-lang/crates.io-index" 1311 - checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" 1370 + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" 1371 + 1372 + [[package]] 1373 + name = "windows_x86_64_gnu" 1374 + version = "0.48.0" 1375 + source = "registry+https://github.com/rust-lang/crates.io-index" 1376 + checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" 1377 + 1378 + [[package]] 1379 + name = "windows_x86_64_gnu" 1380 + version = "0.52.0" 1381 + source = "registry+https://github.com/rust-lang/crates.io-index" 1382 + checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" 1312 1383 1313 1384 [[package]] 1314 1385 name = "windows_x86_64_gnullvm" 1315 - version = "0.42.0" 1386 + version = "0.42.2" 1387 + source = "registry+https://github.com/rust-lang/crates.io-index" 1388 + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" 1389 + 1390 + [[package]] 1391 + name = "windows_x86_64_gnullvm" 1392 + version = "0.48.0" 1393 + source = "registry+https://github.com/rust-lang/crates.io-index" 1394 + checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" 1395 + 1396 + [[package]] 1397 + name = "windows_x86_64_gnullvm" 1398 + version = "0.52.0" 1399 + source = "registry+https://github.com/rust-lang/crates.io-index" 1400 + checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" 1401 + 1402 + [[package]] 1403 + name = "windows_x86_64_msvc" 1404 + version = "0.42.2" 1405 + source = "registry+https://github.com/rust-lang/crates.io-index" 1406 + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" 1407 + 1408 + [[package]] 1409 + name = "windows_x86_64_msvc" 1410 + version = "0.48.0" 1316 1411 source = "registry+https://github.com/rust-lang/crates.io-index" 1317 - checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" 1412 + checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" 1318 1413 1319 1414 [[package]] 1320 1415 name = "windows_x86_64_msvc" 1321 - version = "0.42.0" 1416 + version = "0.52.0" 1417 + source = "registry+https://github.com/rust-lang/crates.io-index" 1418 + checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" 1419 + 1420 + [[package]] 1421 + name = "winsafe" 1422 + version = "0.0.19" 1322 1423 source = "registry+https://github.com/rust-lang/crates.io-index" 1323 - checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" 1424 + checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" 1324 1425 1325 1426 [[package]] 1326 1427 name = "xattr" 1327 - version = "1.0.0" 1428 + version = "1.3.1" 1328 1429 source = "registry+https://github.com/rust-lang/crates.io-index" 1329 - checksum = "ea263437ca03c1522846a4ddafbca2542d0ad5ed9b784909d4b27b76f62bc34a" 1430 + checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" 1330 1431 dependencies = [ 1331 1432 "libc", 1433 + "linux-raw-sys", 1434 + "rustix", 1435 + ] 1436 + 1437 + [[package]] 1438 + name = "yaml-rust" 1439 + version = "0.3.5" 1440 + source = "registry+https://github.com/rust-lang/crates.io-index" 1441 + checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" 1442 + 1443 + [[package]] 1444 + name = "zerocopy" 1445 + version = "0.7.32" 1446 + source = "registry+https://github.com/rust-lang/crates.io-index" 1447 + checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" 1448 + dependencies = [ 1449 + "zerocopy-derive", 1450 + ] 1451 + 1452 + [[package]] 1453 + name = "zerocopy-derive" 1454 + version = "0.7.32" 1455 + source = "registry+https://github.com/rust-lang/crates.io-index" 1456 + checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" 1457 + dependencies = [ 1458 + "proc-macro2", 1459 + "quote", 1460 + "syn 2.0.48", 1332 1461 ]
+13 -5
pkgs/tools/filesystems/httm/default.nix
··· 6 6 7 7 rustPlatform.buildRustPackage rec { 8 8 pname = "httm"; 9 - version = "0.23.3"; 9 + version = "0.38.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "kimono-koans"; 13 13 repo = pname; 14 14 rev = version; 15 - hash = "sha256-yia7GEPemFVHzTkhrL7HejQsFO1zwpdUtq4DLdm4s2g="; 15 + hash = "sha256-aCWhjMXLNx5/wV1HFDtyUuUfpRAxDZhI/Bk7roqZkJ8="; 16 16 }; 17 17 18 18 cargoLock = { 19 19 lockFile = ./Cargo.lock; 20 - outputHashes = { 21 - "skim-0.10.2" = "sha256-5bDQZer4r9sNupIilY3afXbyFE1UB8kNsZIFOPmuyu4="; 22 - }; 23 20 }; 24 21 25 22 nativeBuildInputs = [ installShellFiles ]; 26 23 24 + postPatch = '' 25 + chmod +x scripts/*.bash 26 + patchShebangs scripts/*.bash 27 + ''; 28 + 27 29 postInstall = '' 28 30 installManPage httm.1 29 31 30 32 installShellCompletion --cmd httm \ 31 33 --zsh scripts/httm-key-bindings.zsh 34 + 35 + for script in scripts/*.bash; do 36 + install -Dm755 "$script" "$out/bin/$(basename "$script" .bash)" 37 + done 38 + 39 + install -Dm644 README.md $out/share/doc/README.md 32 40 ''; 33 41 34 42 meta = with lib; {
+3
pkgs/tools/misc/pandoc-include/default.nix
··· 5 5 , panflute 6 6 , lxml 7 7 , setuptools 8 + , nix-update-script 8 9 }: 9 10 10 11 buildPythonApplication rec { ··· 22 23 nativeBuildInputs = [ 23 24 setuptools 24 25 ]; 26 + 27 + passthru.updateScript = nix-update-script {}; 25 28 26 29 propagatedBuildInputs = [ natsort panflute lxml ]; 27 30
+3 -3
pkgs/tools/misc/phrase-cli/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "phrase-cli"; 5 - version = "2.27.0"; 5 + version = "2.27.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "phrase"; 9 9 repo = "phrase-cli"; 10 10 rev = version; 11 - sha256 = "sha256-PStbkJbSGCN92eAk4TZaIzbkG1C25PKI6R6LJgaQuxQ="; 11 + sha256 = "sha256-96avkMhIjVdUou6gOddEGOsRNI5HEH5jLQu39HdJmSQ="; 12 12 }; 13 13 14 - vendorHash = "sha256-5EgttRimT+TTL9QhT36AO9rx2DdZBmnQrllBfRpdhg0="; 14 + vendorHash = "sha256-srLQ2T8Ltigm6vcov4l4/f6DRs9+Mqyy9tovvnpUASc="; 15 15 16 16 ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; 17 17
+2 -2
pkgs/tools/networking/grpc_cli/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "grpc_cli"; 5 - version = "1.64.0"; 5 + version = "1.64.1"; 6 6 src = fetchFromGitHub { 7 7 owner = "grpc"; 8 8 repo = "grpc"; 9 9 rev = "v${version}"; 10 - hash = "sha256-5mTyXA7jxos+PclImuFDyLTEVkqxm4Kxnorm8R12i9U="; 10 + hash = "sha256-FfAH9vGlqzSGCPFKZtYhYFLQtbUbdksZvDptx94gkDE="; 11 11 fetchSubmodules = true; 12 12 }; 13 13 nativeBuildInputs = [ automake cmake autoconf ];
+3 -3
pkgs/tools/networking/ockam/default.nix
··· 13 13 14 14 let 15 15 pname = "ockam"; 16 - version = "0.124.0"; 16 + version = "0.125.0"; 17 17 in 18 18 rustPlatform.buildRustPackage { 19 19 inherit pname version; ··· 22 22 owner = "build-trust"; 23 23 repo = pname; 24 24 rev = "ockam_v${version}"; 25 - hash = "sha256-ovcZD9D/iVF3iIti+vQ29YIJE+UI64BeuA2huJsAx5s="; 25 + hash = "sha256-CFJ2Z/PI7du9wlvh3/Ew8AejcU//xPuUXJweQ4phYc8="; 26 26 }; 27 27 28 - cargoHash = "sha256-z+GIFN5Q3LWnT5PrZ291G2lHgd5mzDFkKwdcxUXvUnU="; 28 + cargoHash = "sha256-j9c1m6beT70E0+czXMVOqY36wAHR1uqL5zKHkrlIAQk="; 29 29 nativeBuildInputs = [ git pkg-config ]; 30 30 buildInputs = [ openssl dbus ] 31 31 ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
+5 -3
pkgs/tools/package-management/harmonia/default.nix pkgs/by-name/ha/harmonia/package.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "harmonia"; 15 - version = "0.7.5"; 15 + version = "0.8.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "nix-community"; 19 19 repo = pname; 20 20 rev = "refs/tags/${pname}-v${version}"; 21 - hash = "sha256-QqRq5maYk4hDl0MXkj9wOPWUta5b+kXG9e/kqRorNE4="; 21 + hash = "sha256-+V0V/l9Q7HR3J0aH1UWc1qHrpGiRWd6B4R+3MECFORg="; 22 22 }; 23 23 24 - cargoHash = "sha256-dlmSn4cWU6RqEiUoQYNJFhxu3owplkxlbtszBxm+GbU="; 24 + cargoHash = "sha256-3Nx1YXjbYVOD7pYgI9Cp5Vsxv1j1XeX6pCl4+Q1OtVs="; 25 + 26 + doCheck = false; 25 27 26 28 nativeBuildInputs = [ 27 29 pkg-config nixVersions.nix_2_21
+2 -5
pkgs/tools/security/beyond-identity/default.nix
··· 5 5 6 6 let 7 7 pname = "beyond-identity"; 8 - version = "2.60.0-0"; 8 + version = "2.97.0-0"; 9 9 libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); 10 10 meta = with lib; { 11 11 description = "Passwordless MFA identities for workforces, customers, and developers"; ··· 22 22 23 23 src = fetchurl { 24 24 url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb"; 25 - hash = "sha512-JrHLf7KkJVbJLxx54OTvOSaIzY3+hjX+bpkeBHKX23YriCJssUUvEP6vlbI4r6gjMMFMhW92k0iikAgD1Tr4ug=="; 25 + hash = "sha512-aOQi0hG7AZ3lIAPCDgGAjqVmNCuqFC62CjI9XPLBpvbxBgr2yi7alP952i31MufzzruzVweoQb8SWgNIHq/zIw=="; 26 26 }; 27 27 28 28 nativeBuildInputs = [ ··· 37 37 mkdir -p $out/opt/beyond-identity 38 38 39 39 rm -rf usr/share/doc 40 - 41 - # https://github.com/NixOS/nixpkgs/issues/42117 42 - sed -i -e 's/auth_self/yes/g' usr/share/polkit-1/actions/com.beyondidentity.endpoint.stepup.policy 43 40 44 41 cp -ar usr/{bin,share} $out 45 42 cp -ar opt/beyond-identity/bin $out/opt/beyond-identity
-2
pkgs/top-level/all-packages.nix
··· 8858 8858 8859 8859 hardinfo = callPackage ../tools/system/hardinfo { }; 8860 8860 8861 - harmonia = callPackage ../tools/package-management/harmonia { }; 8862 - 8863 8861 hayagriva = callPackage ../tools/typesetting/hayagriva { }; 8864 8862 8865 8863 hcl2json = callPackage ../applications/misc/hcl2json { };