lol

Merge staging-next into staging

authored by

github-actions[bot] and committed by
GitHub
e5f37c0e 5198400d

+1712 -1329
+6
maintainers/maintainer-list.nix
··· 7427 7427 githubId = 21156405; 7428 7428 name = "GuangTao Zhang"; 7429 7429 }; 7430 + Guanran928 = { 7431 + email = "guanran928@outlook.com"; 7432 + github = "Guanran928"; 7433 + githubId = 68757440; 7434 + name = "Guanran928"; 7435 + }; 7430 7436 guekka = { 7431 7437 github = "Guekka"; 7432 7438 githubId = 39066502;
+4 -3
nixos/modules/programs/clash-verge.nix
··· 3 3 { 4 4 options.programs.clash-verge = { 5 5 enable = lib.mkEnableOption (lib.mdDoc "Clash Verge"); 6 + package = lib.mkPackageOption pkgs "clash-verge" {}; 6 7 autoStart = lib.mkEnableOption (lib.mdDoc "Clash Verge auto launch"); 7 8 tunMode = lib.mkEnableOption (lib.mdDoc "Clash Verge TUN mode"); 8 9 }; ··· 14 15 lib.mkIf cfg.enable { 15 16 16 17 environment.systemPackages = [ 17 - pkgs.clash-verge 18 + cfg.package 18 19 (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem { 19 20 name = "clash-verge"; 20 - package = pkgs.clash-verge; 21 + package = cfg.package; 21 22 })) 22 23 ]; 23 24 ··· 25 26 owner = "root"; 26 27 group = "root"; 27 28 capabilities = "cap_net_bind_service,cap_net_admin=+ep"; 28 - source = "${lib.getExe pkgs.clash-verge}"; 29 + source = "${lib.getExe cfg.package}"; 29 30 }; 30 31 }; 31 32
+1 -1
nixos/modules/services/security/yubikey-agent.nix
··· 37 37 38 38 # This overrides the systemd user unit shipped with the 39 39 # yubikey-agent package 40 - systemd.user.services.yubikey-agent = mkIf (pinentryFlavor != null) { 40 + systemd.user.services.yubikey-agent = mkIf (config.programs.gnupg.agent.pinentryPackage != null) { 41 41 path = [ config.programs.gnupg.agent.pinentryPackage ]; 42 42 wantedBy = [ "default.target" ]; 43 43 };
+10 -17
pkgs/applications/audio/youtube-music/default.nix
··· 1 1 { lib 2 2 , fetchFromGitHub 3 - , buildNpmPackage 4 3 , makeWrapper 5 4 , electron 6 5 , python3 ··· 14 13 , makeDesktopItem 15 14 }: 16 15 17 - let 16 + stdenv.mkDerivation (finalAttrs: { 18 17 pname = "youtube-music"; 19 - version = "3.1.0"; 18 + version = "3.3.1"; 20 19 21 20 src = fetchFromGitHub { 22 21 owner = "th-ch"; 23 - repo = pname; 24 - rev = "v${version}"; 25 - hash = "sha256-6ZiftpdCwxCkJzcHryVrUKzM+mM1eQpdLNFl0Dja59Q="; 22 + repo = "youtube-music"; 23 + rev = "v${finalAttrs.version}"; 24 + hash = "sha256-N6TzDTKvMyasksE0qcEGKeNjGAD08OzxpmpoQ11/ZW4="; 26 25 }; 27 26 28 - in 29 - stdenv.mkDerivation (finalAttrs: { 30 - inherit pname version src; 31 - 32 27 pnpmDeps = stdenvNoCC.mkDerivation { 33 28 pname = "${finalAttrs.pname}-pnpm-deps"; 34 29 inherit (finalAttrs) src version ELECTRON_SKIP_BINARY_DOWNLOAD; ··· 51 46 dontBuild = true; 52 47 dontFixup = true; 53 48 outputHashMode = "recursive"; 54 - outputHashAlgo = "sha256"; 55 49 outputHash = { 56 - x86_64-linux = "sha256-Oy11V7FXfVhLUR9gX0sjQEFuVPFpbaVdT518oOSLcvA="; 57 - aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI="; 58 - x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY="; 59 - aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs="; 50 + x86_64-linux = "sha256-V6CSawxBWFbXmAPbck0xCXqRlANpqFAoqSAB4Duf8qM="; 51 + aarch64-linux = "sha256-cqBn35soV14CmobKt0napRELio4HKKA8Iw3QSWTxzP8="; 52 + x86_64-darwin = "sha256-DY9T1N8Hxr57/XisYT+u2+hQvYMIiyQ3UHeTuA6BhSY="; 53 + aarch64-darwin = "sha256-3Zk0SyhVKaz5QdO69/xzWFZj9ueJS6GLWhfW7odWvHc="; 60 54 }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); 61 55 }; 62 56 63 - nativeBuildInputs = 64 - [ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ] 57 + nativeBuildInputs = [ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ] 65 58 ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; 66 59 67 60
+6 -6
pkgs/applications/editors/vscode/vscodium.nix
··· 15 15 archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; 16 16 17 17 sha256 = { 18 - x86_64-linux = "0pz2dn245jzjw2n79mm9angvdlwlwxb4lwdq8za1i99g2m4il1bz"; 19 - x86_64-darwin = "0d0ivs672zh7w60pxy95awq7c8gxhs7d8wv5cf25289gnzcd6qff"; 20 - aarch64-linux = "1srir5gr0bdvnxyqrfq00p34ligg0pppr22g9zrdm8jasvrz6fb0"; 21 - aarch64-darwin = "046kcsanz5msf5xd94b1lxcwclsp3dcwxgzrcxycbsykxslz9gpq"; 22 - armv7l-linux = "0h576q3jbdy48bvg4h9swd2w7cynxmnm2klj6p719myigx7h2jzg"; 18 + x86_64-linux = "02rkp86rj7irs5011g6180yihllwfx47afk5vybxab4v23vigidr"; 19 + x86_64-darwin = "1hpj6kkyby9chr27w2382az7h2bg3x1x7c9j6i5bh8vl81s9yfd4"; 20 + aarch64-linux = "04fhmfplvyqg2l5xlqldl6kfy1m3y19sf2nikigmsm550b8m6sgc"; 21 + aarch64-darwin = "1yhyybd27ympg12mp4w46z64g2mi1hbv4d6hfl34l7fq4c5jkjf2"; 22 + armv7l-linux = "0jpjsfal67la123hqp9607bih3vnjdpbnrghyy1vywy15z71pff5"; 23 23 }.${system} or throwSystem; 24 24 25 25 sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; ··· 29 29 30 30 # Please backport all compatible updates to the stable release. 31 31 # This is important for the extension ecosystem. 32 - version = "1.86.2.24057"; 32 + version = "1.87.1.24068"; 33 33 pname = "vscodium"; 34 34 35 35 executableName = "codium";
+3 -3
pkgs/applications/emulators/ripes/default.nix
··· 14 14 stdenv.mkDerivation rec { 15 15 pname = "ripes"; 16 16 # Pulling unstable version as latest stable does not build against gcc-13. 17 - version = "2.2.6-unstable-2024-01-02"; 17 + version = "2.2.6-unstable-2024-03-03"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "mortbopet"; 21 21 repo = "Ripes"; 22 - rev = "0faf41b669a93a1944707cd7d111a5e9241425fe"; 22 + rev = "b71f0ddd5d2d346cb97b28fd3f70fef55bb9b6b7"; 23 23 fetchSubmodules = true; 24 - hash = "sha256-3+jibS1mGYBy9jmucytc7GvB1ZKRfh7aXtDty77hA3k="; 24 + hash = "sha256-zQrrWBHNIacRoAEIjR0dlgUTncBCiodcBeT/wbDClWg="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+1 -18
pkgs/applications/misc/mkgmap/build.xml.patch
··· 1 1 --- a/build.xml (revision 4555) 2 2 +++ a/build.xml (working copy) 3 - @@ -222,13 +222,13 @@ 4 - <property name="svn.version.build" value="none"/> 5 - 6 - <propertyfile file="${build.classes}/mkgmap-version.properties"> 7 - - <entry key="svn.version" value="${svn.version.build}" /> 8 - - <entry key="build.timestamp" value="${build.timestamp}" /> 9 - + <entry key="svn.version" value="@version@" /> 10 - + <entry key="build.timestamp" value="unknown" /> 11 - </propertyfile> 3 + @@ -228,7 +228,7 @@ 12 4 </target> 13 5 14 6 <!-- Compile the product itself (no tests). --> ··· 35 27 <mkdir dir="tmp/report"/> 36 28 <junit printsummary="yes" failureproperty="junit.failure" forkmode="once"> 37 29 38 - @@ -351,7 +351,7 @@ 39 - ignoreerrors="true"/> 40 - </target> 41 - 42 - - <target name="dist" depends="build, check-version, version-file" 43 - + <target name="dist" depends="build, version-file" 44 - description="Make the distribution area"> 45 - 46 - <mkdir dir="${dist}"/>
+43 -18
pkgs/applications/misc/mkgmap/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchurl 3 4 , fetchsvn 4 - , substituteAll 5 5 , jdk 6 6 , jre 7 7 , ant ··· 24 24 }; 25 25 26 26 patches = [ 27 - (substituteAll { 28 - # Disable automatic download of dependencies 29 - src = ./build.xml.patch; 30 - inherit version; 31 - }) 27 + # Disable automatic download of dependencies 28 + ./build.xml.patch 29 + ./ignore-impure-test.patch 32 30 ]; 33 31 34 32 postPatch = with deps; '' 33 + # Fix the output jar timestamps for reproducibility 34 + substituteInPlace build.xml \ 35 + --replace-fail '<jar ' '<jar modificationtime="0" ' 36 + 37 + # Manually create version properties file for reproducibility 38 + mkdir -p build/classes 39 + cat > build/classes/mkgmap-version.properties << EOF 40 + svn.version=${version} 41 + build.timestamp=unknown 42 + EOF 43 + 44 + # Put pre-fetched dependencies into the right place 35 45 mkdir -p lib/compile 36 46 cp ${fastutil} lib/compile/${fastutil.name} 37 47 cp ${osmpbf} lib/compile/${osmpbf.name} ··· 53 63 54 64 nativeBuildInputs = [ jdk ant makeWrapper ]; 55 65 56 - buildPhase = "ant"; 66 + buildPhase = '' 67 + runHook preBuild 68 + ant 69 + runHook postBuild 70 + ''; 57 71 58 72 inherit doCheck; 59 73 60 - checkPhase = "ant test"; 74 + checkPhase = '' 75 + runHook preCheck 76 + ant test 77 + runHook postCheck 78 + ''; 61 79 62 80 installPhase = '' 81 + runHook preInstall 82 + 63 83 install -Dm644 dist/mkgmap.jar -t $out/share/java/mkgmap 64 84 install -Dm644 dist/doc/mkgmap.1 -t $out/share/man/man1 65 85 cp -r dist/lib/ $out/share/java/mkgmap/ 66 86 makeWrapper ${jre}/bin/java $out/bin/mkgmap \ 67 87 --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" 68 - '' + lib.optionalString withExamples '' 69 - mkdir -p $out/share/mkgmap 70 - cp -r dist/examples $out/share/mkgmap/ 88 + 89 + ${lib.optionalString withExamples '' 90 + mkdir -p $out/share/mkgmap 91 + cp -r dist/examples $out/share/mkgmap/ 92 + ''} 93 + 94 + runHook postInstall 71 95 ''; 72 96 73 97 passthru.updateScript = [ ./update.sh "mkgmap" meta.downloadPage ]; 74 98 75 99 meta = with lib; { 76 100 description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; 77 - homepage = "https://www.mkgmap.org.uk/"; 78 101 downloadPage = "https://www.mkgmap.org.uk/download/mkgmap.html"; 102 + homepage = "https://www.mkgmap.org.uk/"; 103 + license = licenses.gpl2Only; 104 + mainProgram = "mkgmap"; 105 + maintainers = with maintainers; [ sikmir ]; 106 + platforms = platforms.all; 79 107 sourceProvenance = with sourceTypes; [ 80 108 fromSource 81 - binaryBytecode # deps 109 + binaryBytecode # deps 82 110 ]; 83 - license = licenses.gpl2Only; 84 - maintainers = with maintainers; [ sikmir ]; 85 - platforms = platforms.all; 86 - mainProgram = "mkgmap"; 87 111 }; 112 + 88 113 }
+20
pkgs/applications/misc/mkgmap/ignore-impure-test.patch
··· 1 + diff --git a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java b/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java 2 + index e1e4ac7..954b918 100644 3 + --- a/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java 4 + +++ b/test/uk/me/parabola/imgfmt/app/srt/SrtCollatorTest.java 5 + @@ -17,6 +17,7 @@ import java.text.Collator; 6 + import uk.me.parabola.mkgmap.srt.SrtTextReader; 7 + 8 + import org.junit.Before; 9 + +import org.junit.Ignore; 10 + import org.junit.Test; 11 + 12 + import static org.junit.Assert.*; 13 + @@ -111,6 +112,7 @@ public class SrtCollatorTest { 14 + * meant to be identical to the java one. 15 + */ 16 + @Test 17 + + @Ignore 18 + public void testJavaRules() { 19 + Collator collator = Collator.getInstance(); 20 +
+1 -17
pkgs/applications/misc/mkgmap/splitter/build.xml.patch
··· 1 1 --- a/build.xml (revision 597) 2 2 +++ a/build.xml (working copy) 3 - @@ -207,12 +207,12 @@ 4 - <property name="svn.version.build" value="unknown"/> 5 - 6 - <propertyfile file="${build.classes}/splitter-version.properties"> 7 - - <entry key="svn.version" value="${svn.version.build}" /> 8 - - <entry key="build.timestamp" value="${build.timestamp}" /> 9 - + <entry key="svn.version" value="@version@" /> 10 - + <entry key="build.timestamp" value="unknown" /> 3 + @@ -212,7 +212,7 @@ 11 4 </propertyfile> 12 5 </target> 13 6 ··· 25 18 <javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false"> 26 19 <include name="**/*.java"/> 27 20 <classpath refid="test.classpath"/> 28 - @@ -261,7 +261,7 @@ 29 - <fail if="junit.failure" message="Test failed. See test-reports/index.html"/> 30 - </target> 31 - 32 - - <target name="dist" depends="build, check-version, version-file" description="Make the distribution area"> 33 - + <target name="dist" depends="build, version-file" description="Make the distribution area"> 34 - 35 - <mkdir dir="${dist}"/> 36 - <mkdir dir="${dist}/doc/api"/> 37 21 @@ -324,7 +324,7 @@ 38 22 </target> 39 23
+37 -15
pkgs/applications/misc/mkgmap/splitter/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchurl 3 4 , fetchsvn 4 - , substituteAll 5 5 , jdk 6 6 , jre 7 7 , ant ··· 23 23 }; 24 24 25 25 patches = [ 26 - (substituteAll { 27 - # Disable automatic download of dependencies 28 - src = ./build.xml.patch; 29 - inherit version; 30 - }) 31 - 26 + # Disable automatic download of dependencies 27 + ./build.xml.patch 32 28 # Fix func.SolverAndProblemGeneratorTest test 33 29 ./fix-failing-test.patch 34 30 ]; 35 31 36 32 postPatch = with deps; '' 33 + # Fix the output jar timestamps for reproducibility 34 + substituteInPlace build.xml \ 35 + --replace-fail '<jar ' '<jar modificationtime="0" ' 36 + 37 + # Manually create version properties file for reproducibility 38 + mkdir -p build/classes 39 + cat > build/classes/splitter-version.properties << EOF 40 + svn.version=${version} 41 + build.timestamp=unknown 42 + EOF 43 + 44 + # Put pre-fetched dependencies into the right place 37 45 mkdir -p lib/compile 38 46 cp ${fastutil} lib/compile/${fastutil.name} 39 47 cp ${osmpbf} lib/compile/${osmpbf.name} ··· 52 60 53 61 nativeBuildInputs = [ jdk ant makeWrapper ]; 54 62 55 - buildPhase = "ant"; 63 + buildPhase = '' 64 + runHook preBuild 65 + ant 66 + runHook postBuild 67 + ''; 56 68 57 69 inherit doCheck; 58 70 59 - checkPhase = "ant run.tests && ant run.func-tests"; 71 + checkPhase = '' 72 + runHook preCheck 73 + ant run.tests 74 + ant run.func-tests 75 + runHook postCheck 76 + ''; 60 77 61 78 installPhase = '' 79 + runHook preInstall 80 + 62 81 install -Dm644 dist/splitter.jar -t $out/share/java/splitter 63 82 install -Dm644 doc/splitter.1 -t $out/share/man/man1 64 83 cp -r dist/lib/ $out/share/java/splitter/ 65 84 makeWrapper ${jre}/bin/java $out/bin/splitter \ 66 85 --add-flags "-jar $out/share/java/splitter/splitter.jar" 86 + 87 + runHook postInstall 67 88 ''; 68 89 69 90 passthru.updateScript = [ ../update.sh "mkgmap-splitter" meta.downloadPage ]; 70 91 71 92 meta = with lib; { 72 93 description = "Utility for splitting OpenStreetMap maps into tiles"; 94 + downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; 73 95 homepage = "https://www.mkgmap.org.uk/"; 74 - downloadPage = "https://www.mkgmap.org.uk/download/splitter.html"; 96 + license = licenses.gpl2Only; 97 + mainProgram = "splitter"; 98 + maintainers = with maintainers; [ sikmir ]; 99 + platforms = platforms.all; 75 100 sourceProvenance = with sourceTypes; [ 76 101 fromSource 77 - binaryBytecode # deps 102 + binaryBytecode # deps 78 103 ]; 79 - license = licenses.gpl2Only; 80 - maintainers = with maintainers; [ sikmir ]; 81 - platforms = platforms.all; 82 104 }; 83 105 }
+2 -2
pkgs/applications/networking/clash-verge/default.nix pkgs/by-name/cl/clash-verge/package.nix
··· 42 42 43 43 mkdir -p $out/bin 44 44 mv usr/* $out 45 - rm $out/bin/{clash,clash-meta} 46 45 47 46 runHook postInstall 48 47 ''; 49 48 50 49 postFixup = '' 51 - ln -s ${lib.getExe clash-meta} $out/bin/clash-meta 50 + rm -f $out/bin/clash 51 + ln -sf ${lib.getExe clash-meta} $out/bin/${clash-meta.meta.mainProgram} 52 52 ''; 53 53 54 54 meta = with lib; {
+3 -3
pkgs/applications/networking/gnmic/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "gnmic"; 11 - version = "0.35.1"; 11 + version = "0.36.2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "openconfig"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - hash = "sha256-1Rtq/tRDU8hwrEYhP2/2qPWAYeCPL03m4NpXO3sGUdo="; 17 + hash = "sha256-PUOIKPkzM6riiXR8R1Io0QI/qr6HaexfFgbp2Hx2SOo="; 18 18 }; 19 19 20 - vendorHash = "sha256-HoOjVfpowb5jvAYdQ3cbCQmSl1RJKPDjvOaOGfhe5TY="; 20 + vendorHash = "sha256-zrG/rNoYtfVNN50g41txLQIcBAKi1yE5p1TODrDiXzU="; 21 21 22 22 ldflags = [ 23 23 "-s" "-w"
+5 -5
pkgs/applications/networking/sync/rclone/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "rclone"; 9 - version = "1.65.2"; 9 + version = "1.66.0"; 10 10 11 11 src = fetchFromGitHub { 12 - owner = pname; 13 - repo = pname; 12 + owner = "rclone"; 13 + repo = "rclone"; 14 14 rev = "v${version}"; 15 - hash = "sha256-P7VJ6pauZ7J8LvyYNi7ANsKrYOcmInZCfRO+X+K6LzI="; 15 + hash = "sha256-75RnAROICtRUDn95gSCNO0F6wes4CkJteNfUN38GQIY="; 16 16 }; 17 17 18 - vendorHash = "sha256-budC8psvTtfVi3kYOaJ+dy/9H11ekJVkXMmeV9RhXVU="; 18 + vendorHash = "sha256-zGBwgIuabLDqWbutvPHDbPRo5Dd9kNfmgToZXy7KVgI="; 19 19 20 20 subPackages = [ "." ]; 21 21
+2 -2
pkgs/applications/office/tryton/default.nix
··· 21 21 22 22 python3Packages.buildPythonApplication rec { 23 23 pname = "tryton"; 24 - version = "7.0.5"; 24 + version = "7.0.7"; 25 25 26 26 disabled = !python3Packages.isPy3k; 27 27 28 28 src = fetchPypi { 29 29 inherit pname version; 30 - sha256 = "sha256-NAnNBfwnMky0qbtU3P5+kHJwCj6nfIQCtYgu6nXLcaQ="; 30 + sha256 = "sha256-NODeDEgmf/nSKrM+RxAUsUwsbVQT7OSDrTOGVBwOzpw="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+3 -15
pkgs/applications/video/rtabmap/default.nix
··· 27 27 28 28 stdenv.mkDerivation rec { 29 29 pname = "rtabmap"; 30 - version = "0.21.0"; 30 + version = "0.21.4"; 31 31 32 32 src = fetchFromGitHub { 33 33 owner = "introlab"; 34 34 repo = "rtabmap"; 35 35 rev = "refs/tags/${version}"; 36 - hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI"; 36 + hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ="; 37 37 }; 38 38 39 - patches = [ 40 - # Fix build with g2o 20230806 41 - (fetchpatch { 42 - url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch"; 43 - hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo="; 44 - }) 45 - # Fix typo in previous patch 46 - (fetchpatch { 47 - url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch"; 48 - hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA="; 49 - }) 50 - ]; 51 - 52 39 nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; 53 40 buildInputs = [ 54 41 ## Required 55 42 opencv 43 + opencv.cxxdev 56 44 pcl 57 45 liblapack 58 46 xorg.libSM
+10
pkgs/by-name/as/ast-grep/package.nix
··· 2 2 , rustPlatform 3 3 , fetchFromGitHub 4 4 , stdenv 5 + , installShellFiles 5 6 }: 6 7 7 8 rustPlatform.buildRustPackage rec { ··· 22 23 NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; 23 24 }; 24 25 26 + nativeBuildInputs = [ installShellFiles ]; 27 + 25 28 # error: linker `aarch64-linux-gnu-gcc` not found 26 29 postPatch = '' 27 30 rm .cargo/config.toml 31 + ''; 32 + 33 + postInstall = '' 34 + installShellCompletion --cmd sg \ 35 + --bash <($out/bin/sg completions bash) \ 36 + --fish <($out/bin/sg completions fish) \ 37 + --zsh <($out/bin/sg completions zsh) 28 38 ''; 29 39 30 40 checkFlags = [
+3 -3
pkgs/by-name/bi/bitwarden-cli/package.nix
··· 10 10 11 11 buildNpmPackage rec { 12 12 pname = "bitwarden-cli"; 13 - version = "2024.2.0"; 13 + version = "2024.2.1"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "bitwarden"; 17 17 repo = "clients"; 18 18 rev = "cli-v${version}"; 19 - hash = "sha256-nCjcwe+7Riml/J0hAVv/t6/oHIDPhwFD5A3iQ/LNR5Y="; 19 + hash = "sha256-g9enDEIdVj9R3xkx5qllf7aTDa6F+MvozhwbJn9w/VY="; 20 20 }; 21 21 22 22 nodejs = nodejs_18; 23 23 24 - npmDepsHash = "sha256-GJl9pVwFWEg9yku9IXLcu2XMJZz+ZoQOxCf1TrW715Y="; 24 + npmDepsHash = "sha256-fkoI8a8iVMWxtXAj5zNg2xwK/ZPyRZGPo7rnxHpKV7k="; 25 25 26 26 nativeBuildInputs = [ 27 27 python3
+5 -37
pkgs/by-name/cl/clash-meta/package.nix
··· 1 - { lib 2 - , fetchFromGitHub 3 - , buildGoModule 4 - }: 1 + { mihomo }: 5 2 6 - buildGoModule rec { 3 + mihomo.overrideAttrs (finalAttrs: previousAttrs: { 7 4 pname = "clash-meta"; 8 - version = "1.18.1"; 9 - 10 - src = fetchFromGitHub { 11 - owner = "MetaCubeX"; 12 - repo = "mihomo"; 13 - rev = "v${version}"; 14 - hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ="; 15 - }; 16 - 17 - vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64="; 18 - 19 - excludedPackages = [ "./test" ]; 20 - 21 - ldflags = [ 22 - "-s" 23 - "-w" 24 - "-X github.com/metacubex/mihomo/constant.Version=${version}" 25 - ]; 26 - 27 - tags = [ 28 - "with_gvisor" 29 - ]; 30 - 31 - # network required 32 - doCheck = false; 33 5 34 6 postInstall = '' 35 - mv $out/bin/mihomo $out/bin/clash-meta 7 + mv $out/bin/${previousAttrs.meta.mainProgram} $out/bin/${finalAttrs.meta.mainProgram} 36 8 ''; 37 9 38 - meta = with lib; { 39 - description = "A rule-based tunnel in Go. Present named mihomo"; 40 - homepage = "https://github.com/MetaCubeX/mihomo"; 41 - license = licenses.gpl3Only; 42 - maintainers = with maintainers; [ oluceps ]; 10 + meta = previousAttrs.meta // { 43 11 mainProgram = "clash-meta"; 44 12 }; 45 - } 13 + })
+23
pkgs/by-name/cl/clash-nyanpasu/package.nix
··· 1 + { lib 2 + , clash-verge 3 + , mihomo 4 + , fetchurl 5 + }: 6 + 7 + (clash-verge.override { 8 + clash-meta = mihomo; 9 + }).overrideAttrs (old: rec { 10 + pname = "clash-nyanpasu"; 11 + version = "1.4.5"; 12 + 13 + src = fetchurl { 14 + url = "https://github.com/keiko233/clash-nyanpasu/releases/download/v${version}/clash-nyanpasu_${version}_amd64.deb"; 15 + hash = "sha256-cxaq7Rndf0ytEaqc7CGQix5SOAdsTOoTj1Jlhjr5wEA="; 16 + }; 17 + 18 + meta = old.meta // (with lib; { 19 + homepage = "https://github.com/keiko233/clash-nyanpasu"; 20 + maintainers = with maintainers; [ Guanran928 ]; 21 + mainProgram = "clash-nyanpasu"; 22 + }); 23 + })
+19
pkgs/by-name/cl/clash-verge-rev/package.nix
··· 1 + { lib 2 + , clash-verge 3 + , fetchurl 4 + }: 5 + 6 + clash-verge.overrideAttrs (old: rec { 7 + pname = "clash-verge-rev"; 8 + version = "1.5.4"; 9 + 10 + src = fetchurl { 11 + url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; 12 + hash = "sha256-UJYLfefgUASBmh0gyNmjsWdAadluKhwaXZL1wlVlbjU="; 13 + }; 14 + 15 + meta = old.meta // (with lib; { 16 + homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; 17 + maintainers = with maintainers; [ Guanran928 ]; 18 + }); 19 + })
+6 -2
pkgs/by-name/de/dep-scan/package.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "dep-scan"; 8 - version = "5.0.2"; 8 + version = "5.2.11"; 9 9 pyproject = true; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "owasp-dep-scan"; 13 13 repo = "dep-scan"; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-qiJyGBGxznNF4LNG9fbmjG7wX0odhrUO2LxOWABtLQA="; 15 + hash = "sha256-BEvuCdQcr35jWe9r9KR4Uov1zNVxfPSnENNPgy4N+nc="; 16 16 }; 17 17 18 18 postPatch = '' 19 19 substituteInPlace pytest.ini \ 20 20 --replace " --cov-append --cov-report term --cov depscan" "" 21 + substituteInPlace pyproject.toml \ 22 + --replace "oras==0.1.26" "oras~=0.1.26" 21 23 ''; 22 24 23 25 nativeBuildInputs = with python3.pkgs; [ ··· 26 28 27 29 propagatedBuildInputs = with python3.pkgs; [ 28 30 appthreat-vulnerability-db 31 + cvss 29 32 defusedxml 30 33 jinja2 31 34 oras 35 + packageurl-python 32 36 pdfkit 33 37 pygithub 34 38 pyyaml
-14
pkgs/by-name/fr/fritz-exporter/console-script.patch
··· 1 - diff --git a/pyproject.toml b/pyproject.toml 2 - index ffad1a4..e7551da 100644 3 - --- a/pyproject.toml 4 - +++ b/pyproject.toml 5 - @@ -44,6 +44,9 @@ coverage = ">=6.4.4,<8.0.0" 6 - pytest-cov = ">=3,<5" 7 - ruff = "^0.1.7" 8 - 9 - +[tool.poetry.scripts] 10 - +fritzexporter = "fritzexporter.__main__:main" 11 - + 12 - [build-system] 13 - requires = ["poetry-core"] 14 - build-backend = "poetry.core.masonry.api"
+3 -7
pkgs/by-name/fr/fritz-exporter/package.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "fritz-exporter"; 8 - version = "2.3.1"; 8 + version = "2.4.3"; 9 9 pyproject = true; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "pdreker"; 13 13 repo = "fritz_exporter"; 14 14 rev = "fritzexporter-v${version}"; 15 - hash = "sha256-Dv/2Og1OJV7canZ8Y5Pai5gPRUvcRDYmSGoD2pnAkSs="; 15 + hash = "sha256-2A8hw2XkdxkauG+lMlKfObEvLHUQk79xWmlp0hlrXYM="; 16 16 }; 17 17 18 - patches = [ 19 - # https://github.com/pdreker/fritz_exporter/pull/282 20 - ./console-script.patch 21 - ]; 22 - 23 18 postPatch = '' 24 19 # don't test coverage 25 20 sed -i "/^addopts/d" pyproject.toml ··· 31 26 32 27 propagatedBuildInputs = with python3.pkgs; [ 33 28 attrs 29 + defusedxml 34 30 fritzconnection 35 31 prometheus-client 36 32 pyyaml
+43
pkgs/by-name/gm/gmetronome/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitLab 4 + , pkg-config 5 + , autoreconfHook 6 + , wrapGAppsHook 7 + , gtkmm3 8 + , libpulseaudio 9 + }: 10 + 11 + stdenv.mkDerivation rec { 12 + pname = "gmetronome"; 13 + version = "0.3.3"; 14 + 15 + src = fetchFromGitLab { 16 + domain = "gitlab.gnome.org"; 17 + owner = "dqpb"; 18 + repo = "gmetronome"; 19 + rev = version; 20 + hash = "sha256-ilFO1HwleWIQ51Bkzck1sm1Yu3ugqkvZrpxPOYzXydM="; 21 + }; 22 + 23 + nativeBuildInputs = [ 24 + pkg-config 25 + autoreconfHook 26 + wrapGAppsHook 27 + ]; 28 + 29 + buildInputs = [ 30 + gtkmm3 31 + libpulseaudio 32 + ]; 33 + 34 + meta = with lib; { 35 + description = "A free software metronome and tempo measurement tool"; 36 + homepage = "https://gitlab.gnome.org/dqpb/gmetronome"; 37 + license = licenses.gpl3Plus; 38 + platforms = platforms.unix; 39 + maintainers = with maintainers; [ aleksana ]; 40 + mainProgram = "gmetronome"; 41 + broken = stdenv.isDarwin; 42 + }; 43 + }
+3 -3
pkgs/by-name/in/invidtui/package.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "invidtui"; 5 - version = "0.4.2"; 5 + version = "0.4.4"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "darkhz"; 9 9 repo = "invidtui"; 10 10 rev = "refs/tags/v${version}"; 11 - hash = "sha256-/HsoV8HdMffD7dzRblSSBMv7kBPRpxUarM5WZoYVxvQ="; 11 + hash = "sha256-nNJ2bjrHRIzcPs+jbZpgaHBxSWRzSRIsT6xx9EsbISg="; 12 12 }; 13 13 14 - vendorHash = "sha256-T/muFaQQp/joOCehNZQc5CWmyGakoRaGAsO2mTOODJA="; 14 + vendorHash = "sha256-C7O2GJuEdO8geRPfHx1Sq6ZveDE/u65JBx/Egh3cnK4="; 15 15 16 16 doCheck = true; 17 17
+68
pkgs/by-name/li/librum/package.nix
··· 1 + { lib 2 + , mupdf 3 + , stdenv 4 + , fetchFromGitHub 5 + , substituteAll 6 + , cmake 7 + , qt6 8 + , desktopToDarwinBundle 9 + }: 10 + 11 + let 12 + mupdf-cxx = mupdf.override { enableCxx = true; }; 13 + in 14 + stdenv.mkDerivation rec { 15 + pname = "librum"; 16 + version = "0.12.1"; 17 + 18 + src = fetchFromGitHub { 19 + owner = "Librum-Reader"; 20 + repo = "Librum"; 21 + rev = "v.${version}"; 22 + fetchSubmodules = true; 23 + hash = "sha256-/QxTWlTMoXykPe3z+mmn6eaGRJDu2IX8BJPcXi1gUqQ="; 24 + }; 25 + 26 + patches = [ 27 + (substituteAll { 28 + src = ./use_mupdf_in_nixpkgs.patch; 29 + nixMupdfLibPath = "${mupdf-cxx.out}/lib"; 30 + nixMupdfIncludePath = "${mupdf-cxx.dev}/include"; 31 + }) 32 + ]; 33 + 34 + nativeBuildInputs = [ 35 + cmake 36 + qt6.qttools 37 + qt6.wrapQtAppsHook 38 + ] ++ lib.optionals stdenv.isDarwin [ 39 + desktopToDarwinBundle 40 + ]; 41 + 42 + buildInputs = [ 43 + qt6.qtbase 44 + qt6.qtsvg 45 + ] ++ lib.optionals stdenv.isLinux [ 46 + qt6.qtwayland 47 + ]; 48 + 49 + meta = with lib; { 50 + description = "An application designed to make reading enjoyable and straightforward"; 51 + longDescription = '' 52 + Librum is an application designed to make reading enjoyable 53 + and straightforward for everyone. It's not just an e-book 54 + reader. With Librum, you can manage your own online library 55 + and access it from any device anytime, anywhere. It has 56 + features like note-taking, AI tooling, and highlighting, 57 + while offering customization to make it as personal as you 58 + want! Librum also provides free access to over 70,000 books 59 + and personal reading statistics while being free and 60 + completely open source. 61 + ''; 62 + homepage = "https://librumreader.com"; 63 + license = licenses.gpl3Plus; 64 + mainProgram = "librum"; 65 + maintainers = with maintainers; [ aleksana oluceps ]; 66 + platforms = platforms.unix; 67 + }; 68 + }
+109
pkgs/by-name/li/librum/use_mupdf_in_nixpkgs.patch
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 191ff732..de46f35b 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -71,7 +71,7 @@ endif() 6 + 7 + # Dependencies 8 + add_subdirectory(libs/rapidfuzz-cpp) 9 + - 10 + +include_directories(@nixMupdfIncludePath@) 11 + 12 + # Build 13 + add_subdirectory(src/) 14 + diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt 15 + index bf122a66..64415be3 100644 16 + --- a/src/application/CMakeLists.txt 17 + +++ b/src/application/CMakeLists.txt 18 + @@ -102,10 +102,9 @@ if(ANDROID) 19 + endif() 20 + 21 + if(UNIX) 22 + - set(MUPDF_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/libs/mupdf/build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release>") 23 + + set(MUPDF_OUTPUT_DIR "@nixMupdfLibPath@") 24 + set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so") 25 + set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so" PARENT_SCOPE) 26 + - set(MUPDF_BUILD_COMMAND ./scripts/mupdfwrap.py ${VENV_OPTION} -d build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release> -b --m-target libs ${EXTRA_MAKE_AGRS} -j 0 m01) 27 + elseif(WIN32) 28 + set(MUPDF_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/libs/mupdf/platform/win32/x64/$<IF:$<CONFIG:Debug>,Debug,Release>") 29 + set(MUPDF_OUTPUT "${MUPDF_OUTPUT_DIR}/mupdfcpp64.lib" PARENT_SCOPE) 30 + @@ -113,8 +112,6 @@ elseif(WIN32) 31 + set(MUPDF_BUILD_COMMAND python scripts/mupdfwrap.py ${VENV_OPTION} -d build/$<IF:$<CONFIG:Debug>,shared-debug,shared-release> -b -j 0 m01) 32 + endif() 33 + 34 + -message("MuPdf build command: " ${MUPDF_BUILD_COMMAND}) 35 + - 36 + 37 + set(CC_COMMAND "${CMAKE_C_COMPILER}") 38 + set(CXX_COMMAND "${CMAKE_CXX_COMPILER}") 39 + @@ -135,18 +132,6 @@ else() 40 + endif() 41 + 42 + 43 + -add_custom_target(mupdf 44 + - COMMAND ${CMAKE_COMMAND} -E env 45 + - ${ANDROID_COMPILERS} 46 + - "USE_SYSTEM_LIBJPEG=${USE_SYSTEM_LIBJPEG_VALUE}" 47 + - "USE_SONAME=no" 48 + - ${MUPDF_BUILD_COMMAND} 49 + - BYPRODUCTS ${MUPDF_OUTPUT} 50 + - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/libs/mupdf 51 + - COMMENT "Building mupdf (This takes a while) ..." 52 + -) 53 + - 54 + - 55 + #Copy the mupdf dlls to the build directory for windows 56 + if(WIN32) 57 + add_custom_command( 58 + @@ -168,8 +153,6 @@ add_library(application 59 + interfaces/utility/i_book_getter.hpp 60 + ) 61 + 62 + -add_dependencies(application mupdf) # Ensure the mupdf target is built before the application target 63 + - 64 + target_compile_definitions(application PRIVATE APPLICATION_LIBRARY) 65 + 66 + target_include_directories(application 67 + @@ -188,12 +171,6 @@ target_include_directories(application 68 + ${CMAKE_CURRENT_SOURCE_DIR}/core/utils 69 + ) 70 + 71 + -# Make sure to ignore warnings from mupdf by adding it as a system include directory 72 + -target_include_directories(application SYSTEM PUBLIC 73 + - ${PROJECT_SOURCE_DIR}/libs/mupdf/platform/c++/include 74 + - ${PROJECT_SOURCE_DIR}/libs/mupdf/include 75 + -) 76 + - 77 + target_compile_definitions(application 78 + PRIVATE 79 + $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG> 80 + @@ -236,29 +213,10 @@ if(LINUX) 81 + install(TARGETS application 82 + DESTINATION lib 83 + ) 84 + - 85 + - # Install mupdf's shared libraries 86 + - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so 87 + - ${MUPDF_OUTPUT_DIR}/libmupdf.so 88 + - DESTINATION lib) 89 + - 90 + - # Install links with correct permissions 91 + - if(EXISTS "${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0") 92 + - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so.24.0 93 + - ${MUPDF_OUTPUT_DIR}/libmupdf.so.24.0 94 + - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE 95 + - GROUP_READ GROUP_EXECUTE 96 + - WORLD_READ WORLD_EXECUTE 97 + - DESTINATION lib) 98 + - endif() 99 + 100 + elseif(APPLE) 101 + install(TARGETS application 102 + DESTINATION lib 103 + ) 104 + 105 + - # Install mupdf's shared libraries 106 + - install(FILES ${MUPDF_OUTPUT_DIR}/libmupdfcpp.so 107 + - ${MUPDF_OUTPUT_DIR}/libmupdf.dylib 108 + - DESTINATION lib) 109 + endif()
+41
pkgs/by-name/mi/mihomo/package.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , buildGoModule 4 + }: 5 + 6 + buildGoModule rec { 7 + pname = "mihomo"; 8 + version = "1.18.1"; 9 + 10 + src = fetchFromGitHub { 11 + owner = "MetaCubeX"; 12 + repo = "mihomo"; 13 + rev = "v${version}"; 14 + hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ="; 15 + }; 16 + 17 + vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64="; 18 + 19 + excludedPackages = [ "./test" ]; 20 + 21 + ldflags = [ 22 + "-s" 23 + "-w" 24 + "-X github.com/metacubex/mihomo/constant.Version=${version}" 25 + ]; 26 + 27 + tags = [ 28 + "with_gvisor" 29 + ]; 30 + 31 + # network required 32 + doCheck = false; 33 + 34 + meta = with lib; { 35 + description = "A rule-based tunnel in Go"; 36 + homepage = "https://github.com/MetaCubeX/mihomo"; 37 + license = licenses.gpl3Only; 38 + maintainers = with maintainers; [ oluceps ]; 39 + mainProgram = "mihomo"; 40 + }; 41 + }
+2 -2
pkgs/by-name/py/pyprland/package.nix
··· 2 2 3 3 python3Packages.buildPythonApplication rec { 4 4 pname = "pyprland"; 5 - version = "2.0.5"; 5 + version = "2.0.8"; 6 6 format = "pyproject"; 7 7 8 8 disabled = python3Packages.pythonOlder "3.10"; ··· 11 11 owner = "hyprland-community"; 12 12 repo = "pyprland"; 13 13 rev = "refs/tags/${version}"; 14 - hash = "sha256-VaNJ6hSdcH23Vk7JJpmNV6Qxb7gK5xWK6WHdeyfjUvQ="; 14 + hash = "sha256-oLatPMTiDGRgci5rWBnB6dGDXQKOUMjoh8a7h/0EHxA="; 15 15 }; 16 16 17 17 nativeBuildInputs = with python3Packages; [ poetry-core ];
+2 -2
pkgs/by-name/re/renode-unstable/package.nix
··· 7 7 inherit buildUnstable; 8 8 }).overrideAttrs (finalAttrs: _: { 9 9 pname = "renode-unstable"; 10 - version = "1.14.0+20240305gitcec51e561"; 10 + version = "1.14.0+20240308git65e3eb0f5"; 11 11 12 12 src = fetchurl { 13 13 url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; 14 - hash = "sha256-dXT4C/s7Aygqhq0U6MiPsQL8ZvjPfTzKYuhA6aRQKlI="; 14 + hash = "sha256-s0SK4Ixl2hTbh6X3nddjKNpnxePjcd/SRXnP/xytInc="; 15 15 }; 16 16 })
+3 -3
pkgs/by-name/se/searxng/package.nix
··· 5 5 6 6 python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { 7 7 pname = "searxng"; 8 - version = "0-unstable-2024-02-24"; 8 + version = "0-unstable-2024-03-08"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "searxng"; 12 12 repo = "searxng"; 13 - rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; 14 - hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; 13 + rev = "9c08a0cdddae7ceafbe5e00ce94cf7f1d36c97e0"; 14 + hash = "sha256-0qlOpJqpOmseIeIafd0NLd2lF5whu18QxmwOua8dKzg="; 15 15 }; 16 16 17 17 postPatch = ''
+41
pkgs/by-name/so/sophus/package.nix
··· 1 + { lib 2 + , stdenv 3 + , eigen 4 + , fmt 5 + , fetchFromGitHub 6 + , cmake 7 + }: 8 + 9 + stdenv.mkDerivation (finalAttrs: { 10 + pname = "sophus"; 11 + version = "1.22.10"; 12 + 13 + src = fetchFromGitHub { 14 + owner = "strasdat"; 15 + repo = "Sophus"; 16 + rev = finalAttrs.version; 17 + hash = "sha256-TNuUoL9r1s+kGE4tCOGFGTDv1sLaHJDUKa6c9x41Z7w="; 18 + }; 19 + 20 + nativeBuildInputs = [ 21 + cmake 22 + ]; 23 + 24 + buildInputs = [ 25 + eigen 26 + fmt 27 + ]; 28 + 29 + cmakeFlags = [ 30 + (lib.cmakeBool "BUILD_SOPHUS_TESTS" false) 31 + (lib.cmakeBool "BUILD_SOPHUS_EXAMPLES" false) 32 + ]; 33 + 34 + meta = { 35 + description = "C++ implementation of Lie Groups using Eigen"; 36 + homepage = "https://github.com/strasdat/Sophus"; 37 + license = lib.licenses.mit; 38 + maintainers = with lib.maintainers; [ locochoco acowley ]; 39 + platforms = lib.platforms.all; 40 + }; 41 + })
+14
pkgs/by-name/ss/ssh-openpgp-auth/daemon.nix
··· 1 + # Ideally, this file would have been placed in 2 + # pkgs/by-name/ss/sshd-openpgp-auth/package.nix, but since `./generic.nix` is 3 + # outside of the directory, the nixpkgs-check-by-name test will fail the CI. So 4 + # we call this file in all-packages.nix like in the old days. 5 + { callPackage }: 6 + 7 + callPackage ./generic.nix { 8 + pname = "sshd-openpgp-auth"; 9 + version = "0.3.0"; 10 + srcHash = "sha256-IV0Nhdqyn12HDOp1jaKz3sKTI3ktFd5b6qybCLWt27I="; 11 + cargoHash = "sha256-/+lZkVMeFUMRD7NQ/MHDU5f3rkKDx1kDv5tjA41RExc="; 12 + metaDescription = 13 + "Command-line tool for creating and managing OpenPGP based trust anchors for SSH host keys"; 14 + }
+82
pkgs/by-name/ss/ssh-openpgp-auth/generic.nix
··· 1 + # This file is based upon upstream's package.nix shared among both 2 + # "ssh-openpgp-auth" and "sshd-openpgpg-auth" 3 + { lib 4 + , rustPlatform 5 + , fetchFromGitea 6 + , pkg-config 7 + , just 8 + , rust-script 9 + , installShellFiles 10 + , bzip2 11 + , nettle 12 + , openssl 13 + , sqlite 14 + , stdenv 15 + , darwin 16 + , openssh 17 + # Arguments not supplied by callPackage 18 + , pname , version , srcHash , cargoHash, metaDescription 19 + }: 20 + 21 + rustPlatform.buildRustPackage { 22 + inherit pname version; 23 + 24 + src = fetchFromGitea { 25 + domain = "codeberg.org"; 26 + owner = "wiktor"; 27 + repo = "ssh-openpgp-auth"; 28 + # See also: https://codeberg.org/wiktor/ssh-openpgp-auth/pulls/92#issuecomment-1635274 29 + rev = "${pname}/${version}"; 30 + hash = srcHash; 31 + }; 32 + buildAndTestSubdir = pname; 33 + inherit cargoHash; 34 + 35 + nativeBuildInputs = [ 36 + pkg-config 37 + rustPlatform.bindgenHook 38 + just 39 + rust-script 40 + installShellFiles 41 + ]; 42 + # Otherwise just's build, check and install phases take precedence over 43 + # buildRustPackage's phases. 44 + dontUseJustBuild = true; 45 + dontUseJustCheck = true; 46 + dontUseJustInstall = true; 47 + 48 + postInstall = '' 49 + export HOME=$(mktemp -d) 50 + just generate manpages ${pname} $out/share/man/man1 51 + just generate shell_completions ${pname} shell_completions 52 + installShellCompletion --cmd ${pname} \ 53 + --bash shell_completions/${pname}.bash \ 54 + --fish shell_completions/${pname}.fish \ 55 + --zsh shell_completions/_${pname} 56 + ''; 57 + 58 + 59 + buildInputs = [ 60 + nettle 61 + openssl 62 + sqlite 63 + ] ++ lib.optionals stdenv.isDarwin [ 64 + darwin.apple_sdk_11_0.frameworks.CoreFoundation 65 + darwin.apple_sdk_11_0.frameworks.IOKit 66 + darwin.apple_sdk_11_0.frameworks.Security 67 + darwin.apple_sdk_11_0.frameworks.SystemConfiguration 68 + ]; 69 + 70 + doCheck = true; 71 + nativeCheckInputs = [ 72 + openssh 73 + ]; 74 + 75 + meta = with lib; { 76 + description = metaDescription; 77 + homepage = "https://codeberg.org/wiktor/ssh-openpgp-auth"; 78 + license = with licenses; [ mit /* or */ asl20 ]; 79 + maintainers = with maintainers; [ doronbehar ]; 80 + mainProgram = pname; 81 + }; 82 + }
+10
pkgs/by-name/ss/ssh-openpgp-auth/package.nix
··· 1 + { callPackage }: 2 + 3 + callPackage ./generic.nix { 4 + pname = "ssh-openpgp-auth"; 5 + version = "0.2.2"; 6 + srcHash = "sha256-5ew6jT6Zr54QYaWFQIGYXd8sqC3yHHZjPfoaCossm8o="; 7 + cargoHash = "sha256-/k/XAp7PHIJaJWf4Oa1JC1mMSR5pyeM4SSPCcr77cAg="; 8 + metaDescription = 9 + "Command-line tool that provides client-side functionality to transparently verify the identity of remote SSH hosts"; 10 + }
+771 -798
pkgs/by-name/ty/typst/Cargo.lock
··· 9 9 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" 10 10 11 11 [[package]] 12 - name = "ahash" 13 - version = "0.8.6" 14 - source = "registry+https://github.com/rust-lang/crates.io-index" 15 - checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" 16 - dependencies = [ 17 - "cfg-if", 18 - "getrandom", 19 - "once_cell", 20 - "version_check", 21 - "zerocopy", 22 - ] 23 - 24 - [[package]] 25 12 name = "aho-corasick" 26 13 version = "1.1.2" 27 14 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 47 34 48 35 [[package]] 49 36 name = "anstream" 50 - version = "0.6.4" 37 + version = "0.6.13" 51 38 source = "registry+https://github.com/rust-lang/crates.io-index" 52 - checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" 39 + checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" 53 40 dependencies = [ 54 41 "anstyle", 55 42 "anstyle-parse", ··· 61 48 62 49 [[package]] 63 50 name = "anstyle" 64 - version = "1.0.4" 51 + version = "1.0.6" 65 52 source = "registry+https://github.com/rust-lang/crates.io-index" 66 - checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" 53 + checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" 67 54 68 55 [[package]] 69 56 name = "anstyle-parse" 70 - version = "0.2.2" 57 + version = "0.2.3" 71 58 source = "registry+https://github.com/rust-lang/crates.io-index" 72 - checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" 59 + checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" 73 60 dependencies = [ 74 61 "utf8parse", 75 62 ] 76 63 77 64 [[package]] 78 65 name = "anstyle-query" 79 - version = "1.0.0" 66 + version = "1.0.2" 80 67 source = "registry+https://github.com/rust-lang/crates.io-index" 81 - checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" 68 + checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" 82 69 dependencies = [ 83 - "windows-sys", 70 + "windows-sys 0.52.0", 84 71 ] 85 72 86 73 [[package]] 87 74 name = "anstyle-wincon" 88 - version = "3.0.1" 75 + version = "3.0.2" 89 76 source = "registry+https://github.com/rust-lang/crates.io-index" 90 - checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" 77 + checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" 91 78 dependencies = [ 92 79 "anstyle", 93 - "windows-sys", 80 + "windows-sys 0.52.0", 94 81 ] 95 82 96 83 [[package]] ··· 103 90 ] 104 91 105 92 [[package]] 93 + name = "arbitrary" 94 + version = "1.3.2" 95 + source = "registry+https://github.com/rust-lang/crates.io-index" 96 + checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" 97 + 98 + [[package]] 106 99 name = "arrayref" 107 100 version = "0.3.7" 108 101 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 128 121 129 122 [[package]] 130 123 name = "base64" 131 - version = "0.21.5" 124 + version = "0.21.7" 125 + source = "registry+https://github.com/rust-lang/crates.io-index" 126 + checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" 127 + 128 + [[package]] 129 + name = "base64" 130 + version = "0.22.0" 132 131 source = "registry+https://github.com/rust-lang/crates.io-index" 133 - checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" 132 + checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" 134 133 135 134 [[package]] 136 135 name = "biblatex" 137 - version = "0.9.0" 136 + version = "0.9.3" 138 137 source = "registry+https://github.com/rust-lang/crates.io-index" 139 - checksum = "88be3c837773ba281f5fd6674c1c82565c62726abe3d76707da6fb9d434cc392" 138 + checksum = "27fe7285040d0227cd8b5395e1c4783f44f0b673eca5a657f4432ae401f2b7b8" 140 139 dependencies = [ 141 140 "numerals", 142 141 "paste", ··· 177 176 178 177 [[package]] 179 178 name = "bitflags" 180 - version = "2.4.1" 179 + version = "2.4.2" 181 180 source = "registry+https://github.com/rust-lang/crates.io-index" 182 - checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" 181 + checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" 183 182 dependencies = [ 184 183 "serde", 185 184 ] ··· 198 197 199 198 [[package]] 200 199 name = "bumpalo" 201 - version = "3.14.0" 200 + version = "3.15.4" 202 201 source = "registry+https://github.com/rust-lang/crates.io-index" 203 - checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" 202 + checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" 204 203 205 204 [[package]] 206 205 name = "bytemuck" 207 - version = "1.14.0" 206 + version = "1.14.3" 208 207 source = "registry+https://github.com/rust-lang/crates.io-index" 209 - checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" 208 + checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" 210 209 211 210 [[package]] 212 211 name = "byteorder" ··· 216 215 217 216 [[package]] 218 217 name = "cc" 219 - version = "1.0.83" 218 + version = "1.0.90" 220 219 source = "registry+https://github.com/rust-lang/crates.io-index" 221 - checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" 220 + checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" 222 221 dependencies = [ 222 + "jobserver", 223 223 "libc", 224 224 ] 225 225 ··· 231 231 232 232 [[package]] 233 233 name = "chinese-number" 234 - version = "0.7.3" 234 + version = "0.7.7" 235 235 source = "registry+https://github.com/rust-lang/crates.io-index" 236 - checksum = "d9cec9efb10b00914876c7e7b1fdaec572b888443b4046cd11ba91eb8c5a1ccb" 236 + checksum = "49fccaef6346f6d6a741908d3b79fe97c2debe2fbb5eb3a7d00ff5981b52bb6c" 237 237 dependencies = [ 238 238 "chinese-variant", 239 239 "enum-ordinalize", ··· 243 243 244 244 [[package]] 245 245 name = "chinese-variant" 246 - version = "1.1.2" 246 + version = "1.1.3" 247 247 source = "registry+https://github.com/rust-lang/crates.io-index" 248 - checksum = "17df2e16b0704fc5413214165d1bfdd619f18b1044d5991d5c5351b05fee852e" 248 + checksum = "7588475145507237ded760e52bf2f1085495245502033756d28ea72ade0e498b" 249 249 250 250 [[package]] 251 251 name = "chrono" 252 - version = "0.4.31" 252 + version = "0.4.35" 253 253 source = "registry+https://github.com/rust-lang/crates.io-index" 254 - checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" 254 + checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" 255 255 dependencies = [ 256 256 "android-tzdata", 257 257 "iana-time-zone", 258 258 "num-traits", 259 - "windows-targets", 259 + "windows-targets 0.52.4", 260 260 ] 261 261 262 262 [[package]] 263 263 name = "ciborium" 264 - version = "0.2.1" 264 + version = "0.2.2" 265 265 source = "registry+https://github.com/rust-lang/crates.io-index" 266 - checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" 266 + checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" 267 267 dependencies = [ 268 268 "ciborium-io", 269 269 "ciborium-ll", ··· 272 272 273 273 [[package]] 274 274 name = "ciborium-io" 275 - version = "0.2.1" 275 + version = "0.2.2" 276 276 source = "registry+https://github.com/rust-lang/crates.io-index" 277 - checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" 277 + checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" 278 278 279 279 [[package]] 280 280 name = "ciborium-ll" 281 - version = "0.2.1" 281 + version = "0.2.2" 282 282 source = "registry+https://github.com/rust-lang/crates.io-index" 283 - checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" 283 + checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" 284 284 dependencies = [ 285 285 "ciborium-io", 286 286 "half", ··· 288 288 289 289 [[package]] 290 290 name = "citationberg" 291 - version = "0.1.1" 291 + version = "0.3.0" 292 292 source = "registry+https://github.com/rust-lang/crates.io-index" 293 - checksum = "c15a0bf8014b266d11f20451dc9202d8d26180ffd8b094d73ecbe74d821f01fb" 293 + checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899" 294 294 dependencies = [ 295 - "quick-xml 0.28.2", 295 + "quick-xml", 296 296 "serde", 297 297 ] 298 298 299 299 [[package]] 300 300 name = "clap" 301 - version = "4.4.8" 301 + version = "4.5.2" 302 302 source = "registry+https://github.com/rust-lang/crates.io-index" 303 - checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" 303 + checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" 304 304 dependencies = [ 305 305 "clap_builder", 306 306 "clap_derive", ··· 308 308 309 309 [[package]] 310 310 name = "clap_builder" 311 - version = "4.4.8" 311 + version = "4.5.2" 312 312 source = "registry+https://github.com/rust-lang/crates.io-index" 313 - checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" 313 + checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" 314 314 dependencies = [ 315 315 "anstream", 316 316 "anstyle", ··· 320 320 321 321 [[package]] 322 322 name = "clap_complete" 323 - version = "4.4.4" 323 + version = "4.5.1" 324 324 source = "registry+https://github.com/rust-lang/crates.io-index" 325 - checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" 325 + checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" 326 326 dependencies = [ 327 327 "clap", 328 328 ] 329 329 330 330 [[package]] 331 331 name = "clap_derive" 332 - version = "4.4.7" 332 + version = "4.5.0" 333 333 source = "registry+https://github.com/rust-lang/crates.io-index" 334 - checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" 334 + checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" 335 335 dependencies = [ 336 336 "heck", 337 337 "proc-macro2", 338 338 "quote", 339 - "syn 2.0.39", 339 + "syn", 340 340 ] 341 341 342 342 [[package]] 343 343 name = "clap_lex" 344 - version = "0.6.0" 344 + version = "0.7.0" 345 345 source = "registry+https://github.com/rust-lang/crates.io-index" 346 - checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" 346 + checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" 347 347 348 348 [[package]] 349 349 name = "clap_mangen" 350 - version = "0.2.15" 350 + version = "0.2.20" 351 351 source = "registry+https://github.com/rust-lang/crates.io-index" 352 - checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" 352 + checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" 353 353 dependencies = [ 354 354 "clap", 355 355 "roff", ··· 385 385 386 386 [[package]] 387 387 name = "comemo" 388 - version = "0.3.1" 388 + version = "0.4.0" 389 389 source = "registry+https://github.com/rust-lang/crates.io-index" 390 - checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" 390 + checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91" 391 391 dependencies = [ 392 392 "comemo-macros", 393 + "once_cell", 394 + "parking_lot", 393 395 "siphasher 1.0.0", 394 396 ] 395 397 396 398 [[package]] 397 399 name = "comemo-macros" 398 - version = "0.3.1" 400 + version = "0.4.0" 399 401 source = "registry+https://github.com/rust-lang/crates.io-index" 400 - checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" 402 + checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" 401 403 dependencies = [ 402 404 "proc-macro2", 403 405 "quote", 404 - "syn 2.0.39", 406 + "syn", 407 + ] 408 + 409 + [[package]] 410 + name = "core-foundation" 411 + version = "0.9.4" 412 + source = "registry+https://github.com/rust-lang/crates.io-index" 413 + checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" 414 + dependencies = [ 415 + "core-foundation-sys", 416 + "libc", 405 417 ] 406 418 407 419 [[package]] 408 420 name = "core-foundation-sys" 409 - version = "0.8.4" 421 + version = "0.8.6" 410 422 source = "registry+https://github.com/rust-lang/crates.io-index" 411 - checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" 423 + checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" 412 424 413 425 [[package]] 414 426 name = "core_maths" ··· 421 433 422 434 [[package]] 423 435 name = "crc32fast" 424 - version = "1.3.2" 436 + version = "1.4.0" 425 437 source = "registry+https://github.com/rust-lang/crates.io-index" 426 - checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" 438 + checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" 427 439 dependencies = [ 428 440 "cfg-if", 429 441 ] 430 442 431 443 [[package]] 432 444 name = "crossbeam-channel" 433 - version = "0.5.8" 445 + version = "0.5.12" 434 446 source = "registry+https://github.com/rust-lang/crates.io-index" 435 - checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" 447 + checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" 436 448 dependencies = [ 437 - "cfg-if", 438 449 "crossbeam-utils", 439 450 ] 440 451 441 452 [[package]] 442 453 name = "crossbeam-deque" 443 - version = "0.8.3" 454 + version = "0.8.5" 444 455 source = "registry+https://github.com/rust-lang/crates.io-index" 445 - checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" 456 + checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" 446 457 dependencies = [ 447 - "cfg-if", 448 458 "crossbeam-epoch", 449 459 "crossbeam-utils", 450 460 ] 451 461 452 462 [[package]] 453 463 name = "crossbeam-epoch" 454 - version = "0.9.15" 464 + version = "0.9.18" 455 465 source = "registry+https://github.com/rust-lang/crates.io-index" 456 - checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" 466 + checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" 457 467 dependencies = [ 458 - "autocfg", 459 - "cfg-if", 460 468 "crossbeam-utils", 461 - "memoffset", 462 - "scopeguard", 463 469 ] 464 470 465 471 [[package]] 466 472 name = "crossbeam-utils" 467 - version = "0.8.16" 473 + version = "0.8.19" 468 474 source = "registry+https://github.com/rust-lang/crates.io-index" 469 - checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" 470 - dependencies = [ 471 - "cfg-if", 472 - ] 475 + checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" 476 + 477 + [[package]] 478 + name = "crunchy" 479 + version = "0.2.2" 480 + source = "registry+https://github.com/rust-lang/crates.io-index" 481 + checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" 473 482 474 483 [[package]] 475 484 name = "csv" ··· 493 502 ] 494 503 495 504 [[package]] 496 - name = "dashmap" 497 - version = "5.5.3" 505 + name = "ctrlc" 506 + version = "3.4.2" 498 507 source = "registry+https://github.com/rust-lang/crates.io-index" 499 - checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" 508 + checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" 500 509 dependencies = [ 501 - "cfg-if", 502 - "hashbrown 0.14.3", 503 - "lock_api", 504 - "once_cell", 505 - "parking_lot_core", 510 + "nix", 511 + "windows-sys 0.52.0", 506 512 ] 507 513 508 514 [[package]] ··· 512 518 checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" 513 519 514 520 [[package]] 521 + name = "deranged" 522 + version = "0.3.11" 523 + source = "registry+https://github.com/rust-lang/crates.io-index" 524 + checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" 525 + dependencies = [ 526 + "powerfmt", 527 + ] 528 + 529 + [[package]] 515 530 name = "dirs" 516 531 version = "5.0.1" 517 532 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 529 544 "libc", 530 545 "option-ext", 531 546 "redox_users", 532 - "windows-sys", 547 + "windows-sys 0.48.0", 533 548 ] 534 549 535 550 [[package]] ··· 540 555 dependencies = [ 541 556 "proc-macro2", 542 557 "quote", 543 - "syn 2.0.39", 558 + "syn", 544 559 ] 545 560 546 561 [[package]] ··· 551 566 552 567 [[package]] 553 568 name = "ecow" 554 - version = "0.2.0" 569 + version = "0.2.1" 555 570 source = "registry+https://github.com/rust-lang/crates.io-index" 556 - checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" 571 + checksum = "dba31a30727c42ff5e60468d695c7f21e43a6db2808b7195adcab908fbd9f794" 557 572 dependencies = [ 558 573 "serde", 559 574 ] 560 575 561 576 [[package]] 562 577 name = "either" 563 - version = "1.9.0" 578 + version = "1.10.0" 564 579 source = "registry+https://github.com/rust-lang/crates.io-index" 565 - checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" 580 + checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" 566 581 567 582 [[package]] 568 583 name = "embedded-io" ··· 572 587 573 588 [[package]] 574 589 name = "enum-ordinalize" 575 - version = "3.1.15" 590 + version = "4.3.0" 576 591 source = "registry+https://github.com/rust-lang/crates.io-index" 577 - checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" 592 + checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" 578 593 dependencies = [ 579 - "num-bigint", 580 - "num-traits", 581 - "proc-macro2", 582 - "quote", 583 - "syn 2.0.39", 594 + "enum-ordinalize-derive", 584 595 ] 585 596 586 597 [[package]] 587 - name = "env_logger" 588 - version = "0.10.1" 598 + name = "enum-ordinalize-derive" 599 + version = "4.3.1" 589 600 source = "registry+https://github.com/rust-lang/crates.io-index" 590 - checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" 601 + checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" 591 602 dependencies = [ 592 - "log", 603 + "proc-macro2", 604 + "quote", 605 + "syn", 593 606 ] 594 607 595 608 [[package]] ··· 610 623 611 624 [[package]] 612 625 name = "errno" 613 - version = "0.3.7" 626 + version = "0.3.8" 614 627 source = "registry+https://github.com/rust-lang/crates.io-index" 615 - checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" 628 + checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" 616 629 dependencies = [ 617 630 "libc", 618 - "windows-sys", 631 + "windows-sys 0.52.0", 619 632 ] 620 633 621 634 [[package]] ··· 651 664 652 665 [[package]] 653 666 name = "fdeflate" 654 - version = "0.3.1" 667 + version = "0.3.4" 655 668 source = "registry+https://github.com/rust-lang/crates.io-index" 656 - checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" 669 + checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" 657 670 dependencies = [ 658 671 "simd-adler32", 659 672 ] 660 673 661 674 [[package]] 662 675 name = "filetime" 663 - version = "0.2.22" 676 + version = "0.2.23" 664 677 source = "registry+https://github.com/rust-lang/crates.io-index" 665 - checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" 678 + checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" 666 679 dependencies = [ 667 680 "cfg-if", 668 681 "libc", 669 - "redox_syscall 0.3.5", 670 - "windows-sys", 682 + "redox_syscall", 683 + "windows-sys 0.52.0", 671 684 ] 672 685 673 686 [[package]] ··· 694 707 695 708 [[package]] 696 709 name = "fontconfig-parser" 697 - version = "0.5.3" 710 + version = "0.5.6" 698 711 source = "registry+https://github.com/rust-lang/crates.io-index" 699 - checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" 712 + checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" 700 713 dependencies = [ 701 714 "roxmltree", 702 715 ] 703 716 704 717 [[package]] 705 718 name = "fontdb" 706 - version = "0.15.0" 719 + version = "0.16.2" 707 720 source = "registry+https://github.com/rust-lang/crates.io-index" 708 - checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" 721 + checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" 709 722 dependencies = [ 710 723 "fontconfig-parser", 711 724 "log", ··· 716 729 ] 717 730 718 731 [[package]] 732 + name = "foreign-types" 733 + version = "0.3.2" 734 + source = "registry+https://github.com/rust-lang/crates.io-index" 735 + checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" 736 + dependencies = [ 737 + "foreign-types-shared", 738 + ] 739 + 740 + [[package]] 741 + name = "foreign-types-shared" 742 + version = "0.1.1" 743 + source = "registry+https://github.com/rust-lang/crates.io-index" 744 + checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" 745 + 746 + [[package]] 719 747 name = "form_urlencoded" 720 748 version = "1.2.1" 721 749 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 723 751 dependencies = [ 724 752 "percent-encoding", 725 753 ] 754 + 755 + [[package]] 756 + name = "fs_extra" 757 + version = "1.3.0" 758 + source = "registry+https://github.com/rust-lang/crates.io-index" 759 + checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" 726 760 727 761 [[package]] 728 762 name = "fsevent-sys" ··· 750 784 751 785 [[package]] 752 786 name = "getrandom" 753 - version = "0.2.11" 787 + version = "0.2.12" 754 788 source = "registry+https://github.com/rust-lang/crates.io-index" 755 - checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" 789 + checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" 756 790 dependencies = [ 757 791 "cfg-if", 758 792 "libc", ··· 764 798 version = "0.12.0" 765 799 source = "registry+https://github.com/rust-lang/crates.io-index" 766 800 checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" 801 + dependencies = [ 802 + "color_quant", 803 + "weezl", 804 + ] 805 + 806 + [[package]] 807 + name = "gif" 808 + version = "0.13.1" 809 + source = "registry+https://github.com/rust-lang/crates.io-index" 810 + checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" 767 811 dependencies = [ 768 812 "color_quant", 769 813 "weezl", ··· 771 815 772 816 [[package]] 773 817 name = "half" 774 - version = "1.8.2" 818 + version = "2.4.0" 775 819 source = "registry+https://github.com/rust-lang/crates.io-index" 776 - checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" 820 + checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" 821 + dependencies = [ 822 + "cfg-if", 823 + "crunchy", 824 + ] 777 825 778 826 [[package]] 779 827 name = "hashbrown" ··· 789 837 790 838 [[package]] 791 839 name = "hayagriva" 792 - version = "0.5.1" 840 + version = "0.5.2" 793 841 source = "registry+https://github.com/rust-lang/crates.io-index" 794 - checksum = "f9f97c07366b7f686741521ca63cc14baf18cea53c39b0c09873cd1d4a1b2b8c" 842 + checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc" 795 843 dependencies = [ 796 844 "biblatex", 797 845 "ciborium", 798 846 "citationberg", 799 - "indexmap 2.1.0", 847 + "indexmap 2.2.5", 800 848 "numerals", 801 849 "paste", 802 850 "serde", 803 - "serde_yaml 0.9.27", 851 + "serde_yaml 0.9.32", 804 852 "thiserror", 805 853 "unic-langid", 806 854 "unicode-segmentation", ··· 815 863 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" 816 864 817 865 [[package]] 818 - name = "hermit-abi" 819 - version = "0.3.3" 820 - source = "registry+https://github.com/rust-lang/crates.io-index" 821 - checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" 822 - 823 - [[package]] 824 866 name = "hypher" 825 - version = "0.1.4" 867 + version = "0.1.5" 826 868 source = "registry+https://github.com/rust-lang/crates.io-index" 827 - checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" 828 - 829 - [[package]] 830 - name = "iai" 831 - version = "0.1.1" 832 - source = "git+https://github.com/typst/iai?rev=3f0f927#3f0f92736408ebce6545808b98e0cb2aea89b7dd" 833 - dependencies = [ 834 - "cfg-if", 835 - ] 869 + checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" 836 870 837 871 [[package]] 838 872 name = "iana-time-zone" 839 - version = "0.1.58" 873 + version = "0.1.60" 840 874 source = "registry+https://github.com/rust-lang/crates.io-index" 841 - checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" 875 + checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" 842 876 dependencies = [ 843 877 "android_system_properties", 844 878 "core-foundation-sys", ··· 979 1013 dependencies = [ 980 1014 "proc-macro2", 981 1015 "quote", 982 - "syn 2.0.39", 1016 + "syn", 983 1017 ] 984 1018 985 1019 [[package]] ··· 1023 1057 1024 1058 [[package]] 1025 1059 name = "image" 1026 - version = "0.24.7" 1060 + version = "0.24.9" 1027 1061 source = "registry+https://github.com/rust-lang/crates.io-index" 1028 - checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" 1062 + checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" 1029 1063 dependencies = [ 1030 1064 "bytemuck", 1031 1065 "byteorder", 1032 1066 "color_quant", 1033 - "gif", 1067 + "gif 0.13.1", 1034 1068 "jpeg-decoder", 1035 - "num-rational", 1036 1069 "num-traits", 1037 1070 "png", 1038 1071 ] ··· 1044 1077 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" 1045 1078 1046 1079 [[package]] 1047 - name = "include_dir" 1048 - version = "0.7.3" 1049 - source = "registry+https://github.com/rust-lang/crates.io-index" 1050 - checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" 1051 - dependencies = [ 1052 - "include_dir_macros", 1053 - ] 1054 - 1055 - [[package]] 1056 - name = "include_dir_macros" 1057 - version = "0.7.3" 1058 - source = "registry+https://github.com/rust-lang/crates.io-index" 1059 - checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" 1060 - dependencies = [ 1061 - "proc-macro2", 1062 - "quote", 1063 - ] 1064 - 1065 - [[package]] 1066 1080 name = "indexmap" 1067 1081 version = "1.9.3" 1068 1082 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1074 1088 1075 1089 [[package]] 1076 1090 name = "indexmap" 1077 - version = "2.1.0" 1091 + version = "2.2.5" 1078 1092 source = "registry+https://github.com/rust-lang/crates.io-index" 1079 - checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" 1093 + checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" 1080 1094 dependencies = [ 1081 1095 "equivalent", 1082 1096 "hashbrown 0.14.3", ··· 1091 1105 checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" 1092 1106 1093 1107 [[package]] 1094 - name = "inferno" 1095 - version = "0.11.19" 1096 - source = "registry+https://github.com/rust-lang/crates.io-index" 1097 - checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" 1098 - dependencies = [ 1099 - "ahash", 1100 - "clap", 1101 - "crossbeam-channel", 1102 - "crossbeam-utils", 1103 - "dashmap", 1104 - "env_logger", 1105 - "indexmap 2.1.0", 1106 - "is-terminal", 1107 - "itoa", 1108 - "log", 1109 - "num-format", 1110 - "once_cell", 1111 - "quick-xml 0.26.0", 1112 - "rgb", 1113 - "str_stack", 1114 - ] 1115 - 1116 - [[package]] 1117 1108 name = "inotify" 1118 1109 version = "0.9.6" 1119 1110 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1152 1143 ] 1153 1144 1154 1145 [[package]] 1155 - name = "is-terminal" 1156 - version = "0.4.9" 1157 - source = "registry+https://github.com/rust-lang/crates.io-index" 1158 - checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" 1159 - dependencies = [ 1160 - "hermit-abi", 1161 - "rustix", 1162 - "windows-sys", 1163 - ] 1164 - 1165 - [[package]] 1166 1146 name = "is-wsl" 1167 1147 version = "0.4.0" 1168 1148 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1174 1154 1175 1155 [[package]] 1176 1156 name = "itoa" 1177 - version = "1.0.9" 1157 + version = "1.0.10" 1158 + source = "registry+https://github.com/rust-lang/crates.io-index" 1159 + checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" 1160 + 1161 + [[package]] 1162 + name = "jobserver" 1163 + version = "0.1.28" 1178 1164 source = "registry+https://github.com/rust-lang/crates.io-index" 1179 - checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" 1165 + checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" 1166 + dependencies = [ 1167 + "libc", 1168 + ] 1180 1169 1181 1170 [[package]] 1182 1171 name = "jpeg-decoder" 1183 - version = "0.3.0" 1172 + version = "0.3.1" 1184 1173 source = "registry+https://github.com/rust-lang/crates.io-index" 1185 - checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" 1174 + checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" 1186 1175 1187 1176 [[package]] 1188 1177 name = "js-sys" 1189 - version = "0.3.66" 1178 + version = "0.3.69" 1190 1179 source = "registry+https://github.com/rust-lang/crates.io-index" 1191 - checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" 1180 + checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" 1192 1181 dependencies = [ 1193 1182 "wasm-bindgen", 1183 + ] 1184 + 1185 + [[package]] 1186 + name = "kamadak-exif" 1187 + version = "0.5.5" 1188 + source = "registry+https://github.com/rust-lang/crates.io-index" 1189 + checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" 1190 + dependencies = [ 1191 + "mutate_once", 1194 1192 ] 1195 1193 1196 1194 [[package]] ··· 1230 1228 1231 1229 [[package]] 1232 1230 name = "libc" 1233 - version = "0.2.150" 1231 + version = "0.2.153" 1234 1232 source = "registry+https://github.com/rust-lang/crates.io-index" 1235 - checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" 1233 + checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" 1236 1234 1237 1235 [[package]] 1238 1236 name = "libdeflate-sys" 1239 - version = "1.19.0" 1237 + version = "1.19.3" 1240 1238 source = "registry+https://github.com/rust-lang/crates.io-index" 1241 - checksum = "67921a7f85100c1559efc3d1c7c472091b7da05f304b4bbd5356f075e97f1cc2" 1239 + checksum = "cc9caa76c8cc6ee8c4efcf8f4514a812ebcad3aa7d3b548efe4d26da1203f177" 1242 1240 dependencies = [ 1243 1241 "cc", 1244 1242 ] 1245 1243 1246 1244 [[package]] 1247 1245 name = "libdeflater" 1248 - version = "1.19.0" 1246 + version = "1.19.3" 1249 1247 source = "registry+https://github.com/rust-lang/crates.io-index" 1250 - checksum = "3a31b22f662350ec294b13859f935aea772ba7b2bc8776269f4a5627308eab7d" 1248 + checksum = "265a985bd31e5f22e2b2ac107cbed44c6ccf40ae236e46963cd00dd213e4bd03" 1251 1249 dependencies = [ 1252 1250 "libdeflate-sys", 1253 1251 ] 1254 1252 1255 1253 [[package]] 1254 + name = "libfuzzer-sys" 1255 + version = "0.4.7" 1256 + source = "registry+https://github.com/rust-lang/crates.io-index" 1257 + checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" 1258 + dependencies = [ 1259 + "arbitrary", 1260 + "cc", 1261 + "once_cell", 1262 + ] 1263 + 1264 + [[package]] 1256 1265 name = "libm" 1257 1266 version = "0.2.8" 1258 1267 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1264 1273 source = "registry+https://github.com/rust-lang/crates.io-index" 1265 1274 checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" 1266 1275 dependencies = [ 1267 - "bitflags 2.4.1", 1276 + "bitflags 2.4.2", 1268 1277 "libc", 1269 - "redox_syscall 0.4.1", 1278 + "redox_syscall", 1270 1279 ] 1271 1280 1272 1281 [[package]] ··· 1286 1295 1287 1296 [[package]] 1288 1297 name = "linux-raw-sys" 1289 - version = "0.4.11" 1298 + version = "0.4.13" 1290 1299 source = "registry+https://github.com/rust-lang/crates.io-index" 1291 - checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" 1300 + checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" 1292 1301 1293 1302 [[package]] 1294 1303 name = "lipsum" ··· 1321 1330 1322 1331 [[package]] 1323 1332 name = "log" 1324 - version = "0.4.20" 1333 + version = "0.4.21" 1325 1334 source = "registry+https://github.com/rust-lang/crates.io-index" 1326 - checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" 1335 + checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" 1327 1336 1328 1337 [[package]] 1329 1338 name = "lzma-sys" ··· 1338 1347 1339 1348 [[package]] 1340 1349 name = "memchr" 1341 - version = "2.6.4" 1350 + version = "2.7.1" 1342 1351 source = "registry+https://github.com/rust-lang/crates.io-index" 1343 - checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" 1352 + checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" 1344 1353 1345 1354 [[package]] 1346 1355 name = "memmap2" 1347 - version = "0.8.0" 1356 + version = "0.9.4" 1348 1357 source = "registry+https://github.com/rust-lang/crates.io-index" 1349 - checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" 1358 + checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" 1350 1359 dependencies = [ 1351 1360 "libc", 1352 1361 ] 1353 1362 1354 1363 [[package]] 1355 - name = "memoffset" 1356 - version = "0.9.0" 1357 - source = "registry+https://github.com/rust-lang/crates.io-index" 1358 - checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" 1359 - dependencies = [ 1360 - "autocfg", 1361 - ] 1362 - 1363 - [[package]] 1364 1364 name = "miniz_oxide" 1365 - version = "0.7.1" 1365 + version = "0.7.2" 1366 1366 source = "registry+https://github.com/rust-lang/crates.io-index" 1367 - checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" 1367 + checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" 1368 1368 dependencies = [ 1369 1369 "adler", 1370 1370 "simd-adler32", ··· 1372 1372 1373 1373 [[package]] 1374 1374 name = "mio" 1375 - version = "0.8.9" 1375 + version = "0.8.11" 1376 1376 source = "registry+https://github.com/rust-lang/crates.io-index" 1377 - checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" 1377 + checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" 1378 1378 dependencies = [ 1379 1379 "libc", 1380 1380 "log", 1381 1381 "wasi", 1382 - "windows-sys", 1382 + "windows-sys 0.48.0", 1383 + ] 1384 + 1385 + [[package]] 1386 + name = "mutate_once" 1387 + version = "0.1.1" 1388 + source = "registry+https://github.com/rust-lang/crates.io-index" 1389 + checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" 1390 + 1391 + [[package]] 1392 + name = "native-tls" 1393 + version = "0.2.11" 1394 + source = "registry+https://github.com/rust-lang/crates.io-index" 1395 + checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" 1396 + dependencies = [ 1397 + "lazy_static", 1398 + "libc", 1399 + "log", 1400 + "openssl", 1401 + "openssl-probe", 1402 + "openssl-sys", 1403 + "schannel", 1404 + "security-framework", 1405 + "security-framework-sys", 1406 + "tempfile", 1407 + ] 1408 + 1409 + [[package]] 1410 + name = "nix" 1411 + version = "0.27.1" 1412 + source = "registry+https://github.com/rust-lang/crates.io-index" 1413 + checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" 1414 + dependencies = [ 1415 + "bitflags 2.4.2", 1416 + "cfg-if", 1417 + "libc", 1383 1418 ] 1384 1419 1385 1420 [[package]] ··· 1388 1423 source = "registry+https://github.com/rust-lang/crates.io-index" 1389 1424 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" 1390 1425 dependencies = [ 1391 - "bitflags 2.4.1", 1426 + "bitflags 2.4.2", 1392 1427 "crossbeam-channel", 1393 1428 "filetime", 1394 1429 "fsevent-sys", ··· 1398 1433 "log", 1399 1434 "mio", 1400 1435 "walkdir", 1401 - "windows-sys", 1402 - ] 1403 - 1404 - [[package]] 1405 - name = "nu-ansi-term" 1406 - version = "0.46.0" 1407 - source = "registry+https://github.com/rust-lang/crates.io-index" 1408 - checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" 1409 - dependencies = [ 1410 - "overload", 1411 - "winapi", 1436 + "windows-sys 0.48.0", 1412 1437 ] 1413 1438 1414 1439 [[package]] ··· 1423 1448 ] 1424 1449 1425 1450 [[package]] 1426 - name = "num-format" 1427 - version = "0.4.4" 1451 + name = "num-conv" 1452 + version = "0.1.0" 1428 1453 source = "registry+https://github.com/rust-lang/crates.io-index" 1429 - checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" 1430 - dependencies = [ 1431 - "arrayvec", 1432 - "itoa", 1433 - ] 1454 + checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" 1434 1455 1435 1456 [[package]] 1436 1457 name = "num-integer" 1437 - version = "0.1.45" 1458 + version = "0.1.46" 1438 1459 source = "registry+https://github.com/rust-lang/crates.io-index" 1439 - checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" 1460 + checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" 1440 1461 dependencies = [ 1441 - "autocfg", 1442 - "num-traits", 1443 - ] 1444 - 1445 - [[package]] 1446 - name = "num-rational" 1447 - version = "0.4.1" 1448 - source = "registry+https://github.com/rust-lang/crates.io-index" 1449 - checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" 1450 - dependencies = [ 1451 - "autocfg", 1452 - "num-integer", 1453 1462 "num-traits", 1454 1463 ] 1455 1464 1456 1465 [[package]] 1457 1466 name = "num-traits" 1458 - version = "0.2.17" 1467 + version = "0.2.18" 1459 1468 source = "registry+https://github.com/rust-lang/crates.io-index" 1460 - checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" 1469 + checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" 1461 1470 dependencies = [ 1462 1471 "autocfg", 1463 1472 ] ··· 1470 1479 1471 1480 [[package]] 1472 1481 name = "once_cell" 1473 - version = "1.18.0" 1482 + version = "1.19.0" 1474 1483 source = "registry+https://github.com/rust-lang/crates.io-index" 1475 - checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" 1484 + checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" 1476 1485 1477 1486 [[package]] 1478 1487 name = "open" 1479 - version = "5.0.1" 1488 + version = "5.1.1" 1480 1489 source = "registry+https://github.com/rust-lang/crates.io-index" 1481 - checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" 1490 + checksum = "68b3fbb0d52bf0cbb5225ba3d2c303aa136031d43abff98284332a9981ecddec" 1482 1491 dependencies = [ 1483 1492 "is-wsl", 1484 1493 "libc", ··· 1486 1495 ] 1487 1496 1488 1497 [[package]] 1489 - name = "option-ext" 1490 - version = "0.2.0" 1498 + name = "openssl" 1499 + version = "0.10.64" 1491 1500 source = "registry+https://github.com/rust-lang/crates.io-index" 1492 - checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" 1501 + checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" 1502 + dependencies = [ 1503 + "bitflags 2.4.2", 1504 + "cfg-if", 1505 + "foreign-types", 1506 + "libc", 1507 + "once_cell", 1508 + "openssl-macros", 1509 + "openssl-sys", 1510 + ] 1493 1511 1494 1512 [[package]] 1495 - name = "overload" 1513 + name = "openssl-macros" 1496 1514 version = "0.1.1" 1497 1515 source = "registry+https://github.com/rust-lang/crates.io-index" 1498 - checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" 1516 + checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" 1517 + dependencies = [ 1518 + "proc-macro2", 1519 + "quote", 1520 + "syn", 1521 + ] 1522 + 1523 + [[package]] 1524 + name = "openssl-probe" 1525 + version = "0.1.5" 1526 + source = "registry+https://github.com/rust-lang/crates.io-index" 1527 + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" 1528 + 1529 + [[package]] 1530 + name = "openssl-src" 1531 + version = "300.2.3+3.2.1" 1532 + source = "registry+https://github.com/rust-lang/crates.io-index" 1533 + checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" 1534 + dependencies = [ 1535 + "cc", 1536 + ] 1537 + 1538 + [[package]] 1539 + name = "openssl-sys" 1540 + version = "0.9.101" 1541 + source = "registry+https://github.com/rust-lang/crates.io-index" 1542 + checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" 1543 + dependencies = [ 1544 + "cc", 1545 + "libc", 1546 + "openssl-src", 1547 + "pkg-config", 1548 + "vcpkg", 1549 + ] 1550 + 1551 + [[package]] 1552 + name = "option-ext" 1553 + version = "0.2.0" 1554 + source = "registry+https://github.com/rust-lang/crates.io-index" 1555 + checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" 1499 1556 1500 1557 [[package]] 1501 1558 name = "oxipng" ··· 1506 1563 "bitvec", 1507 1564 "crossbeam-channel", 1508 1565 "filetime", 1509 - "indexmap 2.1.0", 1566 + "indexmap 2.2.5", 1510 1567 "libdeflater", 1511 1568 "log", 1512 1569 "rayon", ··· 1518 1575 1519 1576 [[package]] 1520 1577 name = "palette" 1521 - version = "0.7.3" 1578 + version = "0.7.5" 1522 1579 source = "registry+https://github.com/rust-lang/crates.io-index" 1523 - checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" 1580 + checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" 1524 1581 dependencies = [ 1525 1582 "approx", 1526 1583 "fast-srgb8", ··· 1530 1587 1531 1588 [[package]] 1532 1589 name = "palette_derive" 1533 - version = "0.7.3" 1590 + version = "0.7.5" 1534 1591 source = "registry+https://github.com/rust-lang/crates.io-index" 1535 - checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" 1592 + checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" 1536 1593 dependencies = [ 1537 1594 "proc-macro2", 1538 1595 "quote", 1539 - "syn 2.0.39", 1596 + "syn", 1597 + ] 1598 + 1599 + [[package]] 1600 + name = "parking_lot" 1601 + version = "0.12.1" 1602 + source = "registry+https://github.com/rust-lang/crates.io-index" 1603 + checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" 1604 + dependencies = [ 1605 + "lock_api", 1606 + "parking_lot_core", 1540 1607 ] 1541 1608 1542 1609 [[package]] ··· 1547 1614 dependencies = [ 1548 1615 "cfg-if", 1549 1616 "libc", 1550 - "redox_syscall 0.4.1", 1617 + "redox_syscall", 1551 1618 "smallvec", 1552 - "windows-targets", 1619 + "windows-targets 0.48.5", 1553 1620 ] 1554 1621 1555 1622 [[package]] ··· 1588 1655 source = "registry+https://github.com/rust-lang/crates.io-index" 1589 1656 checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" 1590 1657 dependencies = [ 1658 + "phf_macros", 1591 1659 "phf_shared", 1592 1660 ] 1593 1661 1594 1662 [[package]] 1595 - name = "phf_codegen" 1663 + name = "phf_generator" 1596 1664 version = "0.11.2" 1597 1665 source = "registry+https://github.com/rust-lang/crates.io-index" 1598 - checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" 1666 + checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" 1599 1667 dependencies = [ 1600 - "phf_generator", 1601 1668 "phf_shared", 1669 + "rand", 1602 1670 ] 1603 1671 1604 1672 [[package]] 1605 - name = "phf_generator" 1673 + name = "phf_macros" 1606 1674 version = "0.11.2" 1607 1675 source = "registry+https://github.com/rust-lang/crates.io-index" 1608 - checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" 1676 + checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" 1609 1677 dependencies = [ 1678 + "phf_generator", 1610 1679 "phf_shared", 1611 - "rand", 1680 + "proc-macro2", 1681 + "quote", 1682 + "syn", 1612 1683 ] 1613 1684 1614 1685 [[package]] ··· 1627 1698 checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" 1628 1699 1629 1700 [[package]] 1630 - name = "pin-project-lite" 1631 - version = "0.2.13" 1632 - source = "registry+https://github.com/rust-lang/crates.io-index" 1633 - checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" 1634 - 1635 - [[package]] 1636 1701 name = "pixglyph" 1637 - version = "0.2.0" 1702 + version = "0.3.0" 1638 1703 source = "registry+https://github.com/rust-lang/crates.io-index" 1639 - checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" 1704 + checksum = "e2e0f8ad4c197db38125b880c3c44544788665c7d5f4c42f5a35da44bca1a712" 1640 1705 dependencies = [ 1641 1706 "ttf-parser", 1642 1707 ] 1643 1708 1644 1709 [[package]] 1645 1710 name = "pkg-config" 1646 - version = "0.3.27" 1711 + version = "0.3.30" 1647 1712 source = "registry+https://github.com/rust-lang/crates.io-index" 1648 - checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" 1713 + checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" 1649 1714 1650 1715 [[package]] 1651 1716 name = "plist" 1652 - version = "1.5.1" 1717 + version = "1.6.0" 1653 1718 source = "registry+https://github.com/rust-lang/crates.io-index" 1654 - checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" 1719 + checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" 1655 1720 dependencies = [ 1656 - "base64", 1657 - "indexmap 1.9.3", 1721 + "base64 0.21.7", 1722 + "indexmap 2.2.5", 1658 1723 "line-wrap", 1659 - "quick-xml 0.30.0", 1724 + "quick-xml", 1660 1725 "serde", 1661 1726 "time", 1662 1727 ] 1663 1728 1664 1729 [[package]] 1665 1730 name = "png" 1666 - version = "0.17.10" 1731 + version = "0.17.13" 1667 1732 source = "registry+https://github.com/rust-lang/crates.io-index" 1668 - checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" 1733 + checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" 1669 1734 dependencies = [ 1670 1735 "bitflags 1.3.2", 1671 1736 "crc32fast", ··· 1675 1740 ] 1676 1741 1677 1742 [[package]] 1743 + name = "portable-atomic" 1744 + version = "1.6.0" 1745 + source = "registry+https://github.com/rust-lang/crates.io-index" 1746 + checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" 1747 + 1748 + [[package]] 1678 1749 name = "postcard" 1679 1750 version = "1.0.8" 1680 1751 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1686 1757 ] 1687 1758 1688 1759 [[package]] 1760 + name = "powerfmt" 1761 + version = "0.2.0" 1762 + source = "registry+https://github.com/rust-lang/crates.io-index" 1763 + checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" 1764 + 1765 + [[package]] 1689 1766 name = "ppv-lite86" 1690 1767 version = "0.2.17" 1691 1768 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1693 1770 1694 1771 [[package]] 1695 1772 name = "proc-macro2" 1696 - version = "1.0.70" 1773 + version = "1.0.78" 1697 1774 source = "registry+https://github.com/rust-lang/crates.io-index" 1698 - checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" 1775 + checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" 1699 1776 dependencies = [ 1700 1777 "unicode-ident", 1701 1778 ] ··· 1711 1788 1712 1789 [[package]] 1713 1790 name = "pulldown-cmark" 1714 - version = "0.9.3" 1791 + version = "0.9.6" 1715 1792 source = "registry+https://github.com/rust-lang/crates.io-index" 1716 - checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" 1793 + checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" 1717 1794 dependencies = [ 1718 - "bitflags 1.3.2", 1795 + "bitflags 2.4.2", 1719 1796 "getopts", 1720 1797 "memchr", 1721 1798 "unicase", 1722 1799 ] 1723 1800 1724 1801 [[package]] 1725 - name = "quick-xml" 1726 - version = "0.26.0" 1802 + name = "qcms" 1803 + version = "0.3.0" 1727 1804 source = "registry+https://github.com/rust-lang/crates.io-index" 1728 - checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" 1729 - dependencies = [ 1730 - "memchr", 1731 - ] 1805 + checksum = "edecfcd5d755a5e5d98e24cf43113e7cdaec5a070edd0f6b250c03a573da30fa" 1732 1806 1733 1807 [[package]] 1734 1808 name = "quick-xml" 1735 - version = "0.28.2" 1809 + version = "0.31.0" 1736 1810 source = "registry+https://github.com/rust-lang/crates.io-index" 1737 - checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" 1811 + checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" 1738 1812 dependencies = [ 1739 1813 "memchr", 1740 1814 "serde", 1741 1815 ] 1742 1816 1743 1817 [[package]] 1744 - name = "quick-xml" 1745 - version = "0.30.0" 1746 - source = "registry+https://github.com/rust-lang/crates.io-index" 1747 - checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" 1748 - dependencies = [ 1749 - "memchr", 1750 - ] 1751 - 1752 - [[package]] 1753 1818 name = "quote" 1754 - version = "1.0.33" 1819 + version = "1.0.35" 1755 1820 source = "registry+https://github.com/rust-lang/crates.io-index" 1756 - checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" 1821 + checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" 1757 1822 dependencies = [ 1758 1823 "proc-macro2", 1759 1824 ] ··· 1770 1835 source = "registry+https://github.com/rust-lang/crates.io-index" 1771 1836 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" 1772 1837 dependencies = [ 1773 - "libc", 1774 - "rand_chacha", 1775 1838 "rand_core", 1776 1839 ] 1777 1840 ··· 1790 1853 version = "0.6.4" 1791 1854 source = "registry+https://github.com/rust-lang/crates.io-index" 1792 1855 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" 1793 - dependencies = [ 1794 - "getrandom", 1795 - ] 1796 1856 1797 1857 [[package]] 1798 1858 name = "rayon" 1799 - version = "1.8.0" 1859 + version = "1.9.0" 1800 1860 source = "registry+https://github.com/rust-lang/crates.io-index" 1801 - checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" 1861 + checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" 1802 1862 dependencies = [ 1803 1863 "either", 1804 1864 "rayon-core", ··· 1806 1866 1807 1867 [[package]] 1808 1868 name = "rayon-core" 1809 - version = "1.12.0" 1869 + version = "1.12.1" 1810 1870 source = "registry+https://github.com/rust-lang/crates.io-index" 1811 - checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" 1871 + checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" 1812 1872 dependencies = [ 1813 1873 "crossbeam-deque", 1814 1874 "crossbeam-utils", 1815 1875 ] 1816 1876 1817 1877 [[package]] 1818 - name = "rctree" 1819 - version = "0.5.0" 1820 - source = "registry+https://github.com/rust-lang/crates.io-index" 1821 - checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" 1822 - 1823 - [[package]] 1824 - name = "redox_syscall" 1825 - version = "0.3.5" 1826 - source = "registry+https://github.com/rust-lang/crates.io-index" 1827 - checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" 1828 - dependencies = [ 1829 - "bitflags 1.3.2", 1830 - ] 1831 - 1832 - [[package]] 1833 1878 name = "redox_syscall" 1834 1879 version = "0.4.1" 1835 1880 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1851 1896 1852 1897 [[package]] 1853 1898 name = "regex" 1854 - version = "1.10.2" 1899 + version = "1.10.3" 1855 1900 source = "registry+https://github.com/rust-lang/crates.io-index" 1856 - checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" 1901 + checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" 1857 1902 dependencies = [ 1858 1903 "aho-corasick", 1859 1904 "memchr", 1860 1905 "regex-automata", 1861 - "regex-syntax 0.8.2", 1906 + "regex-syntax", 1862 1907 ] 1863 1908 1864 1909 [[package]] 1865 1910 name = "regex-automata" 1866 - version = "0.4.3" 1911 + version = "0.4.6" 1867 1912 source = "registry+https://github.com/rust-lang/crates.io-index" 1868 - checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" 1913 + checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" 1869 1914 dependencies = [ 1870 1915 "aho-corasick", 1871 1916 "memchr", 1872 - "regex-syntax 0.8.2", 1917 + "regex-syntax", 1873 1918 ] 1874 1919 1875 1920 [[package]] 1876 1921 name = "regex-syntax" 1877 - version = "0.7.5" 1878 - source = "registry+https://github.com/rust-lang/crates.io-index" 1879 - checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" 1880 - 1881 - [[package]] 1882 - name = "regex-syntax" 1883 1922 version = "0.8.2" 1884 1923 source = "registry+https://github.com/rust-lang/crates.io-index" 1885 1924 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" 1886 1925 1887 1926 [[package]] 1888 1927 name = "resvg" 1889 - version = "0.36.0" 1928 + version = "0.38.0" 1890 1929 source = "registry+https://github.com/rust-lang/crates.io-index" 1891 - checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" 1930 + checksum = "5c34501046959e06470ba62a2dc7f31c15f94ac250d842a45f9e012f4ee40c1e" 1892 1931 dependencies = [ 1893 - "gif", 1932 + "gif 0.12.0", 1894 1933 "jpeg-decoder", 1895 1934 "log", 1896 1935 "pico-args", ··· 1911 1950 ] 1912 1951 1913 1952 [[package]] 1914 - name = "ring" 1915 - version = "0.17.5" 1916 - source = "registry+https://github.com/rust-lang/crates.io-index" 1917 - checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" 1918 - dependencies = [ 1919 - "cc", 1920 - "getrandom", 1921 - "libc", 1922 - "spin", 1923 - "untrusted", 1924 - "windows-sys", 1925 - ] 1926 - 1927 - [[package]] 1928 1953 name = "roff" 1929 1954 version = "0.2.1" 1930 1955 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1932 1957 1933 1958 [[package]] 1934 1959 name = "roxmltree" 1935 - version = "0.18.1" 1960 + version = "0.19.0" 1936 1961 source = "registry+https://github.com/rust-lang/crates.io-index" 1937 - checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" 1938 - dependencies = [ 1939 - "xmlparser", 1940 - ] 1962 + checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" 1941 1963 1942 1964 [[package]] 1943 1965 name = "rustc-hash" ··· 1956 1978 1957 1979 [[package]] 1958 1980 name = "rustix" 1959 - version = "0.38.25" 1981 + version = "0.38.31" 1960 1982 source = "registry+https://github.com/rust-lang/crates.io-index" 1961 - checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" 1983 + checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" 1962 1984 dependencies = [ 1963 - "bitflags 2.4.1", 1985 + "bitflags 2.4.2", 1964 1986 "errno", 1965 1987 "libc", 1966 1988 "linux-raw-sys", 1967 - "windows-sys", 1968 - ] 1969 - 1970 - [[package]] 1971 - name = "rustls" 1972 - version = "0.21.9" 1973 - source = "registry+https://github.com/rust-lang/crates.io-index" 1974 - checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" 1975 - dependencies = [ 1976 - "log", 1977 - "ring", 1978 - "rustls-webpki", 1979 - "sct", 1980 - ] 1981 - 1982 - [[package]] 1983 - name = "rustls-pemfile" 1984 - version = "1.0.4" 1985 - source = "registry+https://github.com/rust-lang/crates.io-index" 1986 - checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" 1987 - dependencies = [ 1988 - "base64", 1989 - ] 1990 - 1991 - [[package]] 1992 - name = "rustls-webpki" 1993 - version = "0.101.7" 1994 - source = "registry+https://github.com/rust-lang/crates.io-index" 1995 - checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" 1996 - dependencies = [ 1997 - "ring", 1998 - "untrusted", 1989 + "windows-sys 0.52.0", 1999 1990 ] 2000 1991 2001 1992 [[package]] ··· 2006 1997 2007 1998 [[package]] 2008 1999 name = "rustybuzz" 2009 - version = "0.10.0" 2000 + version = "0.12.1" 2010 2001 source = "registry+https://github.com/rust-lang/crates.io-index" 2011 - checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" 2002 + checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" 2012 2003 dependencies = [ 2013 - "bitflags 1.3.2", 2004 + "bitflags 2.4.2", 2014 2005 "bytemuck", 2015 2006 "smallvec", 2016 2007 "ttf-parser", ··· 2022 2013 2023 2014 [[package]] 2024 2015 name = "ryu" 2025 - version = "1.0.15" 2016 + version = "1.0.17" 2026 2017 source = "registry+https://github.com/rust-lang/crates.io-index" 2027 - checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" 2018 + checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" 2028 2019 2029 2020 [[package]] 2030 2021 name = "safemem" ··· 2042 2033 ] 2043 2034 2044 2035 [[package]] 2036 + name = "schannel" 2037 + version = "0.1.23" 2038 + source = "registry+https://github.com/rust-lang/crates.io-index" 2039 + checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" 2040 + dependencies = [ 2041 + "windows-sys 0.52.0", 2042 + ] 2043 + 2044 + [[package]] 2045 2045 name = "scopeguard" 2046 2046 version = "1.2.0" 2047 2047 source = "registry+https://github.com/rust-lang/crates.io-index" 2048 2048 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" 2049 2049 2050 2050 [[package]] 2051 - name = "sct" 2052 - version = "0.7.1" 2051 + name = "security-framework" 2052 + version = "2.9.2" 2053 + source = "registry+https://github.com/rust-lang/crates.io-index" 2054 + checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" 2055 + dependencies = [ 2056 + "bitflags 1.3.2", 2057 + "core-foundation", 2058 + "core-foundation-sys", 2059 + "libc", 2060 + "security-framework-sys", 2061 + ] 2062 + 2063 + [[package]] 2064 + name = "security-framework-sys" 2065 + version = "2.9.1" 2053 2066 source = "registry+https://github.com/rust-lang/crates.io-index" 2054 - checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" 2067 + checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" 2055 2068 dependencies = [ 2056 - "ring", 2057 - "untrusted", 2069 + "core-foundation-sys", 2070 + "libc", 2058 2071 ] 2059 2072 2060 2073 [[package]] ··· 2065 2078 dependencies = [ 2066 2079 "fastrand 1.9.0", 2067 2080 "tempfile", 2068 - "windows-sys", 2081 + "windows-sys 0.48.0", 2069 2082 ] 2070 2083 2071 2084 [[package]] 2072 2085 name = "semver" 2073 - version = "1.0.20" 2086 + version = "1.0.22" 2074 2087 source = "registry+https://github.com/rust-lang/crates.io-index" 2075 - checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" 2088 + checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" 2076 2089 2077 2090 [[package]] 2078 2091 name = "serde" 2079 - version = "1.0.193" 2092 + version = "1.0.197" 2080 2093 source = "registry+https://github.com/rust-lang/crates.io-index" 2081 - checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" 2094 + checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" 2082 2095 dependencies = [ 2083 2096 "serde_derive", 2084 2097 ] 2085 2098 2086 2099 [[package]] 2087 2100 name = "serde_derive" 2088 - version = "1.0.193" 2101 + version = "1.0.197" 2089 2102 source = "registry+https://github.com/rust-lang/crates.io-index" 2090 - checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" 2103 + checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" 2091 2104 dependencies = [ 2092 2105 "proc-macro2", 2093 2106 "quote", 2094 - "syn 2.0.39", 2107 + "syn", 2095 2108 ] 2096 2109 2097 2110 [[package]] 2098 2111 name = "serde_json" 2099 - version = "1.0.108" 2112 + version = "1.0.114" 2100 2113 source = "registry+https://github.com/rust-lang/crates.io-index" 2101 - checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" 2114 + checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" 2102 2115 dependencies = [ 2103 2116 "itoa", 2104 2117 "ryu", ··· 2107 2120 2108 2121 [[package]] 2109 2122 name = "serde_spanned" 2110 - version = "0.6.4" 2123 + version = "0.6.5" 2111 2124 source = "registry+https://github.com/rust-lang/crates.io-index" 2112 - checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" 2125 + checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" 2113 2126 dependencies = [ 2114 2127 "serde", 2115 2128 ] ··· 2128 2141 2129 2142 [[package]] 2130 2143 name = "serde_yaml" 2131 - version = "0.9.27" 2144 + version = "0.9.32" 2132 2145 source = "registry+https://github.com/rust-lang/crates.io-index" 2133 - checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" 2146 + checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" 2134 2147 dependencies = [ 2135 - "indexmap 2.1.0", 2148 + "indexmap 2.2.5", 2136 2149 "itoa", 2137 2150 "ryu", 2138 2151 "serde", ··· 2140 2153 ] 2141 2154 2142 2155 [[package]] 2143 - name = "sharded-slab" 2144 - version = "0.1.7" 2145 - source = "registry+https://github.com/rust-lang/crates.io-index" 2146 - checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" 2147 - dependencies = [ 2148 - "lazy_static", 2149 - ] 2150 - 2151 - [[package]] 2152 2156 name = "simd-adler32" 2153 2157 version = "0.3.7" 2154 2158 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2177 2181 2178 2182 [[package]] 2179 2183 name = "slotmap" 2180 - version = "1.0.6" 2184 + version = "1.0.7" 2181 2185 source = "registry+https://github.com/rust-lang/crates.io-index" 2182 - checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" 2186 + checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" 2183 2187 dependencies = [ 2184 2188 "version_check", 2185 2189 ] 2186 2190 2187 2191 [[package]] 2188 2192 name = "smallvec" 2189 - version = "1.11.2" 2193 + version = "1.13.1" 2190 2194 source = "registry+https://github.com/rust-lang/crates.io-index" 2191 - checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" 2195 + checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" 2192 2196 2193 2197 [[package]] 2194 2198 name = "spin" ··· 2216 2220 ] 2217 2221 2218 2222 [[package]] 2219 - name = "str_stack" 2220 - version = "0.1.0" 2221 - source = "registry+https://github.com/rust-lang/crates.io-index" 2222 - checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" 2223 - 2224 - [[package]] 2225 2223 name = "strict-num" 2226 2224 version = "0.1.1" 2227 2225 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2232 2230 2233 2231 [[package]] 2234 2232 name = "strsim" 2235 - version = "0.10.0" 2233 + version = "0.11.0" 2236 2234 source = "registry+https://github.com/rust-lang/crates.io-index" 2237 - checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" 2235 + checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" 2238 2236 2239 2237 [[package]] 2240 2238 name = "strum" 2241 - version = "0.24.1" 2239 + version = "0.26.1" 2242 2240 source = "registry+https://github.com/rust-lang/crates.io-index" 2243 - checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" 2241 + checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" 2244 2242 dependencies = [ 2245 2243 "strum_macros", 2246 2244 ] 2247 2245 2248 2246 [[package]] 2249 2247 name = "strum_macros" 2250 - version = "0.24.3" 2248 + version = "0.26.1" 2251 2249 source = "registry+https://github.com/rust-lang/crates.io-index" 2252 - checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" 2250 + checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" 2253 2251 dependencies = [ 2254 2252 "heck", 2255 2253 "proc-macro2", 2256 2254 "quote", 2257 2255 "rustversion", 2258 - "syn 1.0.109", 2256 + "syn", 2259 2257 ] 2260 2258 2261 2259 [[package]] ··· 2266 2264 2267 2265 [[package]] 2268 2266 name = "svg2pdf" 2269 - version = "0.9.1" 2267 + version = "0.10.0" 2270 2268 source = "registry+https://github.com/rust-lang/crates.io-index" 2271 - checksum = "a81da66842e426278f20062cd249779565e13f9ab4bfe0ac9e94eb476bc3a0f3" 2269 + checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" 2272 2270 dependencies = [ 2273 2271 "image", 2274 2272 "miniz_oxide", 2275 2273 "once_cell", 2276 2274 "pdf-writer", 2275 + "resvg", 2276 + "tiny-skia", 2277 2277 "usvg", 2278 2278 ] 2279 2279 2280 2280 [[package]] 2281 2281 name = "svgtypes" 2282 - version = "0.12.0" 2282 + version = "0.13.0" 2283 2283 source = "registry+https://github.com/rust-lang/crates.io-index" 2284 - checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" 2284 + checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" 2285 2285 dependencies = [ 2286 2286 "kurbo", 2287 2287 "siphasher 0.3.11", ··· 2289 2289 2290 2290 [[package]] 2291 2291 name = "syn" 2292 - version = "1.0.109" 2292 + version = "2.0.52" 2293 2293 source = "registry+https://github.com/rust-lang/crates.io-index" 2294 - checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" 2295 - dependencies = [ 2296 - "proc-macro2", 2297 - "quote", 2298 - "unicode-ident", 2299 - ] 2300 - 2301 - [[package]] 2302 - name = "syn" 2303 - version = "2.0.39" 2304 - source = "registry+https://github.com/rust-lang/crates.io-index" 2305 - checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" 2294 + checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" 2306 2295 dependencies = [ 2307 2296 "proc-macro2", 2308 2297 "quote", ··· 2311 2300 2312 2301 [[package]] 2313 2302 name = "synstructure" 2314 - version = "0.13.0" 2303 + version = "0.13.1" 2315 2304 source = "registry+https://github.com/rust-lang/crates.io-index" 2316 - checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" 2305 + checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" 2317 2306 dependencies = [ 2318 2307 "proc-macro2", 2319 2308 "quote", 2320 - "syn 2.0.39", 2321 - "unicode-xid", 2309 + "syn", 2322 2310 ] 2323 2311 2324 2312 [[package]] 2325 2313 name = "syntect" 2326 - version = "5.1.0" 2314 + version = "5.2.0" 2327 2315 source = "registry+https://github.com/rust-lang/crates.io-index" 2328 - checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" 2316 + checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" 2329 2317 dependencies = [ 2330 2318 "bincode", 2331 2319 "bitflags 1.3.2", ··· 2334 2322 "fnv", 2335 2323 "once_cell", 2336 2324 "plist", 2337 - "regex-syntax 0.7.5", 2325 + "regex-syntax", 2338 2326 "serde", 2327 + "serde_derive", 2339 2328 "serde_json", 2340 2329 "thiserror", 2341 2330 "walkdir", ··· 2361 2350 2362 2351 [[package]] 2363 2352 name = "tempfile" 2364 - version = "3.8.1" 2353 + version = "3.10.1" 2365 2354 source = "registry+https://github.com/rust-lang/crates.io-index" 2366 - checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" 2355 + checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" 2367 2356 dependencies = [ 2368 2357 "cfg-if", 2369 2358 "fastrand 2.0.1", 2370 - "redox_syscall 0.4.1", 2371 2359 "rustix", 2372 - "windows-sys", 2360 + "windows-sys 0.52.0", 2373 2361 ] 2374 2362 2375 2363 [[package]] 2376 2364 name = "termcolor" 2377 - version = "1.4.0" 2365 + version = "1.4.1" 2378 2366 source = "registry+https://github.com/rust-lang/crates.io-index" 2379 - checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" 2367 + checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" 2380 2368 dependencies = [ 2381 2369 "winapi-util", 2382 2370 ] 2383 2371 2384 2372 [[package]] 2385 2373 name = "thiserror" 2386 - version = "1.0.50" 2374 + version = "1.0.57" 2387 2375 source = "registry+https://github.com/rust-lang/crates.io-index" 2388 - checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" 2376 + checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" 2389 2377 dependencies = [ 2390 2378 "thiserror-impl", 2391 2379 ] 2392 2380 2393 2381 [[package]] 2394 2382 name = "thiserror-impl" 2395 - version = "1.0.50" 2383 + version = "1.0.57" 2396 2384 source = "registry+https://github.com/rust-lang/crates.io-index" 2397 - checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" 2385 + checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" 2398 2386 dependencies = [ 2399 2387 "proc-macro2", 2400 2388 "quote", 2401 - "syn 2.0.39", 2402 - ] 2403 - 2404 - [[package]] 2405 - name = "thread_local" 2406 - version = "1.1.7" 2407 - source = "registry+https://github.com/rust-lang/crates.io-index" 2408 - checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" 2409 - dependencies = [ 2410 - "cfg-if", 2411 - "once_cell", 2389 + "syn", 2412 2390 ] 2413 2391 2414 2392 [[package]] 2415 2393 name = "time" 2416 - version = "0.3.20" 2394 + version = "0.3.34" 2417 2395 source = "registry+https://github.com/rust-lang/crates.io-index" 2418 - checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" 2396 + checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" 2419 2397 dependencies = [ 2398 + "deranged", 2420 2399 "itoa", 2400 + "num-conv", 2401 + "powerfmt", 2421 2402 "serde", 2422 2403 "time-core", 2423 2404 "time-macros", ··· 2425 2406 2426 2407 [[package]] 2427 2408 name = "time-core" 2428 - version = "0.1.0" 2409 + version = "0.1.2" 2429 2410 source = "registry+https://github.com/rust-lang/crates.io-index" 2430 - checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" 2411 + checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" 2431 2412 2432 2413 [[package]] 2433 2414 name = "time-macros" 2434 - version = "0.2.8" 2415 + version = "0.2.17" 2435 2416 source = "registry+https://github.com/rust-lang/crates.io-index" 2436 - checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" 2417 + checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" 2437 2418 dependencies = [ 2419 + "num-conv", 2438 2420 "time-core", 2439 2421 ] 2440 2422 2441 2423 [[package]] 2442 2424 name = "tiny-skia" 2443 - version = "0.11.2" 2425 + version = "0.11.4" 2444 2426 source = "registry+https://github.com/rust-lang/crates.io-index" 2445 - checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" 2427 + checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" 2446 2428 dependencies = [ 2447 2429 "arrayref", 2448 2430 "arrayvec", ··· 2455 2437 2456 2438 [[package]] 2457 2439 name = "tiny-skia-path" 2458 - version = "0.11.2" 2440 + version = "0.11.4" 2459 2441 source = "registry+https://github.com/rust-lang/crates.io-index" 2460 - checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" 2442 + checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" 2461 2443 dependencies = [ 2462 2444 "arrayref", 2463 2445 "bytemuck", ··· 2492 2474 2493 2475 [[package]] 2494 2476 name = "toml" 2495 - version = "0.8.8" 2477 + version = "0.8.10" 2496 2478 source = "registry+https://github.com/rust-lang/crates.io-index" 2497 - checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" 2479 + checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" 2498 2480 dependencies = [ 2499 2481 "serde", 2500 2482 "serde_spanned", ··· 2513 2495 2514 2496 [[package]] 2515 2497 name = "toml_edit" 2516 - version = "0.21.0" 2498 + version = "0.22.6" 2517 2499 source = "registry+https://github.com/rust-lang/crates.io-index" 2518 - checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" 2500 + checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" 2519 2501 dependencies = [ 2520 - "indexmap 2.1.0", 2502 + "indexmap 2.2.5", 2521 2503 "serde", 2522 2504 "serde_spanned", 2523 2505 "toml_datetime", ··· 2525 2507 ] 2526 2508 2527 2509 [[package]] 2528 - name = "tracing" 2529 - version = "0.1.40" 2530 - source = "registry+https://github.com/rust-lang/crates.io-index" 2531 - checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" 2532 - dependencies = [ 2533 - "pin-project-lite", 2534 - "tracing-attributes", 2535 - "tracing-core", 2536 - ] 2537 - 2538 - [[package]] 2539 - name = "tracing-attributes" 2540 - version = "0.1.27" 2541 - source = "registry+https://github.com/rust-lang/crates.io-index" 2542 - checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" 2543 - dependencies = [ 2544 - "proc-macro2", 2545 - "quote", 2546 - "syn 2.0.39", 2547 - ] 2548 - 2549 - [[package]] 2550 - name = "tracing-core" 2551 - version = "0.1.32" 2552 - source = "registry+https://github.com/rust-lang/crates.io-index" 2553 - checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" 2554 - dependencies = [ 2555 - "once_cell", 2556 - "valuable", 2557 - ] 2558 - 2559 - [[package]] 2560 - name = "tracing-error" 2561 - version = "0.2.0" 2562 - source = "registry+https://github.com/rust-lang/crates.io-index" 2563 - checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" 2564 - dependencies = [ 2565 - "tracing", 2566 - "tracing-subscriber", 2567 - ] 2568 - 2569 - [[package]] 2570 - name = "tracing-flame" 2571 - version = "0.2.0" 2510 + name = "ttf-parser" 2511 + version = "0.20.0" 2572 2512 source = "registry+https://github.com/rust-lang/crates.io-index" 2573 - checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" 2574 - dependencies = [ 2575 - "lazy_static", 2576 - "tracing", 2577 - "tracing-subscriber", 2578 - ] 2513 + checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" 2579 2514 2580 2515 [[package]] 2581 - name = "tracing-log" 2582 - version = "0.2.0" 2516 + name = "two-face" 2517 + version = "0.3.0" 2583 2518 source = "registry+https://github.com/rust-lang/crates.io-index" 2584 - checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" 2519 + checksum = "37bed2135b2459c7eefba72c906d374697eb15949c205f2f124e3636a46b5eeb" 2585 2520 dependencies = [ 2586 - "log", 2587 2521 "once_cell", 2588 - "tracing-core", 2589 - ] 2590 - 2591 - [[package]] 2592 - name = "tracing-subscriber" 2593 - version = "0.3.18" 2594 - source = "registry+https://github.com/rust-lang/crates.io-index" 2595 - checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" 2596 - dependencies = [ 2597 - "nu-ansi-term", 2598 - "sharded-slab", 2599 - "smallvec", 2600 - "thread_local", 2601 - "tracing-core", 2602 - "tracing-log", 2522 + "serde", 2523 + "syntect", 2603 2524 ] 2604 2525 2605 2526 [[package]] 2606 - name = "ttf-parser" 2607 - version = "0.19.2" 2608 - source = "registry+https://github.com/rust-lang/crates.io-index" 2609 - checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" 2610 - 2611 - [[package]] 2612 2527 name = "typed-arena" 2613 2528 version = "2.0.2" 2614 2529 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2616 2531 2617 2532 [[package]] 2618 2533 name = "typst" 2619 - version = "0.10.0" 2534 + version = "0.11.0-rc1" 2620 2535 dependencies = [ 2621 2536 "az", 2622 - "bitflags 2.4.1", 2537 + "bitflags 2.4.2", 2623 2538 "chinese-number", 2624 2539 "ciborium", 2625 2540 "comemo", ··· 2633 2548 "icu_provider_adapters", 2634 2549 "icu_provider_blob", 2635 2550 "icu_segmenter", 2551 + "if_chain", 2636 2552 "image", 2637 - "indexmap 2.1.0", 2553 + "indexmap 2.2.5", 2554 + "kamadak-exif", 2638 2555 "kurbo", 2639 2556 "lipsum", 2640 2557 "log", 2641 2558 "once_cell", 2642 2559 "palette", 2560 + "phf", 2561 + "png", 2562 + "portable-atomic", 2563 + "qcms", 2643 2564 "rayon", 2644 2565 "regex", 2645 2566 "roxmltree", 2646 2567 "rustybuzz", 2647 2568 "serde", 2648 2569 "serde_json", 2649 - "serde_yaml 0.9.27", 2570 + "serde_yaml 0.9.32", 2650 2571 "siphasher 1.0.0", 2651 2572 "smallvec", 2652 2573 "stacker", 2653 2574 "syntect", 2654 2575 "time", 2655 2576 "toml", 2656 - "tracing", 2657 2577 "ttf-parser", 2578 + "two-face", 2658 2579 "typed-arena", 2580 + "typst-assets", 2581 + "typst-dev-assets", 2659 2582 "typst-macros", 2660 2583 "typst-syntax", 2584 + "typst-timing", 2661 2585 "unicode-bidi", 2662 2586 "unicode-math-class", 2663 2587 "unicode-script", ··· 2667 2591 ] 2668 2592 2669 2593 [[package]] 2594 + name = "typst-assets" 2595 + version = "0.11.0-rc1" 2596 + source = "registry+https://github.com/rust-lang/crates.io-index" 2597 + checksum = "e43b98ec1d7969c329e3735e597bbe5e69076445a570f9634b30c8dc01c704ae" 2598 + 2599 + [[package]] 2670 2600 name = "typst-cli" 2671 - version = "0.10.0" 2601 + version = "0.11.0-rc1" 2672 2602 dependencies = [ 2673 2603 "chrono", 2674 2604 "clap", ··· 2676 2606 "clap_mangen", 2677 2607 "codespan-reporting", 2678 2608 "comemo", 2609 + "ctrlc", 2679 2610 "dirs", 2680 2611 "ecow", 2681 2612 "env_proxy", 2682 2613 "flate2", 2683 2614 "fontdb", 2684 - "inferno", 2615 + "fs_extra", 2616 + "native-tls", 2685 2617 "notify", 2686 2618 "once_cell", 2687 2619 "open", 2620 + "openssl", 2621 + "parking_lot", 2688 2622 "pathdiff", 2689 - "rustls", 2690 - "rustls-pemfile", 2623 + "rayon", 2691 2624 "same-file", 2692 2625 "self-replace", 2693 2626 "semver", 2694 2627 "serde", 2695 2628 "serde_json", 2696 - "serde_yaml 0.9.27", 2629 + "serde_yaml 0.9.32", 2697 2630 "siphasher 1.0.0", 2698 2631 "tar", 2699 2632 "tempfile", 2700 - "tracing", 2701 - "tracing-error", 2702 - "tracing-flame", 2703 - "tracing-subscriber", 2633 + "toml", 2704 2634 "typst", 2635 + "typst-assets", 2636 + "typst-macros", 2705 2637 "typst-pdf", 2706 2638 "typst-render", 2707 2639 "typst-svg", 2640 + "typst-timing", 2708 2641 "ureq", 2709 2642 "xz2", 2710 2643 "zip", 2711 2644 ] 2712 2645 2713 2646 [[package]] 2714 - name = "typst-docs" 2647 + name = "typst-dev-assets" 2715 2648 version = "0.10.0" 2649 + source = "git+https://github.com/typst/typst-dev-assets?rev=c63ab46#c63ab467b6d2242b7993b81c1156b915486bcf02" 2650 + 2651 + [[package]] 2652 + name = "typst-docs" 2653 + version = "0.11.0-rc1" 2716 2654 dependencies = [ 2655 + "clap", 2717 2656 "comemo", 2718 2657 "ecow", 2719 2658 "heck", 2720 - "include_dir", 2721 2659 "once_cell", 2722 2660 "pulldown-cmark", 2723 2661 "serde", 2724 - "serde_yaml 0.9.27", 2662 + "serde_json", 2663 + "serde_yaml 0.9.32", 2725 2664 "syntect", 2726 2665 "typed-arena", 2727 2666 "typst", 2728 - "unicode_names2", 2667 + "typst-assets", 2668 + "typst-dev-assets", 2669 + "typst-render", 2729 2670 "unscanny", 2730 2671 "yaml-front-matter", 2731 2672 ] 2732 2673 2733 2674 [[package]] 2675 + name = "typst-fuzz" 2676 + version = "0.11.0-rc1" 2677 + dependencies = [ 2678 + "comemo", 2679 + "libfuzzer-sys", 2680 + "typst", 2681 + "typst-assets", 2682 + "typst-render", 2683 + "typst-syntax", 2684 + ] 2685 + 2686 + [[package]] 2734 2687 name = "typst-ide" 2735 - version = "0.10.0" 2688 + version = "0.11.0-rc1" 2736 2689 dependencies = [ 2737 2690 "comemo", 2738 2691 "ecow", ··· 2745 2698 2746 2699 [[package]] 2747 2700 name = "typst-macros" 2748 - version = "0.10.0" 2701 + version = "0.11.0-rc1" 2749 2702 dependencies = [ 2750 2703 "heck", 2751 2704 "proc-macro2", 2752 2705 "quote", 2753 - "syn 2.0.39", 2706 + "syn", 2754 2707 ] 2755 2708 2756 2709 [[package]] 2757 2710 name = "typst-pdf" 2758 - version = "0.10.0" 2711 + version = "0.11.0-rc1" 2759 2712 dependencies = [ 2760 - "base64", 2713 + "base64 0.22.0", 2761 2714 "bytemuck", 2762 2715 "comemo", 2763 2716 "ecow", ··· 2767 2720 "pdf-writer", 2768 2721 "subsetter", 2769 2722 "svg2pdf", 2770 - "tracing", 2771 2723 "ttf-parser", 2772 2724 "typst", 2725 + "typst-assets", 2726 + "typst-macros", 2727 + "typst-timing", 2773 2728 "unicode-properties", 2774 2729 "unscanny", 2775 2730 "xmp-writer", ··· 2777 2732 2778 2733 [[package]] 2779 2734 name = "typst-render" 2780 - version = "0.10.0" 2735 + version = "0.11.0-rc1" 2781 2736 dependencies = [ 2782 2737 "bytemuck", 2783 2738 "comemo", ··· 2789 2744 "tiny-skia", 2790 2745 "ttf-parser", 2791 2746 "typst", 2747 + "typst-macros", 2748 + "typst-timing", 2792 2749 "usvg", 2793 2750 ] 2794 2751 2795 2752 [[package]] 2796 2753 name = "typst-svg" 2797 - version = "0.10.0" 2754 + version = "0.11.0-rc1" 2798 2755 dependencies = [ 2799 - "base64", 2756 + "base64 0.22.0", 2800 2757 "comemo", 2801 2758 "ecow", 2802 2759 "flate2", 2803 - "tracing", 2804 2760 "ttf-parser", 2805 2761 "typst", 2762 + "typst-macros", 2763 + "typst-timing", 2806 2764 "xmlparser", 2807 2765 "xmlwriter", 2808 2766 ] 2809 2767 2810 2768 [[package]] 2811 2769 name = "typst-syntax" 2812 - version = "0.10.0" 2770 + version = "0.11.0-rc1" 2813 2771 dependencies = [ 2814 2772 "comemo", 2815 2773 "ecow", 2816 2774 "once_cell", 2817 2775 "serde", 2818 - "tracing", 2819 2776 "unicode-ident", 2820 2777 "unicode-math-class", 2821 2778 "unicode-script", ··· 2825 2782 2826 2783 [[package]] 2827 2784 name = "typst-tests" 2828 - version = "0.10.0" 2785 + version = "0.11.0-rc1" 2829 2786 dependencies = [ 2830 2787 "clap", 2831 2788 "comemo", 2832 2789 "ecow", 2833 - "iai", 2834 2790 "once_cell", 2835 2791 "oxipng", 2836 2792 "rayon", 2837 2793 "tiny-skia", 2838 2794 "ttf-parser", 2839 2795 "typst", 2796 + "typst-assets", 2797 + "typst-dev-assets", 2798 + "typst-ide", 2840 2799 "typst-pdf", 2841 2800 "typst-render", 2842 2801 "typst-svg", ··· 2845 2804 ] 2846 2805 2847 2806 [[package]] 2807 + name = "typst-timing" 2808 + version = "0.11.0-rc1" 2809 + dependencies = [ 2810 + "parking_lot", 2811 + "serde", 2812 + "serde_json", 2813 + "typst-syntax", 2814 + ] 2815 + 2816 + [[package]] 2848 2817 name = "unic-langid" 2849 - version = "0.9.1" 2818 + version = "0.9.4" 2850 2819 source = "registry+https://github.com/rust-lang/crates.io-index" 2851 - checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" 2820 + checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" 2852 2821 dependencies = [ 2853 2822 "unic-langid-impl", 2854 2823 ] 2855 2824 2856 2825 [[package]] 2857 2826 name = "unic-langid-impl" 2858 - version = "0.9.1" 2827 + version = "0.9.4" 2859 2828 source = "registry+https://github.com/rust-lang/crates.io-index" 2860 - checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" 2829 + checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" 2861 2830 dependencies = [ 2862 2831 "serde", 2863 2832 "tinystr", ··· 2874 2843 2875 2844 [[package]] 2876 2845 name = "unicode-bidi" 2877 - version = "0.3.13" 2846 + version = "0.3.15" 2878 2847 source = "registry+https://github.com/rust-lang/crates.io-index" 2879 - checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" 2848 + checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" 2880 2849 2881 2850 [[package]] 2882 2851 name = "unicode-bidi-mirroring" ··· 2904 2873 2905 2874 [[package]] 2906 2875 name = "unicode-normalization" 2907 - version = "0.1.22" 2876 + version = "0.1.23" 2908 2877 source = "registry+https://github.com/rust-lang/crates.io-index" 2909 - checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" 2878 + checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" 2910 2879 dependencies = [ 2911 2880 "tinyvec", 2912 2881 ] 2913 2882 2914 2883 [[package]] 2915 2884 name = "unicode-properties" 2916 - version = "0.1.0" 2885 + version = "0.1.1" 2917 2886 source = "registry+https://github.com/rust-lang/crates.io-index" 2918 - checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" 2887 + checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" 2919 2888 2920 2889 [[package]] 2921 2890 name = "unicode-script" 2922 - version = "0.5.5" 2891 + version = "0.5.6" 2923 2892 source = "registry+https://github.com/rust-lang/crates.io-index" 2924 - checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" 2893 + checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" 2925 2894 2926 2895 [[package]] 2927 2896 name = "unicode-segmentation" 2928 - version = "1.10.1" 2897 + version = "1.11.0" 2929 2898 source = "registry+https://github.com/rust-lang/crates.io-index" 2930 - checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" 2899 + checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" 2931 2900 2932 2901 [[package]] 2933 2902 name = "unicode-vo" ··· 2942 2911 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" 2943 2912 2944 2913 [[package]] 2945 - name = "unicode-xid" 2946 - version = "0.2.4" 2947 - source = "registry+https://github.com/rust-lang/crates.io-index" 2948 - checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" 2949 - 2950 - [[package]] 2951 - name = "unicode_names2" 2952 - version = "1.2.0" 2953 - source = "registry+https://github.com/rust-lang/crates.io-index" 2954 - checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f" 2955 - dependencies = [ 2956 - "phf", 2957 - "unicode_names2_generator", 2958 - ] 2959 - 2960 - [[package]] 2961 - name = "unicode_names2_generator" 2962 - version = "1.2.0" 2963 - source = "registry+https://github.com/rust-lang/crates.io-index" 2964 - checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7" 2965 - dependencies = [ 2966 - "getopts", 2967 - "log", 2968 - "phf_codegen", 2969 - "rand", 2970 - "time", 2971 - ] 2972 - 2973 - [[package]] 2974 2914 name = "unsafe-libyaml" 2975 - version = "0.2.9" 2915 + version = "0.2.10" 2976 2916 source = "registry+https://github.com/rust-lang/crates.io-index" 2977 - checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" 2917 + checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" 2978 2918 2979 2919 [[package]] 2980 2920 name = "unscanny" ··· 2983 2923 checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" 2984 2924 2985 2925 [[package]] 2986 - name = "untrusted" 2987 - version = "0.9.0" 2988 - source = "registry+https://github.com/rust-lang/crates.io-index" 2989 - checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" 2990 - 2991 - [[package]] 2992 2926 name = "ureq" 2993 - version = "2.9.1" 2927 + version = "2.9.6" 2994 2928 source = "registry+https://github.com/rust-lang/crates.io-index" 2995 - checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" 2929 + checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" 2996 2930 dependencies = [ 2997 - "base64", 2931 + "base64 0.21.7", 2998 2932 "flate2", 2999 2933 "log", 2934 + "native-tls", 3000 2935 "once_cell", 3001 - "rustls", 3002 - "rustls-webpki", 3003 2936 "serde", 3004 2937 "serde_json", 3005 2938 "url", 3006 - "webpki-roots", 3007 2939 ] 3008 2940 3009 2941 [[package]] ··· 3020 2952 3021 2953 [[package]] 3022 2954 name = "usvg" 3023 - version = "0.36.0" 2955 + version = "0.38.0" 3024 2956 source = "registry+https://github.com/rust-lang/crates.io-index" 3025 - checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" 2957 + checksum = "377f62b4a3c173de8654c1aa80ab1dac1154e6f13a779a9943e53780120d1625" 3026 2958 dependencies = [ 3027 - "base64", 2959 + "base64 0.21.7", 3028 2960 "log", 3029 2961 "pico-args", 3030 2962 "usvg-parser", ··· 3035 2967 3036 2968 [[package]] 3037 2969 name = "usvg-parser" 3038 - version = "0.36.0" 2970 + version = "0.38.0" 3039 2971 source = "registry+https://github.com/rust-lang/crates.io-index" 3040 - checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" 2972 + checksum = "351a05e6f2023d6b4e946f734240a3927aefdcf930d7d42587a2c8a8869814b0" 3041 2973 dependencies = [ 3042 2974 "data-url", 3043 2975 "flate2", ··· 3053 2985 3054 2986 [[package]] 3055 2987 name = "usvg-text-layout" 3056 - version = "0.36.0" 2988 + version = "0.38.0" 3057 2989 source = "registry+https://github.com/rust-lang/crates.io-index" 3058 - checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" 2990 + checksum = "8c41888b9d5cf431fe852eaf9d047bbde83251b98f1749c2f08b1071e6db46e2" 3059 2991 dependencies = [ 3060 2992 "fontdb", 3061 2993 "kurbo", ··· 3069 3001 3070 3002 [[package]] 3071 3003 name = "usvg-tree" 3072 - version = "0.36.0" 3004 + version = "0.38.0" 3073 3005 source = "registry+https://github.com/rust-lang/crates.io-index" 3074 - checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" 3006 + checksum = "18863e0404ed153d6e56362c5b1146db9f4f262a3244e3cf2dbe7d8a85909f05" 3075 3007 dependencies = [ 3076 - "rctree", 3077 3008 "strict-num", 3078 3009 "svgtypes", 3079 3010 "tiny-skia-path", ··· 3081 3012 3082 3013 [[package]] 3083 3014 name = "utf8_iter" 3084 - version = "1.0.3" 3015 + version = "1.0.4" 3085 3016 source = "registry+https://github.com/rust-lang/crates.io-index" 3086 - checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" 3017 + checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" 3087 3018 3088 3019 [[package]] 3089 3020 name = "utf8parse" ··· 3092 3023 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" 3093 3024 3094 3025 [[package]] 3095 - name = "valuable" 3096 - version = "0.1.0" 3026 + name = "vcpkg" 3027 + version = "0.2.15" 3097 3028 source = "registry+https://github.com/rust-lang/crates.io-index" 3098 - checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" 3029 + checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" 3099 3030 3100 3031 [[package]] 3101 3032 name = "version_check" ··· 3105 3036 3106 3037 [[package]] 3107 3038 name = "walkdir" 3108 - version = "2.4.0" 3039 + version = "2.5.0" 3109 3040 source = "registry+https://github.com/rust-lang/crates.io-index" 3110 - checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" 3041 + checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" 3111 3042 dependencies = [ 3112 3043 "same-file", 3113 3044 "winapi-util", ··· 3121 3052 3122 3053 [[package]] 3123 3054 name = "wasm-bindgen" 3124 - version = "0.2.89" 3055 + version = "0.2.92" 3125 3056 source = "registry+https://github.com/rust-lang/crates.io-index" 3126 - checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" 3057 + checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" 3127 3058 dependencies = [ 3128 3059 "cfg-if", 3129 3060 "wasm-bindgen-macro", ··· 3131 3062 3132 3063 [[package]] 3133 3064 name = "wasm-bindgen-backend" 3134 - version = "0.2.89" 3065 + version = "0.2.92" 3135 3066 source = "registry+https://github.com/rust-lang/crates.io-index" 3136 - checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" 3067 + checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" 3137 3068 dependencies = [ 3138 3069 "bumpalo", 3139 3070 "log", 3140 3071 "once_cell", 3141 3072 "proc-macro2", 3142 3073 "quote", 3143 - "syn 2.0.39", 3074 + "syn", 3144 3075 "wasm-bindgen-shared", 3145 3076 ] 3146 3077 3147 3078 [[package]] 3148 3079 name = "wasm-bindgen-macro" 3149 - version = "0.2.89" 3080 + version = "0.2.92" 3150 3081 source = "registry+https://github.com/rust-lang/crates.io-index" 3151 - checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" 3082 + checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" 3152 3083 dependencies = [ 3153 3084 "quote", 3154 3085 "wasm-bindgen-macro-support", ··· 3156 3087 3157 3088 [[package]] 3158 3089 name = "wasm-bindgen-macro-support" 3159 - version = "0.2.89" 3090 + version = "0.2.92" 3160 3091 source = "registry+https://github.com/rust-lang/crates.io-index" 3161 - checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" 3092 + checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" 3162 3093 dependencies = [ 3163 3094 "proc-macro2", 3164 3095 "quote", 3165 - "syn 2.0.39", 3096 + "syn", 3166 3097 "wasm-bindgen-backend", 3167 3098 "wasm-bindgen-shared", 3168 3099 ] 3169 3100 3170 3101 [[package]] 3171 3102 name = "wasm-bindgen-shared" 3172 - version = "0.2.89" 3103 + version = "0.2.92" 3173 3104 source = "registry+https://github.com/rust-lang/crates.io-index" 3174 - checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" 3105 + checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" 3175 3106 3176 3107 [[package]] 3177 3108 name = "wasmi" 3178 - version = "0.31.0" 3109 + version = "0.31.2" 3179 3110 source = "registry+https://github.com/rust-lang/crates.io-index" 3180 - checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" 3111 + checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" 3181 3112 dependencies = [ 3182 3113 "smallvec", 3183 3114 "spin", ··· 3188 3119 3189 3120 [[package]] 3190 3121 name = "wasmi_arena" 3191 - version = "0.4.0" 3122 + version = "0.4.1" 3192 3123 source = "registry+https://github.com/rust-lang/crates.io-index" 3193 - checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" 3124 + checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" 3194 3125 3195 3126 [[package]] 3196 3127 name = "wasmi_core" ··· 3214 3145 ] 3215 3146 3216 3147 [[package]] 3217 - name = "webpki-roots" 3218 - version = "0.25.3" 3219 - source = "registry+https://github.com/rust-lang/crates.io-index" 3220 - checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" 3221 - 3222 - [[package]] 3223 3148 name = "weezl" 3224 - version = "0.1.7" 3149 + version = "0.1.8" 3225 3150 source = "registry+https://github.com/rust-lang/crates.io-index" 3226 - checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" 3151 + checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" 3227 3152 3228 3153 [[package]] 3229 3154 name = "winapi" ··· 3258 3183 3259 3184 [[package]] 3260 3185 name = "windows-core" 3261 - version = "0.51.1" 3186 + version = "0.52.0" 3262 3187 source = "registry+https://github.com/rust-lang/crates.io-index" 3263 - checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" 3188 + checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" 3264 3189 dependencies = [ 3265 - "windows-targets", 3190 + "windows-targets 0.52.4", 3266 3191 ] 3267 3192 3268 3193 [[package]] ··· 3271 3196 source = "registry+https://github.com/rust-lang/crates.io-index" 3272 3197 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" 3273 3198 dependencies = [ 3274 - "windows-targets", 3199 + "windows-targets 0.48.5", 3200 + ] 3201 + 3202 + [[package]] 3203 + name = "windows-sys" 3204 + version = "0.52.0" 3205 + source = "registry+https://github.com/rust-lang/crates.io-index" 3206 + checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 3207 + dependencies = [ 3208 + "windows-targets 0.52.4", 3275 3209 ] 3276 3210 3277 3211 [[package]] ··· 3280 3214 source = "registry+https://github.com/rust-lang/crates.io-index" 3281 3215 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 3282 3216 dependencies = [ 3283 - "windows_aarch64_gnullvm", 3284 - "windows_aarch64_msvc", 3285 - "windows_i686_gnu", 3286 - "windows_i686_msvc", 3287 - "windows_x86_64_gnu", 3288 - "windows_x86_64_gnullvm", 3289 - "windows_x86_64_msvc", 3217 + "windows_aarch64_gnullvm 0.48.5", 3218 + "windows_aarch64_msvc 0.48.5", 3219 + "windows_i686_gnu 0.48.5", 3220 + "windows_i686_msvc 0.48.5", 3221 + "windows_x86_64_gnu 0.48.5", 3222 + "windows_x86_64_gnullvm 0.48.5", 3223 + "windows_x86_64_msvc 0.48.5", 3224 + ] 3225 + 3226 + [[package]] 3227 + name = "windows-targets" 3228 + version = "0.52.4" 3229 + source = "registry+https://github.com/rust-lang/crates.io-index" 3230 + checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 3231 + dependencies = [ 3232 + "windows_aarch64_gnullvm 0.52.4", 3233 + "windows_aarch64_msvc 0.52.4", 3234 + "windows_i686_gnu 0.52.4", 3235 + "windows_i686_msvc 0.52.4", 3236 + "windows_x86_64_gnu 0.52.4", 3237 + "windows_x86_64_gnullvm 0.52.4", 3238 + "windows_x86_64_msvc 0.52.4", 3290 3239 ] 3291 3240 3292 3241 [[package]] ··· 3296 3245 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" 3297 3246 3298 3247 [[package]] 3248 + name = "windows_aarch64_gnullvm" 3249 + version = "0.52.4" 3250 + source = "registry+https://github.com/rust-lang/crates.io-index" 3251 + checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" 3252 + 3253 + [[package]] 3299 3254 name = "windows_aarch64_msvc" 3300 3255 version = "0.48.5" 3301 3256 source = "registry+https://github.com/rust-lang/crates.io-index" 3302 3257 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" 3303 3258 3304 3259 [[package]] 3260 + name = "windows_aarch64_msvc" 3261 + version = "0.52.4" 3262 + source = "registry+https://github.com/rust-lang/crates.io-index" 3263 + checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" 3264 + 3265 + [[package]] 3305 3266 name = "windows_i686_gnu" 3306 3267 version = "0.48.5" 3307 3268 source = "registry+https://github.com/rust-lang/crates.io-index" 3308 3269 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" 3309 3270 3310 3271 [[package]] 3272 + name = "windows_i686_gnu" 3273 + version = "0.52.4" 3274 + source = "registry+https://github.com/rust-lang/crates.io-index" 3275 + checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" 3276 + 3277 + [[package]] 3311 3278 name = "windows_i686_msvc" 3312 3279 version = "0.48.5" 3313 3280 source = "registry+https://github.com/rust-lang/crates.io-index" 3314 3281 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" 3315 3282 3316 3283 [[package]] 3284 + name = "windows_i686_msvc" 3285 + version = "0.52.4" 3286 + source = "registry+https://github.com/rust-lang/crates.io-index" 3287 + checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" 3288 + 3289 + [[package]] 3317 3290 name = "windows_x86_64_gnu" 3318 3291 version = "0.48.5" 3319 3292 source = "registry+https://github.com/rust-lang/crates.io-index" 3320 3293 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" 3321 3294 3322 3295 [[package]] 3296 + name = "windows_x86_64_gnu" 3297 + version = "0.52.4" 3298 + source = "registry+https://github.com/rust-lang/crates.io-index" 3299 + checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" 3300 + 3301 + [[package]] 3323 3302 name = "windows_x86_64_gnullvm" 3324 3303 version = "0.48.5" 3325 3304 source = "registry+https://github.com/rust-lang/crates.io-index" 3326 3305 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" 3327 3306 3328 3307 [[package]] 3308 + name = "windows_x86_64_gnullvm" 3309 + version = "0.52.4" 3310 + source = "registry+https://github.com/rust-lang/crates.io-index" 3311 + checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" 3312 + 3313 + [[package]] 3329 3314 name = "windows_x86_64_msvc" 3330 3315 version = "0.48.5" 3331 3316 source = "registry+https://github.com/rust-lang/crates.io-index" 3332 3317 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" 3333 3318 3334 3319 [[package]] 3320 + name = "windows_x86_64_msvc" 3321 + version = "0.52.4" 3322 + source = "registry+https://github.com/rust-lang/crates.io-index" 3323 + checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" 3324 + 3325 + [[package]] 3335 3326 name = "winnow" 3336 - version = "0.5.19" 3327 + version = "0.6.5" 3337 3328 source = "registry+https://github.com/rust-lang/crates.io-index" 3338 - checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" 3329 + checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" 3339 3330 dependencies = [ 3340 3331 "memchr", 3341 3332 ] ··· 3357 3348 3358 3349 [[package]] 3359 3350 name = "xattr" 3360 - version = "1.0.1" 3351 + version = "1.3.1" 3361 3352 source = "registry+https://github.com/rust-lang/crates.io-index" 3362 - checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" 3353 + checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" 3363 3354 dependencies = [ 3364 3355 "libc", 3356 + "linux-raw-sys", 3357 + "rustix", 3365 3358 ] 3366 3359 3367 3360 [[package]] ··· 3430 3423 dependencies = [ 3431 3424 "proc-macro2", 3432 3425 "quote", 3433 - "syn 2.0.39", 3426 + "syn", 3434 3427 "synstructure", 3435 3428 ] 3436 3429 3437 3430 [[package]] 3438 - name = "zerocopy" 3439 - version = "0.7.26" 3440 - source = "registry+https://github.com/rust-lang/crates.io-index" 3441 - checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" 3442 - dependencies = [ 3443 - "zerocopy-derive", 3444 - ] 3445 - 3446 - [[package]] 3447 - name = "zerocopy-derive" 3448 - version = "0.7.26" 3449 - source = "registry+https://github.com/rust-lang/crates.io-index" 3450 - checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" 3451 - dependencies = [ 3452 - "proc-macro2", 3453 - "quote", 3454 - "syn 2.0.39", 3455 - ] 3456 - 3457 - [[package]] 3458 3431 name = "zerofrom" 3459 3432 version = "0.1.3" 3460 3433 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3471 3444 dependencies = [ 3472 3445 "proc-macro2", 3473 3446 "quote", 3474 - "syn 2.0.39", 3447 + "syn", 3475 3448 "synstructure", 3476 3449 ] 3477 3450 ··· 3507 3480 dependencies = [ 3508 3481 "proc-macro2", 3509 3482 "quote", 3510 - "syn 2.0.39", 3483 + "syn", 3511 3484 ] 3512 3485 3513 3486 [[package]]
+14 -4
pkgs/by-name/ty/typst/package.nix
··· 2 2 , rustPlatform 3 3 , fetchFromGitHub 4 4 , installShellFiles 5 + , pkg-config 6 + , openssl 7 + , xz 5 8 , stdenv 6 9 , darwin 7 10 }: 8 11 9 12 rustPlatform.buildRustPackage rec { 10 13 pname = "typst"; 11 - version = "0.10.0"; 14 + version = "0.11.0-rc1"; 12 15 13 16 src = fetchFromGitHub { 14 17 owner = "typst"; 15 18 repo = "typst"; 16 19 rev = "v${version}"; 17 - hash = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s="; 20 + hash = "sha256-jOq+aoBSRUTXldg8iWGSJ1z0y+3KbhZfVAgjZo9IsGo="; 18 21 }; 19 22 20 23 cargoLock = { 21 24 lockFile = ./Cargo.lock; 22 25 outputHashes = { 23 - "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; 26 + "typst-dev-assets-0.10.0" = "sha256-EBOZbblbavtsr2LEnoIF0UFmpSsm8Sq7ibxxWcAMIHY="; 24 27 }; 25 28 }; 26 29 27 30 nativeBuildInputs = [ 28 31 installShellFiles 32 + pkg-config 29 33 ]; 30 34 31 - buildInputs = lib.optionals stdenv.isDarwin [ 35 + buildInputs = [ 36 + openssl 37 + xz 38 + ] ++ lib.optionals stdenv.isDarwin [ 39 + darwin.apple_sdk.frameworks.CoreFoundation 32 40 darwin.apple_sdk.frameworks.CoreServices 41 + darwin.apple_sdk.frameworks.Security 33 42 ]; 34 43 35 44 env = { 36 45 GEN_ARTIFACTS = "artifacts"; 46 + OPENSSL_NO_VENDOR = true; 37 47 }; 38 48 39 49 postInstall = ''
+20
pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff
··· 1 + diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h 2 + index 49313744..456a5e96 100644 3 + --- a/src/source/common/ddesktopservicesthread.h 4 + +++ b/src/source/common/ddesktopservicesthread.h 5 + @@ -8,10 +8,14 @@ 6 + 7 + #include <QThread> 8 + 9 + +#include <dtkwidget_global.h> 10 + +#include <dtkgui_global.h> 11 + #include <DDesktopServices> 12 + #include <QDebug> 13 + #include <QFileInfo> 14 + + 15 + DWIDGET_USE_NAMESPACE 16 + +DGUI_USE_NAMESPACE 17 + 18 + // 文管打开文件目录线程 19 + class DDesktopServicesThread : public QThread 20 +
+13 -4
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "deepin-compressor"; 23 - version = "5.12.23"; 23 + version = "5.12.24"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "linuxdeepin"; 27 27 repo = pname; 28 28 rev = version; 29 - hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA="; 29 + hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; 30 30 }; 31 31 32 + patches = [ 33 + ./0001-fix-build-on-new-dtk.diff 34 + ]; 35 + 32 36 postPatch = '' 33 37 substituteInPlace src/source/common/pluginmanager.cpp \ 34 - --replace "/usr/lib/" "$out/lib/" 38 + --replace-fail "/usr/lib/" "$out/lib/" 35 39 substituteInPlace src/desktop/deepin-compressor.desktop \ 36 - --replace "/usr" "$out" 40 + --replace-fail "/usr" "$out" 37 41 ''; 38 42 39 43 nativeBuildInputs = [ ··· 59 63 cmakeFlags = [ 60 64 "-DVERSION=${version}" 61 65 "-DUSE_TEST=OFF" 66 + ]; 67 + 68 + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 69 + qtWrapperArgs = [ 70 + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 62 71 ]; 63 72 64 73 strictDeps = true;
+3
pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
··· 78 78 gst-plugins-good 79 79 ]); 80 80 81 + # Fix build failure on dtk 5.6.20 82 + env.NIX_CFLAGS_COMPILE = "-std=c++14"; 83 + 81 84 # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 82 85 qtWrapperArgs = [ 83 86 "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+2 -2
pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
··· 27 27 28 28 stdenv.mkDerivation rec { 29 29 pname = "deepin-system-monitor"; 30 - version = "6.0.9"; 30 + version = "6.0.13"; 31 31 32 32 src = fetchFromGitHub { 33 33 owner = "linuxdeepin"; 34 34 repo = pname; 35 35 rev = version; 36 - hash = "sha256-ompsCTPmmF7S0UHNNU0YDQiTdvcFglpEoS4o+XMZ7jg="; 36 + hash = "sha256-QwZPvEOYypSmbe3deqLRsI3VL/CgVc+Ql3JlsMZ9MqY="; 37 37 }; 38 38 39 39 postPatch = ''
+2 -2
pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
··· 5 5 6 6 stdenvNoCC.mkDerivation rec { 7 7 pname = "dde-account-faces"; 8 - version = "1.0.15"; 8 + version = "1.0.16"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - hash = "sha256-/eTGy+9fcYmGrh09RdCIZ2Cn12gTaGtg4Tluv25n5r0="; 14 + hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU="; 15 15 }; 16 16 17 17 makeFlags = [ "PREFIX=${placeholder "out"}/var" ];
+2 -2
pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
··· 8 8 9 9 stdenvNoCC.mkDerivation rec { 10 10 pname = "deepin-icon-theme"; 11 - version = "2023.11.28"; 11 + version = "2024.01.31"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "linuxdeepin"; 15 15 repo = pname; 16 16 rev = version; 17 - hash = "sha256-kCWJAmJa0VmhnuegE+acj82Ojl4Z5D8g7/q2PzppJwg="; 17 + hash = "sha256-08maujG5Tibsv9N+5olOeD8MrXTRiZh0OQm0bg8t+Cc="; 18 18 }; 19 19 20 20 makeFlags = [ "PREFIX=${placeholder "out"}" ];
+2 -2
pkgs/desktops/deepin/core/dde-app-services/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "dde-app-services"; 16 - version = "1.0.23"; 16 + version = "1.0.25"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "linuxdeepin"; 20 20 repo = pname; 21 21 rev = version; 22 - hash = "sha256-INxbRDpG3MqPW6IMTqEagDCGo7vwxkR6D1+lcWdjO3w="; 22 + hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo="; 23 23 }; 24 24 25 25 postPatch = ''
+3 -3
pkgs/desktops/deepin/core/dde-appearance/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "dde-appearance"; 20 - version = "1.1.6"; 20 + version = "1.1.25"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "linuxdeepin"; 24 24 repo = pname; 25 25 rev = version; 26 - hash = "sha256-7oRbydLXw8yRzi9L1GH/q0cjMY/DLyWbj4RUSyNpVNM="; 26 + hash = "sha256-H9TvWF6Q0lX4GF4mQ71E3SUqWbhH7dzHIlScovbN7lM="; 27 27 }; 28 28 29 29 patches = [ ··· 43 43 substituteInPlace src/service/modules/api/themethumb.cpp \ 44 44 --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" 45 45 46 - substituteInPlace src/service/dbus/deepinwmfaker.cpp \ 46 + substituteInPlace fakewm/dbus/deepinwmfaker.cpp \ 47 47 --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" 48 48 49 49 substituteInPlace src/service/modules/api/locale.cpp \
+3 -3
pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff
··· 11 11 "serial": 0, 12 12 "flags": [], 13 13 "name": "Background_Uris", 14 - diff --git a/src/service/dbus/deepinwmfaker.cpp b/src/service/dbus/deepinwmfaker.cpp 14 + diff --git a/fakewm/dbus/deepinwmfaker.cpp b/fakewm/dbus/deepinwmfaker.cpp 15 15 index 5d455fa..40ec608 100644 16 - --- a/src/service/dbus/deepinwmfaker.cpp 17 - +++ b/src/service/dbus/deepinwmfaker.cpp 16 + --- a/fakewm/dbus/deepinwmfaker.cpp 17 + +++ b/fakewm/dbus/deepinwmfaker.cpp 18 18 @@ -54,13 +54,13 @@ Q_GLOBAL_STATIC_WITH_ARGS(QGSettings, _gsettings_dde_zone, ("com.deepin.dde.zone 19 19 20 20 #define KWinDBusCompositorInterface "org.kde.kwin.Compositing"
+15 -27
pkgs/desktops/deepin/core/dde-application-manager/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , cmake 5 6 , pkg-config 6 7 , wrapQtAppsHook 7 8 , qtbase 8 - , dtkwidget 9 - , dde-polkit-agent 10 - , gsettings-qt 11 - , libcap 12 - , jemalloc 13 - , xorg 14 - , iconv 15 9 }: 16 10 17 11 stdenv.mkDerivation rec { 18 12 pname = "dde-application-manager"; 19 - version = "1.0.19"; 13 + version = "1.1.8"; 20 14 21 15 src = fetchFromGitHub { 22 16 owner = "linuxdeepin"; 23 17 repo = pname; 24 18 rev = version; 25 - hash = "sha256-1P265xqlL/wML66nKdfTgkRx6MCpLwrt5rXu+CyeShU="; 19 + hash = "sha256-ImyXSyQWMFLvmtx9mBxrr4/IFOgOH1BW650mbiwFh5U="; 26 20 }; 27 21 28 - # remove this patch after next release 29 - postPatch = '' 30 - substituteInPlace src/modules/mimeapp/mime_app.cpp src/modules/launcher/common.h src/service/main.cpp \ 31 - misc/dconf/com.deepin.dde.appearance.json \ 32 - --replace "/usr/share" "/run/current-system/sw/share" 33 - 34 - substituteInPlace src/lib/dlocale.cpp --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias" 35 - 36 - for file in $(grep -rl "/usr/bin"); do 37 - substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/" 38 - done 39 - ''; 22 + patches = [ 23 + (fetchpatch { 24 + name = "set-more-scale-envs-to-application.patch"; 25 + url = "https://github.com/linuxdeepin/dde-application-manager/commit/a1f8ad276d88c81249dd3468779862186a180238.patch"; 26 + hash = "sha256-/iKg6NZZomNEKYsZCZP1IfNr7ZAXiA9RVBnyf+M/f4w="; 27 + }) 28 + (fetchpatch { 29 + name = "support-execSearchPath-to-prevent-systemd-from-finding-binaries.patch"; 30 + url = "https://github.com/linuxdeepin/dde-application-manager/commit/2eaca7c6b8b841d571e9d3510f9f14c321cd976e.patch"; 31 + hash = "sha256-GWUIv4NIBLQpnY4GcjLShMjiXAfPi3zKdol3whchC/Y="; 32 + }) 33 + ]; 40 34 41 35 nativeBuildInputs = [ 42 36 cmake ··· 46 40 47 41 buildInputs = [ 48 42 qtbase 49 - dtkwidget 50 - gsettings-qt 51 - libcap 52 - jemalloc 53 - xorg.libXdmcp 54 - xorg.libXres 55 43 ]; 56 44 57 45 meta = with lib; {
+2 -2
pkgs/desktops/deepin/core/dde-calendar/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "dde-calendar"; 21 - version = "5.11.1"; 21 + version = "5.12.1"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "linuxdeepin"; 25 25 repo = pname; 26 26 rev = version; 27 - hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg="; 27 + hash = "sha256-p+KtObh2JT7aPcDCi0jmaNmLqB1aU3IvAiYrGmhErcI="; 28 28 }; 29 29 30 30 patches = [
+4 -2
pkgs/desktops/deepin/core/dde-control-center/default.nix
··· 17 17 , polkit-qt 18 18 , libxcrypt 19 19 , librsvg 20 + , gtest 20 21 , runtimeShell 21 22 , dbus 22 23 }: 23 24 24 25 stdenv.mkDerivation rec { 25 26 pname = "dde-control-center"; 26 - version = "6.0.28"; 27 + version = "6.0.44"; 27 28 28 29 src = fetchFromGitHub { 29 30 owner = "linuxdeepin"; 30 31 repo = pname; 31 32 rev = version; 32 - hash = "sha256-kgQ4ySiYtaklOqER56QtKD9lk1CnRSEAU4QPHycl9eI="; 33 + hash = "sha256-NN2CSIYByxeTZraK48lAsQSJYAOTDHzKT1FOa+VWMo0="; 33 34 }; 34 35 35 36 postPatch = '' ··· 57 58 polkit-qt 58 59 libxcrypt 59 60 librsvg 61 + gtest 60 62 ]; 61 63 62 64 cmakeFlags = [
+2 -2
pkgs/desktops/deepin/core/dde-dock/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "dde-dock"; 24 - version = "6.0.22"; 24 + version = "6.0.35"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "linuxdeepin"; 28 28 repo = pname; 29 29 rev = version; 30 - hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w="; 30 + hash = "sha256-ATC/Ze6GyjT92eCgAt9g2FIQbXLVHUMuXuAslNnbkCE="; 31 31 }; 32 32 33 33 postPatch = ''
+5 -10
pkgs/desktops/deepin/core/dde-file-manager/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , runtimeShell 6 5 , dtkwidget 7 6 , qt5integration ··· 44 43 45 44 stdenv.mkDerivation rec { 46 45 pname = "dde-file-manager"; 47 - version = "6.0.31"; 46 + version = "6.0.40"; 48 47 49 48 src = fetchFromGitHub { 50 49 owner = "linuxdeepin"; 51 50 repo = pname; 52 51 rev = version; 53 - hash = "sha256-mc2HcoLrwMXKU8w34KUEh62ZfEIfbJLVzz4JGnUE5EM="; 52 + hash = "sha256-fvxP6wle4hezt9nEDpTgK+xB4J5XIC0mP5jWCmkjJPA="; 54 53 }; 55 54 56 55 nativeBuildInputs = [ ··· 63 62 dontWrapGApps = true; 64 63 65 64 patches = [ 66 - ./use_v23_dbus_interface.diff 67 - 68 - (fetchpatch { 69 - name = "use-pkgconfig-to-check-mount.patch"; 70 - url = "https://github.com/linuxdeepin/dde-file-manager/commit/b6c210057d991591df45b80607a614e7a57a9dc0.patch"; 71 - hash = "sha256-k0ZYlOVN3hHs1qvvRaJ3i6okOhDE+DoUKGs9AhSFBGU="; 72 - }) 65 + ./patch_check_v23_interface.diff 73 66 ]; 74 67 75 68 postPatch = '' ··· 132 125 133 126 cmakeFlags = [ 134 127 "-DVERSION=${version}" 128 + "-DNIX_DEEPIN_VERSION=23" 129 + "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" 135 130 ]; 136 131 137 132 enableParallelBuilding = true;
+3 -3
pkgs/desktops/deepin/core/dde-file-manager/use_v23_dbus_interface.diff pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff
··· 1 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index e93d3ad..94e3eca 100644 2 + index 8a8cfb079..34092aa57 100644 3 3 --- a/CMakeLists.txt 4 4 +++ b/CMakeLists.txt 5 - @@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 5 + @@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 6 6 endif() 7 7 8 8 #Indentify the version 9 9 -if (${DEEPIN_OS_VERSION} MATCHES "23") 10 - +if (TRUE) 10 + +if (${NIX_DEEPIN_VERSION} MATCHES "23") 11 11 add_definitions(-DCOMPILE_ON_V23) 12 12 set(COMPLIE_ON_V23 TRUE) 13 13 message("COMPILE ON v23")
+7 -2
pkgs/desktops/deepin/core/dde-launchpad/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "dde-launchpad"; 18 - version = "0.3.0"; 18 + version = "0.4.4"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "linuxdeepin"; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-8m0DjQYih3hB/n2VHuJgUYBe8tpGwBU0NdkLxr1OsFc="; 24 + hash = "sha256-az8BC3n44NGpATNu3Exjn3H7Rumx/YqDXztEGqCpAbY="; 25 25 }; 26 + 27 + postPatch = '' 28 + substituteInPlace desktopintegration.cpp \ 29 + --replace "AppStreamQt/pool.h" "AppStreamQt5/pool.h" 30 + ''; 26 31 27 32 nativeBuildInputs = [ 28 33 cmake
+2 -2
pkgs/desktops/deepin/core/dde-network-core/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "dde-network-core"; 21 - version = "2.0.15"; 21 + version = "2.0.21"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "linuxdeepin"; 25 25 repo = pname; 26 26 rev = version; 27 - hash = "sha256-AMuWEz3Eyw0tG0srLWpqS7MO7Z4ZzIay4z59cZQZU0o="; 27 + hash = "sha256-xuPEh0o62seyxlW+MKGgv/DdheYibSI1K0RJAjxraCw="; 28 28 }; 29 29 30 30 nativeBuildInputs = [
+2 -2
pkgs/desktops/deepin/core/dde-session-shell/default.nix
··· 25 25 26 26 stdenv.mkDerivation rec { 27 27 pname = "dde-session-shell"; 28 - version = "6.0.10"; 28 + version = "6.0.17"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "linuxdeepin"; 32 32 repo = pname; 33 33 rev = version; 34 - hash = "sha256-h4X3RZe7+CxVeFmk/7+7K4d/2D1+jhECKQaxl4TsuvM="; 34 + hash = "sha256-X/aBMxrYeCT3I9ynV8cPzS23H44fHLkpkztewnfTNxA="; 35 35 }; 36 36 37 37 postPatch = ''
+2 -2
pkgs/desktops/deepin/core/dde-session-ui/default.nix
··· 17 17 18 18 stdenv.mkDerivation rec { 19 19 pname = "dde-session-ui"; 20 - version = "6.0.10"; 20 + version = "6.0.16"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "linuxdeepin"; 24 24 repo = pname; 25 25 rev = version; 26 - hash = "sha256-JwktVbwWdfqURhZuEFdB5oaKMsBZu5DekpZ2WGpcL4Q="; 26 + hash = "sha256-hxunGK7DxRuAbmi6PtylHCBajV3b1qbFVA+AiuOCcN0="; 27 27 }; 28 28 29 29 postPatch = ''
+5 -2
pkgs/desktops/deepin/core/dde-session/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "dde-session"; 18 - version = "1.1.9"; 18 + version = "1.2.5"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "linuxdeepin"; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-CyHvvNALXe4fOMjD48By/iaU6/xNUhH9yG19Ob3bHy0="; 24 + hash = "sha256-YYGRjVbVFyzmRhYu6sDtxzghocgM7Myr3K77AqWQk3E="; 25 25 }; 26 26 27 27 postPatch = '' 28 + substituteInPlace misc/CMakeLists.txt \ 29 + --replace "/etc" "$out/etc" 30 + 28 31 # Avoid using absolute path to distinguish applications 29 32 substituteInPlace src/dde-session/impl/sessionmanager.cpp \ 30 33 --replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \
+2 -2
pkgs/desktops/deepin/core/dde-widgets/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "dde-widgets"; 17 - version = "6.0.14"; 17 + version = "6.0.19"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "linuxdeepin"; 21 21 repo = pname; 22 22 rev = version; 23 - hash = "sha256-bmhT7UhMXtC5wlRtwlVnGjoq8rUQcDSk4rGQ0Xrz9ZI="; 23 + hash = "sha256-oB0lyfmxBSwqjXO+etYdc+DghZVSBU+LXYqK1WS5DaU="; 24 24 }; 25 25 26 26 nativeBuildInputs = [
+2 -2
pkgs/desktops/deepin/core/deepin-kwin/default.nix
··· 36 36 37 37 stdenv.mkDerivation rec { 38 38 pname = "deepin-kwin"; 39 - version = "5.25.11"; 39 + version = "5.25.15"; 40 40 41 41 src = fetchFromGitHub { 42 42 owner = "linuxdeepin"; 43 43 repo = pname; 44 44 rev = version; 45 - hash = "sha256-J92T1hsRmmtkjF9OPsrikRtd7bQSEG88UOYu+BHUSx0="; 45 + hash = "sha256-aI5wHEFfvZeoz4ykw9dVx/9e96T1Yahs4YZNutv+CYM="; 46 46 }; 47 47 48 48 patches = [
+2 -2
pkgs/desktops/deepin/default.nix
··· 1 - { lib, pkgs, config, libsForQt5 }: 1 + { lib, pkgs, config, libsForQt5, qt6Packages }: 2 2 let 3 3 packages = self: 4 4 let ··· 28 28 deepin-kwin = callPackage ./core/deepin-kwin { }; 29 29 dde-appearance = callPackage ./core/dde-appearance { }; 30 30 dde-app-services = callPackage ./core/dde-app-services { }; 31 - dde-application-manager = callPackage ./core/dde-application-manager { }; 31 + dde-application-manager = qt6Packages.callPackage ./core/dde-application-manager { }; 32 32 dde-control-center = callPackage ./core/dde-control-center { }; 33 33 dde-calendar = callPackage ./core/dde-calendar { }; 34 34 dde-clipboard = callPackage ./core/dde-clipboard { };
+8 -17
pkgs/desktops/deepin/go-package/dde-api/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , buildGoModule 6 5 , pkg-config 7 6 , deepin-gettext-tools ··· 21 20 22 21 buildGoModule rec { 23 22 pname = "dde-api"; 24 - version = "6.0.7"; 23 + version = "6.0.9"; 25 24 26 25 src = fetchFromGitHub { 27 26 owner = "linuxdeepin"; 28 27 repo = pname; 29 28 rev = version; 30 - hash = "sha256-kdf1CoZUyda6bOTW0WJTgaXYhocrjRU9ptj7i+k8aaQ="; 29 + hash = "sha256-ht5IaXi4nz0/U1zqp4JTiDkQ3NB69q24MgWfu45SpoY="; 31 30 }; 32 31 33 - patches = [ 34 - (fetchpatch { 35 - name = "modify_PKGBUILD_to_support_OBS.patch"; 36 - url = "https://github.com/linuxdeepin/dde-api/commit/1399522d032c6c649db79a33348cdb1a233bc23a.patch"; 37 - hash = "sha256-kSHnYaOxIvv7lAJnvxpSwyRDPyDxpAq9x+gJcBdU3T8="; 38 - }) 39 - ]; 40 - 41 - vendorHash = "sha256-4Yscw3QjWG1rlju6sMRHGn3dSe65b1nx10B3KeyAzBM="; 32 + vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; 42 33 43 34 postPatch = '' 44 35 substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \ 45 - --replace "/usr/bin/true" "${coreutils}/bin/true" 36 + --replace-fail "/usr/bin/true" "${coreutils}/bin/true" 46 37 47 38 substituteInPlace sound-theme-player/main.go \ 48 - --replace "/usr/sbin/alsactl" "alsactl" 39 + --replace-fail "/usr/sbin/alsactl" "alsactl" 49 40 50 41 substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \ 51 - --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" 42 + --replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" 52 43 53 44 substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \ 54 - --replace "/usr/share/dde-api" "$out/share/dde-api" 45 + --replace-fail "/usr/share/dde-api" "$out/share/dde-api" 55 46 56 47 substituteInPlace themes/{theme.go,settings.go} \ 57 - --replace "/usr/share" "/run/current-system/sw/share" 48 + --replace-fail "/usr/share" "/run/current-system/sw/share" 58 49 59 50 for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}') 60 51 do
+6 -5
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
··· 38 38 39 39 buildGoModule rec { 40 40 pname = "dde-daemon"; 41 - version = "6.0.22"; 41 + version = "6.0.34"; 42 42 43 43 src = fetchFromGitHub { 44 44 owner = "linuxdeepin"; 45 45 repo = pname; 46 46 rev = version; 47 - hash = "sha256-D7s6wWZeZHYl/aP/0qLYNn+lZEwGJAjFNbO0whKymck="; 47 + hash = "sha256-NIFgv6EUSnCqSdPttx6wrr7K1nRV/JIZJy9uS7uu0Sc="; 48 48 }; 49 49 50 - vendorHash = "sha256-U+G5CELpor34RgFzHpxfvJ/jBfWfE4ShjY2b2Z61BhE="; 50 + vendorHash = "sha256-F39QGxY0aD+hHWguHosSrSzcB/ahYbnFW9vVtS5oUnU="; 51 51 52 52 patches = [ 53 53 ./0001-dont-set-PATH.diff ··· 70 70 --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" 71 71 72 72 substituteInPlace bin/dde-system-daemon/wallpaper.go accounts1/user.go \ 73 - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" 73 + --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" 74 74 75 75 substituteInPlace timedate1/zoneinfo/zone.go \ 76 - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" 76 + --replace "/usr/share/dde" "$out/share/dde" \ 77 + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" 77 78 78 79 substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ 79 80 --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api"
+2 -2
pkgs/desktops/deepin/go-package/go-dbus-factory/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "go-dbus-factory"; 8 - version = "1.10.23"; 8 + version = "2.0.8"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - sha256 = "sha256-6u9Bpoa80j/K1MipncfM378/qmSSMZAlx88jE4hHYBk="; 14 + sha256 = "sha256-yzmr61wrBfZi+CuXFhtvOk7EaFtE8y3QyVwwgEDqwKY="; 15 15 }; 16 16 17 17 makeFlags = [ "PREFIX=${placeholder "out"}" ];
-61
pkgs/desktops/deepin/go-package/startdde/0001-avoid-use-hardcode-path.patch
··· 1 - diff --git a/misc/auto_launch/chinese.json b/misc/auto_launch/chinese.json 2 - index 14b8bff..2b2c412 100644 3 - --- a/misc/auto_launch/chinese.json 4 - +++ b/misc/auto_launch/chinese.json 5 - @@ -3,7 +3,7 @@ 6 - "Priority": 9, 7 - "Group": [ 8 - { 9 - - "Command": "/usr/bin/dde-file-manager", 10 - + "Command": "dde-file-manager", 11 - "Wait": false, 12 - "Args": [ 13 - "-d" 14 - @@ -25,7 +25,7 @@ 15 - "Priority": 7, 16 - "Group": [ 17 - { 18 - - "Command": "/usr/bin/dde-shutdown", 19 - + "Command": "dde-shutdown", 20 - "Wait": false, 21 - "Args": [ 22 - "-d" 23 - diff --git a/session.go b/session.go 24 - index da76626..bf9a2c4 100644 25 - --- a/session.go 26 - +++ b/session.go 27 - @@ -14,6 +14,7 @@ import ( 28 - "sync" 29 - "syscall" 30 - "time" 31 - + "strings" 32 - 33 - "github.com/adrg/xdg" 34 - "github.com/godbus/dbus/v5" 35 - @@ -85,7 +86,7 @@ type SessionManager struct { 36 - } 37 - 38 - const ( 39 - - cmdShutdown = "/usr/bin/dde-shutdown" 40 - + cmdShutdown = "dde-shutdown" 41 - lockFrontDest = "org.deepin.dde.LockFront1" 42 - lockFrontIfc = lockFrontDest 43 - lockFrontObjPath = "/org/deepin/dde/LockFront1" 44 - @@ -458,7 +459,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error { 45 - return dbusutil.ToError(err) 46 - } 47 - 48 - - if exe == "/usr/bin/dde-lock" { 49 - + if strings.Contains(exe, "dde-lock") { 50 - m.setLocked(value) 51 - return nil 52 - } 53 - @@ -478,7 +479,7 @@ func (m *SessionManager) SetLocked(sender dbus.Sender, value bool) *dbus.Error { 54 - return dbusutil.ToError(fmt.Errorf("desktop file %q is invalid", desktopFile)) 55 - } 56 - exe = info.GetExecutable() 57 - - if exe != "/usr/bin/dde-lock" { 58 - + if strings.Contains(exe, "dde-lock") { 59 - return dbusutil.ToError(fmt.Errorf("exe %q of desktop file %q is invalid", exe, desktopFile)) 60 - } 61 -
+5 -9
pkgs/desktops/deepin/go-package/startdde/default.nix
··· 19 19 20 20 buildGoModule rec { 21 21 pname = "startdde"; 22 - version = "6.0.10"; 22 + version = "6.0.13"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "linuxdeepin"; 26 26 repo = pname; 27 27 rev = version; 28 - hash = "sha256-B2B8QlA1Ps/ybVzionngtwDwTLd7H02RKJwcXymGlJM="; 28 + hash = "sha256-sftPQq4cSyCTuvVtvjT8YJDLQOpSbmnXEVzFwFFaU4U="; 29 29 }; 30 30 31 - patches = [ 32 - ./0001-avoid-use-hardcode-path.patch 33 - ]; 34 - 35 - vendorHash = "sha256-5BEOazAygYL1N+CaGAbUwdpHZ1EiHr6yNW27/bXNdZg="; 31 + vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; 36 32 37 33 postPatch = '' 38 - substituteInPlace display/manager.go session.go \ 34 + substituteInPlace display/manager.go \ 39 35 --replace "/bin/bash" "${runtimeShell}" 40 36 41 37 substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \ 42 38 --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" 43 39 44 - substituteInPlace display/manager.go utils.go session.go \ 40 + substituteInPlace display/manager.go \ 45 41 --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" 46 42 47 43 substituteInPlace misc/lightdm.conf --replace "/usr" "$out"
+2 -2
pkgs/desktops/deepin/library/dtkcommon/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "dtkcommon"; 9 - version = "5.6.17"; 9 + version = "5.6.21"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "linuxdeepin"; 13 13 repo = pname; 14 14 rev = version; 15 - hash = "sha256-mquBuF+Gzq5txxCczeS+gI8LshdKnK5WnpOCytNki+w="; 15 + hash = "sha256-wRTzgvtmbGJJaIwi1f5m98K2o6g7yZdnKYR1nsDDwk8="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+2 -2
pkgs/desktops/deepin/library/dtkcore/default.nix
··· 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "dtkcore"; 21 - version = "5.6.17"; 21 + version = "5.6.22"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "linuxdeepin"; 25 25 repo = pname; 26 26 rev = version; 27 - hash = "sha256-/MGSvT8tPn+KqqlM6FY2iFsArmAkYMW5Q3Sl4g4zvH0="; 27 + hash = "sha256-W8uLNWC8bYzrKrX/hq9p1h66dWrxp4Vt+/27zDJeAS4="; 28 28 }; 29 29 30 30 patches = [
+2 -2
pkgs/desktops/deepin/library/dtkdeclarative/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "dtkdeclarative"; 18 - version = "5.6.17"; 18 + version = "5.6.24"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "linuxdeepin"; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-P0F6GidGp+CkNplKnLiaYVtcxs6N66gGIx6UcplEt08="; 24 + hash = "sha256-bGy8e+JAyHiAwWvO5Xz1TubHUDP4i4nWUR4h5/appM0="; 25 25 }; 26 26 27 27 patches = [
+2 -9
pkgs/desktops/deepin/library/dtkgui/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , pkg-config 6 5 , cmake 7 6 , qttools ··· 16 15 17 16 stdenv.mkDerivation rec { 18 17 pname = "dtkgui"; 19 - version = "5.6.17"; 18 + version = "5.6.22"; 20 19 21 20 src = fetchFromGitHub { 22 21 owner = "linuxdeepin"; 23 22 repo = pname; 24 23 rev = version; 25 - hash = "sha256-ssCVMFCE1vhucYMxXkEZV5YlFxT1JdYGqrzILhWX1XI="; 24 + hash = "sha256-h3DFG6FaJXP9o9u8R31MtX3Z1+P3DrNDT8Xbd8tlI4Y="; 26 25 }; 27 26 28 27 patches = [ 29 28 ./fix-pkgconfig-path.patch 30 29 ./fix-pri-path.patch 31 - 32 - (fetchpatch { 33 - name = "fix_svg_with_filter_attribute_rendering_exception.patch"; 34 - url = "https://github.com/linuxdeepin/dtkgui/commit/f2c9327eb4989ab8ea96af7560c67d1cada794de.patch"; 35 - hash = "sha256-lfg09tgS4vPuYachRbHdaMYKWdZZ0lP0Hxakkr9JKGs="; 36 - }) 37 30 ]; 38 31 39 32 nativeBuildInputs = [
+2 -2
pkgs/desktops/deepin/library/dtkwidget/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "dtkwidget"; 23 - version = "5.6.17"; 23 + version = "5.6.22"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "linuxdeepin"; 27 27 repo = pname; 28 28 rev = version; 29 - hash = "sha256-oFmM0e7ht3lCL50pwS/v/BLFmT2jymQaUZ4SmLdxvMo="; 29 + hash = "sha256-szy1gPm+PsiUXGvo5QuXKYMVPCcaqVX47iu48WXOjWU="; 30 30 }; 31 31 32 32 patches = [
+2 -2
pkgs/desktops/deepin/library/image-editor/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "image-editor"; 18 - version = "1.0.35"; 18 + version = "1.0.41"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "linuxdeepin"; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-Xr4tueipQbRHyKLStTWeUcVbX7Baiz0YooaaVk65Y+U="; 24 + hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0="; 25 25 }; 26 26 27 27 postPatch = ''
+2 -2
pkgs/desktops/deepin/library/qt5integration/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "qt5integration"; 18 - version = "5.6.17"; 18 + version = "5.6.20"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "linuxdeepin"; 22 22 repo = pname; 23 23 rev = version; 24 - hash = "sha256-8ag/cFkjp5u/0/71xKR6z6dXp2NGRIYNNbzzEmgsDmc="; 24 + hash = "sha256-cmvscSIu3LOTKuMs/+JUdJAvQ7OB4o1k+LqfRxNefZU="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+2 -11
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , cmake 6 5 , extra-cmake-modules 7 6 , pkg-config ··· 18 17 19 18 stdenv.mkDerivation rec { 20 19 pname = "qt5platform-plugins"; 21 - version = "5.6.16"; 20 + version = "5.6.22"; 22 21 23 22 src = fetchFromGitHub { 24 23 owner = "linuxdeepin"; 25 24 repo = pname; 26 25 rev = version; 27 - hash = "sha256-1/biT8wR44+sdOMhBW/8KMUSBDK/UxuEqsyjTZyjBT4="; 26 + hash = "sha256-0XQ4s6xpFHoG6SC8RE8WVnbHH7qNeOYkhrYUkDEH8Dc="; 28 27 }; 29 28 30 29 nativeBuildInputs = [ ··· 43 42 wayland 44 43 dwayland 45 44 qtwayland 46 - ]; 47 - 48 - patches = [ 49 - (fetchpatch { 50 - name = "use-ECM-to-help-dwayland-find-wayland.patch"; 51 - url = "https://github.com/linuxdeepin/qt5platform-plugins/commit/d7f6230716a0ff5ce34fc7d292ec0af5bbac30e4.patch"; 52 - hash = "sha256-RY2+QBR3OjUGBX4Y9oVvIRY90IH9rTOCg8dCddkB2WE="; 53 - }) 54 45 ]; 55 46 56 47 cmakeFlags = [
+2 -2
pkgs/desktops/deepin/library/util-dfm/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "util-dfm"; 16 - version = "1.2.16"; 16 + version = "1.2.21"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "linuxdeepin"; 20 20 repo = pname; 21 21 rev = version; 22 - hash = "sha256-o5ubfCpgAHJXqihGyapq7Dj9eQlw2q6VoER/e37tM6w="; 22 + hash = "sha256-EqNca3heIUUV5joMskpriCY+7NwjUc/vmQwomDkru80="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+2 -2
pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
··· 5 5 }: 6 6 stdenvNoCC.mkDerivation rec { 7 7 pname = "deepin-desktop-base"; 8 - version = "2023.09.05"; 8 + version = "2024.01.03"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "linuxdeepin"; 12 12 repo = pname; 13 13 rev = version; 14 - hash = "sha256-Gqp56TbkuTOI3aT7UmRuYBjUwRiOoIUHiRf0DaY0yew="; 14 + hash = "sha256-45qR1LCnA8ZSrWykqNvvm7Dxbi5pQnAuFy6nZJrzyi0="; 15 15 }; 16 16 17 17 makeFlags = [ "DESTDIR=${placeholder "out"}" ];
+7 -5
pkgs/development/compilers/cakelisp/default.nix
··· 1 - { lib, stdenv, fetchgit, fetchpatch, gcc, unstableGitUpdater }: 1 + { lib, stdenv, fetchgit, gcc, unstableGitUpdater }: 2 2 3 - stdenv.mkDerivation rec { 3 + stdenv.mkDerivation { 4 4 pname = "cakelisp"; 5 5 # using unstable as it's the only version that builds against gcc-13 6 - version = "0.3.0-unstable-2023-12-18"; 6 + version = "0.3.0-unstable-2024-02-21"; 7 7 8 8 src = fetchgit { 9 9 url = "https://macoy.me/code/macoy/cakelisp"; 10 - rev = "866fa2806d3206cc9dd398f0e86640db5be42bd6"; 11 - hash = "sha256-vwMZUNy+updwk69ahA/D9LhO68eV6wH0Prq+o/i1Q/A="; 10 + rev = "75ce620b265bf83c6952c0093df2b9d4f7f32a54"; 11 + hash = "sha256-X+tWq2QQogy4d042pcVuldc80jcClYtV09Jr91rHJl4="; 12 12 }; 13 13 14 14 buildInputs = [ gcc ]; ··· 29 29 ./Build.sh 30 30 runHook postBuild 31 31 ''; 32 + 33 + env.NIX_CFLAGS_COMPILE = "-Wno-error=format"; 32 34 33 35 installPhase = '' 34 36 runHook preInstall
+6 -8
pkgs/development/interpreters/quickjs/default.nix
··· 1 1 { lib 2 2 , stdenv 3 - , fetchFromGitHub 3 + , fetchurl 4 4 , texinfo 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "quickjs"; 9 - version = "2021-12-09"; 9 + version = "2024-01-13"; 10 10 11 - src = fetchFromGitHub { 12 - owner = "bellard"; 13 - repo = pname; 14 - rev = "daa35bc1e5d43192098af9b51caeb4f18f73f9f9"; 15 - hash = "sha256-BhAsa8tumCQ4jK/TbRbptj2iOIUFFjU1MQYdIrDMpko="; 11 + src = fetchurl { 12 + url = "https://bellard.org/quickjs/quickjs-${version}.tar.xz"; 13 + hash = "sha256-PEv4+JW/pUvrSGyNEhgRJ3Hs/FrDvhA2hR70FWghLgM="; 16 14 }; 17 15 18 16 postPatch = lib.optionalString stdenv.isDarwin '' 19 17 substituteInPlace Makefile --replace "CONFIG_LTO=y" "" 20 18 ''; 21 19 22 - makeFlags = [ "prefix=${placeholder "out"}" ]; 20 + makeFlags = [ "PREFIX=${placeholder "out"}" ]; 23 21 enableParallelBuilding = true; 24 22 25 23 nativeBuildInputs = [
+2 -2
pkgs/development/libraries/libadwaita/default.nix
··· 22 22 23 23 stdenv.mkDerivation (finalAttrs: { 24 24 pname = "libadwaita"; 25 - version = "1.4.3"; 25 + version = "1.4.4"; 26 26 27 27 outputs = [ "out" "dev" "devdoc" ]; 28 28 outputBin = "devdoc"; # demo app ··· 32 32 owner = "GNOME"; 33 33 repo = "libadwaita"; 34 34 rev = finalAttrs.version; 35 - hash = "sha256-ctHAN0SY6k68jaBpmIpMm8DngC9DPiL1vAmGhECpNic="; 35 + hash = "sha256-AZP5OH/LIroBeKioe7AIVx0FvFdTpWJ1INdRPZcjmHQ="; 36 36 }; 37 37 38 38 depsBuildBuild = [
+8
pkgs/development/libraries/v8/default.nix
··· 79 79 80 80 patches = [ 81 81 ./darwin.patch 82 + 83 + # gcc-13 build fix for mixxign <cstdint> includes 84 + (fetchpatch { 85 + name = "gcc-13.patch"; 86 + url = "https://chromium.googlesource.com/v8/v8/+/c2792e58035fcbaa16d0cb70998852fbeb5df4cc^!?format=TEXT"; 87 + decode = "base64 -d"; 88 + hash = "sha256-hoPAkSaCmzXflPFXaKUwVPLECMpt6N6/8m8mBSTAHbU="; 89 + }) 82 90 ]; 83 91 84 92 src = v8Src;
+9 -4
pkgs/development/python-modules/aiocache/default.nix
··· 1 1 { lib 2 - , aioredis 3 2 , buildPythonPackage 4 3 , fetchFromGitHub 5 4 , msgpack 6 5 , pythonOlder 6 + , redis 7 + , setuptools 7 8 }: 8 9 9 10 buildPythonPackage rec { 10 11 pname = "aiocache"; 11 12 version = "0.12.2"; 12 - format = "setuptools"; 13 + pyproject = true; 13 14 14 15 disabled = pythonOlder "3.7"; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "aio-libs"; 18 - repo = pname; 19 + repo = "aiocache"; 19 20 rev = "refs/tags/v${version}"; 20 21 hash = "sha256-yvXDNJL8uxReaU81klVWudJwh1hmvg5GeeILcNpm/YA="; 21 22 }; 22 23 24 + nativeBuildInputs = [ 25 + setuptools 26 + ]; 27 + 23 28 passthru.optional-dependencies = { 24 29 redis = [ 25 - aioredis 30 + redis 26 31 ]; 27 32 msgpack = [ 28 33 msgpack
+3 -3
pkgs/development/python-modules/fakeredis/default.nix
··· 1 1 { lib 2 - , aioredis 3 2 , buildPythonPackage 4 3 , fetchFromGitHub 5 4 , hypothesis 5 + , jsonpath-ng 6 6 , lupa 7 7 , poetry-core 8 8 , pybloom-live ··· 49 49 lua = [ 50 50 lupa 51 51 ]; 52 - aioredis = [ 53 - aioredis 52 + json = [ 53 + jsonpath-ng 54 54 ]; 55 55 bf = [ 56 56 pyprobables
+2 -2
pkgs/development/python-modules/hg-git/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "hg-git"; 12 - version = "1.1.0"; 12 + version = "1.1.1"; 13 13 format = "pyproject"; 14 14 15 15 disabled = pythonOlder "3.7"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - hash = "sha256-btEamGLqCC5PRigxHbe49/bnJNVGm6Czf852JaAdB38="; 19 + hash = "sha256-r04Q6zbt8VM1jYkoGOdJZqKPPxXy4jC1X1d9nJ+fEWY="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/langchain-community/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "langchain-community"; 20 - version = "0.0.26"; 20 + version = "0.0.27"; 21 21 pyproject = true; 22 22 23 23 disabled = pythonOlder "3.8"; ··· 25 25 src = fetchPypi { 26 26 pname = "langchain_community"; 27 27 inherit version; 28 - hash = "sha256-K3W+HVDEWqMap4WYDnuFN0gUeJPSEe9nljJKYuqfrCg="; 28 + hash = "sha256-Jm3/vUwWZtsYicrZU/pRAtTev/eCM1NTtteGNqdhd40="; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+3 -2
pkgs/development/python-modules/nevow/default.nix
··· 1 1 { lib, buildPythonPackage, fetchPypi, isPy3k, twisted }: 2 2 3 3 buildPythonPackage rec { 4 - pname = "Nevow"; 4 + pname = "nevow"; 5 5 version = "0.14.5"; 6 6 disabled = isPy3k; 7 7 8 8 src = fetchPypi { 9 - inherit version pname; 9 + pname = "Nevow"; 10 + inherit version; 10 11 sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; 11 12 }; 12 13
+8 -6
pkgs/development/python-modules/systembridgemodels/default.nix
··· 5 5 , fetchpatch2 6 6 , setuptools 7 7 , incremental 8 + , pytestCheckHook 8 9 }: 9 10 10 11 buildPythonPackage rec { 11 12 pname = "systembridgemodels"; 12 - version = "4.0.0"; 13 + version = "4.0.1"; 13 14 pyproject = true; 14 15 15 16 disabled = pythonOlder "3.11"; ··· 18 19 owner = "timmo001"; 19 20 repo = "system-bridge-models"; 20 21 rev = "refs/tags/${version}"; 21 - hash = "sha256-4nbTsVRqtoX4UhTrQS4HwoLtx0RO1VA8UewSAWOSsik="; 22 + hash = "sha256-9k85tqJO/YtkYncfNQBelmDkd3SYtf6SHURfumvqUo0="; 22 23 }; 23 24 24 25 patches = [ 25 26 (fetchpatch2 { 26 - url = "https://github.com/timmo001/system-bridge-models/commit/7cd506760fd47c0f3717b6fcfe127b673e3198f8.patch"; 27 - hash = "sha256-i+GCcoyX07ii9Kj46dtAlT85jUKfF0KHEH9++UTjiik="; 27 + url = "https://github.com/timmo001/system-bridge-models/commit/82fcee37cb302bc77384165b2ce10f2234c2a14a.patch"; 28 + hash = "sha256-tZSaWVUPCJmuzkae9LBTdyZ3UINMvrSMbdS5AvbId8Q="; 28 29 }) 29 30 ]; 30 31 ··· 38 39 39 40 pythonImportsCheck = [ "systembridgemodels" ]; 40 41 41 - # upstream has no tests 42 - doCheck = false; 42 + nativeCheckInputs = [ 43 + pytestCheckHook 44 + ]; 43 45 44 46 meta = { 45 47 changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}";
+2 -2
pkgs/development/python-modules/types-requests/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "types-requests"; 11 - version = "2.31.0.20240218"; 11 + version = "2.31.0.20240310"; 12 12 pyproject = true; 13 13 14 14 src = fetchPypi { 15 15 inherit pname version; 16 - hash = "sha256-8XIduoOFlY9QSlOGJAuS3kc04EegikB1HBZU0awzScU="; 16 + hash = "sha256-iiAXHgiKD3iTqsSQpffzfp9T4U1rdixdVWI76gIu4G8="; 17 17 }; 18 18 19 19 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/vector/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "vector"; 18 - version = "1.2.0"; 18 + version = "1.3.0"; 19 19 format = "pyproject"; 20 20 21 21 disabled = pythonOlder "3.8"; 22 22 23 23 src = fetchPypi { 24 24 inherit pname version; 25 - hash = "sha256-I7esW9qyc7T5MGFn/YZmajd3pSgE0CgqVW2YkTDLV6Q="; 25 + hash = "sha256-nQ7tzYVOmcF0oklmhxbgH4w5cJ+cwuJi1ihich7D7yc="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+2 -2
pkgs/development/tools/build-managers/xmake/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "xmake"; 15 - version = "2.8.7"; 15 + version = "2.8.8"; 16 16 17 17 src = fetchurl { 18 18 url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; 19 - hash = "sha256-jHqMb3ex/BcF54ViTpoelEcWhEqDeP7Oc0HeJ7mfC4k="; 19 + hash = "sha256-UJFlQJleO59K1xr3Gy0Zh751SkaNGzGZxE5CWyMv0KM="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+5 -4
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
··· 1 1 { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: 2 2 3 3 let 4 - version = "16.7.0"; 4 + version = "16.9.1"; 5 5 in 6 6 buildGoModule rec { 7 7 inherit version; ··· 17 17 # For patchShebangs 18 18 buildInputs = [ bash ]; 19 19 20 - vendorHash = "sha256-SHtxkB4qJMfhjo3UVjqBzD647AWIXIk10VtH/CMIB1I="; 20 + vendorHash = "sha256-ErDwGjU6085/on5qazLME3stTLYhP8quHV/EoIZOO04="; 21 21 22 22 src = fetchFromGitLab { 23 23 owner = "gitlab-org"; 24 24 repo = "gitlab-runner"; 25 25 rev = "v${version}"; 26 - sha256 = "sha256-pVD3DCrujsrDJPt/DXelMYSK+u25aV2YUMDW+22QHwI="; 26 + sha256 = "sha256-NEDqXgc0hbQc5BzyPuxddW+rvAWUz8KxnqSkzTDDu/I="; 27 27 }; 28 28 29 29 patches = [ ··· 40 40 41 41 # No writable developer environment 42 42 rm common/build_test.go 43 + rm common/build_settings_test.go 43 44 rm executors/custom/custom_test.go 44 45 45 46 # No docker during build ··· 67 68 meta = with lib; { 68 69 description = "GitLab Runner the continuous integration executor of GitLab"; 69 70 license = licenses.mit; 70 - homepage = "https://about.gitlab.com/gitlab-ci/"; 71 + homepage = "https://docs.gitlab.com/runner/"; 71 72 platforms = platforms.unix ++ platforms.darwin; 72 73 maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; 73 74 };
+3 -3
pkgs/development/tools/just/default.nix pkgs/by-name/ju/just/package.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "just"; 14 - version = "1.25.0"; 14 + version = "1.25.1"; 15 15 outputs = [ "out" "man" "doc" ]; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "casey"; 19 19 repo = pname; 20 20 rev = "refs/tags/${version}"; 21 - hash = "sha256-ymFBR40lY1ZX6vLH6KDX0a9mI9eOuOJY4bjp2UBubG4="; 21 + hash = "sha256-CvOnvUez2mfta9aXmdsLFxpVB/TGDw0y0ha3OyNJ2DE="; 22 22 }; 23 23 24 - cargoHash = "sha256-B10p57SZSzccs53/OtqFuftHJSxaHRpa+cHODqBo8t4="; 24 + cargoHash = "sha256-b4hprcYOcY0z0UnUe3pGc87j+X3n52btYlaCemETLYg="; 25 25 26 26 nativeBuildInputs = [ installShellFiles mdbook ]; 27 27 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
pkgs/development/tools/just/setup-hook.sh pkgs/by-name/ju/just/setup-hook.sh
+3 -3
pkgs/games/openjk/default.nix
··· 32 32 }; 33 33 in stdenv.mkDerivation { 34 34 pname = "OpenJK"; 35 - version = "0-unstable-2024-02-20"; 35 + version = "0-unstable-2024-03-05"; 36 36 37 37 src = fetchFromGitHub { 38 38 owner = "JACoders"; 39 39 repo = "OpenJK"; 40 - rev = "1e8a7998ca2fe434daebb41d586ac3cd5296433a"; 41 - sha256 = "sha256-TKJNaz+oWNYyReFZVefg1frPXyd3Yl96JDklp1qY1to="; 40 + rev = "62124e18ef09b293ea66a1f673b827d83e073928"; 41 + sha256 = "sha256-2LgxRWoAfxNE6YDyrpNmDH9APhi2XH4ufNCNMd91llU="; 42 42 }; 43 43 44 44 dontAddPrefix = true;
+16 -9
pkgs/os-specific/linux/conky/default.nix
··· 16 16 17 17 , ncursesSupport ? true , ncurses ? null 18 18 , x11Support ? true , freetype, xorg 19 + , waylandSupport ? true , pango, wayland, wayland-protocols, wayland-scanner 19 20 , xdamageSupport ? x11Support, libXdamage ? null 20 21 , doubleBufferSupport ? x11Support 21 22 , imlib2Support ? x11Support, imlib2 ? null 22 23 23 24 , luaSupport ? true , lua ? null 24 25 , luaImlib2Support ? luaSupport && imlib2Support 25 - , luaCairoSupport ? luaSupport && x11Support, cairo ? null 26 + , luaCairoSupport ? luaSupport && (x11Support || waylandSupport), cairo ? null 26 27 , toluapp ? null 27 28 28 29 , wirelessSupport ? true , wirelesstools ? null ··· 76 77 hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo="; 77 78 }; 78 79 79 - postPatch = '' 80 - sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ 81 - cmake/ConkyPlatformChecks.cmake 82 - '' + optionalString docsSupport '' 80 + postPatch = optionalString docsSupport '' 83 81 substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" 84 82 85 83 cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp 84 + '' + optionalString waylandSupport '' 85 + substituteInPlace src/CMakeLists.txt \ 86 + --replace 'COMMAND ''${Wayland_SCANNER}' 'COMMAND wayland-scanner' 86 87 ''; 87 88 88 89 env = { ··· 91 92 NIX_LDFLAGS = "-lgcc_s"; 92 93 }; 93 94 94 - nativeBuildInputs = [ cmake pkg-config ]; 95 + nativeBuildInputs = [ cmake pkg-config ] 96 + ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] 97 + ++ optional waylandSupport wayland-scanner 98 + ++ optional luaImlib2Support toluapp 99 + ++ optional luaCairoSupport toluapp 100 + ; 95 101 buildInputs = [ glib libXinerama ] 96 - ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] 97 102 ++ optional ncursesSupport ncurses 98 103 ++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ] 104 + ++ optionals waylandSupport [ pango wayland wayland-protocols ] 99 105 ++ optional xdamageSupport libXdamage 100 106 ++ optional imlib2Support imlib2 101 107 ++ optional luaSupport lua 102 - ++ optionals luaImlib2Support [ toluapp imlib2 ] 103 - ++ optionals luaCairoSupport [ toluapp cairo ] 108 + ++ optional luaImlib2Support imlib2 109 + ++ optional luaCairoSupport cairo 104 110 ++ optional wirelessSupport wirelesstools 105 111 ++ optional curlSupport curl 106 112 ++ optional rssSupport libxml2 ··· 121 127 ++ optional (!ncursesSupport) "-DBUILD_NCURSES=OFF" 122 128 ++ optional rssSupport "-DBUILD_RSS=ON" 123 129 ++ optional (!x11Support) "-DBUILD_X11=OFF" 130 + ++ optional waylandSupport "-DBUILD_WAYLAND=ON" 124 131 ++ optional xdamageSupport "-DBUILD_XDAMAGE=ON" 125 132 ++ optional doubleBufferSupport "-DBUILD_XDBE=ON" 126 133 ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
··· 6 6 # NOTE: When updating these, please also take a look at the changes done to 7 7 # kernel config in the xanmod version commit 8 8 ltsVariant = { 9 - version = "6.6.19"; 10 - hash = "sha256-DfoClySWV0vlDDRAJsujGj5ypnGr+HsVbszCYfi+2V0="; 9 + version = "6.6.21"; 10 + hash = "sha256-DDkjrtKK7zIffVMuBtHvSWp0GtMA87YuOp8AhUw64+Y="; 11 11 variant = "lts"; 12 12 }; 13 13 14 14 mainVariant = { 15 - version = "6.7.7"; 16 - hash = "sha256-Y+SvnvkFOGCxq+hGwpiiymNr1rYbNqppNA0d63TyUmo="; 15 + version = "6.7.9"; 16 + hash = "sha256-/YoZTclMdJBQ8iwpfm/Ne/YLNQneN0hccy95o3fWvGM="; 17 17 variant = "main"; 18 18 }; 19 19
+2 -2
pkgs/os-specific/linux/r8125/default.nix
··· 4 4 pname = "r8125"; 5 5 # On update please verify (using `diff -r`) that the source matches the 6 6 # realtek version. 7 - version = "9.011.01"; 7 + version = "9.012.03"; 8 8 9 9 # This is a mirror. The original website[1] doesn't allow non-interactive 10 10 # downloads, instead emailing you a download link. ··· 13 13 owner = "louistakepillz"; 14 14 repo = "r8125"; 15 15 rev = version; 16 - sha256 = "sha256-QV1DKkWVtqcnuqgAdJnPpj6Z6ch+lw61zpouXKlyfqQ="; 16 + sha256 = "sha256-+CrxvKB96QOcOo87McZOt/XUhriTtTV8jTQgpBG3ejs="; 17 17 }; 18 18 19 19 hardeningDisable = [ "pic" ];
+2 -1
pkgs/os-specific/linux/usbutils/default.nix
··· 27 27 meta = with lib; { 28 28 homepage = "http://www.linux-usb.org/"; 29 29 description = "Tools for working with USB devices, such as lsusb"; 30 - maintainers = with maintainers; [ ]; 30 + maintainers = with maintainers; [ cafkafk ]; 31 31 license = licenses.gpl2Plus; 32 32 platforms = platforms.linux; 33 + mainProgram = "lsusb"; 33 34 }; 34 35 }
+3 -3
pkgs/servers/mattermost/default.nix
··· 12 12 # See https://docs.mattermost.com/upgrade/extended-support-release.html 13 13 # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update 14 14 # the version regex in passthru.updateScript as well. 15 - version = "9.5.1"; 15 + version = "9.5.2"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "mattermost"; 19 19 repo = "mattermost"; 20 20 rev = "v${version}"; 21 - hash = "sha256-w+VF8VoS7oIcDlYS5kCFzSX4rgD9l1B99XBHeJDB6JI="; 21 + hash = "sha256-NYP0mhON+TCvNTSx4I4hddFGF9TWtnMAwyJvX8sEdWU="; 22 22 }; 23 23 24 24 # Needed because buildGoModule does not support go workspaces yet. ··· 34 34 35 35 webapp = fetchurl { 36 36 url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; 37 - hash = "sha256-F32NWulKUhoyHPCmCCih6Hb9+W2iuF/Mxy9USrgp1pM="; 37 + hash = "sha256-ogiowbNYHo9NTQLAg1OKXp8pV1Zn7kPcZR9ukaKvpKA="; 38 38 }; 39 39 40 40 vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE=";
+3 -3
pkgs/servers/miniflux/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "miniflux"; 5 - version = "2.1.0"; 5 + version = "2.1.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "miniflux"; 9 9 repo = "v2"; 10 10 rev = "refs/tags/${version}"; 11 - hash = "sha256-c7xKgu3039gTmxdWXoYWuuYDD/oPv3/uYS3m8KRkhTk="; 11 + hash = "sha256-vXSOHZt6Ov5g4fQBg0bubCfn76aaVrjw2b+LRebbV6s="; 12 12 }; 13 13 14 - vendorHash = "sha256-PuyWik0OA77gJipnuOyRgrCCQlDj9gTM/LDRBl6mBRo="; 14 + vendorHash = "sha256-p31kwJZQMYff5Us6mXpPmxbPrEXyxU6Sipf4LKSG3wU="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 17
+3 -3
pkgs/servers/minio/default.nix
··· 21 21 in 22 22 buildGoModule rec { 23 23 pname = "minio"; 24 - version = "2024-02-26T09-33-48Z"; 24 + version = "2024-03-07T00-43-48Z"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "minio"; 28 28 repo = "minio"; 29 29 rev = "RELEASE.${version}"; 30 - hash = "sha256-V5Pmp36YA0u1Z2SBNdJZAHQuA3PgVKHmIJlDElhS24s="; 30 + hash = "sha256-W82479M4Bgq1ERpiAR6Zc5YDr8vADOtQThV6lSlDuTs="; 31 31 }; 32 32 33 - vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M="; 33 + vendorHash = "sha256-VHokz58pSZd2Tt3hG8MgpeilEMFGjOZ/y6YKt9Fe5xw="; 34 34 35 35 doCheck = false; 36 36
+3 -3
pkgs/tools/misc/fzf/default.nix
··· 24 24 in 25 25 buildGoModule rec { 26 26 pname = "fzf"; 27 - version = "0.46.1"; 27 + version = "0.47.0"; 28 28 29 29 src = fetchFromGitHub { 30 30 owner = "junegunn"; 31 31 repo = pname; 32 32 rev = version; 33 - hash = "sha256-gMSelLwIIYv/vkbdWi4Cw3FEy4lbC8P/5+T+c/e66+c="; 33 + hash = "sha256-rIRn8g4j/drWEHnvZnJW2sSLq5mrw8Q2pn3LN2sEXDY="; 34 34 }; 35 35 36 - vendorHash = "sha256-8ojmIETUyZ3jDhrqkHYnxptRG8vdj0GADYvEpw0wi6w="; 36 + vendorHash = "sha256-BOPACUQKcllmA2eWQs+sOfofAQLle2Byb/rZgOhmkVY="; 37 37 38 38 CGO_ENABLED = 0; 39 39
+3 -3
pkgs/tools/networking/hysteria/default.nix
··· 4 4 }: 5 5 buildGoModule rec { 6 6 pname = "hysteria"; 7 - version = "2.2.4"; 7 + version = "2.3.0"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "apernet"; 11 11 repo = pname; 12 12 rev = "app/v${version}"; 13 - hash = "sha256-A8UTnvH5BYRETsjte65+M+HHO6MrqCiPthNEYwBkBYs="; 13 + hash = "sha256-sjQrHvUdGPdzKpXuJ9ZWp4S9pram8QaygKLT2WRmd2M="; 14 14 }; 15 15 16 - vendorHash = "sha256-uh/qYQBWsyazSbJIz1ykf5bap18fGSIfjVDL8zus2l0="; 16 + vendorHash = "sha256-btDWsvhKygWda4x45c8MSOROq6ujJVV9l0PkGQKWM6A="; 17 17 proxyVendor = true; 18 18 19 19 ldflags =
+18 -18
pkgs/tools/networking/ngrok/versions.json
··· 1 1 { 2 2 "linux-386": { 3 3 "sys": "linux-386", 4 - "url": "https://bin.equinox.io/a/5FUi7gCzPvi/ngrok-v3-3.6.0-linux-386", 5 - "sha256": "2036fc58594c7205aebaa09e9665d5c706391746122a417e57fa9a1bce62a727", 6 - "version": "3.6.0" 4 + "url": "https://bin.equinox.io/a/NYbWaAdCby/ngrok-v3-3.7.0-linux-386", 5 + "sha256": "3fbf2296a8ce35c7d050ed4c828ef4eacc8724852faaaaa8054822ee72426606", 6 + "version": "3.7.0" 7 7 }, 8 8 "linux-amd64": { 9 9 "sys": "linux-amd64", 10 - "url": "https://bin.equinox.io/a/e6rvYmQb6MC/ngrok-v3-3.6.0-linux-amd64", 11 - "sha256": "14e6118f1021b5b8421945a13b15ec501bc88aef0089b1dbf31d1fb229115d9e", 12 - "version": "3.6.0" 10 + "url": "https://bin.equinox.io/a/doBjqyzrcYM/ngrok-v3-3.7.0-linux-amd64", 11 + "sha256": "d1f7149079bb3bce0a70619580818a0ec09ac20da25f64a268203c2a3a019a47", 12 + "version": "3.7.0" 13 13 }, 14 14 "linux-arm": { 15 15 "sys": "linux-arm", 16 - "url": "https://bin.equinox.io/a/iTLH8EwDQN2/ngrok-v3-3.6.0-linux-arm", 17 - "sha256": "0bbc395cc610c0017d12a812496856677f6a653f60a76203d0f031914e4cf7bc", 18 - "version": "3.6.0" 16 + "url": "https://bin.equinox.io/a/hgUUy2bUaz9/ngrok-v3-3.7.0-linux-arm", 17 + "sha256": "5f2f0bf4ae42f5c8dcb945694bd1aedf963d631c39ba0cb9c0b9626eb396b2c4", 18 + "version": "3.7.0" 19 19 }, 20 20 "linux-arm64": { 21 21 "sys": "linux-arm64", 22 - "url": "https://bin.equinox.io/a/ibBBjsbrZAm/ngrok-v3-3.6.0-linux-arm64", 23 - "sha256": "39575a951352e571f6f96fd4409cbaa675dc4593786c9f198c2fb45360361f02", 24 - "version": "3.6.0" 22 + "url": "https://bin.equinox.io/a/9p821sdaKqh/ngrok-v3-3.7.0-linux-arm64", 23 + "sha256": "f43af93d9d7a9af22a2a5423a0b7b964790b1d2dccfd532142a807282360c21a", 24 + "version": "3.7.0" 25 25 }, 26 26 "darwin-amd64": { 27 27 "sys": "darwin-amd64", 28 - "url": "https://bin.equinox.io/a/61nYpJWvYHR/ngrok-v3-3.6.0-darwin-amd64", 29 - "sha256": "05ecb8a6e79cfe57663a085d5fc7cfeddd5867b25fc185829c39de4d25e5857d", 30 - "version": "3.6.0" 28 + "url": "https://bin.equinox.io/a/cC8QZtu8eV3/ngrok-v3-3.7.0-darwin-amd64", 29 + "sha256": "30903672a673454feaafde92e09f04804a3fcea69ef9c02027b6fb12e2ae8df2", 30 + "version": "3.7.0" 31 31 }, 32 32 "darwin-arm64": { 33 33 "sys": "darwin-arm64", 34 - "url": "https://bin.equinox.io/a/9Zzu7daqPHA/ngrok-v3-3.6.0-darwin-arm64", 35 - "sha256": "812829dac649b27f99eaf361306a014eb7ff28d005c3c9d087171342fce9472e", 36 - "version": "3.6.0" 34 + "url": "https://bin.equinox.io/a/jwjx5C5dodJ/ngrok-v3-3.7.0-darwin-arm64", 35 + "sha256": "99df3b5a7a1cbf943931aba41fdbb9b7081ea860ef9dec41b7fb08e53433d498", 36 + "version": "3.7.0" 37 37 } 38 38 }
+1 -1
pkgs/top-level/aliases.nix
··· 171 171 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 172 172 crispyDoom = crispy-doom; # Added 2023-05-01 173 173 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 174 - clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10 174 + clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 175 175 clasp = clingo; # added 2022-12-22 176 176 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 177 177 clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09
+22 -19
pkgs/top-level/all-packages.nix
··· 4640 4640 4641 4641 clash-geoip = callPackage ../data/misc/clash-geoip { }; 4642 4642 4643 - clash-verge = callPackage ../applications/networking/clash-verge { }; 4644 - 4645 4643 clevercsv = with python3Packages; toPythonApplication clevercsv; 4646 4644 4647 4645 clevis = callPackage ../tools/security/clevis { ··· 8498 8496 8499 8497 gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; 8500 8498 8501 - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { 8502 - buildGoModule = buildGo120Module; 8503 - }; 8499 + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; 8504 8500 8505 8501 gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; 8506 8502 ··· 9551 9547 9552 9548 junkie = callPackage ../tools/networking/junkie { }; 9553 9549 9554 - just = callPackage ../development/tools/just { }; 9555 - 9556 9550 go-jira = callPackage ../applications/misc/go-jira { }; 9557 9551 9558 9552 jogl = callPackage ../by-name/jo/jogl/package.nix { ··· 11579 11573 }; 11580 11574 11581 11575 ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; 11576 + 11577 + sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { }; 11582 11578 11583 11579 opensp = callPackage ../tools/text/sgml/opensp { }; 11584 11580 ··· 18342 18338 buildJdk = jdk11_headless; 18343 18339 buildJdkName = "java11"; 18344 18340 runJdk = jdk11_headless; 18345 - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat; 18341 + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv 18342 + else if stdenv.cc.isGNU then gcc10Stdenv 18343 + else stdenv; 18346 18344 bazel_self = bazel_4; 18347 18345 }; 18348 18346 18349 - bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 { 18347 + bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { 18350 18348 inherit (darwin) cctools sigtool; 18351 18349 inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; 18352 18350 buildJdk = jdk11_headless; 18353 18351 runJdk = jdk11_headless; 18354 - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; 18352 + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv 18353 + else if stdenv.cc.isGNU then gcc12Stdenv 18354 + else stdenv; 18355 18355 bazel_self = bazel_5; 18356 - }); 18356 + }; 18357 18357 18358 - bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { 18358 + bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { 18359 18359 inherit (darwin) cctools; 18360 18360 inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; 18361 18361 buildJdk = jdk11_headless; 18362 18362 runJdk = jdk11_headless; 18363 - stdenv = if stdenv.isDarwin then 18364 - darwin.apple_sdk_11_0.stdenv else 18365 - if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; 18363 + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv 18364 + else if stdenv.cc.isClang then llvmPackages.stdenv 18365 + else if stdenv.cc.isGNU then gcc12Stdenv 18366 + else stdenv; 18366 18367 bazel_self = bazel_6; 18367 - }); 18368 + }; 18368 18369 18369 18370 bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { 18370 18371 inherit (darwin) cctools sigtool; ··· 25126 25127 25127 25128 ucommon = callPackage ../development/libraries/ucommon { }; 25128 25129 25129 - v8 = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/v8 ( 25130 + v8 = callPackage ../development/libraries/v8 ( 25130 25131 let 25131 25132 stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" 25132 25133 then overrideLibcxx llvmPackages_15.stdenv ··· 25135 25136 { 25136 25137 stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; 25137 25138 } 25138 - )); 25139 + ); 25139 25140 25140 25141 intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; 25141 25142 ··· 26657 26658 26658 26659 azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; 26659 26660 26660 - miniflux = callPackage ../servers/miniflux { }; 26661 + miniflux = callPackage ../servers/miniflux { 26662 + buildGoModule = buildGo122Module; 26663 + }; 26661 26664 26662 26665 mir = callPackage ../servers/mir { }; 26663 26666