Merge staging-next into staging
This commit is contained in:
@@ -27,13 +27,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"aiven_aiven": {
|
||||
"hash": "sha256-nh8ZxBPWeH4J8+/E0LppTmzx7WInkJVmt2NluC91OcY=",
|
||||
"hash": "sha256-0f+ZxjMoPyOL4qatcRVk8jjn9TAZkinUX7eYQ1hv+FQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.54.0",
|
||||
"rev": "v4.55.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-Ai51lUT782wnua4DIcFkxXCbnSBIhTduUO91zL7LBJY="
|
||||
"vendorHash": "sha256-toCbbqzi0h6hUeyKMClUBcWsh8+H00K0IjdkgZ5HmOs="
|
||||
},
|
||||
"akamai_akamai": {
|
||||
"hash": "sha256-/+IE06obx4Rxzz3uh5QbeS/FhGlK2qTJJFWGAlDWJaw=",
|
||||
@@ -580,13 +580,13 @@
|
||||
"vendorHash": "sha256-mk+fmLdbDBAqwLjQd4xZNW+DK6EDwJYnAMVSSTs2jQM="
|
||||
},
|
||||
"hashicorp_google-beta": {
|
||||
"hash": "sha256-iEAe+eRMRSnsxS8CtmF/vr1PwGcMvhnba/eedx+hS6w=",
|
||||
"hash": "sha256-qiROr5WjyX2CJQ4JyhNeD0pQhhhFf45RBUotRxpjT5c=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.28.0",
|
||||
"rev": "v7.29.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-6AUZpHNEqruuOcnkmEiLe53D+cUf8TmbvEHS0kuHyzU="
|
||||
"vendorHash": "sha256-s6mbjjbQ6VJvZ9Cz//CywP5vF27s5oKHg4GsC0gnYRM="
|
||||
},
|
||||
"hashicorp_helm": {
|
||||
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
|
||||
|
||||
@@ -14,20 +14,20 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2026.3.0";
|
||||
version = "2026.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
tag = "cli-v${finalAttrs.version}";
|
||||
hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U=";
|
||||
hash = "sha256-QhkuGW3R577zHpTZ1+GPhEtSUdZAKrAN/WPJhA5AA7c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove code under unfree license
|
||||
rm -r bitwarden_license
|
||||
|
||||
# Upstream cli-v2026.3.0 bumps @napi-rs/cli to 3.5.1 in the desktop workspace,
|
||||
# Upstream cli-v2026.4.1 bumps @napi-rs/cli to 3.5.1 in the desktop workspace,
|
||||
# but the root lockfile still points that entry at 3.2.0.
|
||||
substituteInPlace package-lock.json \
|
||||
--replace-fail \
|
||||
@@ -38,7 +38,7 @@ buildNpmPackage (finalAttrs: {
|
||||
nodejs = nodejs_22;
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
npmDepsHash = "sha256-JVRwU5MUQ8YzhCW7ODiyVqbgq7/PxgMV9dlw7i32MfI=";
|
||||
npmDepsHash = "sha256-QCN0fyXr/D39MJnwOyAvYu5hANj8flk3HMVuw9kaJwc=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
perl
|
||||
@@ -97,6 +97,7 @@ buildNpmPackage (finalAttrs: {
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
|
||||
passthru = {
|
||||
inherit (finalAttrs) npmDeps;
|
||||
tests = {
|
||||
vaultwarden = nixosTests.vaultwarden.sqlite;
|
||||
};
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0611614fe18..a6dcb2f04b6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
|
||||
@@ -2651,7 +2651,7 @@
|
||||
)
|
||||
if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
|
||||
if(APPLE)
|
||||
@@ -12,10 +11,9 @@ index 0611614fe18..a6dcb2f04b6 100644
|
||||
# with Xcode-11 (the Clang of which doesn't support the flag).
|
||||
message(
|
||||
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
|
||||
index b2db64bbd2e..aac4b552655 100644
|
||||
--- a/build_files/cmake/platform/platform_apple.cmake
|
||||
+++ b/build_files/cmake/platform/platform_apple.cmake
|
||||
@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR)
|
||||
@@ -55,7 +55,6 @@
|
||||
endif()
|
||||
endif()
|
||||
if(NOT EXISTS "${LIBDIR}/.git")
|
||||
@@ -23,7 +21,7 @@ index b2db64bbd2e..aac4b552655 100644
|
||||
endif()
|
||||
if(FIRST_RUN)
|
||||
message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
|
||||
@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE)
|
||||
@@ -115,10 +114,6 @@
|
||||
find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
|
||||
find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
|
||||
list(APPEND LIBSNDFILE_LIBRARIES
|
||||
@@ -34,48 +32,44 @@ index b2db64bbd2e..aac4b552655 100644
|
||||
)
|
||||
|
||||
print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
|
||||
@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG)
|
||||
@@ -169,9 +164,7 @@
|
||||
set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
|
||||
set(FFMPEG_FIND_COMPONENTS
|
||||
avcodec avdevice avformat avutil
|
||||
avcodec avdevice avfilter avformat avutil
|
||||
- mp3lame ogg opus swresample swscale
|
||||
- theora theoradec theoraenc vorbis vorbisenc
|
||||
- vorbisfile vpx x264)
|
||||
+ swresample swscale)
|
||||
# Frameworks required by libavfilter, using legacy macOS CGL
|
||||
string(APPEND PLATFORM_LINKFLAGS " -framework CoreImage -framework OpenGL")
|
||||
if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
|
||||
list(APPEND FFMPEG_FIND_COMPONENTS aom)
|
||||
endif()
|
||||
@@ -285,7 +278,6 @@ endif()
|
||||
add_bundled_libraries(boost/lib)
|
||||
@@ -250,7 +243,6 @@
|
||||
endif()
|
||||
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
- string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it !
|
||||
endif()
|
||||
|
||||
if(WITH_PUGIXML)
|
||||
@@ -361,7 +353,7 @@ endif()
|
||||
# CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
|
||||
if(WITH_OPENMP)
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
- if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0)
|
||||
+ if(FALSE) # clang in nix was compatible with openmp
|
||||
if(WITH_STRICT_BUILD_OPTIONS)
|
||||
message(SEND_ERROR "OpenMP library is not compatible with the current Clang version")
|
||||
else()
|
||||
@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS
|
||||
@@ -411,12 +403,12 @@
|
||||
" -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
|
||||
)
|
||||
|
||||
-if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
|
||||
-if(${XCODE_VERSION} VERSION_EQUAL 15.0)
|
||||
+if(FALSE)
|
||||
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
|
||||
# V4.5 specific workaround: Enforce the legacy Xcode linker to avoid incorrect
|
||||
# assembly generation caused by known bugs in the modern linker shipped with
|
||||
# Xcode 15.0. See issue #148792 for details.
|
||||
string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
|
||||
-elseif(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
|
||||
+elseif(FALSE)
|
||||
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64" AND WITH_LEGACY_MACOS_X64_LINKER)
|
||||
# Silence "no platform load command found in <static library>, assuming: macOS".
|
||||
string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
|
||||
#
|
||||
diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
|
||||
index 935b3f94ee1..f3d73637f71 100644
|
||||
--- a/source/blender/blendthumb/CMakeLists.txt
|
||||
+++ b/source/blender/blendthumb/CMakeLists.txt
|
||||
@@ -65,15 +65,6 @@ elseif(APPLE)
|
||||
@@ -81,16 +81,6 @@
|
||||
# Prevent Xcode from overwriting the signature.
|
||||
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
|
||||
)
|
||||
@@ -85,8 +79,9 @@ index 935b3f94ee1..f3d73637f71 100644
|
||||
- # Command taken from XCode build process.
|
||||
- add_custom_command(
|
||||
- TARGET blender-thumbnailer POST_BUILD
|
||||
- COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
|
||||
- --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
|
||||
- COMMAND codesign --deep --force --sign -
|
||||
- --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
|
||||
- --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
|
||||
- )
|
||||
elseif(UNIX)
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
@@ -138,6 +138,9 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
# Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
|
||||
++ lib.optionals rocmSupport [
|
||||
./hiprt-3-compat.patch
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
./darwin.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
@@ -312,6 +315,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
apple-sdk_15
|
||||
brotli
|
||||
llvmPackages.openmp
|
||||
openxr-loader
|
||||
]
|
||||
)
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [ sse2neon ]
|
||||
@@ -446,7 +450,6 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "3D Creation/Animation/Publishing System";
|
||||
homepage = "https://www.blender.org";
|
||||
# They comment two licenses: GPLv2 and Blender License, but they
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "harper";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3NwQOs0G0b13dnCN0oif863/BJ2zAUFXsF9TpFeMDLA=";
|
||||
hash = "sha256-9AA2uln9cnMzFvPbxiD05sfdAZKO7xzoJSfQbeRNE9Y=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
|
||||
cargoHash = "sha256-+WUmNmFBuk9lQsUXYBEpTo49Ygul0BPRY0kcHCCC0GU=";
|
||||
cargoHash = "sha256-P90qKrV4YK1ATwclbJ8wX+rcCdE1QetNNL96/IXeIMA=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -70,7 +70,6 @@ ps.buildPythonApplication (finalAttrs: {
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${qtWrapperArgs[@]}"
|
||||
--set QT_QPA_PLATFORM xcb
|
||||
--prefix PATH : ${lib.makeBinPath wrapperDeps}
|
||||
)
|
||||
''
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
doctest,
|
||||
# doctest,
|
||||
fmt,
|
||||
perl,
|
||||
glib,
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
doctest
|
||||
# doctest
|
||||
fmt
|
||||
glib
|
||||
openssl
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}"
|
||||
"-DENABLE_FASTTEXT=ON"
|
||||
"-DENABLE_JEMALLOC=ON"
|
||||
"-DSYSTEM_DOCTEST=ON"
|
||||
"-DSYSTEM_DOCTEST=OFF" # https://github.com/rspamd/rspamd/issues/5994
|
||||
"-DSYSTEM_FMT=ON"
|
||||
"-DSYSTEM_XXHASH=ON"
|
||||
"-DSYSTEM_ZSTD=ON"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,41 +5,56 @@
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
electron,
|
||||
xcodebuild,
|
||||
desktopToDarwinBundle,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "solidtime-desktop";
|
||||
version = "0.0.42";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solidtime-io";
|
||||
repo = "solidtime-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ve8hT+Gja2HawJ9G6aELxserOfTK7dRNnfdHpY3WUDU=";
|
||||
hash = "sha256-92w8vmzyQbIbRaQdXKKpeaLdxhLVpxyCE3RJjtJf0Jk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcodebuild
|
||||
desktopToDarwinBundle
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-y4bO2Rcr+JXkS+q1EbSjg3nNd3GCrB8A+t9ePJsE2L4=";
|
||||
npmDepsHash = "sha256-EwtCA94ezhq36ooVvQWd4ThtxqWSOe7cr28V1thet2o=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
# fixes missing npm dependency errors
|
||||
patches = [ ./missing-hashes.patch ];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
# rebuild better-sqlite3 for nixpkgs electron
|
||||
preBuild = ''
|
||||
export npm_config_nodedir="${electron.headers}"
|
||||
export npm_config_target="${electron.version}"
|
||||
|
||||
npm rebuild --verbose --no-progress --offline
|
||||
|
||||
# reduce better-sqlite3 size
|
||||
pushd node_modules/better-sqlite3
|
||||
rm -rf src deps build/{deps,Release/{.deps,obj,obj.target,test_extension.node}}
|
||||
popd
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/icons
|
||||
cp -a build/icon.png $out/share/icons/solidtime-desktop.png
|
||||
cp -a . $out/share/solidtime-desktop
|
||||
install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/solidtime-desktop.png
|
||||
cp -r out $out/lib/node_modules/solidtime
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/solidtime-desktop \
|
||||
--add-flags $out/share/solidtime-desktop
|
||||
--add-flags $out/lib/node_modules/solidtime
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
@@ -62,6 +77,6 @@ buildNpmPackage (finalAttrs: {
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "solidtime-desktop";
|
||||
maintainers = with lib.maintainers; [ hensoko ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/error.rs b/src/error.rs
|
||||
index 4563e1e..050610d 100644
|
||||
--- a/src/error.rs
|
||||
+++ b/src/error.rs
|
||||
@@ -34,7 +34,7 @@ impl fmt::Display for Error {
|
||||
}
|
||||
|
||||
impl error::Error for Error {
|
||||
- fn source<'a>(&'a self) -> Option<&(dyn error::Error + 'static)> {
|
||||
+ fn source(&self) -> Option<&(dyn error::Error + 'static)> {
|
||||
self.reason.as_deref()
|
||||
}
|
||||
}
|
||||
@@ -4,20 +4,21 @@
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typical";
|
||||
version = "0.12.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepchowfun";
|
||||
repo = "typical";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q=";
|
||||
hash = "sha256-gcaOQhEyCiU2kXWZRymGca0Mq+TOBGDR4v/5sFOaDz0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+SnwxmNQDj6acr2nEKJkNmR5PqnTIvyMApyZOmCld2U=";
|
||||
cargoHash = "sha256-cRlxyh8a+lJLc/YkOYYXkCEi8D3KJHlm5a01rhWk3VQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -27,12 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
export NO_COLOR=true
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Related to https://github.com/stepchowfun/typical/pull/501
|
||||
# Committing a slightly different patch because the upstream one doesn't apply cleanly
|
||||
./lifetime.patch
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd typical \
|
||||
--bash <($out/bin/typical shell-completion bash) \
|
||||
@@ -40,6 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--zsh <($out/bin/typical shell-completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Data interchange with algebraic data types";
|
||||
mainProgram = "typical";
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version_4 = "4.13.0";
|
||||
version_4 = "4.14.1";
|
||||
version_3 = "3.8.7";
|
||||
hash_4 = "sha256-FP15a2ueihDm6f/GdXsnqI5drVHo0EtbmrhCZfRdugQ=";
|
||||
hash_4 = "sha256-0UnU5jRSUFMw+WowvXqYqaaN1ZbZAdLLJ6LPyuK6iCc=";
|
||||
hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo=";
|
||||
in
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.26.0";
|
||||
version = "2.27.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_firestore";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-ED/Cve3LgBoxWQ/vmg1QdU7mO4A5RvmvyQSBfIW9k10=";
|
||||
hash = "sha256-VjPLFk71bKbHOoB4IhkaVqmPbxDnaXjE8usZeuAzg9I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -19,7 +19,7 @@ let
|
||||
{ scalaVersion, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ammonite";
|
||||
version = "3.0.6";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
|
||||
@@ -83,6 +83,7 @@ let
|
||||
homepage = "https://github.com/com-lihaoyi/Ammonite";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "amm";
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
};
|
||||
@@ -90,14 +91,14 @@ in
|
||||
{
|
||||
ammonite_2_12 = common {
|
||||
scalaVersion = "2.12";
|
||||
sha256 = "sha256-EH6zBKSVy6uiCGYd+nTS5U2HTOdkOokYVxAiA98JLfE=";
|
||||
sha256 = "sha256-gMyTQDPmHsl6b3CBCsIHb/8z2FwL3+Txuz0siFgvSws=";
|
||||
};
|
||||
ammonite_2_13 = common {
|
||||
scalaVersion = "2.13";
|
||||
sha256 = "sha256-IpPySm8YJBqu1kbCp/oElMmiM25+vKlyMdDHMkYWrhM=";
|
||||
sha256 = "sha256-NCB5ZuW+CqxFlYY10mF6TUHdZl1E8QFygPdyW2FtCe4=";
|
||||
};
|
||||
ammonite_3_3 = common {
|
||||
scalaVersion = "3.3";
|
||||
sha256 = "sha256-C+ShjuF1EnF75cDN0o28q8Afw7wwod4EUsLkdTb54wo=";
|
||||
sha256 = "sha256-H3/wjBDA8b+a+4FISohLQ10eB7VOMUqj+M39bZOefbw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -724,10 +724,10 @@
|
||||
};
|
||||
|
||||
fsharp = {
|
||||
version = "0.2.2-unstable-2026-03-29";
|
||||
version = "0.3.0-unstable-2026-04-16";
|
||||
url = "github:ionide/tree-sitter-fsharp";
|
||||
rev = "594c500ecace8618db32dd1144307897277db067";
|
||||
hash = "sha256-e66aAsmNJWMcElqFIxSiHZgyQsq8NT7zU9y/fpbqJF4=";
|
||||
rev = "5247c1197cb290fcaea0e0a793d32829c1396831";
|
||||
hash = "sha256-ntcLDSt6BPF9PtASx221hwZhKl3yKKrzbEYQD/ghYxw=";
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -794,10 +794,10 @@
|
||||
};
|
||||
|
||||
ghostty = {
|
||||
version = "1.2-unstable-2026-01-02";
|
||||
version = "1.3.0-unstable-2026-04-24";
|
||||
url = "github:bezhermoso/tree-sitter-ghostty";
|
||||
rev = "c14d6cb4dd36ff9dd569978491aa52e4726cbe86";
|
||||
hash = "sha256-sVPr8jR6z0G68z3ZTdlMOXWguNGbZ/5apffNefm9apU=";
|
||||
rev = "753055073a26100e51bdf1a92f4234cd6789c1f9";
|
||||
hash = "sha256-+zy5dqyHUOC6Li31U6/GOAfqPSLZRKfpnyjKgtFSFeM=";
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
}:
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "6.13.1";
|
||||
version = "6.14.0";
|
||||
shortRev = "591ed6e"; # for internal version info
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sensu";
|
||||
repo = "sensu-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VYdm1aNz1IXvDezrJB5yyViIWPl4zf4/xmkw2pm8gyk=";
|
||||
sha256 = "sha256-/1oQz7mZyhH5U7DoVhRYnLv7AvwFrN1OBx9EEK+sCEw=";
|
||||
};
|
||||
|
||||
inherit subPackages postInstall;
|
||||
|
||||
vendorHash = "sha256-32jz5CI94BZxMDo6Crc05DDvlXxMsldJpWvhfHLS37o=";
|
||||
vendorHash = "sha256-ylzMqc+zTtuttLl75ILG0OzA/PqfrpvsiKhW6cPx+ls=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user