Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-03-18 12:18:11 +00:00
committed by GitHub
84 changed files with 981 additions and 395 deletions
@@ -14,19 +14,19 @@ let
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
name = "roo-code-${finalAttrs.version}.vsix";
pname = "roo-code-vsix";
version = "3.45.0";
version = "3.51.1";
src = fetchFromGitHub {
owner = "RooCodeInc";
repo = "Roo-Code";
tag = "v${finalAttrs.version}";
hash = "sha256-ZWt2R50yFxUHDJ2jrkMKaNoWUD6mSNm0ucq/FXPC2VE=";
hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-QAzk+aXdCtQQ/KEoqGfn5j7l7Gx3HDvlL3aO+81hABM=";
hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw=";
};
nativeBuildInputs = [
@@ -1193,13 +1193,13 @@
"vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
},
"selectel_selectel": {
"hash": "sha256-/1s3TQK8EkM7WgHW77a/JGsCemiustIwlLAam9CZpiY=",
"hash": "sha256-oY2cSjoOXpDjmKSQKzx8yQhmX69diSgN1mJPR+z+hA8=",
"homepage": "https://registry.terraform.io/providers/selectel/selectel",
"owner": "selectel",
"repo": "terraform-provider-selectel",
"rev": "v7.5.4",
"rev": "v7.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-QdfBhTY7HwPqz9qm7KE0OL4ACOWiU8gLOKKdFbMrAro="
"vendorHash": "sha256-mHf4ZG0hk/YTofuU80sVl1g78P6T+sbBMuPenE8uGQ0="
},
"siderolabs_talos": {
"hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=",
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "api-linter";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "googleapis";
repo = "api-linter";
tag = "v${finalAttrs.version}";
hash = "sha256-Yx4UTxFJSc+tsA2u6IiSlzV9H7occ2qKtCm7zwv5PaA=";
hash = "sha256-xks5oKfJSMV4MbPFrYGWv82XeBLYbGgXF4r4kbFX93Q=";
};
vendorHash = "sha256-TiZRts1ruC0R5DQ5at7Z1c+zuGpD0f3D89X2b1gXA5s=";
vendorHash = "sha256-wPySRFqm396YRqEUZNMkA19SxqBNApwr8hm0PRA5cO0=";
subPackages = [ "cmd/api-linter" ];
+65
View File
@@ -0,0 +1,65 @@
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
installShellFiles,
nix-update-script,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "betterleaks";
version = "1.1.1";
src = fetchFromGitHub {
owner = "betterleaks";
repo = "betterleaks";
tag = "v${finalAttrs.version}";
hash = "sha256-PJGFvm+QoExUMliL6rvBAKKjt8Ce5VZfQxCYbpXUXfU=";
};
vendorHash = "sha256-lIblIctRnq//ic+most3g9Ff92XhfqbFfHrLdI0beQQ=";
ldflags = [
"-s"
"-X=github.com/betterleaks/betterleaks/version.Version=${finalAttrs.version}"
];
subPackages = [
"."
];
nativeBuildInputs = [
installShellFiles
];
env.CGO_ENABLED = 0;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd betterleaks \
--bash <($out/bin/betterleaks completion bash) \
--fish <($out/bin/betterleaks completion fish) \
--zsh <($out/bin/betterleaks completion zsh)
'';
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgram = "${placeholder "out"}/bin/betterleaks";
versionCheckProgramArg = "version";
passthru.updateScript = nix-update-script { };
meta = {
description = "Scan code for secrets";
homepage = "https://github.com/betterleaks/betterleaks";
changelog = "https://github.com/betterleaks/betterleaks/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
kachick
];
mainProgram = "betterleaks";
};
})
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Analyze dump files produced by Zebra/Quagga or MRT";
license = lib.licenses.hpnd;
maintainers = with lib.maintainers; [ lewo ];
platforms = with lib.platforms; linux;
platforms = lib.platforms.unix;
mainProgram = "bgpdump";
};
})
+9 -4
View File
@@ -18,6 +18,11 @@
# build ESDM RNG plugin
withEsdm ? false,
# build with jitterentropy RNG plugin,
# default disabled, health tests may fail without
# configuration of OSR and related parameters
# in jitterentropy
withJitterentropy ? false,
# useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
withTpm2 ? false,
policy ? null,
@@ -55,7 +60,7 @@ let
'';
in
stdenv.mkDerivation (finalAttrs: {
version = "3.10.0";
version = "3.11.0";
pname = "botan";
__structuredAttrs = true;
@@ -77,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "randombit";
repo = "botan";
tag = finalAttrs.version;
hash = "sha256-E4kKk4ry3SMn2DbnUTVx22lcAWDxxbo8DLyixjr/S6A=";
hash = "sha256-jjrO43SItFi+6FrU9B45Y1GK+6V5ZIgaYaMHkgRh4IE=";
};
nativeBuildInputs = [
@@ -92,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
tpm2-tss
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [
jitterentropy
]
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
@@ -129,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
"--with-tpm2"
]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
++ lib.optionals (withJitterentropy && !stdenv.hostPlatform.isMinGW) [
"--enable-modules=jitter_rng"
]
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
+4 -1
View File
@@ -296,7 +296,10 @@ stdenv.mkDerivation (finalAttrs: {
'';
changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}";
license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ pSub ];
maintainers = with lib.maintainers; [
pSub
sempiternal-aurora
];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isDarwin;
};
@@ -7,6 +7,6 @@ index ed05fce..e1649e0 100644
},
"active": true,
- "createUpdaterArtifacts": true,
"targets": "all",
"targets": ["deb", "rpm"],
"icon": [
"icons/32x32.png",
@@ -27,19 +27,19 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deadlock-mod-manager";
version = "0.14.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "deadlock-mod-manager";
repo = "deadlock-mod-manager";
tag = "v${finalAttrs.version}";
hash = "sha256-A7RsgPi3NlcLSBkLg7/pWcSduaZyCspz19sjGjzEkqM=";
hash = "sha256-rsOaCgP7ub4FkTkg1VWPZyf+N2I0qM0DCIIqBpJZCVg=";
};
cargoRoot = "apps/desktop";
buildAndTestSubdir = finalAttrs.cargoRoot;
cargoHash = "sha256-L4orWiK1s1hfC2QDJ8G4hI1iqrdPHBaVTVHoW0hdlGo=";
cargoHash = "sha256-aUtJzgjc9reFxUVMRwqCd2lNMRALlfMkfIRN4QT3g+E=";
nativeBuildInputs = [
rustPlatform.cargoSetupHook
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pnpm = pnpm_9;
fetcherVersion = 2;
sourceRoot = "source";
hash = "sha256-KhBWFujjo3FW3intvGA2Y7eLIdJ1B/4P5xIRPvzygT8=";
hash = "sha256-oQxW0q+myMllwLQd+GRXXvnce+bYtwTLEEwFU0nupv4=";
};
patches = [
@@ -12,13 +12,13 @@
inherit hamlibSupport gpsdSupport extraScripts;
}).overrideAttrs
(oldAttrs: {
version = "1.8.1-unstable-2026-03-09";
version = "1.8.1-unstable-2026-03-12";
src = fetchFromGitHub {
owner = "wb2osz";
repo = "direwolf";
rev = "3b20d8210a1d6f77073fd3452bbe87a21ee35a79";
hash = "sha256-w/D5RO5dfcTh3nCOxe/GaHTSbzCYm+J1cJCt1K9lAaw=";
rev = "0663670550073c9d89917d5ac78df65e551d237a";
hash = "sha256-4A9595Z3to/HBW1WS1mLYQDGokmSz3ClfRDhsLxIj0E=";
};
dontVersionCheck = true;
+3 -3
View File
@@ -7,13 +7,13 @@
}:
buildGoModule (finalAttrs: {
pname = "dns-collector";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "dmachard";
repo = "dns-collector";
tag = "v${finalAttrs.version}";
hash = "sha256-b1fKxjdZpCuPg+lRhpYn8tjVOqQU1kyhta63G+8Pxr4=";
hash = "sha256-497qilu1/76XbAO3fKIRpDWjQaCmdDgdxswkE5y8pNU=";
};
subPackages = [ "." ];
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
];
vendorHash = "sha256-UNp2lttwBQM9Xx6+aOQGKdOgeMBsyCHQdhCAbyvDCN4=";
vendorHash = "sha256-4gvGqNPRdB/t498WBF9vTqyuTl2rkAo7nRvNEpTMPqY=";
passthru.updateScript = nix-update-script { };
+1 -20
View File
@@ -49,24 +49,5 @@
"@rollup/rollup-win32-arm64-msvc@npm:4.57.1": "c1604ca04c0983fc4cb3b4fcfc546ed30d96b8845445b1f99e7c8ce0800866a6ed0ecae58f4c8fbf5f02aaa9aefc5eebfa7a003fe74e63b96630d8b0ee51a8b8",
"@rollup/rollup-win32-ia32-msvc@npm:4.57.1": "bf3146adcd2cd3a63bfe51b92355ec2a7ec2c004e778b620ea14bfc401b34ffa0e0087a4b2ede0f600a25f4842aaedaffac1d5e67fcb315a0b5507291656e07f",
"@rollup/rollup-win32-x64-gnu@npm:4.57.1": "cdd850fe4136b5d5649cacde8604391487ca9105dd7ef53817d9d9fd0ee80400608cff44f2810451aef5067fe05a31fe2f038c9aec59094fad00e3c8c54504c5",
"@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4",
"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
"@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
"@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
"@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
"@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
"@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
"@rollup/rollup-win32-x64-msvc@npm:4.57.1": "4097849e2a9699531cab315c76576490c4318c8ca5d5a88c775cc94513cfccb66c0f54fc43203ab4b596a37f46d2d72eb341e03b0d5ec7d2bf47adb8651e59e4"
}
+4 -4
View File
@@ -16,19 +16,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "dokieli";
version = "0-unstable-2026-03-01";
version = "0-unstable-2026-03-17";
src = fetchFromGitHub {
owner = "dokieli";
repo = "dokieli";
rev = "85f9e08e41ffd815db39b1524bf880cbb5775a66";
hash = "sha256-EexIbwtENincgdzzbvNVq/dbJKly0uJGoXDT7G/3/Gs=";
rev = "ea9e0b4a4d374a87abc76365b44e7d24017206a6";
hash = "sha256-KJbnXRSUvKGm6q8koZYoNGMaSO5u8xCoA3hDWOCgIx4=";
};
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-kXNev+L8DvDm8kUrCEWOSp7Es3WnCL3kfDLozrZ5/1U=";
hash = "sha256-fhwuF0ELHw2avw8pnZUXPVkq+MJjuynFTBAU6O92mLM=";
};
buildPhase = ''
@@ -1,15 +0,0 @@
diff --git a/auth/lib/services/update_service.dart b/auth/lib/services/update_service.dart
index 716d553f1b..3946d87a7d 100644
--- a/lib/services/update_service.dart
+++ b/lib/services/update_service.dart
@@ -134,9 +134,7 @@ class UpdateService {
}
bool isIndependent() {
- return flavor == "independent" ||
- _packageInfo.packageName.endsWith("independent") ||
- PlatformUtil.isDesktop();
+ return false;
}
}
+1 -1
View File
@@ -1,5 +1,5 @@
{
"ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
"ente_crypto_dart": "sha256-/Pz9HPyQ6ts/sbqopShRSQCC99seiE5pCK0pR5mNji8=",
"fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=",
"flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
"move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=",
+42 -11
View File
@@ -2,30 +2,29 @@
lib,
flutter332,
fetchFromGitHub,
sqlite,
libayatana-appindicator,
makeDesktopItem,
copyDesktopItems,
makeWrapper,
jdk17_headless,
yq-go,
}:
let
# fetch simple-icons directly to avoid cloning with submodules,
# which would also clone a whole copy of flutter
simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
desktopId = "io.ente.auth";
flutter = flutter332;
in
flutter332.buildFlutterApplication rec {
flutter.buildFlutterApplication rec {
pname = "ente-auth";
version = "4.4.12";
version = "4.4.17";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "mobile" ];
tag = "auth-v${version}";
hash = "sha256-1GJWGTzErV+wSkeAg3z0u7tBPFrq6hPc0fWniKT8w9M=";
hash = "sha256-qnjOrct70TaaO91QBHcbRIkzLZGH6mbpuLAAKE9k/es=";
};
sourceRoot = "${src.name}/mobile/apps/auth";
@@ -33,15 +32,43 @@ flutter332.buildFlutterApplication rec {
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = lib.importJSON ./git-hashes.json;
patches = [
# Disable update notifications and auto-update functionality
./0001-disable-updates.patch
];
customSourceBuilders.ente_strings =
{ version, src, ... }:
# There currently is no covenient way to setup the flutter SDK outside of apps
# and we can't move this to the app's own build phase as it would still reference
# the immutable source variant without the generated l10n files.
flutter.buildFlutterApplication {
inherit version src;
inherit (src) passthru;
pname = "ente_strings";
sourceRoot = "${src.name}/mobile/packages/strings";
pubspecLock = lib.importJSON ./strings.pubspec.lock.json;
buildPhase = ''
runHook preBuild
flutter gen-l10n
runHook postBuild
'';
installPhase = ''
runHook preInstall
# The $debug output can't be disabled for buildFlutterApplication.
# The $out structure must match that of ente-auth to correctly resolve
# the package as pubspec uses relative paths for workspace packages.
mkdir -p $debug $out/mobile/{apps/auth,packages}
rm pubspec.lock
cp -r . $out/mobile/packages/strings
runHook postInstall
'';
};
postPatch = ''
rmdir assets/simple-icons
ln -s ${simple-icons} assets/simple-icons
${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml
'';
nativeBuildInputs = [
@@ -50,7 +77,6 @@ flutter332.buildFlutterApplication rec {
];
buildInputs = [
sqlite
libayatana-appindicator
# The networking client used by ente-auth (native_dio_adapter)
# introduces a transitive dependency on Java, which technically
@@ -63,6 +89,11 @@ flutter332.buildFlutterApplication rec {
# https://github.com/juliansteenbakker/flutter_secure_storage/issues/965
env.CXXFLAGS = toString [ "-Wno-deprecated-literal-operator" ];
flutterBuildFlags = [
# Disable update notifications and auto-update functionality
"--dart-define=app.flavor=independent"
];
# Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml
# and https://github.com/ente-io/ente/blob/main/auth/linux/packaging/enteauth.appdata.xml
desktopItems = [
+63 -16
View File
@@ -414,11 +414,11 @@
"dependency": "direct main",
"description": {
"name": "device_info_plus",
"sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110",
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.1.2"
"version": "11.5.0"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
@@ -450,15 +450,6 @@
"source": "hosted",
"version": "2.1.1"
},
"dir_utils": {
"dependency": "direct main",
"description": {
"path": "../../packages/dir_utils",
"relative": true
},
"source": "path",
"version": "1.0.0"
},
"dots_indicator": {
"dependency": "direct main",
"description": {
@@ -526,17 +517,35 @@
"source": "path",
"version": "1.0.0"
},
"ente_crypto_dart": {
"ente_crypto_api": {
"dependency": "direct main",
"description": {
"path": "../../packages/ente_crypto_api",
"relative": true
},
"source": "path",
"version": "0.0.1"
},
"ente_crypto_dart": {
"dependency": "transitive",
"description": {
"path": ".",
"ref": "HEAD",
"resolved-ref": "f91e1545f8263df127762240c4da54a0c42835b2",
"resolved-ref": "dc995b62d6ec5bca3ba47966685b2af3c42235b2",
"url": "https://github.com/ente-io/ente_crypto_dart.git"
},
"source": "git",
"version": "1.0.0"
},
"ente_crypto_dart_adapter": {
"dependency": "direct main",
"description": {
"path": "../../packages/ente_crypto_dart_adapter",
"relative": true
},
"source": "path",
"version": "0.0.1"
},
"ente_events": {
"dependency": "direct main",
"description": {
@@ -573,6 +582,15 @@
"source": "path",
"version": "1.0.0"
},
"ente_pure_utils": {
"dependency": "direct main",
"description": {
"path": "../../packages/ente_pure_utils",
"relative": true
},
"source": "path",
"version": "1.0.0"
},
"ente_qr": {
"dependency": "direct main",
"description": {
@@ -601,7 +619,7 @@
"version": "1.0.0"
},
"ente_utils": {
"dependency": "direct overridden",
"dependency": "direct main",
"description": {
"path": "../../packages/utils",
"relative": true
@@ -1275,6 +1293,16 @@
"source": "hosted",
"version": "6.9.5"
},
"launcher_icon_switcher": {
"dependency": "direct main",
"description": {
"name": "launcher_icon_switcher",
"sha256": "a1e0778ed016107077f54f22b4987f322315de8d3df31a6ed494134f55c0ff41",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.0.2"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
@@ -1777,6 +1805,15 @@
"source": "hosted",
"version": "0.11.0"
},
"scoped_dir_access": {
"dependency": "direct main",
"description": {
"path": "../../packages/scoped_dir_access",
"relative": true
},
"source": "path",
"version": "1.0.0"
},
"screen_retriever": {
"dependency": "transitive",
"description": {
@@ -2103,6 +2140,16 @@
"source": "hosted",
"version": "2.7.6"
},
"sqlite3_flutter_libs": {
"dependency": "direct main",
"description": {
"name": "sqlite3_flutter_libs",
"sha256": "e07232b998755fe795655c56d1f5426e0190c9c435e1752d39e7b1cd33699c71",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.34"
},
"stack_trace": {
"dependency": "transitive",
"description": {
@@ -2477,11 +2524,11 @@
"dependency": "transitive",
"description": {
"name": "win32_registry",
"sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
"sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.5"
"version": "2.1.0"
},
"window_manager": {
"dependency": "direct main",
@@ -0,0 +1,272 @@
{
"packages": {
"async": {
"dependency": "transitive",
"description": {
"name": "async",
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.13.0"
},
"boolean_selector": {
"dependency": "transitive",
"description": {
"name": "boolean_selector",
"sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
},
"characters": {
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
},
"clock": {
"dependency": "transitive",
"description": {
"name": "clock",
"sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
},
"collection": {
"dependency": "transitive",
"description": {
"name": "collection",
"sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.19.1"
},
"fake_async": {
"dependency": "transitive",
"description": {
"name": "fake_async",
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.3"
},
"flutter": {
"dependency": "direct main",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"flutter_lints": {
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
"sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.0"
},
"flutter_localizations": {
"dependency": "direct main",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"flutter_test": {
"dependency": "direct dev",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"intl": {
"dependency": "direct main",
"description": {
"name": "intl",
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.20.2"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.9"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.9"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
},
"lints": {
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.1.1"
},
"matcher": {
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.17"
},
"material_color_utilities": {
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.11.1"
},
"meta": {
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.16.0"
},
"path": {
"dependency": "transitive",
"description": {
"name": "path",
"sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.1"
},
"sky_engine": {
"dependency": "transitive",
"description": "flutter",
"source": "sdk",
"version": "0.0.0"
},
"source_span": {
"dependency": "transitive",
"description": {
"name": "source_span",
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.10.1"
},
"stack_trace": {
"dependency": "transitive",
"description": {
"name": "stack_trace",
"sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.1"
},
"stream_channel": {
"dependency": "transitive",
"description": {
"name": "stream_channel",
"sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
},
"string_scanner": {
"dependency": "transitive",
"description": {
"name": "string_scanner",
"sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.1"
},
"term_glyph": {
"dependency": "transitive",
"description": {
"name": "term_glyph",
"sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.2"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.4"
},
"vector_math": {
"dependency": "transitive",
"description": {
"name": "vector_math",
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "15.0.0"
}
},
"sdks": {
"dart": ">=3.7.0-0 <4.0.0",
"flutter": ">=3.18.0-18.0.pre.54"
}
}
+8 -2
View File
@@ -20,13 +20,19 @@ echo "Updating to $short_version"
mobile_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "mobile") | .url' --raw-output)"
apps_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "apps") | .url' --raw-output)"
auth_tree="$(gh-curl "$apps_tree" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
packages_tree="$(gh-curl "$mobile_tree" | gojq '.tree[] | select(.path == "packages") | .url' --raw-output)"
strings_tree="$(gh-curl "$packages_tree" | gojq '.tree[] | select(.path == "strings") | .url' --raw-output)"
pushd "$pkg_dir"
# Get lockfile, filter out incompatible sqlite dependency and convert to JSON
# Get lockfile and convert to JSON
echo "Updating lockfile"
pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > pubspec.lock.json
gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > pubspec.lock.json
echo "Updating strings lockfile"
strings_pubspec_lock="$(gh-curl "$strings_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
gh-curl "$strings_pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input > strings.pubspec.lock.json
echo "Updating git hashes"
./fetch-git-hashes.py
+63
View File
@@ -0,0 +1,63 @@
{
lib,
stdenv,
cmake,
fetchFromGitHub,
openssl,
asio,
tinyxml-2,
openjdk11,
python3,
foonathan-memory,
fastcdr,
pkg-config,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastdds";
version = "3.4.2";
src = fetchFromGitHub {
owner = "eProsima";
repo = "Fast-DDS";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-NTdkGRbE4yVMMZ/PqLC2nZYD0uIcmo1tr+ieOBSijCM=";
};
nativeBuildInputs = [
cmake
openjdk11
pkg-config
];
buildInputs = [
openssl
asio
tinyxml-2
foonathan-memory
fastcdr
python3
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_SHARED_LIBS=ON"
"-DSECURITY=ON"
"-DCOMPILE_EXAMPLES=OFF"
"-DCMAKE_PREFIX_PATH=${foonathan-memory}"
];
meta = {
description = "C++ implementation of the DDS (Data Distribution Service) standard";
homepage = "https://github.com/eProsima/Fast-DDS";
license = lib.licenses.asl20;
longDescription = ''
eProsima Fast DDS is a C++ implementation of the DDS (Data Distribution Service) standard
of the OMG (Object Management Group). It implements the RTPS (Real Time Publish Subscribe)
protocol, which provides publisher-subscriber communications over unreliable transports
such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.
'';
platforms = lib.platforms.linux;
};
})
@@ -6,13 +6,13 @@
}:
let
version = "1.1.0-stable";
version = "1.2.2-stable";
src = fetchFromGitHub {
owner = "gtsteffaniak";
repo = "filebrowser";
tag = "v${version}";
hash = "sha256-S3MtqIqmFYDY053HX8yYGxHc6ev0Y8eXbe24TL8PtYQ=";
hash = "sha256-MWFBoVr5WRfLhDUGEGS6ntb3v23HcOcm91x3fGriM2A=";
};
frontend = buildNpmPackage {
@@ -20,7 +20,7 @@ let
inherit version src;
sourceRoot = "${src.name}/frontend";
npmDepsHash = "sha256-pJR5m1XrqeHwOADWMnFDtHivaKCBqqdG2O6fWql7ugA=";
npmDepsHash = "sha256-brW5YR/DNBOCPBDMEjSzyk+YTbrP5ppdQ0US/DLbyIs=";
buildPhase = ''
runHook preBuild
@@ -47,7 +47,7 @@ buildGoModule {
sourceRoot = "${src.name}/backend";
vendorHash = "sha256-t4cREfkj+z+EvgXjzqYc8xs0jhTMUZMjcHxkkuuLpZs=";
vendorHash = "sha256-pU5qtWvhLbMdxzXK6uKxEkvbZdb2oa4ZHKaCPm0bIwU=";
preBuild = ''
mkdir -p http/embed
+4 -4
View File
@@ -10,10 +10,10 @@
}:
let
version = "2.8.2";
srcHash = "sha256-2UBnOtTdYkzHioGUHtAd0vwqpCouk/uaNvYmjmwc4F0=";
vendorHash = "sha256-W6Vgvb4pPexHxx7t8IIfBWyC3c5jUr9KxaR8k5QUUpw=";
manifestsHash = "sha256-mYIn7tzsKmx9Wx2WCrztyD3IVLI3pF7robv25HPiCx4=";
version = "2.8.3";
srcHash = "sha256-5bs7atecd7NqUrJySMxOe01zGpTMbgrau5B6QkUTRyg=";
vendorHash = "sha256-ICI9Lace4gv2GE/nb9y5yRlvsOkujr2DA2gQ8PnIrIs=";
manifestsHash = "sha256-V1rWHu23K4224eiwUuueG2vk3LsdgtvVGZVQG5vBhLQ=";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
+104 -104
View File
@@ -42,159 +42,159 @@ in
{
app-schema = mkGeoserverExtension {
name = "app-schema";
version = "2.28.1"; # app-schema
hash = "sha256-PwZW9hFRiZIxgil75DXMsq0ymo7jPYX4Boj+hkXW8NI="; # app-schema
version = "2.28.2"; # app-schema
hash = "sha256-wJ0grTy8ZeiifvINLgbuLXdDYQeQvXKkGcFoYxlkOjI="; # app-schema
};
authkey = mkGeoserverExtension {
name = "authkey";
version = "2.28.1"; # authkey
hash = "sha256-Zg3Db5QG4w+yMZ75MqtHt1Kri8peDGMZ0va5ZwI+6dw="; # authkey
version = "2.28.2"; # authkey
hash = "sha256-vy9HLjt1Lefd1+2QlKPHKU9IcPYfDPWcfqzInFahBBk="; # authkey
};
cas = mkGeoserverExtension {
name = "cas";
version = "2.28.1"; # cas
hash = "sha256-YMnaRVPLn98mXm2sErKSRlzmvQbnU9MGMDXuYgwm+H0="; # cas
version = "2.28.2"; # cas
hash = "sha256-Z3FdAdVHrzNPiA1L/9cnSr/7QsevlqhxBoSwOfjap/E="; # cas
};
charts = mkGeoserverExtension {
name = "charts";
version = "2.28.1"; # charts
hash = "sha256-LM75iq2xvSQjVxGnngoLCz5IkSI9/YqAqOqgSUlkrUA="; # charts
version = "2.28.2"; # charts
hash = "sha256-ZLFI6taLpSw9uIsAr8zAsP0xIHqKHhlnffCglEhmvbU="; # charts
};
control-flow = mkGeoserverExtension {
name = "control-flow";
version = "2.28.1"; # control-flow
hash = "sha256-ZO04mls+OapOK/fi5IBy0mVJ5cF0fyQ1RgFhWt0AuEw="; # control-flow
version = "2.28.2"; # control-flow
hash = "sha256-ncKjBkYJGqtgsSU2RCMkfZd4jnqWCxaVf3VfQTHHv7Q="; # control-flow
};
css = mkGeoserverExtension {
name = "css";
version = "2.28.1"; # css
hash = "sha256-2PcZhxkHXEOAs46fnt37VhupVOfRNWaRynNlLGviAho="; # css
version = "2.28.2"; # css
hash = "sha256-TAvS6VoJEkxUHaz/5/Sng2f8tvTWUZVeriL8uOrtb0I="; # css
};
csw = mkGeoserverExtension {
name = "csw";
version = "2.28.1"; # csw
hash = "sha256-6TmSWnny0OedvnLu+HnKpVxdfcicp1D//isFFOclcmk="; # csw
version = "2.28.2"; # csw
hash = "sha256-AR229hydrY1D5rxpGFfyDAPgsceDcs46nH/vyHyn484="; # csw
};
csw-iso = mkGeoserverExtension {
name = "csw-iso";
version = "2.28.1"; # csw-iso
hash = "sha256-BlnIS8gpWwBuiwdIqvq3UpJrdKPULvJxR7o3XJtI5tQ="; # csw-iso
version = "2.28.2"; # csw-iso
hash = "sha256-7s+Eu+Ik+9+C3+LMZ6gZowVLg8kuNOY9ZlsZEUDKRDg="; # csw-iso
};
db2 = mkGeoserverExtension {
name = "db2";
version = "2.28.1"; # db2
hash = "sha256-Ga4Db6G+LxRN+casjs0nYD6TFN1YrDjgOIlu46/0RgQ="; # db2
version = "2.28.2"; # db2
hash = "sha256-ipjFaGsVfBebKjMS9r7ZNHanNdbSA2lcdsLufr/ohgI="; # db2
};
# Needs wps extension.
dxf = mkGeoserverExtension {
name = "dxf";
version = "2.28.1"; # dxf
hash = "sha256-703y8CBd9oYsryGgAftXq5Cr1lUeyws1Alx0tSwzZo8="; # dxf
version = "2.28.2"; # dxf
hash = "sha256-H7dugiW/fldMWVCqr3aPAYgYQUkBFutBALeOmYJouhE="; # dxf
};
excel = mkGeoserverExtension {
name = "excel";
version = "2.28.1"; # excel
hash = "sha256-9ti+J7e9QieVbCFQ2xxuqX8TvQCcLPw0tPUNVqGG9+0="; # excel
version = "2.28.2"; # excel
hash = "sha256-wWxOVpy41sAQMqHgR+B8zIdQV05VIi7gV0on1rrqZ0g="; # excel
};
feature-pregeneralized = mkGeoserverExtension {
name = "feature-pregeneralized";
version = "2.28.1"; # feature-pregeneralized
hash = "sha256-eGayG9FUJabhP60iypib1gLcRStqz5J4PMTuSB+xL60="; # feature-pregeneralized
version = "2.28.2"; # feature-pregeneralized
hash = "sha256-f6tqDnW3AI/Kg3Dd4w9CdoqhJoygN4EiNjht1mH3o3s="; # feature-pregeneralized
};
# Note: The extension name ("gdal") clashes with pkgs.gdal.
gdal = mkGeoserverExtension {
name = "gdal";
version = "2.28.1"; # gdal
version = "2.28.2"; # gdal
buildInputs = [ pkgs.gdal ];
hash = "sha256-sVI9o2xwbvez7Gm8gY9DAbEr5TUluVGDoC7ZweK4BUE="; # gdal
hash = "sha256-jT3QhjrQiTtZHCCyBE1F7MfEanNRdzjdRQ/Ao+Azars="; # gdal
};
# Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
#geofence = mkGeoserverExtension {
# name = "geofence";
# version = "2.28.1"; # geofence
# hash = "sha256-POBOhg3d8HlA3qF2W41UTVhISM5vAQi74cI+y+Rj+Ic="; # geofence
# version = "2.28.2"; # geofence
# hash = "sha256-G72N5BRMIlkyfldeHdwNHM4kKEhbhp52VkJKaObtPQI="; # geofence
#};
#geofence-server-h2 = mkGeoserverExtension {
# name = "geofence-server-h2";
# version = "2.28.1"; # geofence-server
# hash = "sha256-8lY+wrCD7PizeNvh9hDRhxdFxT7n1SVKD8TVU80iiZk="; # geofence-server-h2
# version = "2.28.2"; # geofence-server
# hash = "sha256-qgm2jNXGYJ40lFmWN/ksWf6GxzLTYhZwkIRr0/dvItc="; # geofence-server-h2
#};
#geofence-server-postgres = mkGeoserverExtension {
# name = "geofence-server-postgres";
# version = "2.28.1"; # geofence-server
# hash = "sha256-DB3OK2dvPrDtlRRHaDUXqQW7AlOhN4zFm2t0N1+B3rk="; # geofence-server-postgres
# version = "2.28.2"; # geofence-server
# hash = "sha256-3vkf+jIdmt/ZMci1PSeA7yVoUuo5d5vuuowQ1G7pz6M="; # geofence-server-postgres
#};
#geofence-wps = mkGeoserverExtension {
# name = "geofence-wps";
# version = "2.28.1"; # geofence-wps
# hash = "sha256-tP3hnN0kXKFIdgKrS7juyrCh1OoQD0Bx54/xq6nUzWA="; # geofence-wps
# version = "2.28.2"; # geofence-wps
# hash = "sha256-Bl+0gte7buh4uMbK6AEJOs3HHCZ1s6sED7UrB1v69BM="; # geofence-wps
#};
geopkg-output = mkGeoserverExtension {
name = "geopkg-output";
version = "2.28.1"; # geopkg-output
hash = "sha256-6ARKLmhc5lhqi841Ou5ZrBuj6bdOwQDSGPwzGcBTNJw="; # geopkg-output
version = "2.28.2"; # geopkg-output
hash = "sha256-ccf6PP7lSnkPCguewaTkLiszmeNB1KRlc6sku1aUp3k="; # geopkg-output
};
grib = mkGeoserverExtension {
name = "grib";
version = "2.28.1"; # grib
hash = "sha256-AW/i+vRthQct3U45EGw/6uPDZNdS9z816nnKVIGCg/k="; # grib
version = "2.28.2"; # grib
hash = "sha256-5QQhxLA6LR9ahEhLJM3FhFr7T30vzbXZ72sv2IbQuwA="; # grib
buildInputs = [ netcdf ];
};
gwc-s3 = mkGeoserverExtension {
name = "gwc-s3";
version = "2.28.1"; # gwc-s3
hash = "sha256-wVLW7qbKDRmf1okTI0PDREQ5eoJOVGMVLS+uusY2+cM="; # gwc-s3
version = "2.28.2"; # gwc-s3
hash = "sha256-ZKo10/k5aY6SNVKNPs4U9x9rMaz/P6nqPt1PJHr7U1Y="; # gwc-s3
};
h2 = mkGeoserverExtension {
name = "h2";
version = "2.28.1"; # h2
hash = "sha256-zEjNN1dCmNR/5st/yNpWP1G3P6Zqf3RSFdUKOgdwff4="; # h2
version = "2.28.2"; # h2
hash = "sha256-vkjZn5y0taVG13/1/RJuFoKIFcHx+Ju2yYYLV3K8Qdc="; # h2
};
iau = mkGeoserverExtension {
name = "iau";
version = "2.28.1"; # iau
hash = "sha256-zn4FlC/vVvq1K6mSplOKarHHUWLNev5IW76wSiTvBuE="; # iau
version = "2.28.2"; # iau
hash = "sha256-yIpXjMCYjWE/xMGuNg3iNDyjMVdQCvRBeNCBOS0c1JA="; # iau
};
importer = mkGeoserverExtension {
name = "importer";
version = "2.28.1"; # importer
hash = "sha256-7v5MvpvVbVKOBxUlEwem8MzPUTtBc8z+1JAEqeHUmYI="; # importer
version = "2.28.2"; # importer
hash = "sha256-Kb02ihQ9WIjcXRS1Yc9gO968/YK/FRlQ2CQGZCZmy20="; # importer
};
inspire = mkGeoserverExtension {
name = "inspire";
version = "2.28.1"; # inspire
hash = "sha256-kgqwO3elSnT/4M9G+OgULaW+i/nDNGhvHblmWZRjTTA="; # inspire
version = "2.28.2"; # inspire
hash = "sha256-fU0/4VvTlIhyjPTNIYIVdT8dygWG8r0qk45O1q4fr3U="; # inspire
};
# Needs Kakadu plugin from
# https://github.com/geosolutions-it/imageio-ext
#jp2k = mkGeoserverExtension {
# name = "jp2k";
# version = "2.28.1"; # jp2k
# hash = "sha256-sLUgsMXymnTuceCRLzqIAPmk4/Q3BO+A+7BLQoc3iP0="; # jp2k
# version = "2.28.2"; # jp2k
# hash = "sha256-eOg9w9z3KykTLvouWrUH4fvAJ1OaQJG7M9vA+3pwyFM="; # jp2k
#};
# Throws "java.lang.UnsatisfiedLinkError: 'void org.libjpegturbo.turbojpeg.TJDecompressor.init()'"
@@ -202,174 +202,174 @@ in
# NOTE: When re-enabling this, RE-ENABLE THE CORRESPONDING TEST, TOO! (See tests/geoserver.nix)
#libjpeg-turbo = mkGeoserverExtension {
# name = "libjpeg-turbo";
# version = "2.28.1"; # libjpeg-turbo
# hash = "sha256-fn1ItYvLMfvRLpCE8rEpTpBmkk8zkN3QtBO/RN4RXfo="; # libjpeg-turbo
# version = "2.28.2"; # libjpeg-turbo
# hash = "sha256-4RQzkMXuOdQKszmafTWG5PekU8nCGVb7/Oumql8vqFc="; # libjpeg-turbo
# buildInputs = [ libjpeg.out ];
#};
mapml = mkGeoserverExtension {
name = "mapml";
version = "2.28.1"; # mapml
hash = "sha256-AonH/wBRh0oVs8psJ+XRutkSwybN3fs505SI/0qzG3o="; # mapml
version = "2.28.2"; # mapml
hash = "sha256-qOYI6MT+Ihpa+aSbC77J96aaA2cSaPBei0ppsPhC0ks="; # mapml
};
mbstyle = mkGeoserverExtension {
name = "mbstyle";
version = "2.28.1"; # mbstyle
hash = "sha256-SvgvBkp6dS6v1JjQxpa7m7tqc2c63hruWCcFcouHXaQ="; # mbstyle
version = "2.28.2"; # mbstyle
hash = "sha256-M9Eg8DbiWTFrpZ26v7MdeKcxS+CscNTT/r7CPqGe7RI="; # mbstyle
};
metadata = mkGeoserverExtension {
name = "metadata";
version = "2.28.1"; # metadata
hash = "sha256-M3HcgrPGZBBotNm6dsw4UjrH1onIQHDMdxuwNVuqO84="; # metadata
version = "2.28.2"; # metadata
hash = "sha256-EHtbBQpiqd56FtfizasbQtbMkwasOtZOcaRqStkjViU="; # metadata
};
mongodb = mkGeoserverExtension {
name = "mongodb";
version = "2.28.1"; # mongodb
hash = "sha256-Urp8d0i6Xlk2muNKKioJTnrEvzC05tqiipLT162L7uk="; # mongodb
version = "2.28.2"; # mongodb
hash = "sha256-GlAXb1yx8bTAZr0z1H/3n6nODAsUeV21UgEej/97F4k="; # mongodb
};
monitor = mkGeoserverExtension {
name = "monitor";
version = "2.28.1"; # monitor
hash = "sha256-Qo9aFOjbg9s1RZVqa/z1ka+QmFrPZJgrH8qMcstCywQ="; # monitor
version = "2.28.2"; # monitor
hash = "sha256-zyCNr+Z/juYjD5cvcFssIe/fS/MxB8ZYaZsEOoPSBhI="; # monitor
};
mysql = mkGeoserverExtension {
name = "mysql";
version = "2.28.1"; # mysql
hash = "sha256-5/xP8vPNhOYN9YXL4sZk16652ZBB7Ivm7Cq05fYi7wI="; # mysql
version = "2.28.2"; # mysql
hash = "sha256-xQPSia3O/K9wC9wQHiwle6Z1jXEgEUIWp59u4lVv2RU="; # mysql
};
netcdf = mkGeoserverExtension {
name = "netcdf";
version = "2.28.1"; # netcdf
hash = "sha256-qKgSyFrKI7JVMNt/qjgJ5puLaTsU406P5VyUpncMHOg="; # netcdf
version = "2.28.2"; # netcdf
hash = "sha256-EXtbuSu0uBQ77BjKWTt6lw15Vb3X48MX7iF35JD8Z2s="; # netcdf
buildInputs = [ netcdf ];
};
netcdf-out = mkGeoserverExtension {
name = "netcdf-out";
version = "2.28.1"; # netcdf-out
hash = "sha256-Xk3cTve45U9LDv8lWugtGpfid4yr5yDWh7H7daVlAc8="; # netcdf-out
version = "2.28.2"; # netcdf-out
hash = "sha256-I7Snzevhl/hTxriKULartxda3ZX7pXP0HxFEwJMHFZE="; # netcdf-out
buildInputs = [ netcdf ];
};
ogr-wfs = mkGeoserverExtension {
name = "ogr-wfs";
version = "2.28.1"; # ogr-wfs
version = "2.28.2"; # ogr-wfs
buildInputs = [ pkgs.gdal ];
hash = "sha256-ykFfqoLXeGigAdCLnDCKiCGD++n7jiOivua8Oh2DwU8="; # ogr-wfs
hash = "sha256-/8EebpM9Ppc2BqsOTEly6i/U358X9mCAkC5PE3z3Uw0="; # ogr-wfs
};
# Needs ogr-wfs extension.
ogr-wps = mkGeoserverExtension {
name = "ogr-wps";
version = "2.28.1"; # ogr-wps
version = "2.28.2"; # ogr-wps
# buildInputs = [ pkgs.gdal ];
hash = "sha256-WxOZ5WDNxV1HAT9cfCPm9DwoU/96OobuODOjd5dGN94="; # ogr-wps
hash = "sha256-VTj2XBWXY+I73ux6Y/XTsAtvPpMXiuz+cieTmkNLr6M="; # ogr-wps
};
oracle = mkGeoserverExtension {
name = "oracle";
version = "2.28.1"; # oracle
hash = "sha256-lj53CC6f9vXatH9vxHaFZvEGDpplTZSYy56fz4d4Qs0="; # oracle
version = "2.28.2"; # oracle
hash = "sha256-a6idJZfCy2iSB5UWOepeZ1YGlhrOaMNpxHkJ5+8bJGc="; # oracle
};
params-extractor = mkGeoserverExtension {
name = "params-extractor";
version = "2.28.1"; # params-extractor
hash = "sha256-1Znwqb+PHFlsuQIs8pMqo08s4uSc7wLZRYE+hVZzoQY="; # params-extractor
version = "2.28.2"; # params-extractor
hash = "sha256-EEX0E3f4Y0A120Trz5molTFOIrcZVXXIdW3skn5ID7Y="; # params-extractor
};
printing = mkGeoserverExtension {
name = "printing";
version = "2.28.1"; # printing
hash = "sha256-OeMHkx4d7/FwNigQ8Mnz9UlqFJbMZFGmxZT8kJ3iPp8="; # printing
version = "2.28.2"; # printing
hash = "sha256-uyhqI14sy1refOaZwJZ81IEobrOiKIGKR1y80llNAv0="; # printing
};
pyramid = mkGeoserverExtension {
name = "pyramid";
version = "2.28.1"; # pyramid
hash = "sha256-fLe2SeRSNvj6qqh6CMDu2w0gubf+xi3Ez7jO2fEbpjc="; # pyramid
version = "2.28.2"; # pyramid
hash = "sha256-fHNbhIUBL9A4ND6QVT1Z1jPgqM0jz/MRt+WHmHIl2g4="; # pyramid
};
querylayer = mkGeoserverExtension {
name = "querylayer";
version = "2.28.1"; # querylayer
hash = "sha256-QM5DAoTFsn6JTLubQy4p0qsA91DcfU7C74cb80jzzWM="; # querylayer
version = "2.28.2"; # querylayer
hash = "sha256-tQ/BSL12Zj1hYAl582p+kYz+7SS5HGLvKOrA5c/hUXA="; # querylayer
};
sldservice = mkGeoserverExtension {
name = "sldservice";
version = "2.28.1"; # sldservice
hash = "sha256-u5uzwyrwBzz5qcEtRS+ZIbmis9kVuGPt6+qo19K1HCM="; # sldservice
version = "2.28.2"; # sldservice
hash = "sha256-tKow9r+0km/IyzlubSi7NwfyuCm8jYIBv3PYkmcDGN0="; # sldservice
};
sqlserver = mkGeoserverExtension {
name = "sqlserver";
version = "2.28.1"; # sqlserver
hash = "sha256-19KyMBZEYBeUKiogxux8jrc8VgNDdCnvhrEV8Q84SG0="; # sqlserver
version = "2.28.2"; # sqlserver
hash = "sha256-6J7tEPUXqtKcD0aKgHQv7/24Lpv4pOZZnWvmkNHTeco="; # sqlserver
};
vectortiles = mkGeoserverExtension {
name = "vectortiles";
version = "2.28.1"; # vectortiles
hash = "sha256-tT4phUdL8yMKzobxWNivMpHJYu6KQmPiNECK9TtJgjg="; # vectortiles
version = "2.28.2"; # vectortiles
hash = "sha256-MlP+mjoQZHc9SRPIfMcV7OtUFXM8Z9T+O+Ti6rWLQuc="; # vectortiles
};
wcs2_0-eo = mkGeoserverExtension {
name = "wcs2_0-eo";
version = "2.28.1"; # wcs2_0-eo
hash = "sha256-HawDOyymB01x7PaFg5QKQhTSFdybeY5oAAusaG95To8="; # wcs2_0-eo
version = "2.28.2"; # wcs2_0-eo
hash = "sha256-xxClO61LYNX80npRHoYvNvzz/eeVZ7yHoA2uhqGNLyQ="; # wcs2_0-eo
};
web-resource = mkGeoserverExtension {
name = "web-resource";
version = "2.28.1"; # web-resource
hash = "sha256-FkuxR3WN95jyorpcv4ShT9J6jmUi0Z9NNwLEW3OKzx0="; # web-resource
version = "2.28.2"; # web-resource
hash = "sha256-hPS8B3DF+Em0ffL+z5z39dzyHlcdW0bgNNU3rRfzA9c="; # web-resource
};
wmts-multi-dimensional = mkGeoserverExtension {
name = "wmts-multi-dimensional";
version = "2.28.1"; # wmts-multi-dimensional
hash = "sha256-tJP9pPKKYFLGbLWZEV5gWSaQdTbml3OKiIPM1sqhekY="; # wmts-multi-dimensional
version = "2.28.2"; # wmts-multi-dimensional
hash = "sha256-9wsLHgj0g+qGTfeVTkECfwIO1YwBRsxnS5H1NmsDqU0="; # wmts-multi-dimensional
};
wps = mkGeoserverExtension {
name = "wps";
version = "2.28.1"; # wps
hash = "sha256-aYAN89XFpwzsW5aRBKSnixks3bxCAfOOznFDpoIvbIk="; # wps
version = "2.28.2"; # wps
hash = "sha256-DaL2b26sHW7a3WVB19H/S6pEJDde8fRwrHBDitWXqDI="; # wps
};
# Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
# available in nixpgs as of 2024/01.
#wps-cluster-hazelcast = mkGeoserverExtension {
# name = "wps-cluster-hazelcast";
# version = "2.28.1"; # wps-cluster-hazelcast
# hash = "sha256-hO1/7OG9J5Ot5xKhMUbTAqm7B6TlecqNGxxbIuFCpCc="; # wps-cluster-hazelcast
# version = "2.28.2"; # wps-cluster-hazelcast
# hash = "sha256-+kgpkg+ZSi2IuupMUZ5O7aVXkeydylYv9ogALf4tDEM="; # wps-cluster-hazelcast
#};
wps-download = mkGeoserverExtension {
name = "wps-download";
version = "2.28.1"; # wps-download
hash = "sha256-qB1vtczNULOsEjZaof9cA5YKPDE0Dwcz6mlUtzCanPQ="; # wps-download
version = "2.28.2"; # wps-download
hash = "sha256-o3Ya6ez/Y0ia6dstYlkMd8t6UOc5dvfPo12BzsMpDh0="; # wps-download
};
# Needs Postrgres configuration or similar.
# See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
wps-jdbc = mkGeoserverExtension {
name = "wps-jdbc";
version = "2.28.1"; # wps-jdbc
hash = "sha256-9S6/TXK9YFzPD8u/S7SQuBcIGjUTalY69kzG4xbIU3g="; # wps-jdbc
version = "2.28.2"; # wps-jdbc
hash = "sha256-9Toz6BKX6XN4ohEX8+jEJ1z7aEYxbdFCiUmbiWYLXk8="; # wps-jdbc
};
ysld = mkGeoserverExtension {
name = "ysld";
version = "2.28.1"; # ysld
hash = "sha256-qLWnujvB32U0EW7xW12GaAx6mPHkrU5Pa3S+T8+19r8="; # ysld
version = "2.28.2"; # ysld
hash = "sha256-XIQ6ksnySRNwtfMI696E57tIv1Aa2XKmyEpHdX7sRGs="; # ysld
};
}
+2 -2
View File
@@ -10,11 +10,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "geoserver";
version = "2.28.1";
version = "2.28.2";
src = fetchurl {
url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip";
hash = "sha256-wll05KPMVfpZGnybBxLeGH3pan8q4eWy8F4v5y5N3Gk=";
hash = "sha256-Gp38NuG92I4RF+9VL5bmS0uIUU9/IAbw5FqLkiOxcLQ=";
};
sourceRoot = ".";
+6 -5
View File
@@ -1,21 +1,22 @@
{
lib,
buildGoModule,
buildGo126Module,
fetchFromGitea,
}:
buildGoModule (finalAttrs: {
buildGo126Module (finalAttrs: {
pname = "gitea-mcp-server";
version = "0.8.1";
version = "1.0.1";
src = fetchFromGitea {
domain = "gitea.com";
owner = "gitea";
repo = "gitea-mcp";
tag = "v${finalAttrs.version}";
hash = "sha256-2K5bdrz7P99PmcY4iJp74PHSyvvE/aiC8UJMz9q3N88=";
hash = "sha256-B7uB69YsQd8EeENrezFK7kFXha21XValjEAYRjeYreo=";
};
vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
vendorHash = "sha256-xfhvbTcniRnkv81MIEnoy36up8O2IZ1WUrhYJrhtZ3k=";
subPackages = [ "." ];
+15 -6
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
pkg-config,
intltool,
libxml2,
@@ -37,6 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-fv4RlIfJiLY3MbsAsgRgJ010/Ob1X1be29XfoweCMpI=";
};
patches = [
# Replace bool type with gboolean.
# See https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/39.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnumeric/-/commit/dee6523426b75c10c36b188fafe6e7a27b6631e3.patch";
hash = "sha256-a4KgxsrU9m/dZqu2LNC+jWiXvCTcRPzZW/67pg8yLGY=";
})
];
postPatch = ''
substituteInPlace configure.ac \
--replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#'
'';
preConfigure = ''
./autogen.sh
'';
@@ -74,11 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
postPatch = ''
substituteInPlace configure.ac \
--replace-fail 'GLIB_COMPILE_RESOURCES=' 'GLIB_COMPILE_RESOURCES="glib-compile-resources"#'
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gnumeric";
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "go-passbolt-cli";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "passbolt";
repo = "go-passbolt-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-EytU20jdrfXwuoofp8OAphX9jjUoFpKva75PBDIFDD8=";
hash = "sha256-cvcRVeVwwfVX96Ud6YmimtGJ1uJYcIhryWB1Yebr1Vc=";
};
vendorHash = "sha256-HbwGF9ZTwWdJf7XnUKnS1n58GSaPTRlblXAmtKQoooU=";
vendorHash = "sha256-M8jix6bJ+venQvwm1FTJ7+fXQxSIrdCdXmmp2aVkZo8=";
ldflags = [
"-X=main.version=${finalAttrs.version}"
+9 -9
View File
@@ -1,30 +1,30 @@
{
stdenv,
lib,
buildGo125Module,
buildGo126Module,
fetchFromGitHub,
installShellFiles,
buildPackages,
testers,
goreleaser,
}:
buildGo125Module rec {
buildGo126Module (finalAttrs: {
pname = "goreleaser";
version = "2.13.3";
version = "2.14.3";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${version}";
hash = "sha256-VlpBz2FguUfN+ssv+PLSB9RDgLKGP2V/0pAxaLNGu7w=";
rev = "v${finalAttrs.version}";
hash = "sha256-2zG7B6d+NZ1XJrObCfgBZyin5JDv6hKlvZ8C4ckAJ8Q=";
};
vendorHash = "sha256-UiQ8JH6ISOmo5rQzxE1Zf4jU8VXtI29GsZFTINokLo8=";
vendorHash = "sha256-ImjoPvxkg35Fn4XdhTFLT2o4cDCjuyEOn1mDkMTjksk=";
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.version=${finalAttrs.version}"
"-X main.builtBy=nixpkgs"
];
@@ -53,7 +53,7 @@ buildGo125Module rec {
passthru.tests.version = testers.testVersion {
package = goreleaser;
command = "goreleaser -v";
inherit version;
inherit (finalAttrs) version;
};
meta = {
@@ -67,4 +67,4 @@ buildGo125Module rec {
license = lib.licenses.mit;
mainProgram = "goreleaser";
};
}
})
+2 -2
View File
@@ -10,13 +10,13 @@
buildGoModule (finalAttrs: {
pname = "gosmee";
version = "0.29.0";
version = "0.30.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = "gosmee";
tag = "v${finalAttrs.version}";
hash = "sha256-93KO0rKyNlc1gxmG/4uWJUC6KccW5pBfxl/a/x1B9f8=";
hash = "sha256-IOxUpZUIIts2MU9YwHmzVDgyO1oV8sWzi3nOWogYJTQ=";
};
vendorHash = null;
+14 -12
View File
@@ -3,22 +3,27 @@
stdenv,
cmake,
fetchFromGitHub,
fetchpatch,
nix-update-script,
xercesc,
gtest,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libe57format";
version = "3.2.0";
version = "3.3.0";
src = fetchFromGitHub {
owner = "asmaloney";
repo = "libE57Format";
rev = "v${finalAttrs.version}";
hash = "sha256-GyzfJshL2cOTEDp8eR0sqQq4GSnOdskiLi5mY1a2KW0=";
fetchSubmodules = true; # for submodule-vendored libraries such as `gtest`
tag = "v${finalAttrs.version}";
hash = "sha256-rEX251cgb6GMToGzcZcwDzjLZBGcwN8+ij1nCIpK2ZE=";
};
postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
rmdir test/extern/googletest
ln -s ${gtest.src} test/extern/googletest
'';
# Repository of E57 files used for testing.
libE57Format-test-data_src = fetchFromGitHub {
owner = "asmaloney";
@@ -27,16 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-JARpxp6Z2VioBfY0pZSyQU2mG/EllbaF3qteSFM9u8o=";
};
env.CXXFLAGS = toString [
# GCC 13: error: 'int16_t' has not been declared in 'std'
"-include cstdint"
];
nativeBuildInputs = [
cmake
];
buildInputs = [
propagatedBuildInputs = [
xercesc
];
@@ -72,11 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c
mv libE57FormatShared.so libE57Format.so
if [ "$dontDisableStatic" -ne "1" ]; then
if [ "''${dontDisableStatic:-1}" -ne "1" ]; then
rm libE57Format.a
fi
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Library for reading & writing the E57 file format";
homepage = "https://github.com/asmaloney/libE57Format";
+5 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mapproxy";
version = "5.1.1";
version = "6.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "mapproxy";
repo = "mapproxy";
tag = finalAttrs.version;
hash = "sha256-4TRaY/NfOjmq5v+6Rv2UGwF1rqnw4UggVOX2HMa5mVI=";
hash = "sha256-1LDN0vfnJlINHCIagQWhai4uJP+Fidi/9seBoJIlLl0=";
};
prePatch = ''
@@ -26,9 +26,12 @@ python3Packages.buildPythonApplication (finalAttrs: {
pythonRemoveDeps = [ "future" ];
dependencies = with python3Packages; [
babel
boto3 # needed for caches service
jinja2
jsonschema
pillow
python-dateutil
pyyaml
pyproj
shapely
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "morse";
version = "2.6";
version = "2.7";
src = fetchFromGitLab {
owner = "esr";
repo = "morse-classic";
tag = finalAttrs.version;
hash = "sha256-wk/Jcp2YWUlecV3OMELD6IWrlj3IC8kh0U4geMxG4fw=";
hash = "sha256-KIFvOPPIpjRsXQDgaQuAFmYDcCwp9rOm9yxTFPOtf3E=";
};
buildInputs = [
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mprisence";
version = "1.4.2";
version = "1.4.3";
src = fetchFromGitHub {
owner = "lazykern";
repo = "mprisence";
tag = "v${finalAttrs.version}";
hash = "sha256-tzxuofwhYq6iRZ+f+T9KkXCV9gIplYc1LdB85D75hBA=";
hash = "sha256-5iNxNuLtIZDz8lS1J8qjBousGy/2ZR1/KI/xeFuQfSU=";
};
cargoHash = "sha256-W4/ppT37h+Ho7oVKA/2KhCjQeZX0NiIqdopQmBWf/Xc=";
cargoHash = "sha256-MIclhi34hXqhpSnyqxS496Fd8Xv/gFJJS3/4EObVYHs=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -6,13 +6,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "nerdfetch";
version = "8.5.1";
version = "8.5.4";
src = fetchFromGitHub {
owner = "ThatOneCalculator";
repo = "NerdFetch";
tag = "v${finalAttrs.version}";
hash = "sha256-wt/VpieLuS8cAUlpCdiFysdrjXwgGZ436eMUycTl0S4=";
hash = "sha256-tV8Ug7i/BTD+TxUCejwYdGLYauAYos18AnWQ1XgynWs=";
};
dontUnpack = true;
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
description = "POSIX *nix (Linux, macOS, Android, *BSD, etc) fetch script using Nerdfonts";
homepage = "https://github.com/ThatOneCalculator/NerdFetch";
changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/ThatOneCalculator/NerdFetch/releases/tag/${finalAttrs.src.tag}";
maintainers = with lib.maintainers; [ ByteSudoer ];
license = lib.licenses.mit;
mainProgram = "nerdfetch";
@@ -6,16 +6,16 @@
buildNpmPackage rec {
pname = "netbird-dashboard";
version = "2.32.5";
version = "2.34.2";
src = fetchFromGitHub {
owner = "netbirdio";
repo = "dashboard";
rev = "v${version}";
hash = "sha256-DNIibCGeC4dzJ8xKQPLkWJZ2YfW2igLse+321SrSmhE=";
hash = "sha256-eqDH0mtxb756M6G0pC+FmbZtgj0vk9uKXnzCHlPEquE=";
};
npmDepsHash = "sha256-shN+XdS5Z2MxEFy453YqqovDUXbde3L9Y7+cPZW53/Y=";
npmDepsHash = "sha256-AYbTtUgo/e9BD5Kg877qUHkj+4l2OJ88rxnquA2789k=";
npmFlags = [ "--legacy-peer-deps" ];
installPhase = ''
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "nomore403";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "devploit";
repo = "nomore403";
tag = "v${finalAttrs.version}";
hash = "sha256-5jZgX8Cj+K2XHnSqmyq0/AQ295XHO9aI94niLNdxwuc=";
hash = "sha256-7rtmLBHv7QcfrD5+y6+r1uX1vB3VlxJzXQeBYUW6tK8=";
};
vendorHash = "sha256-SGme/lJ/QZz4LEe3HJYGSmowDqekKIwXEJzZAgrvUGU=";
vendorHash = "sha256-zAkS0o+wOQLmCil7Lh7DIZCcHYiceb1KwiK/vkSYYwk=";
ldflags = [
"-s"
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "nvidia-mig-parted";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "mig-parted";
tag = "v${finalAttrs.version}";
hash = "sha256-No8NzmjDjri77r7YzuSYsGMvHHMxsvxJaddarKcDMr0=";
hash = "sha256-b+/Rz1Lj+Ef7fIw4g2el8td982SGKXb0iPboP53XGKQ=";
};
vendorHash = null;
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule (finalAttrs: {
pname = "openfga-cli";
version = "0.7.10";
version = "0.7.11";
src = fetchFromGitHub {
owner = "openfga";
repo = "cli";
rev = "v${finalAttrs.version}";
hash = "sha256-2sFuECnQoxySqTY0QWgKs5DUd+15fqd8m43zcVqfrXI=";
hash = "sha256-kExvR5FxC1VbT8xmkFREdeqJ+ism7Is1pTgrBMJp7Qs=";
};
vendorHash = "sha256-8MRafaGwu16+G20RMvBPu7JhyNu5FOIr7+sN7knw6ac=";
vendorHash = "sha256-QBUPJ+rWT8BeIVx/437j/pUNBHmIVWkEyRpnWhYdjO4=";
nativeBuildInputs = [ installShellFiles ];
-2
View File
@@ -24,7 +24,6 @@
proj,
sqlite,
tiledb,
xercesc,
zlib,
zstd,
}:
@@ -59,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
proj
sqlite
tiledb
xercesc
zlib
zstd
]
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "penelope";
version = "0.18.0";
version = "0.19.1";
pyproject = true;
src = fetchFromGitHub {
owner = "brightio";
repo = "penelope";
tag = "v${finalAttrs.version}";
hash = "sha256-ryUG/OQsU6mecr+kSe5CD41a53xNRrPs1esL+V1lmdQ=";
hash = "sha256-72HFPByH4FBRIYaTeEWaZ2dW43Q1OjosT3qAOMiu5t4=";
};
postPatch = ''
+2 -2
View File
@@ -19,11 +19,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qownnotes";
appname = "QOwnNotes";
version = "26.3.7";
version = "26.3.13";
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
hash = "sha256-bweV/rDRZIm7QJr9RwcycMOYti5nZGAClvAgA4KsPP4=";
hash = "sha256-7B88l012hOKmAUJ5LvSEs8vwRmTv1yuzaj3OXTwLRPY=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -11,14 +11,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
version = "0.9.9";
version = "1.0.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
tag = "v${finalAttrs.version}";
sha256 = "sha256-lL90qhd0qggLQ98g4FgMHZT6xBChHACmASLvxfYNAAw=";
sha256 = "sha256-cBypvVr/DwnzeKX32PCHKg3vR/7fReRiJB5Pfh11blA=";
};
nativeBuildInputs = [
@@ -0,0 +1,25 @@
From aa31e5d8af9295488bef3a559ec3756d5021501d Mon Sep 17 00:00:00 2001
From: Markus Theil <markus.theil@secunet.com>
Date: Mon, 16 Mar 2026 13:14:29 +0100
Subject: [PATCH] fix build with Botan 3.11
Signed-off-by: Markus Theil <markus.theil@secunet.com>
---
src/lib/crypto/mem.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/crypto/mem.cpp b/src/lib/crypto/mem.cpp
index 94d90f54..dbd2a143 100644
--- a/src/lib/crypto/mem.cpp
+++ b/src/lib/crypto/mem.cpp
@@ -25,6 +25,7 @@
*/
#include <cstdio>
+#include <cstring>
#include "mem.h"
#include "logging.h"
#include <botan/ffi.h>
--
2.53.0
+2
View File
@@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
];
patches = [
# tracked at https://github.com/rnpgp/rnp/pull/2381
./0001-fix-build-with-Botan-3.11.patch
];
cmakeFlags = [
+8 -8
View File
@@ -21,8 +21,8 @@
wolfssl,
python3,
pugixml,
flatbuffers,
llvm_18,
protobuf_33,
llvm,
cubeb,
opencv,
enableDiscordRpc ? false,
@@ -50,19 +50,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "rpcs3";
version = "0.0.39-unstable-2026-01-15";
version = "0.0.39-unstable-2026-02-20";
src = fetchFromGitHub {
owner = "RPCS3";
repo = "rpcs3";
rev = "eaebd3426e7050c35beb8f24952d6da4d6a75360";
rev = "6bfb33279f6989f3ff9ea2dc40ef45d6aeb57ef8";
postCheckout = ''
cd $out/3rdparty
git submodule update --init \
fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
feralinteractive/feralinteractive
'';
hash = "sha256-iE7iZ66BSWI96a9DOeBQEx6NV+CtIyX0PXg3O2RXHWY=";
hash = "sha256-Cu4Zaze0FZ00sRvPtUzUkOiX5ZAHWTtmWa536gNOTNY=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "USE_SYSTEM_FAUDIO" true)
(lib.cmakeBool "USE_SYSTEM_OPENAL" true)
(lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
(lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true)
(lib.cmakeBool "USE_SYSTEM_PROTOBUF" true)
(lib.cmakeBool "USE_SYSTEM_SDL" true)
(lib.cmakeBool "USE_SYSTEM_OPENCV" true)
(lib.cmakeBool "USE_SYSTEM_CUBEB" true)
@@ -131,8 +131,8 @@ stdenv.mkDerivation (finalAttrs: {
python3
pugixml
sdl3
flatbuffers
llvm_18
protobuf_33
llvm
libsm
opencv.cxxdev
cubeb
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shader-slang";
version = "2026.4";
version = "2026.4.2";
src = fetchFromGitHub {
owner = "shader-slang";
repo = "slang";
tag = "v${finalAttrs.version}";
hash = "sha256-BuvIXhxKMXkqxXu4kuGOGrhT+/MrNXAdfPTbX9++wys=";
hash = "sha256-BOI3lIb04zLGz9HCK4HPziX+yVHu2BBAP5M6I07L1fQ=";
fetchSubmodules = true;
};
+10 -9
View File
@@ -1,21 +1,21 @@
{
lib,
buildGoModule,
buildGo126Module,
fetchFromGitHub,
findutils,
go,
go_1_26,
nix-update-script,
}:
buildGoModule (finalAttrs: {
buildGo126Module (finalAttrs: {
pname = "tsgolint";
version = "0.11.5";
version = "0.17.0";
src = fetchFromGitHub {
owner = "oxc-project";
repo = "tsgolint";
tag = "v${finalAttrs.version}";
hash = "sha256-XPx8yU3K2v5+FTANwXX9xs+d/WEz6L19suf1QED/Mbs=";
hash = "sha256-bY5oDaaKMu4KmGQFT3MyzNNKZWC8PVSRjAgWYhPVE2s=";
fetchSubmodules = true;
};
@@ -30,8 +30,9 @@ buildGoModule (finalAttrs: {
(finalAttrs.src + "/patches/0001-Parallel-readDirectory-visitor.patch")
(finalAttrs.src + "/patches/0002-Adapt-project-service-for-single-run-mode.patch")
(finalAttrs.src + "/patches/0003-patch-expose-more-functions-via-the-shim-with-type-f.patch")
(finalAttrs.src + "/patches/0004-feat-improve-panic-message-for-extracting-TS-extensi.patch")
(finalAttrs.src + "/patches/0005-fix-early-return-from-invalid-tsconfig-for-better-er.patch")
(finalAttrs.src + "/patches/0004-fix-early-return-from-invalid-tsconfig-for-better-er.patch")
(finalAttrs.src + "/patches/0005-fix-collections-avoid-internal-json-import-in-ordere.patch")
(finalAttrs.src + "/patches/0006-perf-vfs-cache-ReadFile-results-in-cachedvfs.patch")
];
postPatch =
@@ -39,7 +40,7 @@ buildGoModule (finalAttrs: {
# the local module to the go.mod instead.
''
popd
${lib.getExe go} mod edit --replace=github.com/microsoft/typescript-go=./typescript-go
${lib.getExe go_1_26} mod edit --replace=github.com/microsoft/typescript-go=./typescript-go
''
+
# From justfile's "init" target upstream.
@@ -49,7 +50,7 @@ buildGoModule (finalAttrs: {
'';
proxyVendor = true;
vendorHash = "sha256-5NX+rjdPz/ZSVmykOc5ffFg1rplF1pznIWKiydl6kKY=";
vendorHash = "sha256-Mb78gEN582QFTRTBefdAz8Yly2vB3zbPyViRnA1V3wI=";
subPackages = [ "cmd/tsgolint" ];
+46
View File
@@ -0,0 +1,46 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
autoPatchelfHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "unitree-sdk2";
version = "2.0.2";
src = fetchFromGitHub {
owner = "unitreerobotics";
repo = "unitree_sdk2";
rev = finalAttrs.version;
hash = "sha256-a+O3jQDJFq/v0zhpGJVuwjgWAZWkIqiNfKt/L4IOSco=";
};
nativeBuildInputs = [
cmake
autoPatchelfHook
];
buildInputs = [
stdenv.cc.cc.lib
];
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
];
# The SDK core is a prebuilt static library; only cmake configure and install are needed
dontBuild = true;
meta = {
description = "Unitree robot SDK version 2 for Go2, B2, H1, and G1 robots";
homepage = "https://github.com/unitreerobotics/unitree_sdk2";
license = lib.licenses.bsd3;
platforms = [
"x86_64-linux"
"aarch64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wireguard-tools";
version = "1.0.20250521";
version = "1.0.20260223";
src = fetchzip {
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${finalAttrs.version}.tar.xz";
sha256 = "sha256-V9yKf4ZvxpOoVCFkFk18+130YBMhyeMt0641tn0O0e0=";
sha256 = "sha256-jOFEE9CcCjU52nPO/+ib72rqki7H1qkIinv7Z8yWQBA=";
};
outputs = [
+1 -1
View File
@@ -3,5 +3,5 @@
set -eu -o pipefail
version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\tkmodtools\t\([^\t]\+\)\t.*/\1/p')"
version="$(curl -sL https://build.wireguard.com/distros.txt | sed -n 's/^upstream\ttools\t\([^\t]\+\)\t.*/\1/p')"
update-source-version wireguard-tools "$version"
+9 -9
View File
@@ -1,18 +1,18 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2026-01-29
# Last updated: 2026-03-18
{
linux-version = "12.1.2.24722";
darwin-version = "12.1.25195";
linux-version = "12.1.2.24730";
darwin-version = "12.1.25205";
x86_64-linux = {
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24722/wps-office_12.1.2.24722.AK.preread.sw_612408_amd64.deb";
hash = "sha256-eSX3Zu1q1Hrq1HNQPfILJWH7D3F55rr3FiJ79Er57xs=";
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24730/wps-office_12.1.2.24730.AK.preread.sw_625635_amd64.deb";
hash = "sha256-kkITeff8xnq2E9OpiMeMr2ixTILhVbTfScESxZ3WXCY=";
};
x86_64-darwin = {
url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_x64.dmg";
hash = "sha256-QwCV281dlE0j0Q2dHt/gV3QPFaQ8vQm8UIU2ohaaSus=";
url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_x64.dmg";
hash = "sha256-U//LuyogUn8+WUVkFSRIWMeQK3cPpyfu4c+84jnXoAw=";
};
aarch64-darwin = {
url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25195/WPS_Office_12.1.25195(25195)_arm64.dmg";
hash = "sha256-9HqZTJ73tE8XzbEI+MH3ePVNr/gtELwcjZHrAKWK+x0=";
url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_arm64.dmg";
hash = "sha256-/lMVXokvwKCMRChpCyi01ehJgTUeoKHP1MlNzTX1NvA=";
};
}
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "youtube-tui";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "Siriusmart";
repo = "youtube-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-a2Y0CATnKmZsYr3eUch3EUgHw41X1a2iOP0CjEJLXnc=";
hash = "sha256-bTdhncgtQaC367P7OLfX5om+Zn0+V5HHGaWJ252xnrA=";
};
cargoHash = "sha256-W3MBYcxb51cBjHUF7zXMOrRVzcxUX/TxiLyYGuOPFyI=";
cargoHash = "sha256-Mq0FyapMGufTyPJXfRVZtPa3XMdimZ8nSXqTue1tdA0=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -9,14 +9,14 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "ytdl-sub";
version = "2026.03.09.post3";
version = "2026.03.13";
pyproject = true;
src = fetchFromGitHub {
owner = "jmbannon";
repo = "ytdl-sub";
tag = finalAttrs.version;
hash = "sha256-+ULR/8bHO6gX7oWDbj3WHqYLXTwbDxSPenEDXGETTi0=";
hash = "sha256-P+LCDk/d/gsqOoBh6cyYpJVgVQ6jL3dhlywvvH1AkW4=";
};
postPatch = ''
@@ -3,7 +3,7 @@
mkCoqDerivation,
which,
coq,
metarocq,
metarocq-erasure,
bignums,
QuickChick,
stdpp,
@@ -25,14 +25,15 @@ mkCoqDerivation {
in
lib.switch coq.coq-version [
(case "9.1" "1.0.0")
(case "9.1" "1.0.1")
] null;
release."1.0.1".sha256 = "sha256-HqbgUnGcZHkeG6qLf4qp/JT5oTPmdfOn1IJqnrloM2U=";
release."1.0.0".sha256 = "sha256-R+kWOZtR7T2LVQnHmLGDmGpLO0S76fPRWJpsO9nWqLE=";
releaseRev = v: "v${v}";
propagatedBuildInputs = [
coq.ocamlPackages.findlib
metarocq
metarocq-erasure
bignums
QuickChick
stdpp
@@ -4,7 +4,7 @@
which,
coq,
stdlib,
metarocq,
metarocq-erasure,
version ? null,
single ? false,
}:
@@ -29,13 +29,15 @@ let
lib.switch
[
coq.coq-version
metarocq.version
metarocq-erasure.version
]
[
(case "9.1" "1.5.1-9.1" "0.2.1")
(case "9.1" (lib.versions.range "1.4" "1.4.1") "0.2.0")
]
null;
release = {
"0.2.1".sha256 = "sha256-GWdu/l7CipeBubgS5OGHsZfpP2Fkr1cfiZMRH5d1n0g=";
"0.2.0".sha256 = "sha256-rgg39X45IXjcnejBhh8N7wMiH+gHQrfO8pBbFEWOGVI=";
};
releaseRev = v: "v${v}";
@@ -87,7 +89,7 @@ let
propagatedBuildInputs = [
stdlib
coq.ocamlPackages.findlib
metarocq
metarocq-erasure
]
++ typedextraction-deps;
@@ -2,7 +2,7 @@
lib,
mkCoqDerivation,
coq,
metarocq,
metarocq-utils,
stdlib,
version ? null,
}:
@@ -31,7 +31,7 @@ mkCoqDerivation {
propagatedBuildInputs = [
coq.ocamlPackages.findlib
stdlib
metarocq
metarocq-utils
];
meta = {
@@ -4,6 +4,8 @@
single ? false,
coq,
equations,
ExtLib,
stdlib,
version ? null,
}@args:
@@ -15,7 +17,7 @@ let
case = case: out: { inherit case out; };
in
lib.switch coq.coq-version [
(case "9.1" "1.4.1-9.1")
(case "9.1" "1.5.1-9.1")
(case "9.0" "1.4-9.0.1")
] null;
release = {
@@ -23,6 +25,7 @@ let
"1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
"1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE=";
"1.4.1-9.1".sha256 = "sha256-tzoAWX74lg7pArGVP11QBvDRKMvmGxXvrf3+1E3Y4DI=";
"1.5.1-9.1".sha256 = "sha256-0iFnSzfbufn2XhJ8EPyWu3KIiHYwxfMVQa2KT6GSR7s=";
};
releaseRev = v: "v${v}";
@@ -91,6 +94,8 @@ let
mlPlugin = true;
propagatedBuildInputs = [
equations
ExtLib
stdlib
coq.ocamlPackages.zarith
coq.ocamlPackages.stdlib-shims
]
@@ -1,4 +1,5 @@
{
lib,
buildDunePackage,
conduit-lwt,
ppx_sexp_conv,
@@ -30,7 +31,7 @@ buildDunePackage {
lwt_ssl
];
doCheck = true;
doCheck = !lib.versionAtLeast lwt.version "6.0.0";
checkInputs = [
lwt_log
ssl
@@ -3,7 +3,6 @@
fetchFromGitHub,
buildDunePackage,
zed,
lwt_log,
lwt_react,
mew_vi,
uucp,
@@ -23,7 +22,6 @@ buildDunePackage (finalAttrs: {
propagatedBuildInputs = [
zed
lwt_log
lwt_react
mew_vi
uucp
@@ -7,15 +7,13 @@
dune-configurator,
ocplib-endian,
ppxlib,
version ? if lib.versionAtLeast ppxlib.version "0.36" then "5.9.2" else "5.9.1",
version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.1" else "5.9.1",
}:
buildDunePackage {
pname = "lwt";
inherit version;
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "lwt";
@@ -24,6 +22,7 @@ buildDunePackage {
{
"5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
"5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8=";
"6.1.1" = "sha256-EMlA+mh66bfVNqDcmuaW7GoEEu6xQhCRjZx7t7pHuGo=";
}
."${version}";
};
@@ -2,6 +2,7 @@
lib,
buildDunePackage,
fetchurl,
fetchpatch,
eio,
lwt,
}:
@@ -16,6 +17,11 @@ buildDunePackage rec {
hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE=";
};
patches = lib.optional (lib.versionAtLeast lwt.version "6.0.0") (fetchpatch {
url = "https://github.com/ocaml-multicore/lwt_eio/commit/5f8bf1e7af33590683ee45151894d7b9a20607f0.patch";
hash = "sha256-5A3Bh+xOXo79Rw145hYqYv42li30M0TKLW+qu/dC0KQ=";
});
propagatedBuildInputs = [
eio
lwt
@@ -5,17 +5,15 @@
lwt,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "lwt_log";
version = "1.1.2";
minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "aantron";
repo = pname;
rev = version;
sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
repo = "lwt_log";
tag = finalAttrs.version;
hash = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
};
propagatedBuildInputs = [ lwt ];
@@ -25,5 +23,6 @@ buildDunePackage rec {
homepage = "https://github.com/aantron/lwt_log";
license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ];
broken = lib.versionAtLeast lwt.version "6.0.0";
};
}
})
@@ -20,7 +20,6 @@
ca-certs,
cohttp,
cohttp-lwt-unix,
lwt_log,
re,
logs-syslog,
cryptokit,
@@ -78,7 +77,6 @@ buildDunePackage (finalAttrs: {
cohttp-lwt-unix
cryptokit
ipaddr
lwt_log
lwt_ssl
re
logs-syslog
@@ -1,20 +1,37 @@
{
lib,
buildDunePackage,
applyPatches,
fetchpatch,
fetchFromGitHub,
lwt_ppx,
lwt,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "ocsipersist-lib";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsipersist";
tag = version;
hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU=";
src = applyPatches {
src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsipersist";
tag = finalAttrs.version;
hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU=";
};
patches = [
# Migrate to logs
(fetchpatch {
url = "https://github.com/ocsigen/ocsipersist/commit/1fc0088b4dc2226f01863dd25f8ed56528c5543d.patch";
hash = "sha256-WR7SW8jAAo47AIQ7UMQNF8FTXgj6FbxIqFjrLhu7wFs=";
excludes = [
"*.opam"
"dune-project"
];
})
];
};
buildInputs = [ lwt_ppx ];
@@ -26,4 +43,4 @@ buildDunePackage rec {
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/ocsigen/ocsipersist/";
};
}
})
@@ -1,7 +1,7 @@
{
buildDunePackage,
ocsipersist,
lwt_log,
logs,
pgocaml,
xml-light,
}:
@@ -11,7 +11,7 @@ buildDunePackage {
inherit (ocsipersist) version src;
propagatedBuildInputs = [
lwt_log
logs
ocsipersist
pgocaml
];
@@ -1,7 +1,7 @@
{
buildDunePackage,
ocsipersist,
lwt_log,
logs,
ocaml_sqlite3,
ocsigen_server,
}:
@@ -11,7 +11,7 @@ buildDunePackage {
inherit (ocsipersist) version src;
propagatedBuildInputs = [
lwt_log
logs
ocaml_sqlite3
ocsipersist
];
@@ -31,5 +31,6 @@ buildDunePackage rec {
meta = {
description = "Test framework for unit tests, integration tests, and regression tests";
license = lib.licenses.mit;
broken = lib.versionAtLeast lwt.version "6.0.0";
};
}
@@ -33,14 +33,14 @@
buildPythonPackage (finalAttrs: {
pname = "a2a-sdk";
version = "0.3.24";
version = "0.3.25";
pyproject = true;
src = fetchFromGitHub {
owner = "a2aproject";
repo = "a2a-python";
tag = "v${finalAttrs.version}";
hash = "sha256-NnLyLCoUFzTp9ji8OE+JxtCHMzy0Ri3uPLoN2HyAjxU=";
hash = "sha256-pGsxrNRqIFXEOxstvTFC4sXjZvphMHfPYzk4xhjaA6s=";
};
build-system = [
@@ -11,14 +11,14 @@
buildPythonPackage (finalAttrs: {
pname = "adafruit-io";
version = "2.8.2";
version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "adafruit";
repo = "Adafruit_IO_Python";
tag = finalAttrs.version;
hash = "sha256-JYQKrGg4FRzqq3wy/TqafC16rldvPEi+/xEI7XGvWM8=";
hash = "sha256-INi1ZJf9j8fP+DJrtQvXKWr7gjp8V7OQVOBuSMB1O/0=";
};
build-system = [
@@ -5,11 +5,12 @@
flit-core,
pytestCheckHook,
pythonAtLeast,
typing-extensions,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "asyncstdlib";
version = "3.13.1";
version = "3.13.3";
pyproject = true;
# https://github.com/maxfischer2781/asyncstdlib/issues/189
@@ -18,21 +19,24 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "maxfischer2781";
repo = "asyncstdlib";
tag = "v${version}";
hash = "sha256-U2/LPbg/U6CUB22EpsJHprK2ngjQmZhLtEEuszuzB8Q=";
tag = "v${finalAttrs.version}";
hash = "sha256-3mM97zB/pEw8/kPO6jUL7dz6Q7kVatfsURy+5zSq9Bs=";
};
build-system = [ flit-core ];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
typing-extensions
];
pythonImportsCheck = [ "asyncstdlib" ];
meta = {
description = "Python library that extends the Python asyncio standard library";
homepage = "https://asyncstdlib.readthedocs.io/";
changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/${src.tag}";
license = with lib.licenses; [ mit ];
changelog = "https://github.com/maxfischer2781/asyncstdlib/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -34,7 +34,7 @@ buildPythonPackage rec {
setuptools-scm
];
sourceRoot = "Botan-${version}/src/python";
sourceRoot = "source/src/python";
postPatch = ''
# remove again, when https://github.com/randombit/botan/pull/5040 got
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "garminconnect";
version = "0.2.38";
version = "0.2.40";
pyproject = true;
src = fetchFromGitHub {
owner = "cyberjunky";
repo = "python-garminconnect";
tag = version;
hash = "sha256-d2R/ir/dxFnC4ZjLBHP+mm9JMtfPZ9VMxSRv35rE+CU=";
hash = "sha256-EAmKrOmnJFn+vTfmAprd5onqW/uyOe/shSB1u0HVrIE=";
};
pythonRelaxDeps = [
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202603171";
version = "0.1.202603181";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-MbGWIPYsuKO7oK360QThNQMd/qLcXsyu9uNAibp9CBs=";
hash = "sha256-rmb7T+olD0iLaie0luUHyltNgpPDO1BQOas+ZFPU2BY=";
};
__darwinAllowLocalNetworking = true;
@@ -10,14 +10,14 @@
buildPythonPackage (finalAttrs: {
pname = "identify";
version = "2.6.17";
version = "2.6.18";
pyproject = true;
src = fetchFromGitHub {
owner = "pre-commit";
repo = "identify";
tag = "v${finalAttrs.version}";
hash = "sha256-hnVG1TRkq605uFk3PmzqFwnzcYru/4OYbrJYAtDuo0g=";
hash = "sha256-Va1aWNeavA0iR/gKSrheJI/PIIy+KfmjEK1I97n9V/c=";
};
build-system = [ setuptools ];
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "kurbopy";
version = "0.11.1";
version = "0.13.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-05ezUpcHxCxo/4oyPKogq4/vdfpNnEBhtv+lYBjKdvg=";
hash = "sha256-JiXNgUeY2booOp1zaWtCuEqdyp/CxXy4rUo5kKmq0eQ=";
};
propagatedBuildInputs = [ fonttools ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-51qJAcJvolYCW3XWeymc2xd2QHiKLd7MdRdDedEH8QY=";
hash = "sha256-dWYOQk6kSGRL8nl3f89FWzdB17hgBALvsQkjeT9oKNc=";
};
nativeCheckInputs = [ pytestCheckHook ];
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "llama-index-readers-database";
version = "0.5.1";
version = "0.6.0";
pyproject = true;
src = fetchPypi {
pname = "llama_index_readers_database";
inherit version;
hash = "sha256-9hMQJ0DdMIADJ5Mtjx7PIq6pOHjUmCceecuPev10d/8=";
hash = "sha256-LDxPRKd+i4zwGArLW8b8URtBc9Y+id/uKEybnsW4c5U=";
};
build-system = [ hatchling ];
@@ -10,13 +10,13 @@
buildPythonPackage (finalAttrs: {
pname = "llama-index-workflows";
version = "2.15.1";
version = "2.16.1";
pyproject = true;
src = fetchPypi {
pname = "llama_index_workflows";
inherit (finalAttrs) version;
hash = "sha256-Xkba4saD06negApPr0crSqkVAms/Qb02urowexLNPn8=";
hash = "sha256-L2viI69AcITu8GS8vsj2CuTdAR2aBGMYh86YYlj6xYo=";
};
postPatch = ''
@@ -51,14 +51,14 @@
buildPythonPackage rec {
pname = "openai";
version = "2.24.0";
version = "2.28.0";
pyproject = true;
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
tag = "v${version}";
hash = "sha256-xFoNBbwz9VBp1IGIKroFIpGhJoWlHSB7AR8JpqKRV4A=";
hash = "sha256-81IlPvEdXpMAaxN4PYRFLbkLAl15gOuwUqhItV+cI7g=";
};
postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
@@ -1,5 +1,6 @@
{
lib,
aiofiles,
beautifulsoup4,
buildPythonPackage,
fetchFromGitHub,
@@ -10,14 +11,14 @@
buildPythonPackage (finalAttrs: {
pname = "pyporscheconnectapi";
version = "0.2.6";
version = "0.2.7";
pyproject = true;
src = fetchFromGitHub {
owner = "CJNE";
repo = "pyporscheconnectapi";
tag = finalAttrs.version;
hash = "sha256-aiNCT1IYSXdlJfIoQsBnVn9FGHifkI8e35VCQGGAAZ0=";
hash = "sha256-c46XAWKf7LeQ9Nz1IumOIs/Z8DuCa2zaatBizFT+FMg=";
};
postPatch = ''
@@ -28,6 +29,7 @@ buildPythonPackage (finalAttrs: {
build-system = [ setuptools ];
dependencies = [
aiofiles
beautifulsoup4
httpx
rich
@@ -5,16 +5,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pysyncobj";
version = "0.3.14";
version = "0.3.15";
pyproject = true;
src = fetchFromGitHub {
owner = "bakwc";
repo = "PySyncObj";
tag = "v${version}";
hash = "sha256-a1fECsLIEFu9Wwai0viR/lkqWVWBKs+OdxHey3Pltmo=";
tag = "v${finalAttrs.version}";
hash = "sha256-6kvWcKSyVtK3sdeetJxx1golIXRY/RYkFCpWBfs10rg=";
};
build-system = [ setuptools ];
@@ -27,9 +27,9 @@ buildPythonPackage rec {
meta = {
description = "Python library for replicating your class";
homepage = "https://github.com/bakwc/PySyncObj";
changelog = "https://github.com/bakwc/PySyncObj/releases/tag/v${version}";
changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "syncobj_admin";
};
}
})
@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "pyweatherflowudp";
version = "1.5.1";
version = "1.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "briis";
repo = "pyweatherflowudp";
tag = finalAttrs.version;
hash = "sha256-07AvFvrnNainBpve3pkiHzbrqSsjcP0N/nJ2slwVdqc=";
hash = "sha256-4zS6YQmceGfJMGR++VdymIfNq7NAB9jKDT6bVl0wHAc=";
};
build-system = [
@@ -6,26 +6,30 @@
fetchPypi,
pytestCheckHook,
pytest-cov-stub,
setuptools,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "tld";
version = "0.13.1";
format = "setuptools";
version = "0.13.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-dewAk2y89WT2c2HEFxM2NEC2xO8PDBWStbD75ywXo1A=";
hash = "sha256-2YP6krnXF0AHQvyoROKdXhgnEHnHvPq/ZtAbObShQ0U=";
};
nativeCheckInputs = [
pytestCheckHook
pytest-cov-stub
build-system = [
setuptools
setuptools-scm
];
checkInputs = [
nativeCheckInputs = [
factory-boy
faker
pytest-cov-stub
pytestCheckHook
];
doCheck = false; # missing pytest-codeblock
@@ -41,7 +45,6 @@ buildPythonPackage rec {
meta = {
description = "Extracts the top level domain (TLD) from the URL given";
mainProgram = "update-tld-names";
homepage = "https://github.com/barseghyanartur/tld";
changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst";
# https://github.com/barseghyanartur/tld/blob/master/README.rst#license
@@ -52,5 +55,6 @@ buildPythonPackage rec {
gpl2Only
];
maintainers = with lib.maintainers; [ fab ];
mainProgram = "update-tld-names";
};
}
@@ -1,11 +1,12 @@
{
lib,
buildPythonPackage,
boto3,
buildPythonPackage,
fetchFromGitHub,
httpretty,
keyring,
lz4,
orjson,
pytestCheckHook,
python-dateutil,
pytz,
@@ -35,6 +36,7 @@ buildPythonPackage rec {
dependencies = [
lz4
orjson
python-dateutil
pytz
requests
@@ -1,9 +1,11 @@
{
lib,
buildDunePackage,
js_of_ocaml-ppx,
js_of_ocaml,
lwt,
lwt_log,
loggerSupport ? !lib.versionAtLeast lwt.version "6.0.0",
}:
buildDunePackage {
@@ -16,6 +18,6 @@ buildDunePackage {
propagatedBuildInputs = [
js_of_ocaml
lwt
lwt_log
];
]
++ lib.optional loggerSupport lwt_log;
}