diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index cd24ce5ba03c..c6c5f758dfc8 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -393,10 +393,6 @@ buildGoModule (finalAttrs: { --replace-fail '"$LDFLAGS $STATIC" -o' \ '"$LDFLAGS" -o' - # Ensure the embedded tarball is reproducible: sort file order and clamp timestamps - substituteInPlace scripts/package-cli \ - --replace-fail 'tar cvf' 'tar c --sort=name --mtime=@0 -vf' - # Add the -e flag to process "errornous" packages. We need to modify this because the upstream # build-time version detection doesn't work with a vendor directory. substituteInPlace scripts/version.sh \ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a46a3f683c5e..80828080b269 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -155,13 +155,13 @@ "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o=" }, "checkly_checkly": { - "hash": "sha256-OCcEGqjpgsfi0hveucRw7I1j6qtqvuB54oxJS8351RY=", + "hash": "sha256-S83+rMPCN3Bt5kftmViYS2yUTsZsFtdiAE14WrBu+XA=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.21.1", + "rev": "v1.22.0", "spdx": null, - "vendorHash": "sha256-zmXfPmc+yl3nRf6HS6Hvy73yljau1gF1D9wat+Nw/2I=" + "vendorHash": "sha256-fY1oLzNYYNmUvOVNCWZlo2pvn2SgGjc4JnMORZdt/ss=" }, "ciscodevnet_aci": { "hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=", diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 9030799195bb..8435e824b843 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -274,6 +274,5 @@ edk2.mkDerivation projectDscPath (finalAttrs: { mjoerg sigmasquadron ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 5cf7ae30268d..c6027ed0ae27 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -39,6 +39,13 @@ stdenv.mkDerivation (finalAttrs: { "-O3" ]; + # ACPICA emits packed structs that produce unaligned pointers. Apple's + # arm64 linker rejects these under chained fixups; opt back into the + # legacy fixup format so the link succeeds. + NIX_LDFLAGS = lib.optionalString ( + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 + ) "-no_fixup_chains"; + # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable # -Werror altogether to make this derivation less fragile to toolchain # updates. @@ -46,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # We can handle stripping ourselves. # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. - INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; + INSTALLFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-m 555"; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 70efedec2921..1b6c251980c7 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aphorme"; - version = "0.1.19"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Iaphetes"; repo = "aphorme_launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI="; + hash = "sha256-eSJlWInGMFnn+16um7j8Dp92LYdNsfAdLJQSQIDAlaA="; }; - cargoHash = "sha256-knxFQ9hBBc8zATwf4ntbbmT2a+33uYcqax8AAFsj/NM="; + cargoHash = "sha256-CRDVIY5HVMFme+fOf9tdoT+VVy5z2+s5opw/KH25YOw="; # No tests exist doCheck = false; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 7fb9055926b8..e872aa63dc30 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2125.1"; + version = "2125.1.1"; src = fetchFromGitHub { owner = "azahar-emu"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { echo "${finalAttrs.version}" > "$out/GIT-TAG" git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT" ''; - hash = "sha256-F5v52axQ4+vH6ZqEEuuMtV5PVahWmnS3PixZHqywhtM="; + hash = "sha256-cSnD4H7rruhnSeVPQqvzLqvL5tM1o5WZ4oZunrlHZOM="; }; strictDeps = true; diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index 94d57da92c98..2913f020b813 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-QVaREzIkFl/4S8gaDyhkTS5wPL5GpzKlJL70UvqsvU4="; + hash = "sha256-f326mxdZD5INhfQAl3Rebt93r0Itk+ye8tAkw4BJsnA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix index 61b3f7e187cc..30c336a6f779 100644 --- a/pkgs/by-name/ce/cerberus/package.nix +++ b/pkgs/by-name/ce/cerberus/package.nix @@ -90,11 +90,13 @@ ocamlPackages.buildDunePackage (finalAttrs: { runHook postInstall ''; - doInstallCheck = false; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + # Bypass `dune exec` so its stderr warnings don't pollute test output. PATH="$out/bin":$PATH + export WITH_CERB=cerberus patchShebangs --build tests diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 11ac2e2a6fd2..f45f5bcd5789 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-IGCi9zDDilejWv/kZ34SLYM0ciq8QcgiM7dkXLFe5Js="; + hash = "sha256-vm1yz0iKErkw/l4cGPedVVaoBGLV0h4O7xA56e3IoqM="; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-66Mm/Hi6qi3Zk7cNrAhFB3np5xNO7r6pWWbfsiRf+cs="; + hash = "sha256-cBZymB2eI93ui8rdQzBibdf44lXJC/KGwoz0EyeOk2A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/dart_frog_cli/package.nix b/pkgs/by-name/da/dart_frog_cli/package.nix new file mode 100644 index 000000000000..8e34f206bf52 --- /dev/null +++ b/pkgs/by-name/da/dart_frog_cli/package.nix @@ -0,0 +1,61 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + versionCheckHook, + callPackage, +}: +buildDartApplication (finalAttrs: { + pname = "dart_frog_cli"; + version = "1.2.14"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "dart-frog-dev"; + repo = "dart_frog"; + tag = "dart_frog_cli-v${finalAttrs.version}"; + hash = "sha256-B5ET/SwQzYw251Ox/RyuLM27+M//xTehke9JJSD7Gf8="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/dart_frog_cli"; + + dartEntryPoints = { + "bin/dart_frog" = "bin/dart_frog.dart"; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + preBuild = '' + rm pubspec_overrides.yaml + ''; + + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + # If your tests.nix needs the package itself, pass finalAttrs.finalPackage + tests = callPackage ./tests.nix { }; + }; + + meta = { + mainProgram = "dart_frog"; + homepage = "https://dart-frog.dev"; + description = "Command line tools for Dart Frog"; + longDescription = '' + The official command line interface for Dart Frog — a fast, minimalistic backend framework for Dart. + ''; + changelog = "https://pub.dev/packages/dart_frog_cli/changelog#${ + lib.replaceString "." "" finalAttrs.version + }"; + license = lib.licenses.mit; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "dart-frog-dev" finalAttrs.version; + maintainers = with lib.maintainers; [ KristijanZic ]; + }; +}) diff --git a/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json b/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json new file mode 100644 index 000000000000..b80b77adb4d4 --- /dev/null +++ b/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json @@ -0,0 +1,797 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "99.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.9" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.1" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.5" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.1" + }, + "build_verify": { + "dependency": "direct dev", + "description": { + "name": "build_verify", + "sha256": "3b17b59b6d66f9d3e6014996f089902d56cec5760e051c353cc387b9da577652", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "build_version": { + "dependency": "direct dev", + "description": { + "name": "build_version", + "sha256": "1063066ec338c18f0629d01077c9315f92fae3e7e0e06d0dc10e8aa3145d44f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.5" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_completion": { + "dependency": "direct main", + "description": { + "name": "cli_completion", + "sha256": "72e8ccc4545f24efa7bbdf3bff7257dc9d62b072dee77513cc54295575bc9220", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "dart_frog_gen": { + "dependency": "direct main", + "description": { + "name": "dart_frog_gen", + "sha256": "f706052ef3423f48e946dd3d794f522fd79d73874b8cf6fed0631ed4ffe69a89", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.8" + }, + "equatable": { + "dependency": "direct main", + "description": { + "name": "equatable", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "mason": { + "dependency": "direct main", + "description": { + "name": "mason", + "sha256": "515b28eedc3e106bbbfb95f0ff63471003396978d3413daeba0a64bcac01367b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "mason_logger": { + "dependency": "transitive", + "description": { + "name": "mason_logger", + "sha256": "1d46102c6f299c0df7fe986dd3dd3271d57c2ec7c00ae590660b7c3018810048", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.19" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.2" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mocktail": { + "dependency": "direct dev", + "description": { + "name": "mocktail", + "sha256": "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mustache_template": { + "dependency": "transitive", + "description": { + "name": "mustache_template", + "sha256": "544ff0b837836f5ad6b351e7a676ff7c2cad4fa412c465908aeb9358caddb6fc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pub_updater": { + "dependency": "direct main", + "description": { + "name": "pub_updater", + "sha256": "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "pubspec_parse": { + "dependency": "direct main", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "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" + }, + "stream_transform": { + "dependency": "direct main", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "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": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.31.0" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.17" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.3" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.1.0" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.10.0 <4.0.0" + } +} diff --git a/pkgs/by-name/da/dart_frog_cli/tests.nix b/pkgs/by-name/da/dart_frog_cli/tests.nix new file mode 100644 index 000000000000..b4076863731d --- /dev/null +++ b/pkgs/by-name/da/dart_frog_cli/tests.nix @@ -0,0 +1,61 @@ +{ + testers, + dart_frog_cli, + dart, +}: + +let + testPkgName = "my_frog_project"; +in +{ + # Simple help check (Sanity test) + usage = testers.runCommand { + name = "dart-frog-usage-test"; + buildInputs = [ dart_frog_cli ]; + script = '' + export HOME=$TMPDIR + dart_frog --help > output.txt + if grep -q "Usage: dart_frog" output.txt; then + echo "Usage check passed ✅" + touch $out + else + echo "Usage check failed ❌" + exit 1 + fi + ''; + }; + + # Project creation test (Behavioral test) + create-project = testers.runCommand { + name = "dart-frog-create-test"; + buildInputs = [ + dart_frog_cli + dart + ]; + + script = '' + export HOME=$TMPDIR + + echo "🔨 Creating new Dart Frog project..." + dart_frog create ${testPkgName} + + echo "---------------------------------------" + if [ -d "${testPkgName}" ] && [ -f "${testPkgName}/pubspec.yaml" ]; then + printf "%-20s %-15s %s\n" "Project Created:" "${testPkgName}" "✅" + printf "%-20s %-15s %s\n" "Pubspec Found:" "yes" "✅" + + # Check if it generated the default route + if [ -f "${testPkgName}/routes/index.dart" ]; then + printf "%-20s %-15s %s\n" "Default Route:" "found" "✅" + fi + + echo "---------------------------------------" + echo "Integration test passed successfully! 🚀" + touch $out + else + echo "Project generation failed! ❌" + exit 1 + fi + ''; + }; +} diff --git a/pkgs/by-name/da/dart_frog_cli/update.nix b/pkgs/by-name/da/dart_frog_cli/update.nix new file mode 100644 index 000000000000..f41d0f2cab26 --- /dev/null +++ b/pkgs/by-name/da/dart_frog_cli/update.nix @@ -0,0 +1,64 @@ +{ + writeShellApplication, + common-updater-scripts, + nix-update, + yq-go, + dart, + nix, +}: +let + name = "update-dart_frog_cli"; + packageName = "dart_frog_cli"; + packageDir = toString ./.; +in +writeShellApplication { + inherit name; + runtimeInputs = [ + common-updater-scripts + nix-update + yq-go + dart + nix + ]; + text = '' + pname="''${UPDATE_NIX_PNAME:-${packageName}}" + + main() { + old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}" + nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)" + new_version=$(get_version) + if [[ "$new_version" == "$old_version" ]]; then + exit 0 + fi + generate_lockfile + } + + get_version() { + nix-instantiate --raw --eval --strict -A "$pname.version" + } + + generate_lockfile() { + tmp_dir=$(mktemp -d) + trap 'rm -rf "$tmp_dir"' EXIT + + src=$(nix-build --no-link . -A "$pname.src") + + cp -r "$src/packages/$pname/." "$tmp_dir/" + chmod -R +w "$tmp_dir" + cd "$tmp_dir" + + # Remove pubspec overrides as in the nix preBuild + rm pubspec_overrides.yaml + + # Generate lockfile because it's not included in the source + if ! test -f pubspec.lock; then + dart pub get + fi + + # Convert to JSON + yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json" + } + + main + ''; +} diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 1c69c4ff92a7..a1634e6ec18e 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.38.1"; + version = "0.48.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "fluxcd-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-thSUS3OQecOSaC6e5o1yRuI7FAyy/wZEvp+tIdJrtSo="; + hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8="; }; - vendorHash = "sha256-Z5oKy9u/aqxoEiyDJWBBoUS5WJYWcfh77kK5wyl/pdc="; + vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg="; ldflags = [ "-s" @@ -61,6 +61,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mattfield + stealthybox ]; mainProgram = "flux-operator-mcp"; }; diff --git a/pkgs/by-name/fr/frozen-containers/package.nix b/pkgs/by-name/fr/frozen-containers/package.nix index 89ff0ad6c745..3ef8e7dca1d0 100644 --- a/pkgs/by-name/fr/frozen-containers/package.nix +++ b/pkgs/by-name/fr/frozen-containers/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation { pname = "frozen-containers"; - version = "1.2.0-unstable-2025-07-29"; + version = "1.2.0-unstable-2026-04-20"; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "frozen"; - rev = "61dce5ae18ca59931e27675c468e64118aba8744"; - hash = "sha256-zIczBSRDWjX9hcmYWYkbWY3NAAQwQtKhMTeHlYp4BKk="; + rev = "b07a5c8187bc3e6f1461efab89fe07f467e300db"; + hash = "sha256-eZdiLKUcx1MTcW+HyoRi6U/lUbs/qAQhRw0wX3tpUjY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 41e98d889ab8..6cf1ab34b34f 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -5,23 +5,27 @@ installShellFiles, stdenv, testers, - gh, + makeWrapper, + enableTelemetry ? false, }: buildGoModule (finalAttrs: { pname = "gh"; - version = "2.91.0"; + version = "2.92.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2ggQd2sCybdtNGwiP7+GqB1CwZDNA/bDq24NC5btNFU="; + hash = "sha256-/7EiX4ZZPhSNgY/D5OVOako/c0ujHq05GMj3UB11bqQ="; }; - vendorHash = "sha256-4xZAcwn9/vUTkahIlqwyGb/2SYYGusdXY4nye8ldp/g="; + vendorHash = "sha256-pBLRCIRjN3VoXbTFSq+R9/N3uAUCEjvPtk8LKKKS51s="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; # N.B.: using the Makefile is intentional. # We pass "nixpkgs" for build.Date to avoid `gh --version` reporting a very old date. @@ -35,6 +39,10 @@ buildGoModule (finalAttrs: { runHook preInstall install -Dm755 bin/gh -t $out/bin '' + + lib.optionalString (!enableTelemetry) '' + wrapProgram $out/bin/gh \ + --set GH_TELEMETRY false + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installManPage share/man/*/*.[1-9] @@ -51,7 +59,7 @@ buildGoModule (finalAttrs: { doCheck = false; passthru.tests.version = testers.testVersion { - package = gh; + package = finalAttrs.finalPackage; }; meta = { diff --git a/pkgs/by-name/gh/ghdump/package.nix b/pkgs/by-name/gh/ghdump/package.nix new file mode 100644 index 000000000000..6c71627ef58d --- /dev/null +++ b/pkgs/by-name/gh/ghdump/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ghdump"; + version = "0.1.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "drupol"; + repo = "ghdump"; + tag = finalAttrs.version; + hash = "sha256-ozOWbncNN+Jq9jJpbHvjrIIsx5+R/hzBqQvqfoxH5ZA="; + }; + + cargoHash = "sha256-G24vq74B8NyRq++FlyvR946MWKE0x1n1phTfxFSF8Gs="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/drupol/ghdump/releases/tag/${finalAttrs.version}"; + description = "Export GitHub issues, pull requests, and discussions through customizable templates"; + homepage = "https://github.com/drupol/ghdump"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "ghdump"; + }; +}) diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index 96d93a8ec284..499b544849c1 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gickup"; - version = "0.10.40"; + version = "0.10.41"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; tag = "v${finalAttrs.version}"; - hash = "sha256-/hdCgo09sMbwbF3E5vOEuyYXF/qm0H/79cDuQOlFy/Y="; + hash = "sha256-9aLBplZeNreXEmhjQJsQZ2wYQjHQxGtfaTcxO9Tw5kQ="; }; - vendorHash = "sha256-9t+rjK385Co6RKeihxJprGJz0SjzKFSKNix2Sq0ZlSg="; + vendorHash = "sha256-lmPZlCiQXwe6FWwtDyZjqmF9I2609odpY4AjkEuqPUA="; ldflags = [ "-X main.version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix index a159d4b3dce0..4ae8a43bd410 100644 --- a/pkgs/by-name/ht/htop/package.nix +++ b/pkgs/by-name/ht/htop/package.nix @@ -19,13 +19,13 @@ assert systemdSupport -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "htop" + lib.optionalString withVimKeys "-vim"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "htop-dev"; repo = "htop"; tag = finalAttrs.version; - hash = "sha256-RVJH7osffP3vU74A3e2mjGBAB0ZPMBisBL8n2kDMB+Q="; + hash = "sha256-mw7pixNk+AF2Hz8YUkkUleQpR8yNF0pb1NjYgID076A="; }; patches = lib.optional withVimKeys (fetchpatch2 { diff --git a/pkgs/by-name/ja/jaspr_cli/package.nix b/pkgs/by-name/ja/jaspr_cli/package.nix new file mode 100644 index 000000000000..6074c540bfe9 --- /dev/null +++ b/pkgs/by-name/ja/jaspr_cli/package.nix @@ -0,0 +1,94 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + versionCheckHook, + callPackage, + yq-go, + testers, +}: +# Note: Removed jaspr_cli from arguments because we use finalAttrs.finalPackage for tests +buildDartApplication (finalAttrs: { + pname = "jaspr_cli"; + version = "0.23.0"; + + __structuredAttrs = true; + strictDeps = true; + + # Fetch the whole monorepo + src = fetchFromGitHub { + owner = "schultek"; + repo = "jaspr"; + tag = "jaspr_cli-v${finalAttrs.version}"; + hash = "sha256-V+cmnO4I4hZEdxzjnycPCTQbWpBmjESJSG9cIoMIwjo="; + }; + + sourceRoot = "${finalAttrs.src.name}/packages/jaspr_cli"; + + dartEntryPoints = { + "bin/jaspr" = "bin/jaspr.dart"; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ yq-go ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + # Remove the resolution: workspace section. + # Workspace dependencies break the Nix build which expects + # all dependencies to be resolved via the lockfile. + preBuild = '' + yq -i 'del(.resolution)' pubspec.yaml + ''; + + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + + tests = { + # Basic execution test + help-text = testers.runCommand { + name = "jaspr-cli-help-test"; + # Use finalPackage to refer to the finished derivation + buildInputs = [ finalAttrs.finalPackage ]; + script = '' + jaspr --help | grep "Usage: jaspr" + touch $out + ''; + }; + + # Smoke test: Can it initialize a project? + # Note: Using --no-pub-get because Nix has no network access + create-project = testers.runCommand { + name = "jaspr-cli-create-test"; + buildInputs = [ finalAttrs.finalPackage ]; + script = '' + export HOME=$TMPDIR + jaspr create -t docs my_test_project --no-pub-get + test -f my_test_project/pubspec.yaml + touch $out + ''; + }; + }; + }; + + meta = { + mainProgram = "jaspr"; + homepage = "https://jaspr.site"; + description = "Command line tools for Jaspr"; + longDescription = '' + Command line tools for the Jaspr, a modern web framework for building websites in Dart. Supports SPAs, SSR and SSG. + ''; + changelog = "https://pub.dev/packages/jaspr_cli/changelog#${ + lib.replaceString "." "" finalAttrs.version + }"; + license = lib.licenses.mit; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "schultek" finalAttrs.version; + maintainers = with lib.maintainers; [ KristijanZic ]; + }; +}) diff --git a/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json b/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json new file mode 100644 index 000000000000..badea5fdd5c5 --- /dev/null +++ b/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json @@ -0,0 +1,887 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "96.0.0" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.2.0" + }, + "ansi_styles": { + "dependency": "direct main", + "description": { + "name": "ansi_styles", + "sha256": "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+1" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.9" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.1" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "build_daemon": { + "dependency": "direct main", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.5" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_completion": { + "dependency": "direct main", + "description": { + "name": "cli_completion", + "sha256": "72e8ccc4545f24efa7bbdf3bff7257dc9d62b072dee77513cc54295575bc9220", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "cli_util": { + "dependency": "direct main", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dap": { + "dependency": "transitive", + "description": { + "name": "dap", + "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "dart_service_protocol_shared": { + "dependency": "transitive", + "description": { + "name": "dart_service_protocol_shared", + "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "dds": { + "dependency": "transitive", + "description": { + "name": "dds", + "sha256": "6673c5b29e502fd44dbf5836685e7c7c16b11c0fa7f91ef241e0cbf0638c8794", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.3.0" + }, + "dds_service_extensions": { + "dependency": "transitive", + "description": { + "name": "dds_service_extensions", + "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "devtools_shared": { + "dependency": "transitive", + "description": { + "name": "devtools_shared", + "sha256": "2daf7a9fba6a470668b26ecbd04200f7bf992aad81a2c31d12457c7791419dea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "dtd": { + "dependency": "transitive", + "description": { + "name": "dtd", + "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "10d22555cbb59c3e0e968da646ff7f0103e4f56698bbc37e45145de34e4bad36", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "27.0.3" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "extension_discovery": { + "dependency": "transitive", + "description": { + "name": "extension_discovery", + "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "json_rpc_2": { + "dependency": "transitive", + "description": { + "name": "json_rpc_2", + "sha256": "82dfd37d3b2e5030ae4729e1d7f5538cbc45eb1c73d618b9272931facac3bec1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "mason": { + "dependency": "direct main", + "description": { + "name": "mason", + "sha256": "515b28eedc3e106bbbfb95f0ff63471003396978d3413daeba0a64bcac01367b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "mason_logger": { + "dependency": "transitive", + "description": { + "name": "mason_logger", + "sha256": "1d46102c6f299c0df7fe986dd3dd3271d57c2ec7c00ae590660b7c3018810048", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.19" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.2" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mocktail": { + "dependency": "direct dev", + "description": { + "name": "mocktail", + "sha256": "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mustache_template": { + "dependency": "transitive", + "description": { + "name": "mustache_template", + "sha256": "544ff0b837836f5ad6b351e7a676ff7c2cad4fa412c465908aeb9358caddb6fc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pub_updater": { + "dependency": "direct main", + "description": { + "name": "pub_updater", + "sha256": "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "sse": { + "dependency": "transitive", + "description": { + "name": "sse", + "sha256": "a9a804dbde8bfd369da3b4aa241d44d63a6486a97388c54ec166073d88c52302", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "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" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "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": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.31.0" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.17" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "unified_analytics": { + "dependency": "transitive", + "description": { + "name": "unified_analytics", + "sha256": "406724e9231f8e30119673133c1087f9b24e2a75ba7111ea071253d57bb8f3b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.14" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.1.0" + }, + "vm_service_interface": { + "dependency": "transitive", + "description": { + "name": "vm_service_interface", + "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + } + }, + "sdks": { + "dart": ">=3.11.0 <4.0.0" + } +} diff --git a/pkgs/by-name/ja/jaspr_cli/update.nix b/pkgs/by-name/ja/jaspr_cli/update.nix new file mode 100644 index 000000000000..8ad4ead0a7ae --- /dev/null +++ b/pkgs/by-name/ja/jaspr_cli/update.nix @@ -0,0 +1,64 @@ +{ + writeShellApplication, + common-updater-scripts, + nix-update, + yq-go, + dart, + nix, +}: +let + name = "update-jaspr_cli"; + packageName = "jaspr_cli"; + packageDir = toString ./.; +in +writeShellApplication { + inherit name; + runtimeInputs = [ + common-updater-scripts + nix-update + yq-go + dart + nix + ]; + text = '' + pname="''${UPDATE_NIX_PNAME:-${packageName}}" + + main() { + old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}" + nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)" + new_version=$(get_version) + if [[ "$new_version" == "$old_version" ]]; then + exit 0 + fi + generate_lockfile + } + + get_version() { + nix-instantiate --raw --eval --strict -A "$pname.version" + } + + generate_lockfile() { + tmp_dir=$(mktemp -d) + trap 'rm -rf "$tmp_dir"' EXIT + + src=$(nix-build --no-link . -A "$pname.src") + + cp -r "$src/packages/$pname/." "$tmp_dir/" + chmod -R +w "$tmp_dir" + cd "$tmp_dir" + + # Remove resolution as in the nix build + yq -i 'del(.resolution)' pubspec.yaml + + # Generate lockfile because it's not included in the source + if ! test -f pubspec.lock; then + dart pub get + fi + + # Convert to JSON + yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json" + } + + main + ''; +} diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index 1a98c44cc2c9..320f8d08fc5c 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-NSJn4KSm8xC4HMXzh4m1EqlLUPGVu1SWfDUHT4umKTI="; + hash = "sha256-WA2lH4SCjNDqkUE5OJe2hF7/HaEIyB+dynHT4yDqzMc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 846d21dc2253..37e61e88a66a 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.46.2"; + version = "0.46.3"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-GN0dQy+ZKixOyo3n5n1GV3uS7wa4+e6o8R9vgjD7iJ0="; + hash = "sha256-/Tebhwn+H8HFTUelaQ33kuU6np3QKCrZpKfpvm7buWI="; }; - cargoHash = "sha256-wCz/EjHejsb+caUSVCT/4LoTcFPlObNuDNnnjhagirY="; + cargoHash = "sha256-XP8IphAprOmwqHMzkcJN4rOjMZ3yNEhpvwO3tAD203Y="; preCheck = '' export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 1c260cb3162e..f60a97f33f07 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -14,23 +14,23 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "2.0.1"; + version = "2.2.0"; src = let darwinDmg = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-1RPuNA7/CpH4nMug0H5+uuYozfUN0EaPPcOmk6sze7s="; + hash = "sha256-upHmDcqQ57aZCnxtfvaPZ7NEnyNgStRHV1Nbo3ND9ZM="; }; in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-W+hNOUWNwBwYLbp4qEG5J0Kv/UBN9qFmfIvDz7/CzuE="; + hash = "sha256-z11ujzGvSdt++9KF3xx+nUqjbzIg+ZGyMt+dEemiCq8="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-hHDdPep8MO5GqWIwmFvulfE8C+Jsb4umStQlYkcSdpc="; + hash = "sha256-2A3Ikang4Ii1VUeElbrxmNG1r+H5/iESEYUtK+aa5B8="; }; x86_64-darwin = darwinDmg; aarch64-darwin = darwinDmg; diff --git a/pkgs/by-name/li/liquidsoap/package.nix b/pkgs/by-name/li/liquidsoap/package.nix index 5eec38b5de54..79efc4495c76 100644 --- a/pkgs/by-name/li/liquidsoap/package.nix +++ b/pkgs/by-name/li/liquidsoap/package.nix @@ -11,13 +11,13 @@ bubblewrap, curl, dune, - ffmpeg_6-full, + ffmpeg_8-full, yt-dlp, runtimePackages ? [ awscli2 bubblewrap curl - ffmpeg_6-full + ffmpeg_8-full yt-dlp ], }: @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "liquidsoap"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "savonet"; repo = "liquidsoap"; tag = "v${finalAttrs.version}"; - hash = "sha256-ViJlG+AUncL37mltlFFXVho98Up11qZI3wwSnrd9C8g="; + hash = "sha256-uRqYyxLF6PuSDvbL77qn2PvttqqM9S00BjcaKUFxlQw="; }; postPatch = '' @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - dune build + dune build --release @install runHook postBuild ''; @@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg # Mandatory dependencies + ocamlPackages.domain_shims ocamlPackages.dtools ocamlPackages.duppy ocamlPackages.mm diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix index d34e2c998601..f865ba5927ee 100644 --- a/pkgs/by-name/li/litecli/package.nix +++ b/pkgs/by-name/li/litecli/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "litecli"; - version = "1.12.3"; + version = "1.17.1"; pyproject = true; @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "dbcli"; repo = "litecli"; rev = "v${finalAttrs.version}"; - hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk="; + hash = "sha256-YSPNtDL5rNgRh5lJBKfL1jjWemlmf3eesBMSLyJVRLY="; }; dependencies = @@ -31,6 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = with python3Packages; [ setuptools + setuptools-scm ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index c4c533b6a206..57dc752361c1 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -78,7 +78,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "8864"; + version = "8983"; outputs = [ "out" @@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-IHVBwnjMVKSaDGyA9AYy7dHM9EI1XtCMmXjiKUFXDmg="; + hash = "sha256-v73SfPbzzLBNWyan1dsAnDc2dfSem36zyeGLen5t4KI="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -121,7 +121,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/server/webui"; - npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk="; + npmDepsHash = "sha256-iYJB0z2YHG8OzEA9EwHUZrDa5obr5m2sbnIH+of28o0="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix index 5365f91e3a1c..fb94dbf5a5a1 100644 --- a/pkgs/by-name/ll/llmfit/package.nix +++ b/pkgs/by-name/ll/llmfit/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-BrydHdtiMklC8OZ+FzDg88v+i2/plPyX9eTYprtqNnM="; meta = { - description = "Find what runs on your hardware"; + description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU"; homepage = "https://github.com/AlexsJones/llmfit"; changelog = "https://github.com/AlexsJones/llmfit/blob/v${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 59ea2ea6da7d..5f7a2236c9eb 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxcfs"; - version = "6.0.6"; + version = "7.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; tag = "v${finalAttrs.version}"; - hash = "sha256-lEXXbYDxnOi4Xa/fO1Uy/aVLjVfzYeZm6qzR4XBMBsY="; + hash = "sha256-xONV9Ss71id2Bwb2BFNqaaP+8vK6540sThs1MCw4gok="; }; patches = [ @@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: { # skip installing systemd files ./skip-init.patch - - # fix pidfd checks and include - ./pidfd.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/lx/lxcfs/pidfd.patch b/pkgs/by-name/lx/lxcfs/pidfd.patch deleted file mode 100644 index 3d9b6faa57f9..000000000000 --- a/pkgs/by-name/lx/lxcfs/pidfd.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/meson.build b/meson.build -index a0289ad..211b01b 100644 ---- a/meson.build -+++ b/meson.build -@@ -134,11 +134,13 @@ foreach ident: [ - '''#include - #include - #include -+ #include - #include '''], - ['pidfd_open', - '''#include - #include - #include -+ #include - #include '''], - ] - have = cc.has_function(ident[0], prefix: ident[1], args: '-D_GNU_SOURCE') -diff --git a/src/bindings.c b/src/bindings.c -index 13259c1..e760330 100644 ---- a/src/bindings.c -+++ b/src/bindings.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - -+#include - #include "config.h" - - #include diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index b8d5451e1ae7..7e4fdf0e66e1 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -2,19 +2,18 @@ lib, stdenvNoCC, bun, - fetchgit, fetchFromGitHub, nix-update-script, writableTmpDirAsHomeHook, }: let pname = "models-dev"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-04-29"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "2ccecb60118eb569f15da8421944c92b01eae361"; - hash = "sha256-zQ384Ik3xVtCDpRoFh8WQXQiXo5a3Mlq80gYzD2iMOg="; + rev = "e8b5a27723f124e195d60ff18dfe42735dd76aff"; + hash = "sha256-lGryqSZf/baGL8HP1aKK8zQ5hr5UuyIaATmjcgGkCMI="; }; node_modules = stdenvNoCC.mkDerivation { @@ -58,7 +57,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-O2e9O2qu3QS/8MBdZtUNlE8fm4BumFtHMjUt7AYzzks="; + outputHash = "sha256-eXgzhb/yhgw0B1WDrpaEmH5Tyya+/rye6kJVKdiV56w="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json index a36c1f6b3e9f..63ca31d57eb6 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json @@ -126,10 +126,10 @@ "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { - "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", - "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", - "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": { + "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=", + "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=", + "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI=" }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 0a09dfcc4d3a..5e87b5f24f3b 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -5,7 +5,7 @@ cargo-tauri, desktop-file-utils, fetchFromGitHub, - gradle_8, + gradle_9, jdk17, makeBinaryWrapper, makeShellWrapper, @@ -25,7 +25,7 @@ }: let - gradle = gradle_8.override { java = jdk; }; + gradle = gradle_9.override { java = jdk; }; jdk = jdk17; in @@ -61,13 +61,21 @@ rustPlatform.buildRustPackage (finalAttrs: { ./remove-spotless.patch ]; + cargoPatches = [ + # Cidre 0.11.3 currently fails to build on darwin. Updating it to the latest version + # resolves this issue. + # Upstream PR is https://github.com/modrinth/code/pull/5862 + ./update-cidre.patch + ]; + # Let the app know about our actual version number postPatch = '' substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \ --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-Mnb16KO+xcocUuvQN4woUlb1aFNzzwyIeRP4mIcA1Fk="; + cargoHash = "sha256-GwangszzKTEYvflibPgkIyUkHlpfMgenD/mq3my5LIY="; + mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -116,6 +124,8 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { TURBO_BINARY_PATH = lib.getExe turbo; + # Cidre requires a target version of at least 10.15 + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.15"; }; preGradleUpdate = '' @@ -170,7 +180,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # This builds on architectures like aarch64, but the launcher itself does not support them yet. # Darwin is the only exception # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 - broken = !stdenv.hostPlatform.isx86_64 || !stdenv.hostPlatform.isLinux; + broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # mitm cache diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch new file mode 100644 index 000000000000..ec85dc1a0a52 --- /dev/null +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch @@ -0,0 +1,41 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ee2157d44..db41b81a3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1572,18 +1572,19 @@ dependencies = [ + + [[package]] + name = "cidre" +-version = "0.11.3" ++version = "0.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0cc0eb4d7faf9f94493eaf7e7c0534dee2dfa9642353382039572abb4e0e56e9" ++checksum = "0c903ff1729987d29e07295d2c5841993db25ff86cca43bee04505878d3ec1a7" + dependencies = [ ++ "cc", + "cidre-macros", + ] + + [[package]] + name = "cidre-macros" +-version = "0.3.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "82bc2f84c0baaa09299da3a03864491549685912c1e338a54211e00589dc1e4c" ++checksum = "6facfeffa8b9792dc014bb4e65e364d13518b74e06783d56249810a3e48cfad7" + + [[package]] + name = "cityhash-rs" +diff --git a/Cargo.toml b/Cargo.toml +index 54865d6d3..a09ad3089 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -51,7 +51,7 @@ bytes = "1.10.1" + censor = "0.3.0" + chardetng = "0.1.17" + chrono = "0.4.42" +-cidre = { version = "0.11.3", default-features = false, features = [ ++cidre = { version = "0.15.0", default-features = false, features = [ + "macos_15_0" + ] } + clap = "4.5.48" diff --git a/pkgs/by-name/mo/mono_repo/package.nix b/pkgs/by-name/mo/mono_repo/package.nix new file mode 100644 index 000000000000..922db42dc289 --- /dev/null +++ b/pkgs/by-name/mo/mono_repo/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + versionCheckHook, + callPackage, +}: +buildDartApplication (finalAttrs: { + pname = "mono_repo"; + version = "6.6.3"; + + __structuredAttrs = true; + strictDeps = true; + + # Fetch the whole monorepo + src = fetchFromGitHub { + owner = "google"; + repo = "mono_repo"; + tag = "mono_repo-v${finalAttrs.version}"; + hash = "sha256-2/YJ2S3I9K5Xzje787HdJ/KxfbiBEGKU8feuHnOizn8="; + }; + + sourceRoot = "${finalAttrs.src.name}/mono_repo"; + + dartEntryPoints = { + "bin/mono_repo" = "bin/mono_repo.dart"; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + passthru.updateScript = lib.getExe (callPackage ./update.nix { }); + + meta = { + mainProgram = "mono_repo"; + homepage = "https://dart.dev/tools/mono_repo"; + description = "CLI tools to make it easier to manage a single source repository containing multiple Dart packages"; + changelog = "https://pub.dev/packages/mono_repo/changelog#${ + lib.replaceString "." "" finalAttrs.version + }"; + license = lib.licenses.bsd3; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "google" finalAttrs.version; + maintainers = with lib.maintainers; [ KristijanZic ]; + }; +}) diff --git a/pkgs/by-name/mo/mono_repo/pubspec.lock.json b/pkgs/by-name/mo/mono_repo/pubspec.lock.json new file mode 100644 index 000000000000..40ed01d3369b --- /dev/null +++ b/pkgs/by-name/mo/mono_repo/pubspec.lock.json @@ -0,0 +1,767 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "85.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "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" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "build_test": { + "dependency": "direct dev", + "description": { + "name": "build_test", + "sha256": "a580c76c28440d0006b75c6746bbbb3c1648959ba9e1afae2c2b0f2c26acdf3d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "build_verify": { + "dependency": "direct dev", + "description": { + "name": "build_verify", + "sha256": "3b17b59b6d66f9d3e6014996f089902d56cec5760e051c353cc387b9da577652", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "build_version": { + "dependency": "direct dev", + "description": { + "name": "build_version", + "sha256": "4e8eafbf722eac3bd60c8d38f108c04bd69b80100f8792b32be3407725c7fa6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.4" + }, + "checked_yaml": { + "dependency": "direct main", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.5" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.1" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "direct main", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.7" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "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" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "direct dev", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.26.3" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.7" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.12" + }, + "test_descriptor": { + "dependency": "direct dev", + "description": { + "name": "test_descriptor", + "sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "test_process": { + "dependency": "direct dev", + "description": { + "name": "test_process", + "sha256": "ea79c090deffc87d8276a5d28bb498d080a9873be6b1074d9dcfb82eb87e138e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.8.0 <4.0.0" + } +} diff --git a/pkgs/by-name/mo/mono_repo/update.nix b/pkgs/by-name/mo/mono_repo/update.nix new file mode 100644 index 000000000000..ff669289e84d --- /dev/null +++ b/pkgs/by-name/mo/mono_repo/update.nix @@ -0,0 +1,61 @@ +{ + writeShellApplication, + common-updater-scripts, + nix-update, + yq-go, + dart, + nix, +}: +let + name = "update-mono_repo"; + packageName = "mono_repo"; + packageDir = toString ./.; +in +writeShellApplication { + inherit name; + runtimeInputs = [ + common-updater-scripts + nix-update + yq-go + dart + nix + ]; + text = '' + pname="''${UPDATE_NIX_PNAME:-${packageName}}" + + main() { + old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}" + nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)" + new_version=$(get_version) + if [[ "$new_version" == "$old_version" ]]; then + exit 0 + fi + generate_lockfile + } + + get_version() { + nix-instantiate --raw --eval --strict -A "$pname.version" + } + + generate_lockfile() { + tmp_dir=$(mktemp -d) + trap 'rm -rf "$tmp_dir"' EXIT + + src=$(nix-build --no-link . -A "$pname.src") + + cp -r "$src/$pname/." "$tmp_dir/" + chmod -R +w "$tmp_dir" + cd "$tmp_dir" + + # Generate lockfile because it's not included in the source + if ! test -f pubspec.lock; then + dart pub get + fi + + # Convert to JSON + yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json" + } + + main + ''; +} diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix index 36eeafd5ae8d..6231d05b48bb 100644 --- a/pkgs/by-name/mo/moosefs/package.nix +++ b/pkgs/by-name/mo/moosefs/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "moosefs"; - version = "4.58.4"; + version = "4.59.0"; src = fetchFromGitHub { owner = "moosefs"; repo = "moosefs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-AvY1TOoxxpiqrMqngZe3BTgMuxwltQk1unr/IEfOLt4="; + sha256 = "sha256-l4KtrGyV4qy9QFj1SL73n0tRKEATfgDfjTxES9ws+Zw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ob/obliteratus/package.nix b/pkgs/by-name/ob/obliteratus/package.nix new file mode 100644 index 000000000000..71e950eb9c22 --- /dev/null +++ b/pkgs/by-name/ob/obliteratus/package.nix @@ -0,0 +1,60 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "obliteratus"; + version = "0.1.2-unstable-2026-03-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "elder-plinius"; + repo = "OBLITERATUS"; + rev = "984ce140592a9385347934f9ca647413ba9fac76"; + hash = "sha256-U5DcRC1/IEQRlBGLIfsCX48ZCxPkpzEhg8qIw3ytJps="; + }; + + __structuredAttrs = true; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + accelerate + bitsandbytes + datasets + matplotlib + numpy + pandas + pyyaml + rich + safetensors + scikit-learn + seaborn + torch + tqdm + transformers + ]; + + optional-dependencies = with python3.pkgs; { + spaces = [ gradio ]; + }; + + nativeCheckInputs = with python3.pkgs; [ + pytest-cov-stub + pytestCheckHook + ]; + # This increases the build time significantly + # ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); + + pythonImportsCheck = [ "obliteratus" ]; + + meta = { + description = "Ablation Suite for HuggingFace transformers"; + homepage = "https://github.com/elder-plinius/OBLITERATUS"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "obliteratus"; + }; +}) diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix index 9920eaf7e84b..1a0eaede80f4 100644 --- a/pkgs/by-name/po/porxie/package.nix +++ b/pkgs/by-name/po/porxie/package.nix @@ -5,20 +5,28 @@ nixosTests, stdenvNoCC, nix-update-script, + rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "porxie"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromCodeberg { owner = "Blooym"; repo = "porxie"; rev = "v${finalAttrs.version}"; - hash = "sha256-TxN9BA/o9BI9yF7k3wpJae78hIcCAhB/ggXVQlt4oP0="; + hash = "sha256-dnBHgNSk0i6bokBXQlZMOwePusiplAN2hIna08Y68fA="; }; - cargoHash = "sha256-a0Ps8SvheQoX+Ai8EYgEpyTFwNvB7E3J6MfGiyEvMzM="; + cargoHash = "sha256-fl6mv8qHdVQtXc6B6cVu9vG9gJQruAJU2tklChziOBo="; + + buildInputs = [ rust-jemalloc-sys ]; + + checkFlags = [ + # Requires network access. + "--skip=identity_service::tests::resolve_and_cache" + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index 0cda446476c8..425cc765bae0 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "2.0.0"; + version = "2.0.2"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-Ctx5ZHjlxAu4xu+jo4obymX/Gmr+O/gnh4OAtlKjaZY="; + hash = "sha256-C/2ZxNgnDOLCkTyTqCPGIKiXXjwvHOJNI05BcGy1z0c="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-We7qqazdt6f2JCRz4ufkPaRwzK4MbJcBz5/6fT4kAKU="; + hash = "sha256-wSxTGtuCPU6uT25pBlxudnsQ7XEyihs/piWkiXrjs4w="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-tOuTgdH8Xi/MMlfbmosRSZRYoNBTRWWqofpghPdMzro="; + hash = "sha256-qXXKavGRd6LSdLeoIiwlENhOE9JS/ZxQv432flS0KBg="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-fcSflpaC7GUI4unbUQ1U/GG0wYMHar2qDpcjL40LMyY="; + hash = "sha256-/WClBB5kKnsRNe9oeMPXzjUjsIMhDqgQDu5cNwEBftk="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix index 023a7fd97404..79b0c16cb4c0 100644 --- a/pkgs/by-name/qu/quill-qr/package.nix +++ b/pkgs/by-name/qu/quill-qr/package.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { version = "0.1.0"; src = fetchFromGitHub { - owner = "IvanMalison"; + owner = "colonelpanic8"; repo = "quill-qr"; rev = "v${version}"; sha256 = "1kdsq6csmxfvs2wy31bc9r92l5pkmzlzkyqrangvrf4pbk3sk0r6"; @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Print QR codes for use with https://p5deo-6aaaa-aaaab-aaaxq-cai.raw.ic0.app"; mainProgram = "quill-qr.sh"; - homepage = "https://github.com/IvanMalison/quill-qr"; + homepage = "https://github.com/colonelpanic8/quill-qr"; maintainers = with lib.maintainers; [ imalison ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 66eaea43c56c..302b6bc15c89 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "radicale"; - version = "3.7.1"; + version = "3.7.2"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zwu0xRXSeHmAS9c4TCArBPcE/lMdxn/OxxnmcDvtU/Q="; + hash = "sha256-eZnm3mlG+HoqOXlKxv4UIdN99z04ty0qiwaJeNo3zEM="; }; build-system = with python3.pkgs; [ @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { defusedxml libpass vobject - packaging pika requests ldap3 diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index f8bf769d22a8..5d3a6ad533e9 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -14,13 +14,13 @@ let in renode.overrideAttrs (old: rec { pname = "renode-unstable"; - version = "1.16.1-unstable-2026-04-20"; + version = "1.16.1-unstable-2026-04-29"; src = fetchFromGitHub { owner = "renode"; repo = "renode"; - rev = "8fd79472e778216a6bbf5e40bf79ce54a76f7a7b"; - hash = "sha256-e05IaXImpDWxxwmmI2o6YCnZ9Tp7wtP2Y7786AeoW40="; + rev = "67b2b9ce5e6162e60b4b46a21e0e5b696a3cdb45"; + hash = "sha256-MPcSEijyfC49l96G7y220eljpEdz03uv9LrDm/LXHA0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index a40b4b9f392e..62ed2a1ecd73 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_image"; - version = "1.2.12-unstable-2026-04-03"; + version = "1.2.12-unstable-2026-04-29"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_image"; - rev = "678ac6a4c6021853485050926f45db08ba6aec48"; - hash = "sha256-kK8EPDW8jkdOiDrOxK9MmrtA5varUzbj1/arLwjkUIs="; + rev = "5e690c3ff429025386837c4ff38e1761cd5e1d72"; + hash = "sha256-BZz35PPW3UXfSyQEbYzpLD2HIZ+hCmDNVvvRypmecQY="; }; configureFlags = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 9d19091a03c8..17de2fb08510 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -279,8 +279,9 @@ stdenv.mkDerivation (finalAttrs: { --add-flags ${lib.escapeShellArg commandLineArgs} '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mkdir -p $out/share + mkdir -p $out/share/polkit-1/actions cp -r dist/*-unpacked/resources $out/share/signal-desktop + mv $out/share/signal-desktop/*.policy $out/share/polkit-1/actions/ for icon in build/icons/png/* do diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix index cab7575080b0..e7f5de41a2b3 100644 --- a/pkgs/by-name/st/streamdeck-ui/package.nix +++ b/pkgs/by-name/st/streamdeck-ui/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "streamdeck-ui"; - version = "4.1.3"; + version = "4.1.4"; pyproject = true; src = fetchFromGitHub { repo = "streamdeck-linux-gui"; owner = "streamdeck-linux-gui"; rev = "v${finalAttrs.version}"; - hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU="; + hash = "sha256-XRtIkDyLick9Pq55Br7lQb6FoygMs4DZEJoAD2/o+pQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 5462acd76b5d..f9ae52dea816 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "svix-server"; - version = "1.90.0"; + version = "1.92.2"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${finalAttrs.version}"; - hash = "sha256-KghNfnss1+OK5GLJww1/TH7ogmnyOrjqmHlnQG8R9cE="; + hash = "sha256-6PFD/b2Jc9VQIO+9LTkNldc+eq/6eG/2ZyixkSUh11U="; }; sourceRoot = "${finalAttrs.src.name}/server"; - cargoHash = "sha256-sQUSFK6kITFkxnlp3m0kvhh24/TNTuGdLA6IOH2iSwU="; + cargoHash = "sha256-n+VY0C8ekJu3JRhUCMiiBS/PeMJoqM054CkrD+LEq2o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix index 538f806dc5d2..0a041783ea39 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package.nix +++ b/pkgs/by-name/th/thunderbird-mcp/package.nix @@ -2,17 +2,18 @@ lib, buildNpmPackage, fetchFromGitHub, + nix-update-script, }: buildNpmPackage (finalAttrs: { pname = "thunderbird-mcp"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "TKasperczyk"; repo = "thunderbird-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-+m54jF39SoViHxDI18ewtVjeVUdRximJ6Ozcv1HVdiU="; + hash = "sha256-3o1NskuMc4vQzjaUYgoFL7JZ46Enr6qdPcnePjtul2s="; }; postPatch = '' @@ -25,6 +26,8 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-LbEnmABmAoTCTPNNbocl+n2TtFC3FOFwwTnyATxvM3k="; + passthru.updateScript = nix-update-script { }; + meta = { description = "MCP server for Thunderbird - enables AI assistants to access email, contacts, and calendars"; homepage = "https://github.com/TKasperczyk/thunderbird-mcp"; diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix index 9199191c3ccd..4ea8e40154ec 100644 --- a/pkgs/by-name/wa/waylock/build.zig.zon.nix +++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix @@ -8,10 +8,10 @@ linkFarm "zig-packages" [ { - name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27"; + name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz"; - hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4="; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz"; + hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE="; }; } { diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index 465014f33b40..0f7f7ca4f6e9 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -10,18 +10,20 @@ wayland, wayland-scanner, wayland-protocols, - zig_0_15, + zig_0_16, }: - +let + zig = zig_0_16; +in stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromCodeberg { owner = "ifreund"; repo = "waylock"; tag = "v${finalAttrs.version}"; - hash = "sha256-TSCE6HSGUkXh76epNuJ+AuG/ZCgR0O8EWRDxz9YDuq8="; + hash = "sha256-A/XPgoon1J+fmEVUGuqvqbimRRDfLPkzkMYipPaKrfo="; }; postPatch = '' @@ -34,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config scdoc wayland-scanner - zig_0_15 + zig ]; buildInputs = [ diff --git a/pkgs/by-name/we/webdev/package.nix b/pkgs/by-name/we/webdev/package.nix new file mode 100644 index 000000000000..cec9d4ca6edb --- /dev/null +++ b/pkgs/by-name/we/webdev/package.nix @@ -0,0 +1,98 @@ +{ + lib, + buildDartApplication, + fetchFromGitHub, + versionCheckHook, + callPackage, + testers, + yq-go, +}: +buildDartApplication (finalAttrs: { + pname = "webdev"; + version = "3.8.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "dart-lang"; + repo = "webdev"; + tag = "webdev-v${finalAttrs.version}"; + hash = "sha256-IwH0+J0iCSPxP/FbKPtmhpWjE16SGyYK88xa8ioBC2w="; + }; + + sourceRoot = "${finalAttrs.src.name}/webdev"; + + dartEntryPoints = { + "bin/webdev" = "bin/webdev.dart"; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ yq-go ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + # Remove the dev_dependencies section. + # Relative path overrides in the monorepo break the Nix build which expects + # all dependencies to be resolved via the lockfile. + preBuild = '' + yq -i 'del(.dev_dependencies)' pubspec.yaml + ''; + + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + + tests = { + # Basic usage check + usage = testers.runCommand { + name = "webdev-usage-test"; + # Reference the package itself via finalPackage + buildInputs = [ finalAttrs.finalPackage ]; + script = '' + export HOME=$TMPDIR + webdev --help > output.txt + if grep -q "Usage: webdev" output.txt; then + echo "Usage check passed ✅" + touch $out + else + echo "Usage check failed ❌" + exit 1 + fi + ''; + }; + }; + }; + + meta = { + mainProgram = "webdev"; + homepage = "https://dart.dev/tools/webdev"; + description = "Command-line tool for developing and deploying web applications with Dart"; + longDescription = '' + A CLI for Dart web development. Provides an easy and consistent set of features for users and tools to build and deploy web applications with Dart. + ''; + changelog = "https://pub.dev/packages/webdev/changelog#${ + lib.replaceString "." "" finalAttrs.version + }"; + license = lib.licenses.bsd3; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + identifiers.cpeParts = + let + versionSplit = lib.split "\\+" finalAttrs.version; + versionPart = lib.elemAt versionSplit 0; + updatePart = + if lib.count (x: lib.isList x) versionSplit > 0 then lib.elemAt versionSplit 2 else "*"; + in + { + vendor = "dart-lang"; + product = "webdev"; + version = versionPart; + update = updatePart; + }; + maintainers = with lib.maintainers; [ KristijanZic ]; + }; +}) diff --git a/pkgs/by-name/we/webdev/pubspec.lock.json b/pkgs/by-name/we/webdev/pubspec.lock.json new file mode 100644 index 000000000000..ab8f899b8f95 --- /dev/null +++ b/pkgs/by-name/we/webdev/pubspec.lock.json @@ -0,0 +1,597 @@ +{ + "packages": { + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "build_daemon": { + "dependency": "direct main", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.4" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "dap": { + "dependency": "transitive", + "description": { + "name": "dap", + "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.7" + }, + "dds_service_extensions": { + "dependency": "transitive", + "description": { + "name": "dds_service_extensions", + "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "devtools_shared": { + "dependency": "transitive", + "description": { + "name": "devtools_shared", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "dtd": { + "dependency": "transitive", + "description": { + "name": "dtd", + "sha256": "14a0360d898ded87c3d99591fc386b8a6ea5d432927bee709b22130cd25b993a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "4c522fc0d679168b95041c3f8811078e71150f3950a15b575e04decf9ca231db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "27.0.0" + }, + "extension_discovery": { + "dependency": "transitive", + "description": { + "name": "extension_discovery", + "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "json_rpc_2": { + "dependency": "transitive", + "description": { + "name": "json_rpc_2", + "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.1" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "direct main", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.8" + }, + "stack_trace": { + "dependency": "direct main", + "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" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "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" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "unified_analytics": { + "dependency": "transitive", + "description": { + "name": "unified_analytics", + "sha256": "d86b82270d581c183df9930bf6c910f3fabf8b37a0b1817e34094ce40fad818d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.11" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.3" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + } + }, + "sdks": { + "dart": ">=3.10.0-0.0.dev <4.0.0" + } +} diff --git a/pkgs/by-name/we/webdev/update.nix b/pkgs/by-name/we/webdev/update.nix new file mode 100644 index 000000000000..c1a8824a46f5 --- /dev/null +++ b/pkgs/by-name/we/webdev/update.nix @@ -0,0 +1,64 @@ +{ + writeShellApplication, + common-updater-scripts, + nix-update, + yq-go, + dart, + nix, +}: +let + name = "update-webdev"; + packageName = "webdev"; + packageDir = toString ./.; +in +writeShellApplication { + inherit name; + runtimeInputs = [ + common-updater-scripts + nix-update + yq-go + dart + nix + ]; + text = '' + pname="''${UPDATE_NIX_PNAME:-${packageName}}" + + main() { + old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}" + nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)" + new_version=$(get_version) + if [[ "$new_version" == "$old_version" ]]; then + exit 0 + fi + generate_lockfile + } + + get_version() { + nix-instantiate --raw --eval --strict -A "$pname.version" + } + + generate_lockfile() { + tmp_dir=$(mktemp -d) + trap 'rm -rf "$tmp_dir"' EXIT + + src=$(nix-build --no-link . -A "$pname.src") + + cp -r "$src/$pname/." "$tmp_dir/" + chmod -R +w "$tmp_dir" + cd "$tmp_dir" + + # Remove dev_dependencies as in the nix build + yq -i 'del(.dev_dependencies)' pubspec.yaml + + # Generate lockfile because it's not included in the source + if ! test -f pubspec.lock; then + dart pub get + fi + + # Convert to JSON + yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json" + } + + main + ''; +} diff --git a/pkgs/by-name/wi/wireshark/package.nix b/pkgs/by-name/wi/wireshark/package.nix index fe93c80535cd..b3c8f78ed800 100644 --- a/pkgs/by-name/wi/wireshark/package.nix +++ b/pkgs/by-name/wi/wireshark/package.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.6.4"; + version = "4.6.5"; outputs = [ "out" @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "wireshark"; owner = "wireshark"; tag = "v${finalAttrs.version}"; - hash = "sha256-h254dXxloBC5xQYcpeaLlAj2Ip4eQWHYSPPJLkIwQZw="; + hash = "sha256-U30OJ8m+L/EVLN7NrqWNl77IMaO2cnw2N5uWzLVJE30="; }; patches = [ @@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: { experts. It runs on UNIX, macOS and Windows. ''; homepage = "https://www.wireshark.org"; - changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html"; + changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.version}.html"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index b487be5d7dd0..12f086072b2a 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -31,6 +31,23 @@ stdenv.mkDerivation rec { hash = "sha256-QW1XB78R0rPY0z1nkUGaeG5MxZrAzD7FBe5ZtRqfXJo="; }; + patches = [ + # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/370 + (fetchpatch { + name = "allocate-first_env-dynamically.patch"; + url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/61a14dfc6681f674ae5673856c0749fdf4af6564.patch"; + hash = "sha256-DOn0mtlW1Bl59LxqEQiE90ZJlXDSbTbxL0s8NNL882o="; + includes = [ "src/c/main.d" ]; + }) + + # https://gitlab.com/embeddable-common-lisp/ecl/-/work_items/838 + (fetchpatch { + name = "clang-miscompilation.patch"; + url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/d39cc449f770c52cc4c8b297cf600d7bd53d172a.patch"; + hash = "sha256-C+zVjAY/+hQ4Te62DQxIQsHu0AqewygmSEQpcmrA5EU="; + }) + ]; + nativeBuildInputs = [ libtool autoconf diff --git a/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix b/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix new file mode 100644 index 000000000000..0e36cd50bf28 --- /dev/null +++ b/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix @@ -0,0 +1,87 @@ +{ + lib, + backendStdenv, + fetchFromGitHub, + flags, + + # nativeBuildInputs + cmake, + cuda_nvcc, + + # buildInputs + boost, + cuda_cudart, + cuda_nvml_dev, + + # passthru + nvbandwidth, + + config, + cudaSupport ? config.cudaSupport, +}: +backendStdenv.mkDerivation (finalAttrs: { + pname = "nvbandwidth"; + version = "0.9"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvbandwidth"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j1bKWXHIkjsE/M+w5rRF0UGjkj1gLA2yi+5hc1sWl/A="; + }; + + patches = [ + # Force a dynamic Boost build and link against the CUDA driver / NVML stubs via the CMake + # imported targets exposed by `find_package(CUDAToolkit)`. + ./use-cuda-imported-targets.patch + ]; + + nativeBuildInputs = [ + cmake + cuda_nvcc + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) + ]; + + buildInputs = [ + boost + cuda_cudart # cuda_runtime.h, libcuda stub + cuda_nvml_dev # libnvidia-ml + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 nvbandwidth -t $out/bin + + runHook postInstall + ''; + + passthru.gpuCheck = nvbandwidth.overrideAttrs (_: { + requiredSystemFeatures = [ "cuda" ]; + doInstallCheck = true; + postInstallCheck = '' + $out/bin/${nvbandwidth.meta.mainProgram} + ''; + + # Failing (probably a sandbox limitation): + # hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery. + meta.broken = true; + }); + + meta = { + description = "Tool for bandwidth measurements on NVIDIA GPUs"; + homepage = "https://github.com/NVIDIA/nvbandwidth"; + changelog = "https://github.com/NVIDIA/nvbandwidth/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "nvbandwidth"; + platforms = lib.platforms.linux; + broken = !cudaSupport; + }; +}) diff --git a/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch b/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch new file mode 100644 index 000000000000..f0707cc4021f --- /dev/null +++ b/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch @@ -0,0 +1,47 @@ +Use CMake imported targets and disable the static Boost build. + +The upstream link command `target_link_libraries(... ${NVML_LIB_NAME} cuda)` +expands to plain `-lnvidia-ml -lcuda`, which forces the linker to look up +those names on its search path. The corresponding stubs live in non-standard +`*/lib/stubs` directories that aren't on the Nix linker search path, so the +build fails. Switching to the `CUDA::nvml` / `CUDA::cuda_driver` imported +targets exposed by `find_package(CUDAToolkit)` makes CMake link against the +absolute stub paths it discovers via `CUDAToolkit_ROOT` instead. + +The static-Boost branch is also dropped: it dispatches on `/etc/os-release`, +which doesn't exist in the Nix sandbox, and we want a dynamic build anyway. +--- + CMakeLists.txt | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,16 +43,11 @@ + set(CMAKE_BUILD_TYPE "Release") + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +- file(READ "/etc/os-release" OS_RELEASE_CONTENT) +- # Skip static libs on Fedora - https://github.com/NVIDIA/nvbandwidth/issues/4 +- if(NOT OS_RELEASE_CONTENT MATCHES "ID=.*fedora|azurelinux") +- set(Boost_USE_STATIC_LIBS ON) +- endif() +-else() ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(Boost_USE_STATIC_LIBS ON) + endif() + find_package(Boost COMPONENTS program_options REQUIRED) ++find_package(CUDAToolkit REQUIRED) + + set(src + environment.cpp +@@ -85,7 +80,7 @@ + + add_executable(nvbandwidth ${src}) + target_include_directories(nvbandwidth PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} .) +-target_link_libraries(nvbandwidth Boost::program_options ${NVML_LIB_NAME} cuda) ++target_link_libraries(nvbandwidth Boost::program_options CUDA::nvml CUDA::cuda_driver) + + if (MULTINODE) + find_package(MPI REQUIRED) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index f70aea3e038f..418db720f5f5 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.2.8"; + version = "1.3.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; tag = "v${version}"; - hash = "sha256-wQvpbvAAg4tybAFdGq0O9vfCc0v2iPFk04Q3zgTwa7Y="; + hash = "sha256-qGXuE+wHNuy24jeuGpvMlYIQw7N5g6tXMa7r0pwXVX0="; }; meta = { diff --git a/pkgs/development/ocaml-modules/httpcats/default.nix b/pkgs/development/ocaml-modules/httpcats/default.nix index 6c5b39077b17..a77e462c19d2 100644 --- a/pkgs/development/ocaml-modules/httpcats/default.nix +++ b/pkgs/development/ocaml-modules/httpcats/default.nix @@ -1,10 +1,9 @@ { - fetchpatch, - fetchFromGitHub, + fetchpatch2, + fetchzip, buildDunePackage, lib, logs, - miou, fmt, h2, h1, @@ -22,17 +21,15 @@ buildDunePackage (finalAttrs: { pname = "httpcats"; version = "0.2.1"; - src = fetchFromGitHub { - owner = "robur-coop"; - repo = "httpcats"; - tag = "v${finalAttrs.version}"; - hash = "sha256-I7u/n49WOnpc0EaagsjC4Ts/kz0Xj6YHZv6+QZKLrC4="; + src = fetchzip { + url = "https://github.com/robur-coop/httpcats/releases/download/v${finalAttrs.version}/httpcats-${finalAttrs.version}.tbz"; + hash = "sha256-ehtwxQGHw8igzI0dy2Zzs+VOqvck/tAUuuJl+jSpVU8="; }; patches = [ - (fetchpatch { + (fetchpatch2 { url = "https://github.com/robur-coop/httpcats/commit/d8787555d4831e0488780d42bd2c65de662d1d38.patch"; - hash = "sha256-Mqam6Sxd2kkkHDm459u9uerifuHbvZUVy2khQffvvCE="; + hash = "sha256-6zXPb+mvw2rcEMv28b0npcL8cKl3CASxDbl7FOAGsXs="; }) ]; @@ -46,6 +43,8 @@ buildDunePackage (finalAttrs: { happy-eyeballs-miou-unix ]; + __darwinAllowLocalNetworking = true; + doCheck = true; checkInputs = [ logs @@ -58,7 +57,7 @@ buildDunePackage (finalAttrs: { meta = { homepage = "https://github.com/robur-coop/httpcats/"; description = "A simple HTTP client / server using h1, h2, and miou"; - changelog = "https://github.com/robur-coop/httpcats/blob/${finalAttrs.src.tag}/CHANGES.md"; + changelog = "https://github.com/robur-coop/httpcats/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ rpqt ]; }; diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index d8fb770699ce..c795828767e3 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,67 +1,39 @@ { lib, - aiomisc-pytest, aiormq, buildPythonPackage, - docker, fetchFromGitHub, - pamqp, - poetry-core, - pytestCheckHook, - shortuuid, - testcontainers, - wrapt, + uv-build, yarl, }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.8"; + version = "9.6.2"; pyproject = true; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-0jVxgU+r/d2n4YO5/YAZrZUWDCAlZldBshCGpcEV/sQ="; + hash = "sha256-N5MjFIolMRTTn4aV1NskBwonB/8FSuEZETumUrAa02Y="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.26,<0.10.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ aiormq yarl ]; - nativeCheckInputs = [ - aiomisc-pytest - docker - pamqp - pytestCheckHook - shortuuid - testcontainers - wrapt - ]; - - disabledTests = [ - # Tests attempt to connect to a RabbitMQ server - "test_connection_interleave" - "test_connection_happy_eyeballs_delay" - "test_robust_connection_interleave" - "test_robust_connection_happy_eyeballs_delay" - ]; - - disabledTestPaths = [ - # Tests attempt to connect to a RabbitMQ server - "tests/test_amqp.py" - "tests/test_amqp_robust.py" - "tests/test_amqp_robust_proxy.py" - "tests/test_amqps.py" - "tests/test_master.py" - "tests/test_memory_leak.py" - "tests/test_rpc.py" - "tests/test_types.py" - ]; + # Tests require running a RabbitMQ server. + # They rely on having AMQP_URL set or running Docker. + doCheck = false; pythonImportsCheck = [ "aio_pika" ]; diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index b06dc5fa3007..31e7a30b6fa2 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -1,44 +1,41 @@ { lib, - aiomisc-pytest, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pamqp, + uv-build, yarl, - poetry-core, }: buildPythonPackage rec { pname = "aiormq"; - version = "6.9.2"; + version = "9.6.4"; pyproject = true; src = fetchFromGitHub { owner = "mosquito"; repo = "aiormq"; tag = version; - hash = "sha256-ApwL3okhpc3Dtq4bfWCCnoikyRx+4zPI9XtJ+qPKQdg="; + hash = "sha256-GFeOwjSQ1+nxP9hgNoELoEInTmhhO0JnNeoe2qfWNcg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "uv_build>=0.10.4,<0.11.0" uv_build + ''; + pythonRelaxDeps = [ "pamqp" ]; - build-system = [ poetry-core ]; + build-system = [ uv-build ]; dependencies = [ pamqp yarl ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ aiomisc-pytest ]; - - # Tests attempt to connect to a RabbitMQ server - disabledTestPaths = [ - "tests/test_channel.py" - "tests/test_connection.py" - ]; + # Tests require running a RabbitMQ server. + # They rely on having AMQP_URL set or running Docker. + doCheck = false; pythonImportsCheck = [ "aiormq" ]; diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 30a5be99e417..b7e82bc72c64 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -8,16 +8,16 @@ six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aurorapy"; - version = "0.2.7"; + version = "0.3"; pyproject = true; src = fetchFromGitLab { owner = "energievalsabbia"; repo = "aurorapy"; - rev = version; - hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; + tag = finalAttrs.version; + hash = "sha256-bc5i2x35sZXkCSJraTqX3Zc5B9eKL1qDh97/7ixyHLY="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Implementation of the communication protocol for Power-One Aurora inverters"; homepage = "https://gitlab.com/energievalsabbia/aurorapy"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 0f9f1d7fc3b3..1e0f96586424 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -17,10 +17,7 @@ patchelf, dmgbuild, - # tests - anyio, - bcrypt, - + darwin, python, pytest-mock, pytestCheckHook, @@ -82,6 +79,9 @@ buildPythonPackage rec { pytestCheckHook writableTmpDirAsHomeHook versionCheckHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.sigtool ]; versionCheckProgram = "${placeholder "out"}/bin/cxfreeze"; diff --git a/pkgs/development/python-modules/cx-logging/default.nix b/pkgs/development/python-modules/cx-logging/default.nix index 17a358200068..fd984216f9e5 100644 --- a/pkgs/development/python-modules/cx-logging/default.nix +++ b/pkgs/development/python-modules/cx-logging/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -21,6 +22,11 @@ buildPythonPackage (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools>=70.1,<75" "setuptools" + '' + # The flag -soname isn't recognized by the linker on darwin. Only -install_name is valid. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace setup.py \ + --replace-fail "-soname" "-install_name" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix index f858980e5b76..eaf6dcacddc4 100644 --- a/pkgs/development/python-modules/gerbonara/default.nix +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -9,16 +9,16 @@ rtree, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gerbonara"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "jaseg"; repo = "gerbonara"; - tag = "v${version}"; - hash = "sha256-fT13JMoOvKMxdHoagZAmIsGhU3M1S4bEmKUHae+EJcI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-XWxYgnzvebO+iTL6idWyX+j7bsyvNkWdKDEuqsU/p4w="; }; build-system = [ uv-build ]; @@ -38,9 +38,9 @@ buildPythonPackage rec { meta = { description = "Pythonic library for reading/modifying/writing Gerber/Excellon/IPC-356 files"; - mainProgram = "gerbonara"; homepage = "https://github.com/jaseg/gerbonara"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ wulfsta ]; + mainProgram = "gerbonara"; }; -} +}) diff --git a/pkgs/development/python-modules/httpx-retries/default.nix b/pkgs/development/python-modules/httpx-retries/default.nix new file mode 100644 index 000000000000..f56331bae012 --- /dev/null +++ b/pkgs/development/python-modules/httpx-retries/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-fancy-pypi-readme, + hatchling, + httpx, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "httpx-retries"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "will-ockmore"; + repo = "httpx-retries"; + tag = finalAttrs.version; + hash = "sha256-LElTcIWNsb2AVbk3dXcCnXeB8JhyM7Y64nTZGZWlVm8="; + }; + + build-system = [ + hatch-fancy-pypi-readme + hatchling + ]; + + dependencies = [ httpx ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "httpx_retries" ]; + + meta = { + description = "Retry layer for HTTPX"; + homepage = "https://github.com/will-ockmore/httpx-retries"; + changelog = "https://github.com/will-ockmore/httpx-retries/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 259bdfcb097e..4a387e15993f 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -4,25 +4,25 @@ fetchFromGitHub, hatch-vcs, hatchling, + httpx-retries, httpx, pytest-cov-stub, pytestCheckHook, - pythonOlder, + pyyaml, respx, + typer, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iaqualink"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; - tag = "v${version}"; - hash = "sha256-s/ZhcbTaCvn7ei1O4+P4fKPojitl+4gsatc9PZx+W2g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bn4dcfTRkY+qc/c39ip+vZvlbqll7qZOl7phMgw9EjY="; }; build-system = [ @@ -30,21 +30,34 @@ buildPythonPackage rec { hatchling ]; - dependencies = [ httpx ] ++ httpx.optional-dependencies.http2; + dependencies = [ + httpx + httpx-retries + ] + ++ httpx.optional-dependencies.http2; + + optional-dependencies = { + cli = [ + pyyaml + typer + ]; + }; nativeCheckInputs = [ pytest-cov-stub pytestCheckHook respx - ]; + typer + ] + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "iaqualink" ]; meta = { description = "Python library for Jandy iAqualink"; homepage = "https://github.com/flz/iaqualink-py"; - changelog = "https://github.com/flz/iaqualink-py/releases/tag/${src.tag}"; + changelog = "https://github.com/flz/iaqualink-py/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix index 5a50e51ff8f1..1f1035a660ae 100644 --- a/pkgs/development/python-modules/msticpy/default.nix +++ b/pkgs/development/python-modules/msticpy/default.nix @@ -47,16 +47,16 @@ urllib3, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msticpy"; - version = "2.17.2"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "msticpy"; - tag = "v${version}"; - hash = "sha256-tzAfynPyIqvWHxzLZ67r/Q5hNBKZAJhllhEVJ69L43k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aX5Nd0tNuweBp2SqGwe4/Z4LcdJaX3p5LLNQAOdGVGo="; }; pythonRelaxDeps = [ @@ -117,8 +117,8 @@ buildPythonPackage rec { meta = { description = "Microsoft Threat Intelligence Security Tools"; homepage = "https://github.com/microsoft/msticpy"; - changelog = "https://github.com/microsoft/msticpy/releases/tag/${src.tag}"; + changelog = "https://github.com/microsoft/msticpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 2e930298c2ab..3fafd9f25fd4 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-core"; tag = version; - hash = "sha256-3Q0Cr9GfDNL+uA5oV20V2OMewTU9yRI0/WmXLW+nuzo="; + hash = "sha256-wGaRx+IEqsvs7ygCDgh1H4di662SQhjmpB9LMP/YGKM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 86accde29c63..d5bd70dd3192 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -2,12 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, pytestCheckHook, }: buildPythonPackage rec { - version = "3.3.0"; + version = "4.0.0"; pname = "pamqp"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; repo = "pamqp"; - rev = version; - hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY="; + tag = version; + hash = "sha256-0rRVbzC5G+lH6Okvw8PtoPZKD8LlobAGYvDEIDw0aFo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/gmr/pamqp/blob/${src.rev}/docs/changelog.rst"; + changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.rst"; description = "RabbitMQ Focused AMQP low-level library"; homepage = "https://github.com/gmr/pamqp"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 5c2e099b03f5..f2a8c542201f 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "pysigma"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "pySigma"; tag = "v${finalAttrs.version}"; - hash = "sha256-cAfNj1/YNwIO5sv3B3rTSTZ79qKbYb37Ltw+224NNDY="; + hash = "sha256-MkKZ2iL2fkZcos60d1fd1OVBA28thVXrEmsEgvTMmS4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index cb75a2927084..4a177ce151fd 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/pkgs/development/python-modules/waterfurnace/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "waterfurnace"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "sdague"; repo = "waterfurnace"; tag = "v${finalAttrs.version}"; - hash = "sha256-1uekNUkiFZnzjx1gctEUVXwcpL3h+0HZLTzBSNhKY8o="; + hash = "sha256-o5C964T53JgSBG2M3LP45xNika70CXZmR5Z4ThGdxSE="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix deleted file mode 100644 index c55c98a2d937..000000000000 --- a/pkgs/servers/kanidm/1_7.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./generic.nix { - version = "1.7.4"; - hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E="; - cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM="; - unsupported = true; -} diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix index d6ddaba4ba09..27af30550891 100644 --- a/pkgs/servers/kanidm/1_8.nix +++ b/pkgs/servers/kanidm/1_8.nix @@ -2,5 +2,5 @@ import ./generic.nix { version = "1.8.6"; hash = "sha256-+NZs8HHHmWGmlNNymIlbV7E28RiaGLmvtZkCWZJQvMk="; cargoHash = "sha256-NKCQRIxvWAT5saMO85noYZtm7h0OPFhWFqudvkQPYTE="; - eolDate = "2026-03-16"; + unsupported = true; } diff --git a/pkgs/servers/kanidm/1_9.nix b/pkgs/servers/kanidm/1_9.nix index dd0877813c1e..2952a9f73a67 100644 --- a/pkgs/servers/kanidm/1_9.nix +++ b/pkgs/servers/kanidm/1_9.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.9.2"; - hash = "sha256-OmUWh60WZ4HH9dFCKiWZ66jMRJx6P003HNWfU0ywIO0="; - cargoHash = "sha256-xQ5FR+GiGZLLEt5GnLnc/vtZdx0YY5hsd06vkF+e6sM="; + version = "1.9.3"; + hash = "sha256-YI2nShQhsCd1vn7S4VeCELfcU0HsmZrFs60kllJJFAo="; + cargoHash = "sha256-b6kBDA/CDJHbybfvbRRZ++q9H+SVRu0BmgkwzN2i/YU="; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99ff1f723fae..e25ae37ef3dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1004,7 +1004,7 @@ mapAliases { kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidm_1_5 = throw "'kanidm_1_5' has been removed as it has reached end of life"; # Added 2026-01-29 kanidm_1_6 = throw "'kanidm_1_6' has been removed as it has reached end of life"; # Added 2026-01-29 - kanidmWithSecretProvisioning = warnAlias "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01 + kanidmWithSecretProvisioning = throw "'kanidmWithSecretProvisioning' was removed. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'."; # Added 2026-04-30 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_5 = throw "'kanidmWithSecretProvisioning_1_5' has been removed as it has reached end of life"; # Added 2026-01-29 kanidmWithSecretProvisioning_1_6 = throw "'kanidmWithSecretProvisioning_1_6' has been removed as it has reached end of life"; # Added 2026-01-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f1e58a148d1..72e0845800e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2130,7 +2130,7 @@ with pkgs; cudaPackages_12 = cudaPackages_12_9; - cudaPackages_13 = cudaPackages_13_0; + cudaPackages_13 = cudaPackages_13_2; cudaPackages = recurseIntoAttrs cudaPackages_12; @@ -7994,9 +7994,6 @@ with pkgs; inherit ({ - kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix { - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7; - }; kanidm_1_8 = callPackage ../servers/kanidm/1_8.nix { kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8; }; @@ -8004,14 +8001,11 @@ with pkgs; kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_9; }; - kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; }; kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; }; kanidmWithSecretProvisioning_1_9 = kanidm_1_9.override { enableSecretProvisioning = true; }; }) - kanidm_1_7 kanidm_1_8 kanidm_1_9 - kanidmWithSecretProvisioning_1_7 kanidmWithSecretProvisioning_1_8 kanidmWithSecretProvisioning_1_9 ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 770ef1bcca24..e53172f96fbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7252,6 +7252,8 @@ self: super: with self; { httpx-oauth = callPackage ../development/python-modules/httpx-oauth { }; + httpx-retries = callPackage ../development/python-modules/httpx-retries { }; + httpx-socks = callPackage ../development/python-modules/httpx-socks { }; httpx-sse = callPackage ../development/python-modules/httpx-sse { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 089094edd990..4c02d11a9169 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -45,8 +45,8 @@ # so users choosing to allow don't have to rebuild them every time. permittedInsecurePackages = [ "olm-3.2.16" # see PR #347899 - "kanidm_1_7-1.7.4" - "kanidmWithSecretProvisioning_1_7-1.7.4" + "kanidm_1_8-1.8.6" + "kanidmWithSecretProvisioning_1_8-1.8.6" ]; };