diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d0e374351c8b..06b34fcebfa9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1204,8 +1204,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.134.0"; - hash = "sha256-/tWH2uGfOuyvF8mfga2YdGK1ok2UYQchaOeCC2n+IHk="; + version = "3.136.0"; + hash = "sha256-XPajPR0MX6TiUfaCw/+WYyc453cZOMaK1Uen6ND+RKY="; }; meta.license = lib.licenses.mit; @@ -5134,8 +5134,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.30.5"; - hash = "sha256-MlBACPD880QvsQpPDXe5384dlrMeKMSX1CUSIfzwwPo="; + version = "0.31.0"; + hash = "sha256-E0GJoITZIh2XemVpyPh3gAEtlvM2PZHgNzZDctSpwIA="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; diff --git a/pkgs/applications/editors/vscode/extensions/yzane.markdown-pdf/default.nix b/pkgs/applications/editors/vscode/extensions/yzane.markdown-pdf/default.nix index c17d08d1d351..74ee2d473471 100644 --- a/pkgs/applications/editors/vscode/extensions/yzane.markdown-pdf/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yzane.markdown-pdf/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-pdf"; publisher = "yzane"; - version = "2.0.1"; - hash = "sha256-XykOUbCiTVtfmp5H9UC4gFPBxmrIJR7jv9VvLljOSM0="; + version = "2.1.0"; + hash = "sha256-3N4de2jgLbBlDGouFU7XoH4ElL9En9+2ZprMqoL03/E="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 72fd06c5870b..93329c9c52de 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -188,6 +188,7 @@ stdenv.mkDerivation ( passthru = { inherit executableName + iconName longName tests updateScript diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c5794101e123..c942f64b43e2 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -52,6 +52,11 @@ let inherit (vscode) executableName longName; + # The wrapped editor may override `iconName` (e.g. code-cursor, windsurf, + # kiro and antigravity-ide all set it to a name without the `vs` prefix). Read + # the real value from the package, falling back to the generic.nix default for + # editors built before `iconName` was exposed via passthru. + iconName = vscode.iconName or "vs${executableName}"; wrappedPkgVersion = lib.getVersion vscode; wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name; @@ -100,7 +105,12 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" - ln -sT "${vscode}/share/pixmaps/vs${executableName}.png" "$out/share/pixmaps/vs${executableName}.png" + ln -sT "${vscode}/share/pixmaps/${iconName}.png" "$out/share/pixmaps/${iconName}.png" + # Carry over the themed icons too; the .desktop entry's `Icon=` is + # resolved against the icon theme before falling back to pixmaps. + if [ -d "${vscode}/share/icons" ]; then + ln -sT "${vscode}/share/icons" "$out/share/icons" + fi ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f2d1b48c691b..93c5bef98913 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -319,11 +319,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-Ekuvv1D3f+ePvTpuye207/y5HGf+2WqtdeFgQCtjQ2w=", + "hash": "sha256-gvLdDUFg8WoBg8+351CCK84LhLJlsV6Nqm9kbxlQQ50=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.87.0", + "rev": "v2.89.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1175,11 +1175,11 @@ "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag=" }, "sap_btp": { - "hash": "sha256-8YQxOUgQkmH7FZFqIbSdR3QfwPcPMIV7fWwnPtfxjbc=", + "hash": "sha256-kTH3diM9jbncv80+I//mj+zCWGosIXjjMETXa6IS2HU=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.22.0", + "rev": "v1.23.1", "spdx": "Apache-2.0", "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY=" }, diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix index 4628e42d3d3f..feee30969107 100644 --- a/pkgs/by-name/en/enpass/package.nix +++ b/pkgs/by-name/en/enpass/package.nix @@ -131,17 +131,18 @@ let updater = { update = stdenv.mkDerivation { name = "enpass-update-script"; - SCRIPT = ./update_script.py; + SCRIPT = toString ./update_script.py; buildInputs = with python3Packages; [ python requests + packaging pathlib2 six attrs ]; shellHook = '' - exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} + exec python $SCRIPT --target pkgs/by-name/en/enpass/data.json --repo ${baseUrl} ''; }; diff --git a/pkgs/by-name/en/enpass/update_script.py b/pkgs/by-name/en/enpass/update_script.py index ab0b6ce3f48e..20650bf5f455 100755 --- a/pkgs/by-name/en/enpass/update_script.py +++ b/pkgs/by-name/en/enpass/update_script.py @@ -33,7 +33,8 @@ def find_latest_version(arch): for package in packages.split("\n\n"): matches = version_selector.search(package) matched_version = matches.group('version') if matches and matches.group('version') else "0" - parsed_version = version.parse(matched_version) + try: parsed_version = version.parse(matched_version) + except version.InvalidVersion: continue if parsed_version > last_version: path = path_selector.search(package).group('path') sha256 = hash_selector.search(package).group('sha256') diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 72b378bd5de1..cda7d625dc2c 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.316"; + version = "2.15.335"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-3+M14M0xf2dkIAdgNGe2gTmJ9Vr7h/vCe4H/quiSsU0="; + hash = "sha256-/X5h7umhwZQi65+MBTl4b9HKn28H+OTCgPV8UJJxV5o="; }; - vendorHash = "sha256-rly02HSliL+WXs/XTn9Eb5W+jeGuNVRS8R2vjPGnhGM="; + vendorHash = "sha256-YRnw+1SgMSVq+PWzRfwy2UFAsGFii27vocntXFov8ys="; ldflags = [ "-s" diff --git a/pkgs/by-name/ja/jasp-desktop/boost.patch b/pkgs/by-name/ja/jasp-desktop/boost.patch index 321c96660f82..fe0811aca002 100644 --- a/pkgs/by-name/ja/jasp-desktop/boost.patch +++ b/pkgs/by-name/ja/jasp-desktop/boost.patch @@ -2,14 +2,12 @@ diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake index 3f0fa28..6cdcfad 100644 --- a/Tools/CMake/Libraries.cmake +++ b/Tools/CMake/Libraries.cmake -@@ -67,8 +67,8 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) +@@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) endif() endif() -set(Boost_USE_STATIC_LIBS ON) --find_package(Boost 1.78 REQUIRED COMPONENTS system) +add_definitions(-DBOOST_LOG_DYN_LINK) -+find_package(Boost 1.78 REQUIRED) + find_package(Boost 1.78) find_package(Qt6 REQUIRED COMPONENTS Core) - get_target_property(QT_TARGET_TYPE Qt6::Core TYPE) diff --git a/pkgs/by-name/ja/jasp-desktop/generate-module-info.sh b/pkgs/by-name/ja/jasp-desktop/generate-module-info.sh new file mode 100755 index 000000000000..9c888c0e5803 --- /dev/null +++ b/pkgs/by-name/ja/jasp-desktop/generate-module-info.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch-github +#shellcheck shell=bash +set -euo pipefail + +pkg_dir="$(dirname "$0")" +repo_root="$pkg_dir/../../../.." +jaspRev="$(nix-instantiate --eval --raw "$repo_root" -A jasp-desktop.src.rev)" +echo "Current jasp-desktop revision: $jaspRev" >&2 + +bundlesJsonPath="$(nix-build --no-out-link "$repo_root" -A jasp-desktop.src)/Modules/remote-bundles.json" +echo "Loading bundles from $bundlesJsonPath" >&2 + +# We just need to parse the pname and the tag from the filename +# so we don't care that we're using the entries of Windows-x86_64 +jq -r ' + ."Windows-x86_64" | map(.url) | sort | .[] | + split("jasp-stats-modules/")[1] | split("/") | + [.[0], .[3]] | @tsv +' "$bundlesJsonPath" | while IFS=$'\t' read -r pname tag; do + echo "Prefetching jasp-stats-modules/$pname at rev $tag" >&2 + prefetchData=$(nix-prefetch-github jasp-stats-modules "$pname" --rev "refs/tags/$tag") + + jq -c -n \ + --arg pname "$pname" \ + --arg tag "$tag" \ + --argjson prefetchData "$prefetchData" \ + '{ + key: $pname, + value: { + pname: $pname, + version: $tag | split("_R-")[0], + tag: $tag, + hash: $prefetchData.hash + } + }' +done | jq -s 'from_entries' > "$pkg_dir/module-info.json" + +echo "Successfully updated module-info.json" >&2 diff --git a/pkgs/by-name/ja/jasp-desktop/module-info.json b/pkgs/by-name/ja/jasp-desktop/module-info.json new file mode 100644 index 000000000000..345fe5ed49f0 --- /dev/null +++ b/pkgs/by-name/ja/jasp-desktop/module-info.json @@ -0,0 +1,218 @@ +{ + "jaspAcceptanceSampling": { + "pname": "jaspAcceptanceSampling", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-sbLzTuGr7r/OsIMliOfvwVsmgUgZxL+6rqiq4W+BIBc=" + }, + "jaspAnova": { + "pname": "jaspAnova", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-K695RXTxzbYVF+gh8gzFTsceTTNdx976yF6WiPHm3No=" + }, + "jaspAudit": { + "pname": "jaspAudit", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-1j6Na7Ikk8XJQjbTRRuK28K3jMVdUVe0FwTzo5ywppY=" + }, + "jaspBFF": { + "pname": "jaspBFF", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-bh3uLZcjfYpwaNmEzqVW5eNdPFq/Ig3bh7+1DgXYoF8=" + }, + "jaspBain": { + "pname": "jaspBain", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-CcelkJJD/rr5BOx8MaCkHfbUKp7/tvWOSSC+Ilsopc8=" + }, + "jaspBfpack": { + "pname": "jaspBfpack", + "version": "0.97.2-release.0", + "tag": "0.97.2-release.0_R-4-5-2_Release", + "hash": "sha256-jIlA4qaummkbx696UJkKTGRQQviUeuqYJX6V5AFuiTA=" + }, + "jaspBsts": { + "pname": "jaspBsts", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-sFbn0yOr7ZaaO2APYNOshBcs1zvgIZUT89BvdRrN/+4=" + }, + "jaspCircular": { + "pname": "jaspCircular", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-fqBSR/um02+BXuu7gucd7WWG/RSOeLmhXHQl2wXiVGw=" + }, + "jaspCochrane": { + "pname": "jaspCochrane", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-z6rglW4wItG9akHWplpDBzB5yzRko/ze+DcQotJmHTg=" + }, + "jaspDescriptives": { + "pname": "jaspDescriptives", + "version": "0.96.5-release.0", + "tag": "0.96.5-release.0_R-4-5-2_Release", + "hash": "sha256-226O52pW8GRvmtTA4pS5xWosZ4JR5ONeD1RQvx/tpVg=" + }, + "jaspDistributions": { + "pname": "jaspDistributions", + "version": "0.96.5-release.0", + "tag": "0.96.5-release.0_R-4-5-2_Release", + "hash": "sha256-zwk2CuW2gUhtnOX8LdmMlxUKCk974BjvR3zYlZAT+W8=" + }, + "jaspEquivalenceTTests": { + "pname": "jaspEquivalenceTTests", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-4XFN6ikBfOZWHMTLbNPBwgMoYiLVULQE0XyNaoPQ40k=" + }, + "jaspEsci": { + "pname": "jaspEsci", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-pH1neP1GmL3usXP5ycQKGeLNzvfMV/UBrrKF718QaGI=" + }, + "jaspFactor": { + "pname": "jaspFactor", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-AU9nTrxZNseN0Wsp3932V3N+ax5CzfJMoEB128AR5LM=" + }, + "jaspFrequencies": { + "pname": "jaspFrequencies", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-qolgiJjiODzheW04fXdtxNqAreEny7ln+GlwV4ztRik=" + }, + "jaspJags": { + "pname": "jaspJags", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-f26njMClIUWNc4fGsPgwitzKbqdU6Ld+Ys6ukWAHE/M=" + }, + "jaspLearnBayes": { + "pname": "jaspLearnBayes", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-zqMcWFML/iexmegMtGWCe/OCGqwmWW98/XZfKVs6N8w=" + }, + "jaspLearnStats": { + "pname": "jaspLearnStats", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-Yvqhv269Uvr087IjiGMBzTHZj+4Wu5A8dN/F9+8odqY=" + }, + "jaspMachineLearning": { + "pname": "jaspMachineLearning", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-Wg1C/ZJL98U8JkMfeZcc4/83DmCHRYOIn2OglsMqImw=" + }, + "jaspMetaAnalysis": { + "pname": "jaspMetaAnalysis", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-bXHlYiGEtNMqr833ve3Qrdv+TCm7G4let07McMETUv8=" + }, + "jaspMixedModels": { + "pname": "jaspMixedModels", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-F7NEyqA+vW+66l/ZmWaVvTSbG+0fxI+SsgfV6GmwJLs=" + }, + "jaspNetwork": { + "pname": "jaspNetwork", + "version": "0.96.3-release.0", + "tag": "0.96.3-release.0_R-4-5-2_Release", + "hash": "sha256-Gh4GuvNKK17Lfwncx0TNTsHOjY4g85q/yhnvoCppAxQ=" + }, + "jaspPower": { + "pname": "jaspPower", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-Q5CBXoHr6jPs/UNMpyQXzhMm5a48G8LTYr37VKfzrrc=" + }, + "jaspPredictiveAnalytics": { + "pname": "jaspPredictiveAnalytics", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-CrpozVhA+vTv15dWUH9CqK37BdO7okE8XML6BYRsoYw=" + }, + "jaspProcess": { + "pname": "jaspProcess", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-ZO3Y+3qA84s0wUdL9iRqnc4vljzg69crH34eCbGWmOo=" + }, + "jaspProphet": { + "pname": "jaspProphet", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-rEBXWEVpavXiMljtvNfKLVvI8VIaTk+yymaGx4w/li8=" + }, + "jaspQualityControl": { + "pname": "jaspQualityControl", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-5DNz827MZHfmLnFXNUTFweMmOdDftxm6S8ZJwzCCDa8=" + }, + "jaspRegression": { + "pname": "jaspRegression", + "version": "0.95.5-release.13", + "tag": "0.95.5-release.13_R-4-5-2_Release", + "hash": "sha256-Tte/I2ZcNG0j4s4ka/1T0E+49IzN3KW38J0NpBy+seM=" + }, + "jaspReliability": { + "pname": "jaspReliability", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-uKacghynWflNIdeKryT6dFCD8zZhAM5AOiZwHk9YmJw=" + }, + "jaspRobustTTests": { + "pname": "jaspRobustTTests", + "version": "0.95.0-release.12", + "tag": "0.95.0-release.12_R-4-5-2_Release", + "hash": "sha256-U6qH0tKC7lLFvnTGK9mNli7Azh/SA6pUEJdsUoOCsYo=" + }, + "jaspSem": { + "pname": "jaspSem", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-atNjOnnmkpmViw7az+JwkugepHfLcdg2jbZzJkbgXQk=" + }, + "jaspSummaryStatistics": { + "pname": "jaspSummaryStatistics", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-UuC26atGRnRHwp1xhAJtj5vkdPvYjcs2WIPgAq/0Uvg=" + }, + "jaspSurvival": { + "pname": "jaspSurvival", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-P652YSopruDje69vXfeBMSBMU/GPmYCuRp7jd2ZneEI=" + }, + "jaspTTests": { + "pname": "jaspTTests", + "version": "0.95.5-release.13", + "tag": "0.95.5-release.13_R-4-5-2_Release", + "hash": "sha256-K1thMejBibf8nzP07QbKyS/j3FbbrGQNPdiBpkhKf1w=" + }, + "jaspTimeSeries": { + "pname": "jaspTimeSeries", + "version": "0.95.0-release.12", + "tag": "0.95.0-release.12_R-4-5-2_Release", + "hash": "sha256-FZEEa1n7B9Kt74L7dw+oYWmHBGobI78wUBzQ1wsKos8=" + }, + "jaspVisualModeling": { + "pname": "jaspVisualModeling", + "version": "0.95.5-release.12", + "tag": "0.95.5-release.12_R-4-5-2_Release", + "hash": "sha256-lhvH69LUIzXsFQ730hqcWnkTK0aeMhal3VhSTrr4eHc=" + } +} diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index 8c5f350abe84..c301816dd9ec 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -1,867 +1,725 @@ { + lib, rPackages, fetchFromGitHub, jasp-src, jasp-version, }: -with rPackages; let - jaspGraphs = buildRPackage rec { - pname = "jaspGraphs"; - version = "0.95.3"; + inherit (rPackages) buildRPackage; + customRPackages = + rPackages + // jaspModules + // { + jaspGraphs = buildRPackage rec { + pname = "jaspGraphs"; + version = "0.96.0"; - src = fetchFromGitHub { - owner = "jasp-stats"; - repo = "jaspGraphs"; - tag = "v${version}"; - hash = "sha256-h2jYFtMFGbaIO1Ed75I2Q0+ut0bR8zBaZ3RZWcTpxMs="; - }; + src = fetchFromGitHub { + owner = "jasp-stats"; + repo = "jaspGraphs"; + tag = "v${version}"; + hash = "sha256-aTemaJA3ZitDeYob3QbE4qtjyd5JN0i65OtrpoaopNg="; + }; - propagatedBuildInputs = [ - ggplot2 - gridExtra - gtable - lifecycle - jsonlite - R6 - RColorBrewer - rlang - scales - viridisLite - ]; - }; - - jaspBase = buildRPackage { - pname = "jaspBase"; - version = jasp-version; - - src = jasp-src; - sourceRoot = "${jasp-src.name}/Engine/jaspBase"; - - preConfigure = '' - mkdir -p ./inst/include/ - cp -r --no-preserve=all ../../Common ./inst/include/Common - export INCLUDE_DIR=$(pwd)/inst/include/Common/ - ''; - - propagatedBuildInputs = [ - cli - codetools - ggplot2 - gridExtra - gridGraphics - jaspGraphs - jsonlite - lifecycle - modules - officer - pkgbuild - plyr - qgraph - ragg - R6 - Rcpp - renv - remotes - rjson - rvg - svglite - systemfonts - withr - ]; - }; - - stanova = buildRPackage { - pname = "stanova"; - version = "0.3-unstable-2021-06-06"; - - src = fetchFromGitHub { - owner = "bayesstuff"; - repo = "stanova"; - rev = "988ad8e07cda1674b881570a85502be7795fbd4e"; - hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY="; - }; - - propagatedBuildInputs = [ - emmeans - lme4 - coda - rstan - MASS - ]; - }; - - bstats = buildRPackage { - pname = "bstats"; - version = "0.0.0.9004-unstable-2023-09-08"; - - src = fetchFromGitHub { - owner = "AlexanderLyNL"; - repo = "bstats"; - rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c"; - hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk="; - }; - - propagatedBuildInputs = [ - hypergeo - purrr - SuppDists - ]; - }; - - flexplot = buildRPackage { - pname = "flexplot"; - version = "0.26.3"; - - src = fetchFromGitHub { - owner = "dustinfife"; - repo = "flexplot"; - rev = "cae36ba45502ce1794ad35cfeaf0155275db3056"; - hash = "sha256-aOCYy21EQ/lGDWQvkGAspTSZiJif8mlS2lCwS180dUA="; - }; - - propagatedBuildInputs = [ - cowplot - MASS - tibble - withr - dplyr - magrittr - forcats - purrr - plyr - R6 - ggplot2 - patchwork - ggsci - lme4 - party - mgcv - rlang - ]; - }; - - # conting has been removed from CRAN - conting' = buildRPackage { - pname = "conting"; - version = "1.7.9999"; - - src = fetchFromGitHub { - owner = "vandenman"; - repo = "conting"; - rev = "03a4eb9a687e015d602022a01d4e638324c110c8"; - hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0="; - }; - - propagatedBuildInputs = [ - mvtnorm - gtools - tseries - coda - ]; - }; - - buildJaspModule = - { - pname, - version, - rev ? "refs/tags/v${version}", - hash, - deps, - }: - buildRPackage { - inherit pname version; - src = fetchFromGitHub { - name = "${pname}-${version}-source"; - owner = "jasp-stats"; - repo = pname; - inherit rev hash; + propagatedBuildInputs = with customRPackages; [ + ggplot2 + gridExtra + gtable + htmlwidgets + lifecycle + jsonlite + plotly + R6 + RColorBrewer + rlang + scales + viridisLite + ]; }; - propagatedBuildInputs = deps; + + jaspBase = buildRPackage { + pname = "jaspBase"; + version = jasp-version; + + src = jasp-src; + sourceRoot = "${jasp-src.name}/Engine/jaspBase"; + + preConfigure = '' + mkdir -p ./inst/include/ + cp -r --no-preserve=all ../../Common ./inst/include/Common + export INCLUDE_DIR=$(pwd)/inst/include/Common/ + ''; + + propagatedBuildInputs = with customRPackages; [ + cli + codetools + ggplot2 + gridExtra + gridGraphics + jaspGraphs + jsonlite + lifecycle + modules + officer + pkgbuild + plyr + qgraph + ragg + R6 + Rcpp + renv + remotes + rjson + rvg + svglite + systemfonts + withr + ]; + }; + + stanova = buildRPackage { + pname = "stanova"; + version = "0.3-unstable-2021-06-06"; + + src = fetchFromGitHub { + owner = "bayesstuff"; + repo = "stanova"; + rev = "988ad8e07cda1674b881570a85502be7795fbd4e"; + hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY="; + }; + + propagatedBuildInputs = with customRPackages; [ + emmeans + lme4 + coda + rstan + MASS + ]; + }; + + bstats = buildRPackage { + pname = "bstats"; + version = "0.0.0.9004-unstable-2023-09-08"; + + src = fetchFromGitHub { + owner = "AlexanderLyNL"; + repo = "bstats"; + rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c"; + hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk="; + }; + + propagatedBuildInputs = with customRPackages; [ + hypergeo + purrr + SuppDists + ]; + }; + + flexplot = buildRPackage { + pname = "flexplot"; + version = "0.26.3"; + + src = fetchFromGitHub { + owner = "dustinfife"; + repo = "flexplot"; + rev = "cae36ba45502ce1794ad35cfeaf0155275db3056"; + hash = "sha256-aOCYy21EQ/lGDWQvkGAspTSZiJif8mlS2lCwS180dUA="; + }; + + propagatedBuildInputs = with customRPackages; [ + cowplot + MASS + tibble + withr + dplyr + magrittr + forcats + purrr + plyr + R6 + ggplot2 + patchwork + ggsci + lme4 + party + mgcv + rlang + ]; + }; + + # conting has been removed from CRAN + conting = buildRPackage { + pname = "conting"; + version = "1.7.9999"; + + src = fetchFromGitHub { + owner = "vandenman"; + repo = "conting"; + rev = "03a4eb9a687e015d602022a01d4e638324c110c8"; + hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0="; + }; + + propagatedBuildInputs = with customRPackages; [ + mvtnorm + gtools + tseries + coda + ]; + }; + + DistributionS7 = buildRPackage { + pname = "DistributionS7"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Kucharssim"; + repo = "DistributionS7"; + rev = "8c5a709c120abc0f26697c6009769e4c2d889b9b"; + hash = "sha256-9kxo38CpbEMRmeXbrngSZrQ8M9iL9SzV+WDYQitXDvU="; + }; + + postPatch = '' + rm -f .Rprofile + ''; + + propagatedBuildInputs = with customRPackages; [ + S7 + assertthat + rlang + goftest + nortest + ggplot2 + ggrepel + jaspGraphs + patchwork + sn + gnorm + sgt + generics + ]; + + }; + }; + + moduleInfo = lib.importJSON ./module-info.json; + + jaspModules = lib.mapAttrs ( + name: info: + buildRPackage { + inherit (info) pname version; + src = fetchFromGitHub { + name = "${info.pname}-${info.version}-source"; + owner = "jasp-stats-modules"; + repo = info.pname; + tag = info.tag; + hash = info.hash; + }; + propagatedBuildInputs = moduleDeps.${info.pname}; + # some packages have a .Rprofile that tries to activate renv # we disable this by removing .Rprofile postPatch = '' rm -f .Rprofile ''; - }; -in -{ - inherit jaspBase; + } + ) moduleInfo; - modules = rec { - jaspAcceptanceSampling = buildJaspModule { - pname = "jaspAcceptanceSampling"; - version = "0.96.0"; - hash = "sha256-sbLzTuGr7r/OsIMliOfvwVsmgUgZxL+6rqiq4W+BIBc="; - deps = [ - abtest - BayesFactor - conting' - ggplot2 - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - AcceptanceSampling - ]; - }; - jaspAnova = buildJaspModule { - pname = "jaspAnova"; - version = "0.96.0"; - hash = "sha256-K695RXTxzbYVF+gh8gzFTsceTTNdx976yF6WiPHm3No="; - deps = [ - afex - BayesFactor - boot - car - colorspace - emmeans - effectsize - ggplot2 - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - KernSmooth - matrixStats - multcomp - multcompView - mvShapiroTest - onewaytests - plyr - stringi - stringr - restriktor - ]; - }; - jaspAudit = buildJaspModule { - pname = "jaspAudit"; - version = "0.96.0"; - hash = "sha256-1j6Na7Ikk8XJQjbTRRuK28K3jMVdUVe0FwTzo5ywppY="; - deps = [ - bstats - extraDistr - ggplot2 - ggrepel - jaspBase - jaspGraphs - jfa - ]; - }; - jaspBain = buildJaspModule { - pname = "jaspBain"; - version = "0.96.0"; - hash = "sha256-CcelkJJD/rr5BOx8MaCkHfbUKp7/tvWOSSC+Ilsopc8="; - deps = [ - bain - lavaan - ggplot2 - semPlot - stringr - jaspBase - jaspGraphs - jaspSem - ]; - }; - jaspBFF = buildJaspModule { - pname = "jaspBFF"; - version = "0.96.0"; - hash = "sha256-bh3uLZcjfYpwaNmEzqVW5eNdPFq/Ig3bh7+1DgXYoF8="; - deps = [ - BFF - jaspBase - jaspGraphs - ]; - }; - jaspBfpack = buildJaspModule { - pname = "jaspBfpack"; - version = "0.96.0"; - hash = "sha256-S1lKrMC6BG6cjJWuxVYVtUciZIeePX0Nx/IvwCjixHY="; - deps = [ - BFpack - bain - ggplot2 - stringr - coda - jaspBase - jaspGraphs - ]; - }; - jaspBsts = buildJaspModule { - pname = "jaspBsts"; - version = "0.96.0"; - hash = "sha256-sFbn0yOr7ZaaO2APYNOshBcs1zvgIZUT89BvdRrN/+4="; - deps = [ - Boom - bsts - ggplot2 - jaspBase - jaspGraphs - matrixStats - reshape2 - ]; - }; - jaspCircular = buildJaspModule { - pname = "jaspCircular"; - version = "0.96.0"; - hash = "sha256-fqBSR/um02+BXuu7gucd7WWG/RSOeLmhXHQl2wXiVGw="; - deps = [ - jaspBase - jaspGraphs - circular - ggplot2 - ]; - }; - jaspCochrane = buildJaspModule { - pname = "jaspCochrane"; - version = "0.96.0"; - hash = "sha256-z6rglW4wItG9akHWplpDBzB5yzRko/ze+DcQotJmHTg="; - deps = [ - jaspBase - jaspGraphs - jaspDescriptives - jaspMetaAnalysis - ]; - }; - jaspDescriptives = buildJaspModule { - pname = "jaspDescriptives"; - version = "0.96.0"; - hash = "sha256-cJCTglQhU5fCH7henOKA0h39VuA07zVVfATtuct8tqY="; - deps = [ - ggplot2 - ggrepel - jaspBase - jaspGraphs - jaspTTests - forecast - flexplot - ggrain - ggh4x - ggpp - ggtext - dplyr - tidyplots - ggpubr - forcats - patchwork - ]; - }; - - jaspDistributions = buildJaspModule { - pname = "jaspDistributions"; - version = "0.96.0"; - hash = "sha256-uZWCVCOFfNkLNjJJ82x4H5rKH1m7KE3UDX1p/7dn4uY="; - deps = [ - car - fitdistrplus - ggplot2 - goftest - gnorm - jaspBase - jaspGraphs - MASS - nortest - sgt - sn - ]; - }; - jaspEquivalenceTTests = buildJaspModule { - pname = "jaspEquivalenceTTests"; - version = "0.96.0"; - hash = "sha256-4XFN6ikBfOZWHMTLbNPBwgMoYiLVULQE0XyNaoPQ40k="; - deps = [ - BayesFactor - ggplot2 - jaspBase - jaspGraphs - metaBMA - TOSTER - jaspTTests - ]; - }; - jaspEsci = buildJaspModule { - pname = "jaspEsci"; - version = "0.96.0"; - hash = "sha256-pH1neP1GmL3usXP5ycQKGeLNzvfMV/UBrrKF718QaGI="; - deps = [ - jaspBase - jaspGraphs - esci - glue - vdiffr - legendry - ]; - }; - jaspFactor = buildJaspModule { - pname = "jaspFactor"; - version = "0.96.0"; - hash = "sha256-AU9nTrxZNseN0Wsp3932V3N+ax5CzfJMoEB128AR5LM="; - deps = [ - ggplot2 - jaspBase - jaspGraphs - jaspSem - lavaan - psych - qgraph - reshape2 - semPlot - GPArotation - Rcsdp - semTools - ]; - }; - jaspFrequencies = buildJaspModule { - pname = "jaspFrequencies"; - version = "0.96.0"; - hash = "sha256-qolgiJjiODzheW04fXdtxNqAreEny7ln+GlwV4ztRik="; - deps = [ - abtest - BayesFactor - bridgesampling - conting' - multibridge - ggplot2 - interp - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - ]; - }; - jaspJags = buildJaspModule { - pname = "jaspJags"; - version = "0.96.0"; - hash = "sha256-f26njMClIUWNc4fGsPgwitzKbqdU6Ld+Ys6ukWAHE/M="; - deps = [ - coda - ggplot2 - ggtext - hexbin - jaspBase - jaspGraphs - rjags - runjags - scales - stringr - ]; - }; - jaspLearnBayes = buildJaspModule { - pname = "jaspLearnBayes"; - version = "0.96.0"; - hash = "sha256-zqMcWFML/iexmegMtGWCe/OCGqwmWW98/XZfKVs6N8w="; - deps = [ - extraDistr - ggplot2 - HDInterval - jaspBase - jaspGraphs - MASS - MCMCpack - MGLM - scales - ggalluvial - ragg - rjags - runjags - ggdist - png - posterior - ]; - }; - jaspLearnStats = buildJaspModule { - pname = "jaspLearnStats"; - version = "0.96.0"; - hash = "sha256-Yvqhv269Uvr087IjiGMBzTHZj+4Wu5A8dN/F9+8odqY="; - deps = [ - extraDistr - ggplot2 - jaspBase - jaspGraphs - jaspDistributions - jaspDescriptives - jaspTTests - ggforce - tidyr - igraph - HDInterval - metafor - ]; - }; - jaspMachineLearning = buildJaspModule { - pname = "jaspMachineLearning"; - version = "0.96.0"; - hash = "sha256-Wg1C/ZJL98U8JkMfeZcc4/83DmCHRYOIn2OglsMqImw="; - deps = [ - kknn - AUC - cluster - colorspace - DALEX - dbscan - e1071 - fpc - gbm - Gmedian - ggparty - ggdendro - ggnetwork - ggplot2 - ggrepel - ggridges - glmnet - jaspBase - jaspGraphs - MASS - mclust - mvnormalTest - neuralnet - network - partykit - plyr - randomForest - rpart - ROCR - Rtsne - signal - VGAM - ]; - }; - jaspMetaAnalysis = buildJaspModule { - pname = "jaspMetaAnalysis"; - version = "0.96.0"; - hash = "sha256-bXHlYiGEtNMqr833ve3Qrdv+TCm7G4let07McMETUv8="; - deps = [ - dplyr - ggplot2 - jaspBase - jaspGraphs - jaspSem - MASS - metaBMA - metafor - metaSEM - psych - purrr - rstan - stringr - tibble - tidyr - weightr - BayesTools - RoBMA - metamisc - ggmcmc - pema - clubSandwich - CompQuadForm - sp - dfoptim - nleqslv - patchwork - ]; - }; - jaspMixedModels = buildJaspModule { - pname = "jaspMixedModels"; - version = "0.96.0"; - hash = "sha256-F7NEyqA+vW+66l/ZmWaVvTSbG+0fxI+SsgfV6GmwJLs="; - deps = [ - afex - emmeans - ggplot2 - jaspBase - jaspGraphs - lme4 - loo - mgcv - rstan - rstanarm - stanova - withr - ]; - }; - jaspNetwork = buildJaspModule { - pname = "jaspNetwork"; - version = "0.96.0"; - hash = "sha256-alF9pDjBqrJvqDaJIOf9F/SWu/wrmspSFY/chE8/U9k="; - deps = [ - bootnet - easybgm - corpcor - dplyr - foreach - ggplot2 - gtools - HDInterval - huge - IsingSampler - jaspBase - jaspGraphs - mvtnorm - qgraph - reshape2 - snow - stringr - ]; - }; - jaspPower = buildJaspModule { - pname = "jaspPower"; - version = "0.96.0"; - hash = "sha256-Q5CBXoHr6jPs/UNMpyQXzhMm5a48G8LTYr37VKfzrrc="; - deps = [ - pwr - jaspBase - jaspGraphs - viridis - ]; - }; - jaspPredictiveAnalytics = buildJaspModule { - pname = "jaspPredictiveAnalytics"; - version = "0.96.0"; - hash = "sha256-CrpozVhA+vTv15dWUH9CqK37BdO7okE8XML6BYRsoYw="; - deps = [ - jaspBase - jaspGraphs - bsts - bssm - precrec - reshape2 - Boom - lubridate - prophet - BART - EBMAforecast - imputeTS - scoringRules - scoringutils - ]; - }; - jaspProcess = buildJaspModule { - pname = "jaspProcess"; - version = "0.96.0"; - hash = "sha256-ZO3Y+3qA84s0wUdL9iRqnc4vljzg69crH34eCbGWmOo="; - deps = [ - blavaan - dagitty - ggplot2 - ggraph - jaspBase - jaspGraphs - jaspJags - runjags - ]; - }; - jaspProphet = buildJaspModule { - pname = "jaspProphet"; - version = "0.96.0"; - hash = "sha256-rEBXWEVpavXiMljtvNfKLVvI8VIaTk+yymaGx4w/li8="; - deps = [ - rstan - ggplot2 - jaspBase - jaspGraphs - prophet - scales - ]; - }; - jaspQualityControl = buildJaspModule { - pname = "jaspQualityControl"; - version = "0.96.0"; - hash = "sha256-5DNz827MZHfmLnFXNUTFweMmOdDftxm6S8ZJwzCCDa8="; - deps = [ - car - cowplot - daewr - desirability - DoE_base - EnvStats - FAdist - fitdistrplus - FrF2 - ggplot2 - ggrepel - goftest - ggpp - irr - jaspBase - jaspDescriptives - jaspGraphs - mle_tools - psych - qcc - rsm - Rspc - tidyr - tibble - vipor - weibullness - flexsurv - ]; - }; - jaspRegression = buildJaspModule { - pname = "jaspRegression"; - version = "0.96.0"; - rev = "b0ecad26bb248964e778ee6d4486d671b83930b2"; - hash = "sha256-wm/Fz/wA7B96bzj8UylZjFgrrZgwOTdGnCsmfaCPGp0="; - deps = [ - BAS - boot - bstats - combinat - emmeans - ggplot2 - ggrepel - jaspAnova - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - lmtest - logistf - MASS - matrixStats - mdscore - ppcor - purrr - Rcpp - statmod - VGAM - ]; - }; - jaspReliability = buildJaspModule { - pname = "jaspReliability"; - version = "0.96.0"; - hash = "sha256-WZW9CAAKdEYUTwGC1zmtChvntgRTkLL6xwrpukDoqSo="; - deps = [ - Bayesrel - coda - ggplot2 - ggridges - irr - jaspBase - jaspGraphs - LaplacesDemon - lme4 - MASS - psych - mirt - ]; - }; - jaspRobustTTests = buildJaspModule { - pname = "jaspRobustTTests"; - version = "0.96.0"; - hash = "sha256-U6qH0tKC7lLFvnTGK9mNli7Azh/SA6pUEJdsUoOCsYo="; - deps = [ - RoBTT - ggplot2 - jaspBase - jaspGraphs - ]; - }; - jaspSem = buildJaspModule { - pname = "jaspSem"; - version = "0.96.0"; - hash = "sha256-acSH/0IbqDxSOZi30zBjDgU3I6jxUYCgVG9B7dbkAh8="; - deps = [ - forcats - ggplot2 - lavaan - cSEM - reshape2 - jaspBase - jaspGraphs - semPlot - semTools - stringr - tibble - tidyr - SEMsens - mxsem - OpenMx - ]; - }; - jaspSummaryStatistics = buildJaspModule { - pname = "jaspSummaryStatistics"; - version = "0.96.0"; - hash = "sha256-UuC26atGRnRHwp1xhAJtj5vkdPvYjcs2WIPgAq/0Uvg="; - deps = [ - BayesFactor - bstats - jaspBase - jaspFrequencies - jaspGraphs - jaspRegression - jaspTTests - jaspAnova - jaspDescriptives - SuppDists - bayesplay - ]; - }; - jaspSurvival = buildJaspModule { - pname = "jaspSurvival"; - version = "0.96.0"; - hash = "sha256-P652YSopruDje69vXfeBMSBMU/GPmYCuRp7jd2ZneEI="; - deps = [ - survival - ggsurvfit - flexsurv - jaspBase - jaspGraphs - ]; - }; - jaspTTests = buildJaspModule { - pname = "jaspTTests"; - version = "0.96.0"; - hash = "sha256-K1thMejBibf8nzP07QbKyS/j3FbbrGQNPdiBpkhKf1w="; - deps = [ - BayesFactor - car - ggplot2 - jaspBase - jaspGraphs - logspline - plotrix - plyr - ]; - }; - jaspTestModule = buildJaspModule { - pname = "jaspTestModule"; - version = "0.95.3"; - hash = "sha256-kzwGm4hHkO1+mzmCl792oDQimJrsw4xIhd+e91PrOMg="; - deps = [ - jaspBase - jaspGraphs - svglite - stringi - ]; - }; - jaspTimeSeries = buildJaspModule { - pname = "jaspTimeSeries"; - version = "0.96.0"; - hash = "sha256-FZEEa1n7B9Kt74L7dw+oYWmHBGobI78wUBzQ1wsKos8="; - deps = [ - jaspBase - jaspGraphs - jaspDescriptives - forecast - ]; - }; - jaspVisualModeling = buildJaspModule { - pname = "jaspVisualModeling"; - version = "0.96.0"; - hash = "sha256-lhvH69LUIzXsFQ730hqcWnkTK0aeMhal3VhSTrr4eHc="; - deps = [ - flexplot - jaspBase - jaspGraphs - jaspDescriptives - ]; - }; + moduleDeps = with customRPackages; { + jaspAcceptanceSampling = [ + abtest + BayesFactor + conting + ggplot2 + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + AcceptanceSampling + ]; + jaspAnova = [ + afex + BayesFactor + boot + car + colorspace + emmeans + effectsize + ggplot2 + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + KernSmooth + matrixStats + multcomp + multcompView + mvShapiroTest + onewaytests + plyr + stringi + stringr + restriktor + ]; + jaspAudit = [ + bstats + extraDistr + ggplot2 + ggrepel + jaspBase + jaspGraphs + jfa + ]; + jaspBain = [ + bain + lavaan + ggplot2 + semPlot + stringr + jaspBase + jaspGraphs + jaspSem + ]; + jaspBFF = [ + BFF + jaspBase + jaspGraphs + ]; + jaspBfpack = [ + BFpack + bain + ggplot2 + stringr + coda + jaspBase + jaspGraphs + ]; + jaspBsts = [ + Boom + bsts + ggplot2 + jaspBase + jaspGraphs + matrixStats + reshape2 + ]; + jaspCircular = [ + jaspBase + jaspGraphs + circular + ggplot2 + ]; + jaspCochrane = [ + jaspBase + jaspGraphs + jaspDescriptives + jaspMetaAnalysis + ]; + jaspDescriptives = [ + ggplot2 + ggrepel + jaspBase + jaspGraphs + jaspTTests + forecast + flexplot + ggrain + ggh4x + ggpp + ggtext + dplyr + tidyplots + ggpubr + forcats + patchwork + ]; + jaspDistributions = [ + car + fitdistrplus + ggplot2 + goftest + gnorm + jaspBase + jaspGraphs + MASS + nortest + sgt + sn + DistributionS7 + ]; + jaspEquivalenceTTests = [ + BayesFactor + ggplot2 + jaspBase + jaspGraphs + metaBMA + TOSTER + jaspTTests + ]; + jaspEsci = [ + jaspBase + jaspGraphs + esci + glue + vdiffr + legendry + ]; + jaspFactor = [ + ggplot2 + jaspBase + jaspGraphs + jaspSem + lavaan + psych + qgraph + reshape2 + semPlot + GPArotation + Rcsdp + semTools + ]; + jaspFrequencies = [ + abtest + BayesFactor + bridgesampling + conting + multibridge + ggplot2 + interp + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + ]; + jaspJags = [ + coda + ggplot2 + ggtext + hexbin + jaspBase + jaspGraphs + rjags + runjags + scales + stringr + ]; + jaspLearnBayes = [ + extraDistr + ggplot2 + HDInterval + jaspBase + jaspGraphs + MASS + MCMCpack + MGLM + scales + ggalluvial + ragg + rjags + runjags + ggdist + png + posterior + ]; + jaspLearnStats = [ + extraDistr + ggplot2 + jaspBase + jaspGraphs + jaspDistributions + jaspDescriptives + jaspTTests + ggforce + tidyr + igraph + HDInterval + metafor + ]; + jaspMachineLearning = [ + kknn + AUC + cluster + colorspace + DALEX + dbscan + e1071 + fpc + gbm + Gmedian + ggparty + ggdendro + ggnetwork + ggplot2 + ggrepel + ggridges + glmnet + jaspBase + jaspGraphs + MASS + mclust + mvnormalTest + neuralnet + network + partykit + plyr + randomForest + rpart + ROCR + Rtsne + signal + VGAM + ]; + jaspMetaAnalysis = [ + dplyr + ggplot2 + jaspBase + jaspGraphs + jaspSem + MASS + metaBMA + metafor + metaSEM + psych + purrr + rstan + stringr + tibble + tidyr + weightr + BayesTools + RoBMA + metamisc + ggmcmc + pema + clubSandwich + CompQuadForm + sp + dfoptim + nleqslv + patchwork + ]; + jaspMixedModels = [ + afex + emmeans + ggplot2 + jaspBase + jaspGraphs + lme4 + loo + mgcv + rstan + rstanarm + stanova + withr + ]; + jaspNetwork = [ + bootnet + easybgm + corpcor + dplyr + foreach + ggplot2 + gtools + HDInterval + huge + IsingSampler + jaspBase + jaspGraphs + mvtnorm + qgraph + reshape2 + snow + stringr + ]; + jaspPower = [ + pwr + jaspBase + jaspGraphs + viridis + ]; + jaspPredictiveAnalytics = [ + jaspBase + jaspGraphs + bsts + bssm + precrec + reshape2 + Boom + lubridate + prophet + BART + EBMAforecast + imputeTS + scoringRules + scoringutils + ]; + jaspProcess = [ + blavaan + dagitty + ggplot2 + ggraph + jaspBase + jaspGraphs + jaspJags + runjags + ]; + jaspProphet = [ + rstan + ggplot2 + jaspBase + jaspGraphs + prophet + scales + ]; + jaspQualityControl = [ + car + cowplot + daewr + desirability + DoE_base + EnvStats + FAdist + fitdistrplus + FrF2 + ggplot2 + ggrepel + goftest + ggpp + irr + jaspBase + jaspDescriptives + jaspGraphs + mle_tools + psych + qcc + rsm + Rspc + tidyr + tibble + vipor + weibullness + flexsurv + ]; + jaspRegression = [ + BAS + boot + bstats + combinat + emmeans + ggplot2 + ggrepel + jaspAnova + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + lmtest + logistf + MASS + matrixStats + mdscore + ppcor + purrr + Rcpp + statmod + VGAM + ]; + jaspReliability = [ + Bayesrel + coda + ggplot2 + ggridges + irr + jaspBase + jaspGraphs + LaplacesDemon + lme4 + MASS + psych + mirt + ]; + jaspRobustTTests = [ + RoBTT + ggplot2 + jaspBase + jaspGraphs + ]; + jaspSem = [ + forcats + ggplot2 + lavaan + cSEM + reshape2 + jaspBase + jaspGraphs + semPlot + semTools + stringr + tibble + tidyr + SEMsens + mxsem + OpenMx + ]; + jaspSummaryStatistics = [ + BayesFactor + bstats + jaspBase + jaspFrequencies + jaspGraphs + jaspRegression + jaspTTests + jaspAnova + jaspDescriptives + SuppDists + bayesplay + ]; + jaspSurvival = [ + survival + ggsurvfit + flexsurv + jaspBase + jaspGraphs + ]; + jaspTTests = [ + BayesFactor + car + ggplot2 + jaspBase + jaspGraphs + logspline + plotrix + plyr + ]; + jaspTestModule = [ + jaspBase + jaspGraphs + svglite + stringi + ]; + jaspTimeSeries = [ + jaspBase + jaspGraphs + jaspDescriptives + forecast + ]; + jaspVisualModeling = [ + flexplot + jaspBase + jaspGraphs + jaspDescriptives + ]; }; +in +assert ( + lib.sort lib.lessThan (lib.attrNames jaspModules) + == lib.sort lib.lessThan (lib.attrNames moduleInfo) +); +{ + inherit customRPackages jaspModules; } diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 86cb7b932e15..788de539ffd8 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -16,6 +16,7 @@ freexl, libarchive, librdata, + libsodium, qt6, R, readstat, @@ -24,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasp-desktop"; - version = "0.96.0"; + version = "0.97.1"; src = fetchFromGitHub { owner = "jasp-stats"; repo = "jasp-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5yvnlhPHssWfO9xxgBRULAMe6e5EyAWr8JVY0BQxKog="; + hash = "sha256-4K6ReOJJF8Pt/RdNSp2ZVH/d64ZMCFlX1RIXDAWWWBE="; }; patches = [ - ./boost.patch # link boost dynamically, don't try to find removed system stub library + ./boost.patch # link boost dynamically ./disable-module-install-logic.patch # don't try to install modules via cmake ./disable-renv-logic.patch ./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules @@ -61,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { freexl libarchive librdata + libsodium readstat qt6.qtbase @@ -87,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (import ./modules.nix { - inherit fetchFromGitHub rPackages; + inherit lib fetchFromGitHub rPackages; jasp-src = finalAttrs.src; jasp-version = finalAttrs.version; }) - jaspBase - modules + customRPackages + jaspModules ; # Merges ${R}/lib/R with all used R packages (even propagated ones) @@ -101,16 +103,16 @@ stdenv.mkDerivation (finalAttrs: { paths = [ "${R}/lib/R" rPackages.RInside - finalAttrs.passthru.jaspBase # Should already be propagated from modules, but include it again, just in case + finalAttrs.passthru.customRPackages.jaspBase # Should already be propagated from modules, but include it again, just in case ] - ++ lib.attrValues finalAttrs.passthru.modules; + ++ lib.attrValues finalAttrs.passthru.jaspModules; }; moduleLibs = linkFarm "jasp-desktop-${finalAttrs.version}-module-libs" ( lib.mapAttrsToList (name: drv: { name = name; path = "${drv}/library"; - }) finalAttrs.passthru.modules + }) finalAttrs.passthru.jaspModules ); moduleManifests = linkFarm "jasp-desktop-${finalAttrs.version}-module-manifests" ( @@ -120,8 +122,10 @@ stdenv.mkDerivation (finalAttrs: { name = name; version = drv.version; }; - }) finalAttrs.passthru.modules + }) finalAttrs.passthru.jaspModules ); + + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/ja/jasp-desktop/update.sh b/pkgs/by-name/ja/jasp-desktop/update.sh new file mode 100755 index 000000000000..2b879d8f7bef --- /dev/null +++ b/pkgs/by-name/ja/jasp-desktop/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update +#shellcheck shell=bash +set -euo pipefail + +pkg_dir="$(dirname "$0")" + +nix-update jasp-desktop +"$pkg_dir/generate-module-info.sh" diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix index 63e2932d0a14..0b16b54579c4 100644 --- a/pkgs/by-name/li/librashader/package.nix +++ b/pkgs/by-name/li/librashader/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "librashader"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "SnowflakePowered"; repo = "librashader"; tag = "librashader-v${finalAttrs.version}"; - hash = "sha256-ZkmaPv7cy2qj1I8hBiLBAIgbATS6Ooe/Y52cjKNYyCw="; + hash = "sha256-oo4XbDjnrDR5vYYiOa/wjvKGm4a1KPzGsCQeNy9V07E="; }; patches = [ ./patches/fix-optional-dep-syntax.patch ]; - cargoHash = "sha256-zEHvhjFGcZ9eFWfmJfrRpbjnHPqQhZ0G3OMHBWKQBzQ="; + cargoHash = "sha256-9u/5Mv/Hng5iZzdCvl7oMWnxzKvDpvLeP34CdhHnQHU="; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 0f0c1c1f8297..3baaf9e86f5d 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2026-05-07"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "cef2de6123cccbf0393ed6071ffd6e4a8d092145"; - hash = "sha256-DvkWxkIdB9K/UkIk3r7mNT1RhAtEe9sfIX/ffxPiTIE="; + rev = "140d1bcc67a7287670ad6a02fc77e11c10ef5e07"; + hash = "sha256-EejHojtJDnhgYk5PM8RTiCdV5TCeqcszodHQvs6vVIU="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 885c64f795f8..6296234c02df 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.3.2"; + version = "12.3.3"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-xQUoMQbq3fpbvFbYwbHPMz0SZU3LN/gOaF01duhwKGU="; + hash = "sha256-8aUp2lzVClyje6WHMTOnuOclhLEn1zMf6U5VTl5gEvc="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 0110ccee1694..63312e79cf25 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mimir"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { rev = "mimir-${finalAttrs.version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-IF0Cjg6INAvHyWGnf+V8KphSAmcLEo276MMrsRJgMjI="; + hash = "sha256-Gp4+eVL6HUFlhtAZmDJyHYr/QP0+JQIcDXJfCk2IpCg="; }; vendorHash = null; diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 7ff2f20eb38e..844a230753a3 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.13.4"; + version = "2.15.0"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-Axd6zCAarhXUsT32ZTqcVKC/b2PwmZvIg5f9QNMREAI="; + hash = "sha256-TUMv7+8RUHzNTydUE+Tqihn7VD0QXUdegsU3elGAQG4="; }; - vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM="; + vendorHash = "sha256-vf0hdrNy8HrQBtZZKwmbWOVn2TB6tV4qdews8Enjwao="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 885968b0b1ae..2b27bf85d0c6 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "nezha-agent"; - version = "2.0.4"; + version = "2.2.2"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-ftPJhbh3dnJotJ5J9rlTkYVpmppBb5UWvx5Qy5Y5zGA="; + hash = "sha256-KaONvjQY204VUppt2h78IE92LP+YJQ128BCuHGgMsBk="; }; - vendorHash = "sha256-0dwrwUeHbPdI5O8KeX4PQP1jN6P+AwPznqX78kxSleM="; + vendorHash = "sha256-/pygqSThb3YQ188Ro0vjP4yDN/yfPNRJQWP5FQ7sJ8c="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix index f4eae92c8bcc..a362791747e5 100644 --- a/pkgs/by-name/op/openttd-jgrpp/package.nix +++ b/pkgs/by-name/op/openttd-jgrpp/package.nix @@ -7,13 +7,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.72.2"; + version = "0.72.3"; src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-Ql3W+Xr5zXDW/IBY23X+RMSXieCqn35hYY3jfYGahgs="; + hash = "sha256-W9RakMdyL4eJ/90+/vypzl4FwX7inlrdH9liXNYT3IA="; }; patches = [ ]; diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index a8b838a46814..6d268e0117dd 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -21,25 +21,25 @@ # A pure Rust build would lack the Prettier plugin functionality. stdenv.mkDerivation (finalAttrs: { pname = "oxfmt"; - version = "0.52.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxfmt_v${finalAttrs.version}"; - hash = "sha256-vf99nkcLSBbQ+2ZT19S3KlyW15oFho3JinL532Gx30g="; + hash = "sha256-/AXBMb+EEpA10omlpxG1jkCqMrhbB8AdEewyQrMJqTk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-vQiwaDMd1tCrFXmu3R0RHDjfRzUwv9cdJC+7PaD6SWU="; + hash = "sha256-JHTbbVzXWyigk8NGqvBjVKUuR2p6+gpFRY1GWZEvEFk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-u4BFj1Gp8JUqPhYmEw8rpa8Qozcew5jmlqFGgLFyeKc="; + hash = "sha256-mYwkBQZ3ik3yGoPXc3BtLFhavmkj+QzZNMnYG3qyzyc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index b6b4c7b5dedf..88cd3f3da1bc 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "spacectl"; - version = "1.21.6"; + version = "1.22.0"; src = fetchFromGitHub { owner = "spacelift-io"; repo = "spacectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-iGXDdTnWepOqhOgRWwdLI5cdVVATCLs0kFKk+yVlxZ0="; + hash = "sha256-2wy5I3wmBtp239gdcL8s+SuXWajx9EB+s3xBYxy55ok="; }; - vendorHash = "sha256-NvnsRvLnUJgxhx65nse2er65RRPatZF28rLiRBMnNhY="; + vendorHash = "sha256-+ahiiboLKu/LazJzsxoE39hbF73TSuguPkKCSS7m2BA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index 72d45fb2346d..e35e8dadd02f 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -10,8 +10,6 @@ libtool, libunwind, perl, - postgresql, - postgresqlTestHook, pkg-config, ripgrep, rustc, @@ -50,53 +48,59 @@ in stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "26.1.0"; + version = "27.0.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-0bdomxjx+Qwvxu6NWUTYbLvoKwCvM0e5I3qwhKLEecM="; + hash = "sha256-ikTkp/r24xTJ+RDMlu5q8PmFvGUeLz/sejeIjOSmd5M="; fetchSubmodules = true; }; - cargoDeps = symlinkJoin { - name = "stellar-core-${finalAttrs.version}-cargo-vendor-dir"; - paths = [ - (rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - hash = "sha256-sm8cn288vb4aYJXNOwkjDmPQ8Ug0mnur5YcXH5sS2Sg="; - }) - ] - ++ - map - ( - protocol: - rustPlatform.fetchCargoVendor { - pname = "stellar-core-${protocol}"; - inherit (finalAttrs) version src; - cargoRoot = "src/rust/soroban/${protocol}"; - hash = - { - p21 = "sha256-cUhi2YennW+tukwf0woP69bqf1ZMsQ4JDeNqpk0jYjg="; - p22 = "sha256-5mNAblS3TYXu5a1ThmIdbKC9hUg/3F8vUPvFex3G58U="; - p23 = "sha256-l1nqc4qrqWV8aKOd9NFUaOLw1Mags2znjbQixU5H3+Y="; - p24 = "sha256-P+Q8SNcuFX6diBYqGpkOwHtplK4y4PZxB+gj6MnpYDs="; - p25 = "sha256-9NhnB3bDQI1FLmr0zTYTjEYl8V8KteWbMefWObLDB/A="; - p26 = "sha256-OxkiWTzNtmYxB64OtLUwghAkcT//SnMZVfUXynFg2Bg="; - } - .${protocol}; - } - ) - [ - "p21" - "p22" - "p23" - "p24" - "p25" - "p26" - ]; - }; + cargoDeps = + let + sorobanProtocolHashes = { + p21 = "sha256-cUhi2YennW+tukwf0woP69bqf1ZMsQ4JDeNqpk0jYjg="; + p22 = "sha256-5mNAblS3TYXu5a1ThmIdbKC9hUg/3F8vUPvFex3G58U="; + p23 = "sha256-l1nqc4qrqWV8aKOd9NFUaOLw1Mags2znjbQixU5H3+Y="; + p24 = "sha256-P+Q8SNcuFX6diBYqGpkOwHtplK4y4PZxB+gj6MnpYDs="; + p25 = "sha256-9NhnB3bDQI1FLmr0zTYTjEYl8V8KteWbMefWObLDB/A="; + p26 = "sha256-OxkiWTzNtmYxB64OtLUwghAkcT//SnMZVfUXynFg2Bg="; + p27 = "sha256-KcsyPBJLUOwRAtp95IYFiZZNMi1xWmYW7XXG+bMucmY="; + }; + in + symlinkJoin { + name = "stellar-core-${finalAttrs.version}-cargo-vendor-dir"; + paths = [ + (rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-e7WGYm5RLmg9vjcMjy98RBW0QqjGTd8cPPeilhYbZ2I="; + }) + ] + ++ lib.mapAttrsToList ( + protocol: hash: + rustPlatform.fetchCargoVendor { + pname = "stellar-core-${protocol}"; + inherit (finalAttrs) version src; + cargoRoot = "src/rust/soroban/${protocol}"; + inherit hash; + } + ) sorobanProtocolHashes; + postBuild = '' + # `soroban-synth-wasm` resolves this path relative to the vendored git + # source root, but cargo vendors the workspace crates with versioned + # directory names. + for source in "$out"/source-git-*; do + for dir in "$source"/soroban-env-common-*; do + if [ -d "$dir" ] && [ ! -e "$source"/soroban-env-common ]; then + ln -s "$(basename "$dir")" "$source"/soroban-env-common + fi + break + done + done + ''; + }; strictDeps = true; @@ -115,11 +119,6 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook ]; - nativeCheckInputs = [ - postgresql - postgresqlTestHook - ]; - buildInputs = [ libpq libunwind @@ -129,14 +128,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - postgresqlTestUserOptions = "LOGIN SUPERUSER"; - - postgresqlTestSetupPost = '' - for database in $(seq 0 3); do - createdb "test$database" - done - ''; - preConfigure = '' # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on # having the .git directory present, so directly provide the version @@ -162,12 +153,9 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck - # The full upstream test suite is too heavy for a default package check: it - # includes long-running integration scenarios and Soroban tests across all - # p21-p26 protocol crates. Keep this focused on a basic consensus smoke test - # plus a PostgreSQL-backed persistence test. + # The full upstream test suite is too heavy for a default package check. + # Keep this focused on a basic consensus smoke test. ./src/stellar-core test --ll fatal -w NoTests -a -r simple --disable-dots "standalone" - ./src/stellar-core test --ll fatal -w NoTests -a -r simple --disable-dots "SCP State" runHook postCheck ''; diff --git a/pkgs/by-name/sy/syswatch/package.nix b/pkgs/by-name/sy/syswatch/package.nix index 6d94c8001b70..0203f4c016ea 100644 --- a/pkgs/by-name/sy/syswatch/package.nix +++ b/pkgs/by-name/sy/syswatch/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "syswatch"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "matthart1983"; repo = "syswatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-9LEZ9DWp5H+ODiuE6A5Qzr/ozXQaXQ7TbDnJY8B8GD4="; + hash = "sha256-2+ZF9QiJx37Jc7NqjkrrH/1llHfYtckrpiu0WiT4GAE="; }; __structuredAttrs = true; - cargoHash = "sha256-dGobKfemSrZ+Y4haHrmLt7dqv9yOBDJ2k3XnZ9LkIlw="; + cargoHash = "sha256-2iGSUhar6babzJUF3JVBdKleeyLSEuZoOEndCbOIfxY="; nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 281f40637fcf..976cba3491d6 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasm-tools"; - version = "1.251.0"; + version = "1.252.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-U02BnWiC6u7QPA2sCYC+BIgsjRbpjQFNK3tNAi/Td5Q="; + hash = "sha256-ehWAkTckRftWC/fIxMxFxmTkTowNQ/OWbcQqwJyWbQw="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-YXG6V8eBZm1NNvADhB71pkI05UcfkVW7t6N7kTH/I5Q="; + cargoHash = "sha256-vdRdX4WiPq1NutWwdadWE9tFZKPVdU6eZ4RXf++SSpo="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index 9e2bf8f773ef..f1ab980b1fd1 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "ipp0Yv6uOcEnymkq6A534/pch8Eb2v7E38BgT99XNB4="; + sha256 = "dc7m5o7xIEPacBH1Zo+bb7MLgEidRjPwlB0U63B2/w4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index 55c8866b39eb..4e54c06a87ab 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "dvc-gs"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; src = fetchPypi { pname = "dvc_gs"; inherit (finalAttrs) version; - hash = "sha256-c5aTwNglCjkHS6Fsfc51K7Wn/5NEQtYIH/z9ftkxO5o="; + hash = "sha256-QhhWD/HVGW/Qx5FiZVzXnFE0+mHr40o6UH+vB0kibu4="; }; # Prevent circular dependency diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 5cbb6c791b4d..e162e3ea3a42 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -10,12 +10,12 @@ buildPythonPackage (finalAttrs: { pname = "hcloud"; - version = "2.20.0"; + version = "2.21.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-JwUu/6saJbs8v8ji0kcuDoUDsgrsq1u61cSw6Gl2ltU="; + hash = "sha256-IGC2LqFD5HStdVxp71PHOX+WOPTfg6UC7cznxbX+sZ4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 46f4d840756b..94b2d814951c 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "inkbird-ble"; - version = "1.4.4"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "inkbird-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-URmWIsWoPctuYtSLeX8AU4ml6o9c5BH6YgqCINppQdk="; + hash = "sha256-I07HIbrYXTlaP4TSfyZmEhj1HAjus05JEiPD9UxRatc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix index a2841bf86364..ebc15305a412 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-form"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-serialization-form-v${version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${src.name}/packages/serialization/form/"; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 4945caa07cf7..a429afaae31e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -3,7 +3,6 @@ aiofiles, aiohttp, aioresponses, - aiounittest, buildPythonPackage, ciso8601, fetchFromGitHub, @@ -54,7 +53,6 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses - aiounittest pytest-asyncio pytest-cov-stub pytest-freezegun