diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-09 06:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-09 06:01:23 +0000 |
commit | d961005060b52c47ccc96a2dfabd05a10bd0395b (patch) | |
tree | 7e39dc5c58a33d32d783e4def55c8e90b2847447 /pkgs/by-name | |
parent | 92bc6ad75d3d8484a5fb733cd46943c0a27c2e8c (diff) | |
parent | 050990f547404484d39f990edd59947344b6aef5 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/ae/aeron-cpp/aeron-all.patch | 11 | ||||
-rw-r--r-- | pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch | 11 | ||||
-rw-r--r-- | pkgs/by-name/ae/aeron-cpp/package.nix | 134 | ||||
-rw-r--r-- | pkgs/by-name/me/mercure/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/no/nomnatong/package.nix | 51 | ||||
-rw-r--r-- | pkgs/by-name/sa/satty/package.nix | 15 | ||||
-rw-r--r-- | pkgs/by-name/ui/uiua/package.nix | 6 |
7 files changed, 216 insertions, 18 deletions
diff --git a/pkgs/by-name/ae/aeron-cpp/aeron-all.patch b/pkgs/by-name/ae/aeron-cpp/aeron-all.patch new file mode 100644 index 0000000000000..40dd24c14b0c1 --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/aeron-all.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -323,7 +323,7 @@ if (BUILD_AERON_ARCHIVE_API) + "${CMAKE_CURRENT_SOURCE_DIR}}/aeron-archive/src/main/java/*.java") + + add_custom_command(OUTPUT ${AERON_ALL_JAR} +- COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} ${GRADLE_WRAPPER} :aeron-all:clean :aeron-all:assemble --no-daemon -x javadoc --console=plain -q ++ COMMAND ln --symbolic ${CMAKE_CURRENT_SOURCE_DIR}/aeron-all.jar ${AERON_ALL_JAR} + DEPENDS ${AERON_ALL_SOURCES} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating aeron-all jar") diff --git a/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch b/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch new file mode 100644 index 0000000000000..d4a845f2bf7b2 --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch @@ -0,0 +1,11 @@ +--- a/aeron-archive/src/main/cpp/CMakeLists.txt ++++ b/aeron-archive/src/main/cpp/CMakeLists.txt +@@ -59,7 +59,7 @@ set(GENERATED_CODECS + ${ARCHIVE_CODEC_TARGET_DIR}/aeron_archive_client/RecordingSignalEvent.h) + + add_custom_command(OUTPUT ${GENERATED_CODECS} +- COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} ${GRADLE_WRAPPER} -Dcodec.target.dir=${ARCHIVE_CODEC_TARGET_DIR} :aeron-archive:generateCppCodecs --no-daemon --console=plain -q ++ COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} java -cp sbe.jar -Dsbe.output.dir=${ARCHIVE_CODEC_TARGET_DIR} -Dsbe.target.language=Cpp -Dsbe.target.namespace=aeron.archive.client uk.co.real_logic.sbe.SbeTool ${ARCHIVE_CODEC_SCHEMA_DIR}/aeron-archive-codecs.xml + DEPENDS ${CODEC_SCHEMA} aeron-all-jar + WORKING_DIRECTORY ${ARCHIVE_CODEC_WORKING_DIR} + COMMENT "Generating C++ Archive codecs") diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix new file mode 100644 index 0000000000000..28feed78cc49b --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -0,0 +1,134 @@ +{ + autoPatchelfHook, + cmake, + fetchFromGitHub, + fetchMavenArtifact, + jdk11, + lib, + libbsd, + libuuid, + makeWrapper, + patchelf, + stdenv, + zlib +}: + +let + version = "1.42.1"; + + aeronAll = fetchMavenArtifact { + artifactId = "aeron-all"; + groupId = "io.aeron"; + inherit version; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + }; + + sbeAll_1_29_0 = fetchMavenArtifact { + groupId = "uk.co.real-logic"; + version = "1.29.0"; + artifactId = "sbe-all"; + hash = "sha512-exklKS9MgOH369lyuv+5vAWRHt+Iwg/FmsWy8PsSMjenvjs8I2KA1VTa00pIXkw/YNqbUDBIWvS07b4mS8YdPQ=="; + }; + + sbeAll = sbeAll_1_29_0; + +in + +stdenv.mkDerivation { + pname = "aeron-cpp"; + inherit version; + + src = fetchFromGitHub { + owner = "real-logic"; + repo = "aeron"; + rev = version; + hash = "sha256-ODJeJ4XLazPeNLdzaoclPnE59NpxFUqZu3Aw3iTVQT8="; + }; + + patches = [ + ./aeron-all.patch + # Use pre-built aeron-all.jar from Maven repo, avoiding Gradle + + ./aeron-archive-sbe.patch + # Use SBE tool to generate C++ codecs, avoiding Gradle + ]; + + buildInputs = [ + jdk11 + libbsd + libuuid + zlib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + makeWrapper + patchelf + ]; + + configurePhase = '' + runHook preConfigure + + mkdir --parents cppbuild/Release + ( + cd cppbuild/Release + cmake \ + -G "CodeBlocks - Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DAERON_TESTS=OFF \ + -DAERON_SYSTEM_TESTS=OFF \ + -DAERON_BUILD_SAMPLES=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=../../install \ + ../.. + ) + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + ln --symbolic "${aeronAll.jar}" ./aeron-all.jar + ln --symbolic "${sbeAll.jar}" ./sbe.jar + mkdir --parents aeron-all/build/libs + ( + cd cppbuild/Release + + make -j $NIX_BUILD_CORES \ + aeron \ + aeron_archive_client \ + aeron_client_shared \ + aeron_driver \ + aeron_client \ + aeron_driver_static \ + aeronmd + + make -j $NIX_BUILD_CORES install + ) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir --parents "$out" + cp --archive --verbose --target-directory="$out" install/* + + runHook postInstall + ''; + + meta = with lib; { + description = "Aeron Messaging C++ Library"; + homepage = "https://aeron.io/"; + license = licenses.asl20; + mainProgram = "aeronmd"; + maintainers = [ maintainers.vaci ]; + sourceProvenance = [ + sourceTypes.fromSource + sourceTypes.binaryBytecode + ]; + }; +} + diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index e90bd8d10ba4c..06b674d6a5bbb 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.15.5"; + version = "0.15.6"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA="; + hash = "sha256-sGMjb7Ilm+RqR6bRGLAYB/nciE5oHeitDllr4H11uHU="; }; sourceRoot = "source/caddy"; - vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw="; + vendorHash = "sha256-v0YKlkflo7eKXh38uqsnxZlLr3+fFl8EMeUsf8UMU48="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix new file mode 100644 index 0000000000000..e4913f463e6b2 --- /dev/null +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, python3Packages +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nomnatong"; + version = "5.07"; + + src = fetchFromGitHub { + owner = "nomfoundation"; + repo = "font"; + rev = "v${finalAttrs.version}"; + hash = "sha256-31sqjOIrJByfTx4Ez6KvQDApCeVYMQnGeiM9INMR3zI="; + }; + + nativeBuildInputs = [ + python3Packages.afdko + python3Packages.fonttools + ]; + + sourceRoot = "${finalAttrs.src.name}/src"; + + buildPhase = '' + runHook preBuild + + makeotf -r -f font.pfa -omitMacNames -ff features.txt -mf FontMenuNameDB -ga -ci UnicodeVariationSequences.txt + otf2ttf NomNaTong-Regular.otf + sfntedit -d DSIG NomNaTong-Regular.otf + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 NomNaTong-Regular.otf -t $out/share/fonts/opentype/ + install -Dm444 NomNaTong-Regular.ttf -t $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = { + homepage = "http://nomfoundation.org/nom-tools/Nom-Font"; + description = "The Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 40592a3d7dc37..e358397a48b30 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -9,31 +9,22 @@ , gtk4 , libadwaita , pango -, fetchpatch , copyDesktopItems }: rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-x2ljheG7ZqaeiPersC/e8Er2jvk5TJs65Y3N1GjTiNU="; + hash = "sha256-w2kosnPDWUZqp6iyj6ypAGRlmYSby+9B6epsAkFK6eY="; }; - cargoPatches = [ - (fetchpatch { - name = "fix-Cargo.lock"; - url = "https://github.com/gabm/Satty/commit/39be6ddce264552df971e949a6a3175b102530b2.patch"; - hash = "sha256-GUHupZE1A7AmXvZ8WvRzBkQyH7qlMTetBjHuakfIZ7w="; - }) - ]; - - cargoHash = "sha256-0GsbWd/gpKZm7nNXkuJhB02YKUj3XCrSfpRA9KBXydU="; + cargoHash = "sha256-XeuzoHXSiKtA9ofCBOMHnKKzcmur+/TS96DnzIfpqUA="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 5e91612f3613e..8ad589954ceb5 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-xDHr3U+Lc/C2L7jER2VqJvvw9mxCkDzO+K8tzC4Fw2A="; + hash = "sha256-/yeLsuwEKw6+jBKd7CAnR9RuVaKwXjVpcvO3v0FaAck="; }; - cargoHash = "sha256-9xjTXQJVGIvdx+SfJGPVa5Ax9wvS4Fms7blxAVrt6IY="; + cargoHash = "sha256-4tR1n96s91EFZLO4RIBpNKLjOSbGrBIApJrS60RBuQQ="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook |