diff --git a/nixos/modules/services/web-apps/bentopdf.nix b/nixos/modules/services/web-apps/bentopdf.nix index 651896c41ea4..bf03beccc938 100644 --- a/nixos/modules/services/web-apps/bentopdf.nix +++ b/nixos/modules/services/web-apps/bentopdf.nix @@ -71,7 +71,7 @@ in ''; }; - locations."~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = '' + locations."~* \\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = '' expires 1y; add_header Cache-Control "public, immutable"; ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 400145f4c207..0b4f9a1d3082 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-BYpqXdtjEez7uOtUw3x70ki6sNVUzVuQVvQ8Y7vwOdc=", + "hash": "sha256-hyrbCXLsebkXdGovKxgLlRI6Y7WgHbLCclABRLxKzbE=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.95.0", + "rev": "v0.96.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LvzKLPNZ+37qSSll6VqV44MOVe8/jGmUiKrSWCHkqf8=" + "vendorHash": "sha256-oLvWBDf5wKI5lltwITHrJ+0RmEF1pMuqFoxd161uvrI=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -1193,13 +1193,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-hmXFDWbo79t15nKsyDOi5SDzyG3tA+6oo7LPoMURzh8=", + "hash": "sha256-/1s3TQK8EkM7WgHW77a/JGsCemiustIwlLAam9CZpiY=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v7.5.3", + "rev": "v7.5.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE=" + "vendorHash": "sha256-QdfBhTY7HwPqz9qm7KE0OL4ACOWiU8gLOKKdFbMrAro=" }, "siderolabs_talos": { "hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=", diff --git a/pkgs/by-name/av/avdl/package.nix b/pkgs/by-name/av/avdl/package.nix new file mode 100644 index 000000000000..800cc1bf9e70 --- /dev/null +++ b/pkgs/by-name/av/avdl/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "avdl"; + version = "0.1.5+1.12.1"; + + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "avdl"; + rev = "v${finalAttrs.version}"; + hash = "sha256-/YGDtezPMMdogk8eGoHgqt8B0t6SNA3TVqroLOOANxs="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-QPC58tt7e8O/KJyE3c5mdLMyEt37hKG9lEDBs47prAQ="; + + meta = { + description = "Rust port of avro-tools' IDL tooling"; + homepage = "https://github.com/jonhoo/avdl"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ck3d ]; + mainProgram = "avdl"; + }; +}) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 24b2a5b3a385..f387e168ecef 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2026-01-28"; + version = "0-unstable-2026-02-13"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "ade95a235a50e5ea653a02fd3773c214ac43d425"; - hash = "sha256-XyFhC4I7Y1ppTfLs7em+hXmXx6jQ09rJxcf66EwoK7g="; + rev = "b0a85a7414504191342b0c6d073c6f9233cb923a"; + hash = "sha256-SzZMCNNTIctzFqx2qHwE4y4lioctpum39AyRrylurZA="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 50147c9caf1e..03ada727ad34 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -1,33 +1,46 @@ { lib, - stdenvNoCC, - fetchurl, + fetchFromGitHub, makeBinaryWrapper, jre, + maven, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +maven.buildMavenPackage rec { version = "13.2.0"; pname = "checkstyle"; - src = fetchurl { - url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-rAPNT/zbMXX1s4upQlZD6QnNFliNPlVBzbUjxcTL3PU="; + src = fetchFromGitHub { + owner = "checkstyle"; + repo = "checkstyle"; + tag = "checkstyle-${version}"; + hash = "sha256-f9jJK9zp7sm8VEn30qQA73+ynARJWY3BxbSMEppEDlk="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ jre ]; + mvnHash = "sha256-+l3ubVFWx1QVTSgwVv0yGVyh8RPnxyHBU/vKE4sBRoE="; - dontUnpack = true; + nativeBuildInputs = [ + maven + makeBinaryWrapper + ]; + + mvnParameters = lib.escapeShellArgs [ "-Passembly,no-validations" ]; installPhase = '' runHook preInstall - install -D $src $out/checkstyle/checkstyle-all.jar + + mkdir -p $out/bin $out/share/checkstyle + install -Dm644 target/checkstyle-${version}-all.jar $out/share/checkstyle/checkstyle-all.jar + makeWrapper ${jre}/bin/java $out/bin/checkstyle \ - --add-flags "-jar $out/checkstyle/checkstyle-all.jar" + --add-flags "-jar $out/share/checkstyle/checkstyle-all.jar" + runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Checks Java source against a coding standard"; mainProgram = "checkstyle"; @@ -38,9 +51,15 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://checkstyle.org/"; changelog = "https://checkstyle.org/releasenotes.html#Release_${version}"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ pSub ]; - platforms = jre.meta.platforms; + maintainers = with lib.maintainers; [ + pSub + progrm_jarvis + ]; + inherit (jre.meta) platforms; }; } diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix new file mode 100644 index 000000000000..5eb44bf9bd0a --- /dev/null +++ b/pkgs/by-name/ci/cine/package.nix @@ -0,0 +1,72 @@ +{ + lib, + fetchFromGitHub, + cmake, + meson, + ninja, + wrapGAppsHook4, + appstream, + blueprint-compiler, + desktop-file-utils, + gettext, + glib, + gtk4, + libadwaita, + libGL, + pkg-config, + python3Packages, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "cine"; + version = "1.0.9"; + pyproject = false; + + src = fetchFromGitHub { + owner = "diegopvlk"; + repo = "Cine"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aw+M1wCGSbRRmKKcgyM4luEr0WtPLw/v7SqBE1B5H9U="; + fetchSubmodules = true; + }; + + strictDeps = true; + dontWrapGApps = true; + + nativeBuildInputs = [ + meson + ninja + cmake + pkg-config + wrapGAppsHook4 + blueprint-compiler + desktop-file-utils + appstream + ]; + + buildInputs = [ + gettext + glib + gtk4 + libadwaita + ]; + + dependencies = with python3Packages; [ + pygobject3 + mpv + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}) + ''; + + meta = { + description = "Video Player for Linux"; + homepage = "https://github.com/diegopvlk/Cine"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pancaek ]; + mainProgram = "cine"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/concessio/package.nix b/pkgs/by-name/co/concessio/package.nix index c8fa52d89ce4..f7b95b14a577 100644 --- a/pkgs/by-name/co/concessio/package.nix +++ b/pkgs/by-name/co/concessio/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + blueprint-compiler, desktop-file-utils, fetchFromGitHub, gjs, @@ -17,18 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "concessio"; - version = "0.1.10"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ronniedroid"; repo = "concessio"; tag = "v${finalAttrs.version}"; - hash = "sha256-GDiwpErxz6GiYajcRBOnX0RO1jeaSmpLLxqEsB3nJLA="; + hash = "sha256-vPHL46mZj6idIv9VXY73jrcA2GEpPdG5hn0ZzAZjo6A="; }; strictDeps = true; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils gjs glib # For `glib-compile-schema` diff --git a/pkgs/by-name/di/digital/package.nix b/pkgs/by-name/di/digital/package.nix index 2695ff73e70c..676cb42771f0 100644 --- a/pkgs/by-name/di/digital/package.nix +++ b/pkgs/by-name/di/digital/package.nix @@ -68,6 +68,10 @@ maven.buildMavenPackage rec { classpath=$(find $mvnDeps/.m2 -name "*.jar" -printf ':%h/%f'); install -Dm644 target/Digital.jar $out/share/java + # Install the lib folder containing 74xx series chips and other component libraries + # Digital.jar expects to find lib/ in the same directory as the jar file + cp -r src/main/dig/lib $out/share/java/ + makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ --add-flags "-jar $out/share/java/Digital.jar" diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix index b9175d0da845..8af0b2860b1e 100644 --- a/pkgs/by-name/gi/git-workspace/package.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-workspace"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "orf"; repo = "git-workspace"; tag = "v${finalAttrs.version}"; - hash = "sha256-SeE8O48lzqJSg8rfmIgsUcGPbquo2OvK3OUUBG21ksc="; + hash = "sha256-1/3P7SenUhPrN19cVVrKxFsQt75FR0BG1P3ef3galPg="; }; - cargoHash = "sha256-CaHZivayZNuCi8vID8Qr5j/Ed+GGdNu+7NznvsCb3j0="; + cargoHash = "sha256-JoPs8Py8yaJ7A+OHKxDx3OwXbiJxKR2ZtkQAzXlXgJM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/lc/lcov/package.nix b/pkgs/by-name/lc/lcov/package.nix index 084152895912..b6a2546db78f 100644 --- a/pkgs/by-name/lc/lcov/package.nix +++ b/pkgs/by-name/lc/lcov/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lcov"; - version = "2.3.2"; + version = "2.4"; src = fetchFromGitHub { owner = "linux-test-project"; repo = "lcov"; tag = "v${finalAttrs.version}"; - hash = "sha256-msttwM5QlSkeruKoVwZYpymz5JOJRb6QoSeF19AkEGI="; + hash = "sha256-fGuOqo8Bj1kDxx7Isu3aaAIBDjoMBr7WuZ+tlErjR4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix index 7f10b1436dc3..4d463c63684d 100644 --- a/pkgs/by-name/nd/ndpi/package.nix +++ b/pkgs/by-name/nd/ndpi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.10"; + version = "5.0"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; tag = finalAttrs.version; - hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; + hash = "sha256-Elnj6qDuT8UWDxmasiHOt5DxC7GcH5zgrp3J3LYcl0c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nt/ntopng/package.nix b/pkgs/by-name/nt/ntopng/package.nix index 7505e7ab4782..fad390040f40 100644 --- a/pkgs/by-name/nt/ntopng/package.nix +++ b/pkgs/by-name/nt/ntopng/package.nix @@ -23,17 +23,18 @@ sqlite, which, zeromq, + cmake, }: stdenv.mkDerivation (finalAttrs: { pname = "ntopng"; - version = "6.2"; + version = "6.6"; src = fetchFromGitHub { owner = "ntop"; repo = "ntopng"; tag = finalAttrs.version; - hash = "sha256-8PG18mOV/6EcBpKt9kLyI40OLDnpnc2b4IUu9JbK/Co="; + hash = "sha256-BYJtsEuxmo6jzqCoC/A5vDAiFSGqy8XFyqooGDTZE40="; fetchSubmodules = true; }; @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { git pkg-config which + cmake ]; buildInputs = [ @@ -91,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r doc/README.geolocation.md "$out/share/ntopng/doc/" ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index aabfc749ac94..ec3a8d043e2e 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -3,6 +3,8 @@ rustPlatform, fetchFromGitHub, stdenv, + cacert, + libredirect, pkg-config, openssl, rust-jemalloc-sys, @@ -36,8 +38,21 @@ rustPlatform.buildRustPackage (finalAttrs: { rust-jemalloc-sys ]; - # tests don't work inside the sandbox - doCheck = false; + checkInputs = [ cacert ]; + nativeCheckInputs = [ + libredirect.hook + ]; + + preCheck = '' + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS="/etc/resolv.conf=$(realpath resolv.conf)" + ''; + + doCheck = true; + checkFlags = [ + "--skip=test_google" + "--skip=test_proxy" + ]; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 3337481efbb2..44d17d108da5 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule (finalAttrs: { pname = "process-compose"; - version = "1.90.0"; + version = "1.94.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = "process-compose"; tag = "v${finalAttrs.version}"; - hash = "sha256-P1SBKAS3nNgiUg2NEUPU6DOY3qpYkg2fSzHQSrAt7N4="; + hash = "sha256-5Lcy8evsgnKKLNi3zbuYHiDUVWIaYgzzUnF2rLWhY8U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-KfvZYcw8tiqgHVzNhW1DWHWs0S8Mlrs16MCmPXySvRo="; + vendorHash = "sha256-DWHzWksKBUTx5zOj+/zZ84hSWFLEDtacaKnLyOmmNbw="; doCheck = false; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index ed4e1b2249f8..d79752ebfc7d 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.2.4"; + version = "26.2.8"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-yma+KJfZqTKLpfwpz8j9+wbwk9CuiO7eMHiUVOkIqQY="; + hash = "sha256-CBEMrXbanE173zI9jGhpx6PZDjuh5d6E69bUxRYOr9I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resetti/package.nix b/pkgs/by-name/re/resetti/package.nix new file mode 100644 index 000000000000..d5de305490da --- /dev/null +++ b/pkgs/by-name/re/resetti/package.nix @@ -0,0 +1,41 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "resetti"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "tesselslate"; + repo = "resetti"; + tag = "v${finalAttrs.version}"; + hash = "sha256-H4LkXTjXCuOUB9x24lEc4ofCKkAn1Eac2zMPIAgxkSE="; + }; + + vendorHash = "sha256-lhcCN5r1TSB95Y0pEoKAvftR0DMxtII3g+YOKT8I1qk="; + + ldflags = [ "-s" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = [ "XDG_DATA_HOME" ]; + preVersionCheck = "XDG_DATA_HOME=/tmp"; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility macros for Minecraft speedrunning"; + homepage = "https://github.com/tesselslate/resetti"; + changelog = "https://github.com/tesselslate/resetti/releases/tag/${finalAttrs.src.tag}"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ jess ]; + mainProgram = "resetti"; + }; +}) diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix index 0a42d1490413..584aff3d7d66 100644 --- a/pkgs/by-name/se/seanime/package.nix +++ b/pkgs/by-name/se/seanime/package.nix @@ -1,18 +1,17 @@ { lib, fetchFromGitHub, - buildGoModule, + buildGo126Module, buildNpmPackage, - inter, ffmpeg, }: let - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "5rahim"; repo = "seanime"; rev = "v${version}"; - hash = "sha256-MrO8SuS6d1v3SKmnGBDXGHmxhYdPxr11FdKKZrGU9Hc="; + hash = "sha256-5A2gg0ZFy9JP42I6fh9dcVUkS7P+0aH7arT4gdjAYHM="; }; seanime-web = buildNpmPackage { @@ -24,20 +23,7 @@ let patches = [ ./default-disable-update-check.patch ]; - npmDepsHash = "sha256-rRgp8nXuRvCSOLo040i4ZL+0GCYkEEnkxpgwqDBt/EY="; - - # nextjs seems to require relative paths - postPatch = '' - cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf - - substituteInPlace ./src/app/layout.tsx \ - --replace-fail 'import { Inter } from "next/font/google"' 'import localFont from "next/font/local"' \ - --replace-fail 'const inter = Inter({ subsets: ["latin"] })' 'const inter = localFont({ src: "./Inter.ttf" })' - - substituteInPlace './src/app/(main)/entry/_containers/torrent-stream/torrent-stream-overlay.tsx' \ - --replace-fail 'import { Inter } from "next/font/google"' 'import localFont from "next/font/local"' \ - --replace-fail 'const inter = Inter({ subsets: ["latin"] })' 'const inter = localFont({ src: "../../../../Inter.ttf" })' - ''; + npmDepsHash = "sha256-kO5k4B5mKoIfhhujNM0jw+/ErVwxm9/nZ5eBTWnA7HQ="; installPhase = '' runHook preInstall @@ -49,12 +35,12 @@ let ''; }; in -buildGoModule { +buildGo126Module { pname = "seanime"; inherit src version; - vendorHash = "sha256-LFilsAAuPbNg2KI4aPUbNYjufPk1P3VLcAv1qfMu0p0="; + vendorHash = "sha256-jdGkrU4WGgqkWN0FIaxVhtYfFnS+/ZnAY6dWB+gOmNQ="; preBuild = '' cp -r ${seanime-web}/web . diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 7b40e8c051d3..25855547a304 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2026.2.1"; + version = "2026.3.1"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-UY1nmkXAtxKycqAq7dcErX7afadYgqwWAUahfVI9ZB8="; + hash = "sha256-F+zCchil+Rf1fT7nRBCz5mC1m5oYpiRqWylhpJTr1cw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix index d44e299628a3..c990394b5441 100644 --- a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix +++ b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix @@ -2,11 +2,11 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "137.2.1"; + version = "145.0.0"; shas = { - x86_64-linux = "sha256-1mV+UjvJsIyLFpBGVDrGxr/rqUgKzRRFwgnMyYTb/pM="; - aarch64-linux = "sha256-Rp7chA+GjsozCkMQrDnOoi4VhVJdrFZd1BuLfcRhGjw="; - x86_64-darwin = "sha256-tDMk+F6D/h4osYlzT2qAhqfHYUSDk3nL4RxEKjhBhD0="; - aarch64-darwin = "sha256-1eBUjKFalb/CIPfHYP8SvqIaxRep8vU6u9QFShOMUsQ="; + x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; + aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; + x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; + aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; }; } diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index 9b7cdfaa5a94..d229cb16ac21 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, callPackage, fetchFromGitHub, rustPlatform, @@ -14,20 +15,21 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "spacetimedb"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "clockworklabs"; repo = "spacetimedb"; - rev = "02449737ca3b29e7e39679fccbef541a50f32094"; - hash = "sha256-3e/uxyvxWsEpKV0ynDZ2rqLNIeuBtiG8EEoawswg+0o="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JuZ9odvMTIOIG4G0M4IBS9I9mWV+dk6qltIgn2a/W9I="; }; - cargoHash = "sha256-dV9Advw5Q+zeoMHloYtvRuhx0E3FAfmxjtgoien6ll4="; + cargoHash = "sha256-yAXcTNBITuBm7NPCTiS/RDaxMYgH6mq+ud3VsOELEqE="; nativeBuildInputs = [ pkg-config perl + rustPlatform.bindgenHook ]; buildInputs = [ @@ -45,6 +47,23 @@ rustPlatform.buildRustPackage (finalAttrs: { # require wasm32-unknown-unknown target "--skip=codegen" "--skip=publish" + ] + ++ lib.optionals stdenv.isDarwin [ + # flakes on darwin in nix build sandbox, timing out waiting for listen addr + "--skip=cli_can_ping_spacetimedb_on_disk" + "--skip=cli_can_publish_spacetimedb_on_disk" + "--skip=cli_can_publish_no_conflict_does_not_delete_data" + "--skip=cli_can_publish_no_conflict_with_delete_data_flag" + "--skip=cli_can_publish_no_conflict_without_delete_data_flag" + "--skip=cli_can_publish_with_automigration_change" + "--skip=cli_cannot_publish_automigration_change_without_yes_break_clients" + "--skip=cli_can_publish_automigration_change_with_on_conflict_and_yes_break_clients" + "--skip=cli_cannot_publish_automigration_change_with_on_conflict_without_yes_break_clients" + "--skip=cli_can_publish_automigration_change_with_delete_data_always_without_yes_break_clients" + "--skip=cli_can_publish_automigration_change_with_delete_data_always_and_yes_break_clients" + "--skip=cli_cannot_publish_breaking_change_without_flag" + "--skip=cli_can_publish_breaking_change_with_delete_data_flag" + "--skip=cli_can_publish_breaking_change_with_on_conflict_flag" ]; doInstallCheck = true; diff --git a/pkgs/by-name/vc/vcmi/package.nix b/pkgs/by-name/vc/vcmi/package.nix index fa20ebcdd320..29f36bb69927 100644 --- a/pkgs/by-name/vc/vcmi/package.nix +++ b/pkgs/by-name/vc/vcmi/package.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcmi"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-3XZQyq6urCTI/A6tCSHgzPgOvzH8ckXvDRamWvVgeVY="; + hash = "sha256-jAwYw5btLG9W3oQ3OVMIFDAWEC8sosq0VTZq1RSFHXY="; }; nativeBuildInputs = [ @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_GOLDMASTER" true) (lib.cmakeBool "ENABLE_TEST" false) # Requires nonfree data files. (lib.cmakeBool "ENABLE_PCH" false) + (lib.cmakeBool "ENABLE_DISCORD" false) (lib.cmakeFeature "CMAKE_INSTALL_RPATH" "$out/lib/vcmi") (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix index b4684733a23e..dc89518bd2fc 100644 --- a/pkgs/by-name/ze/zerofs/package.nix +++ b/pkgs/by-name/ze/zerofs/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zerofs"; - version = "1.0.2"; + version = "1.0.5"; src = fetchFromGitHub { owner = "Barre"; repo = "ZeroFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-IwxKXoeCUjC+eE+r80lrqclh/DALOVIo6JLgZO8qJmE="; + hash = "sha256-tDImSu9oLczXabGFj+FDoZXHE8he8vqmBBMwQVQIQqw="; }; sourceRoot = "${finalAttrs.src.name}/zerofs"; - cargoHash = "sha256-27+bmDKveC/AX6DlOpyg+wvZvDBQ7w0eATp2mzN4wTE="; + cargoHash = "sha256-/pAZ+oyYZw70WIVZgz9bRFet5dvpWhUtRJavXi3Ihis="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index d5f6b0b55e39..0ab8e8ae5d92 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (lib.optional isFullBuild python3Packages.pyyaml); - buildInputs = lib.optional isFullBuild linuxHeaders; + buildInputs = lib.optional (isFullBuild && stdenv.hostPlatform.isLinux) linuxHeaders; outputs = [ "out" ] ++ (lib.optional isFullBuild "dev"); diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 8bccfd9f3d85..7c768d3b08e7 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -3,49 +3,76 @@ buildPythonPackage, fetchFromGitHub, attrs, + babel, + frictionless, isodate, + jsonschema, + language-tags, python-dateutil, + rdflib, + requests, rfc3986, + setuptools, + termcolor, uritemplate, pytestCheckHook, pytest-cov-stub, pytest-mock, + requests-mock, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "csvw"; - version = "1.11.0"; - format = "setuptools"; + version = "3.7.0"; + pyproject = true; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; - rev = "v${version}"; - sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HftvI4xJy/MX0WTIFNyZqNqIJIlHsWhhURpeQ1XqrT0="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace src/csvw/__main__.py \ + --replace-fail "'frictionless'" "'${lib.getExe frictionless}'" + ''; + + build-system = [ setuptools ]; + + dependencies = [ attrs + babel + frictionless isodate + jsonschema python-dateutil + requests + rdflib rfc3986 uritemplate + termcolor + language-tags ]; nativeCheckInputs = [ pytestCheckHook pytest-cov-stub pytest-mock + requests-mock ]; + pythonRelaxDeps = [ "rfc3986" ]; + disabledTests = [ # this test is flaky on darwin because it depends on the resolution of filesystem mtimes # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 "test_write_file_exists" - # https://github.com/cldf/csvw/issues/58 - "test_roundtrip_escapechar" - "test_escapequote_escapecharquotechar_final" - "test_doubleQuote" + ]; + + disabledTestPaths = [ + # Missing manifest-json.jsonld + "tests/test_conformance.py" ]; pythonImportsCheck = [ "csvw" ]; @@ -56,4 +83,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/frictionless/default.nix b/pkgs/development/python-modules/frictionless/default.nix index 599f8f0e8258..80013e731fd4 100644 --- a/pkgs/development/python-modules/frictionless/default.nix +++ b/pkgs/development/python-modules/frictionless/default.nix @@ -225,5 +225,6 @@ buildPythonPackage rec { changelog = "https://github.com/frictionlessdata/frictionless-py/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; + mainProgram = "frictionless"; }; } diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix index 8edc6ec68659..2e9915152c4c 100644 --- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -17,15 +17,15 @@ }: buildPythonPackage (finalAttrs: { - pname = "lance-namespace"; - version = "0.4.5"; + pname = "lance-namespace-urllib3-client"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${finalAttrs.version}"; - hash = "sha256-cUwvPPOQemusthuTMttdojqApnWL4JmCdSB5oGZCfZ8="; + hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY="; }; sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client"; diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix index 8ec45715bb05..87fc6c6ae1ff 100644 --- a/pkgs/development/python-modules/lance-namespace/default.nix +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -30,14 +30,14 @@ buildPythonPackage (finalAttrs: { pname = "lance-namespace"; - version = "0.4.5"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance-namespace"; tag = "v${finalAttrs.version}"; - hash = "sha256-cUwvPPOQemusthuTMttdojqApnWL4JmCdSB5oGZCfZ8="; + hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY="; }; sourceRoot = "${finalAttrs.src.name}/python/lance_namespace"; @@ -46,9 +46,6 @@ buildPythonPackage (finalAttrs: { hatchling ]; - pythonRemoveDeps = [ - "pylance" - ]; dependencies = [ lance-namespace-urllib3-client typing-extensions