diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 5a93df560882..c812d387d292 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.11.17", + "version": "1.13.3", "vscodeVersion": "1.104.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/linux-x64/Antigravity.tar.gz", - "sha256": "4548789f5e30ad13ef341ef112f3a399b2d6b0e0cc95e7bf5a0625b08a5a7120" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-x64/Antigravity.tar.gz", + "sha256": "084dfbedf1049b363aa3ad7ba679eec8b80feaf29585accb90b5910ebb270048" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/linux-arm/Antigravity.tar.gz", - "sha256": "6f12c3f5909368846b771b7bcd61db1cb1a79774957a542373bdc5e059b264f6" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-arm/Antigravity.tar.gz", + "sha256": "0f71bce4d81fc02271e2bcaf2b57820e20762b149ef791720406817c6d189184" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/darwin-x64/Antigravity.zip", - "sha256": "24a91f781a27cf9843deb13c9f47525ad9ea762b4fe62fdd65e98dac92261d3b" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-x64/Antigravity.zip", + "sha256": "8e6ba418883dccd8a4a70fd5d6882f8a919630d3166d83327180165ff7b4eb55" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.17-6639170008514560/darwin-arm/Antigravity.zip", - "sha256": "179f61df2b5b72660761ba5110fdc8f6bf68b0224ca1bebb88d5b9a2c5690e7a" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-arm/Antigravity.zip", + "sha256": "ed95de92e852cac9ef1b264a0a304cf755a803129b54c1618682ec7bae1893dc" } } } diff --git a/pkgs/by-name/bo/bonnmotion/package.nix b/pkgs/by-name/bo/bonnmotion/package.nix index dfce23d8ecc5..2cfbbddfa2c3 100644 --- a/pkgs/by-name/bo/bonnmotion/package.nix +++ b/pkgs/by-name/bo/bonnmotion/package.nix @@ -7,12 +7,13 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bonnmotion"; version = "3.0.1"; + # also available at https://github.com/sys-uos/bonnmotion src = fetchzip { - url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip"; + url = "https://bonnmotion.sys.cs.uos.de/src/bonnmotion-${finalAttrs.version}.zip"; sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw"; }; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet, COOJA, MiXiM, and ONE. ''; - homepage = "https://sys.cs.uos.de/bonnmotion/"; + homepage = "https://bonnmotion.sys.cs.uos.de"; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # source bundles dependency jars @@ -58,4 +59,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ oxzi ]; }; -} +}) diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix index 6769c6224133..fe9f7e400a27 100644 --- a/pkgs/by-name/cr/crystal-dock/package.nix +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crystal-dock"; - version = "2.15"; + version = "2.16"; src = fetchFromGitHub { owner = "dangvd"; repo = "crystal-dock"; rev = "v${finalAttrs.version}"; - hash = "sha256-XFq4T39El5MjaWRSnaimonjdj+HGOAydNmEOehgGWX4="; + hash = "sha256-UbRwD8BMw8JSRNtOBtHyULQjaXZRmkxmbTQD92v0BJI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index ff77cba111f4..2cde646fa2c6 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.96.0"; + version = "1.97.1"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-ikNbYzZxWQrJ0PHZ2bEZtvQmFnqIsalnoEFc+YGHb4o="; + hash = "sha256-3Pf4+RSzVH0nRo+rSCJwzEdpZqjzSsvpr1S8qsFuRZ4="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json index 7de4c8adc1bf..041675c47a17 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -1125,13 +1125,6 @@ "module": "sha256-bMYa+9HB0MB2VrO9lcBhH6XfMGMxx5XROs1YZ7VDpH8=", "pom": "sha256-CCCnYjzmYx8Zfde+rTBQIYOfNJsnboNevcIS3BS9LEg=" }, - "jixxed/ed/awesome/ed-awesome-api/maven-metadata": { - "xml": { - "groupId": "nl.jixxed.ed.awesome", - "lastUpdated": "20250822121510", - "release": "1.5" - } - }, "jixxed/ed/confidential#ed-confidential-api/1.3": { "jar": "sha256-iPBjgHIFGjuquG+zga0ZdTxMMIEqAquzGt41IDriGKw=", "module": "sha256-THaam0o2oBL75yHgsXW7+pPz3lbjf9ktcRL+N+WFs98=", diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix index 8bdec38c494e..5ad1957f3b8b 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-P9Mb++2400081OdjMI6y3C2zRW+8IpIjBjLPoNnDbUY="; + hash = "sha256-/spb1BH5zPyxPKNI419/gYON2EfPtjPzT8ba1nEsjl4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index 65c0617d8202..e3e8a9a98aba 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.30.10"; + version = "1.31.0"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-BJqqTHFQlZzQiPAefn1MlO5XhoWaCeJY8AqsEHh9/+U="; + hash = "sha256-XxsMm6IhtZdmp//2jYXna24UKn13opf1pOla0C5la2E="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index fb89f2c5e1ea..5cfecae6df92 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.20.2"; + version = "0.22.2"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-0fGchmQUxZ+DTtBQi3UaCZnP1q5dTOei6bWPx4lXV7o="; + hash = "sha256-neUS8w+3Fz5rwL0DWj1y/GPUo++H5jawDM7jKNGdlZ0="; }; dontUnpack = true; diff --git a/pkgs/by-name/gn/gnet/package.nix b/pkgs/by-name/gn/gnet/package.nix index 24ec6440aa1e..4d79b18f4e47 100644 --- a/pkgs/by-name/gn/gnet/package.nix +++ b/pkgs/by-name/gn/gnet/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitLab, pkg-config, autoconf, automake, @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { pname = "gnet"; version = "2.0.8"; - src = fetchFromGitHub { - owner = "GNOME"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; repo = "gnet"; rev = "GNET_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; + hash = "sha256-B2H8s1JWNrvVR8qn6UFfAaCXQd0zEpNaLUPET99Ex7M="; }; nativeBuildInputs = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Network library, written in C, object-oriented, and built upon GLib"; - homepage = "https://developer.gnome.org/gnet/"; + homepage = "https://gitlab.gnome.org/Archive/gnet"; license = lib.licenses.lgpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pSub ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 40a518637480..e4b86c9b46c8 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.104.2"; + version = "0.104.3"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-S+oscpVa8HhZZKd8qFX8xR84tc7pAncofp/5QzCX/bI="; + hash = "sha256-/XirnwA20DHOFs43/ZRMgxGIcEBfoX+217sFLOclzjY="; # 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. leaveDotGit = true; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-liVutQcKrOjG8/m0uMFE85MejTvd2kCVQ5iLWtnb/94="; + vendorHash = "sha256-77gN/XAgHD9BFA9de2efPuFALpAghGF0JRoGqoqOzbE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix index afc53376e9cb..ade3a41473a5 100644 --- a/pkgs/by-name/ha/haruna/package.nix +++ b/pkgs/by-name/ha/haruna/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "haruna"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${finalAttrs.finalPackage.version}"; - hash = "sha256-pAFO6zclJNmHD91ady0vlnBg6ebSWMzJq7TZN/uBGnM="; + hash = "sha256-FRYsUsZBLXhFCZslQtaD10fd3SqbJ+4TKKShIpuUkQk="; domain = "invent.kde.org"; }; diff --git a/pkgs/by-name/in/intel-npu-driver/package.nix b/pkgs/by-name/in/intel-npu-driver/package.nix index 9f5680d1bb40..4ea78a1b5775 100644 --- a/pkgs/by-name/in/intel-npu-driver/package.nix +++ b/pkgs/by-name/in/intel-npu-driver/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "intel-npu-driver"; - version = "1.26.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "intel"; repo = "linux-npu-driver"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-f3GxvYBfCCK6EGASuHrevFEVcBAyKyWXaIvSNcNcSZQ="; + hash = "sha256-aH7npJompKYlyq2RPXHn/lflQ1C/yYcTp2K+6kX/L0w="; }; buildInputs = [ diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index d9fa50ae2156..6917af413f3b 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.176.0", + "version": "3.178.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_linux_x86_64", - "hash": "sha256-rvVq0yq0j5IpRFaA/D+65kUAJ1qyqUipKWMftNAM1sU=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_x86_64", + "hash": "sha256-UFG/N5qNuBuBnmD6FDJk3Ly+zKGaUtOEO+7H82VFeFc=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_linux_aarch64", - "hash": "sha256-v9PnJVNUaDHYqTXRQPgqnX4WYoHOFz78afWuCZ9LHRQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_linux_aarch64", + "hash": "sha256-/K9VoCHacmPZuv0ycvt9GPrDG/xDPlq6AP3zAO0Lmlo=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_mac_universal", - "hash": "sha256-+jorMrKRRCkxv/KJITVKf6UZN61n3IpDlM8cXDjZ0Qw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal", + "hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.176.0/mirrord_mac_universal", - "hash": "sha256-+jorMrKRRCkxv/KJITVKf6UZN61n3IpDlM8cXDjZ0Qw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.178.0/mirrord_mac_universal", + "hash": "sha256-l3ho45nkazyk8byirvq5J0ZMmrqcMasUMUYBj88bh24=" } } } diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 2fa38aff2929..416f9c76f93c 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -6,18 +6,18 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mprocs"; - version = "0.7.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "pvolok"; repo = "mprocs"; - tag = "v${version}"; - hash = "sha256-/FuvejcZoaHzlYh4zYDVS1WimzNMNbRZyM39OBi02VA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-77uXHlQjhIDbRbnkr3jvZKuLOcvbOIuum8FRsUv8cYw="; }; - cargoHash = "sha256-i9oQT2vpA5nAgQgVpxxfRPvCIb4w1emt1YsjMS6UPIk="; + cargoHash = "sha256-T8zG2Z7UP4MZUGeUypG9ugO49rbicwYrdRZiGJN3H0E="; nativeInstallCheckInputs = [ versionCheckHook @@ -31,13 +31,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "TUI tool to run multiple commands in parallel and show the output of each command separately"; homepage = "https://github.com/pvolok/mprocs"; - changelog = "https://github.com/pvolok/mprocs/releases/tag/v${version}"; + changelog = "https://github.com/pvolok/mprocs/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - GaetanLepage - pyrox0 - ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.unix; mainProgram = "mprocs"; }; -} +}) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 4972aba704ca..bb2d16724804 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -40,7 +40,7 @@ libGL, mediaSupport ? true, - ffmpeg, + ffmpeg_7, audioSupport ? mediaSupport, @@ -94,7 +94,7 @@ let ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg ] + ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); version = "15.0.3"; diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix index fafd024a3b0e..09e92b4bdee4 100644 --- a/pkgs/by-name/mu/muvm/package.nix +++ b/pkgs/by-name/mu/muvm/package.nix @@ -9,15 +9,11 @@ systemd, udev, pkg-config, - procps, fex, writeShellApplication, coreutils, makeBinaryWrapper, -# TODO: Enable again when sommelier is not broken. -# For now, don't give false impression of sommelier being supported. -# sommelier, -# withSommelier ? false, + nix-update-script, }: let # TODO: Setup setuid wrappers. @@ -28,47 +24,46 @@ let coreutils ]; text = '' - if [[ ! -f /etc/NIXOS ]]; then exit; fi - - ln -s /run/muvm-host/run/current-system /run/current-system - # Only create the symlink if that path exists on the host and is a directory. - if [[ -d /run/muvm-host/run/opengl-driver ]]; then ln -s /run/muvm-host/run/opengl-driver /run/opengl-driver; fi + if [[ -f /etc/NIXOS ]]; then + ln -s /run/muvm-host/run/current-system /run/current-system + if [[ -d /run/muvm-host/run/opengl-driver ]]; then + ln -s /run/muvm-host/run/opengl-driver /run/opengl-driver + fi + fi ''; }; - binPath = [ - dhcpcd - passt - (placeholder "out") - ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ fex ]; wrapArgs = lib.escapeShellArgs [ "--prefix" "PATH" ":" - (lib.makeBinPath binPath) + (lib.makeBinPath ( + [ + dhcpcd + passt + (placeholder "out") + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ fex ] + )) "--add-flags" "--execute-pre=${lib.getExe initScript}" ]; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "muvm"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "muvm"; - rev = "muvm-${version}"; - hash = "sha256-1XPhVEj7iqTxdWyYwNk6cbb9VRGuhpvvowYDPJb1cWU="; + tag = "muvm-${finalAttrs.version}"; + hash = "sha256-k3Jj/Tzu5ZfnADMiVG7pAPqosrkZvhmehi0NMbyudN0="; }; - cargoHash = "sha256-fkvdS0c1Ib8Kto44ou06leXy731cpMHXevyFR5RROt4="; + cargoHash = "sha256-jFNyQD2Hf1K5+wHDRD2WG70IJfZbL+hT/gtjeUnt5Mk="; postPatch = '' substituteInPlace crates/muvm/src/guest/bin/muvm-guest.rs \ --replace-fail "/usr/lib/systemd/systemd-udevd" "${systemd}/lib/systemd/systemd-udevd" - - substituteInPlace crates/muvm/src/monitor.rs \ - --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}" '' # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way + lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -95,6 +90,10 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/muvm ${wrapArgs} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Run programs from your system in a microVM"; homepage = "https://github.com/AsahiLinux/muvm"; @@ -106,4 +105,4 @@ rustPlatform.buildRustPackage rec { inherit (libkrun.meta) platforms; mainProgram = "muvm"; }; -} +}) diff --git a/pkgs/by-name/of/office-code-pro/package.nix b/pkgs/by-name/of/office-code-pro/package.nix index 0d4ab3f6b17f..eb5459b0ca8a 100644 --- a/pkgs/by-name/of/office-code-pro/package.nix +++ b/pkgs/by-name/of/office-code-pro/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec { version = "1.004"; src = fetchFromGitHub { - owner = "nathco"; + owner = "phooky"; repo = "Office-Code-Pro"; rev = version; hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4="; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec { Incorporated. The customizations were made specifically for text editors and coding environments, but are still very usable in other applications. ''; - homepage = "https://github.com/nathco/Office-Code-Pro"; + homepage = "https://github.com/phooky/Office-Code-Pro"; license = lib.licenses.ofl; maintainers = [ ]; }; diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index ef311b013bdd..ac5e4bc80de4 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; - tag = "${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE="; }; diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 7736011210ef..5594ab1e206b 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-crate"; - version = "0.4.1"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-9rIFDZbI6XGDsNzFMnMYY4loJxojdz6vnQKAz9eDAyQ="; + hash = "sha256-FBgvDhlyVAegF5n9U6Tunn+MpXdek4f1xWIS3sJ4soI="; }; - cargoHash = "sha256-DjxoORk/DNXQ7ht7L4lxzMfst1i3m/cT7sqn2HoRN9U="; + cargoHash = "sha256-29sM+d6+yaIsZKyxieHP4Q7mB2HAyWEwuBIgFCF281U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index d7fd89f0acb9..86a12a1754e8 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost-serde"; - version = "0.3.1"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-RQlNVGa6BRIqIGodqNN3eGl//hkUWrq7GpTGpRBCDgE="; + hash = "sha256-tgsGyUVoQZQcOqh56KGVwS3VcxwbKzBL3P2VpYs72Ok="; }; - cargoHash = "sha256-OWSXA3S3o5eqM3pg2MPxx3HrCma778YJaPFOJq7S5zY="; + cargoHash = "sha256-otsovgqCC+IdxbdGBaPfjK61bZsHtWwY0QqZBPQxnvw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 14fb7da88428..f617dd125123 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-prost"; - version = "0.4.0"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Bz5/LyKludw0Tz3r+xr4DMRdMSz/nRzjs7Q66z1PrTU="; + hash = "sha256-oeoPQ3hYMQl6sXszpnw6er2HBkxpo4s17XjR0VRKrSA="; }; - cargoHash = "sha256-alzrgiOx9zTR9mgmtvcqpj9SxSz7Zz3mmZOX6vfAFeE="; + cargoHash = "sha256-b4nzT+/tCuhd+vh+JDA+/Wx3VJuEgqPYHbNDv8TiImo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 6d57929cd83e..cf7450a19af5 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-tonic"; - version = "0.4.1"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-H7YQ8y6YA8kjR9bhHfBOYu0OEFc8ezqXkqC6jGScs3s="; + hash = "sha256-F3AVlkyIbSaA6u7/Pm6qM9AuONddSwqcCU6OAHoVwxk="; }; - cargoHash = "sha256-ihEHLFCC5jNpFIIvBUFCxKvpjY/OhOH5UgbvuQMFv3s="; + cargoHash = "sha256-y8d3ZARKwUbT5RiN59FKDSPjk1LYNR4qePg5EIUVe2c="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-validate/package.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix index e27739d6e056..942ac238da04 100644 --- a/pkgs/by-name/pr/protoc-gen-validate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-validate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-kGnfR8o12bvjJH+grAwlYezF6UzWt7lgjGslq+07p3k="; + sha256 = "sha256-225D0iHM+fTYIu/+HPkGZ8IcqbP4FMkf7Lw1wI02rZw="; }; - vendorHash = "sha256-c7zi1y3HWGyjE2xG60msCUdKCTkwhWit2x5gU/bLoec="; + vendorHash = "sha256-R9zcjoMiq69pPbXAahOp1RJNvlgsASuCwbxkwLbMomg="; excludedPackages = [ "tests" ]; diff --git a/pkgs/by-name/s-/s-search/package.nix b/pkgs/by-name/s-/s-search/package.nix index bae28a6a1d27..6955e3c39729 100644 --- a/pkgs/by-name/s-/s-search/package.nix +++ b/pkgs/by-name/s-/s-search/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "s-search"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "zquestz"; repo = "s"; tag = "v${finalAttrs.version}"; - hash = "sha256-bcJeNUGTcXAwB+/xly3AMJE3BTjqiC6QvuqgfDgZZrk="; + hash = "sha256-aK1M9ypEX1Hl7+poK4czZan/Bqe5+giDiTtlPVjErHY="; }; - vendorHash = "sha256-0E/9fONanSxb2Tv5wKIpf1J/A6Hdge23xy3r6pFyV9E="; + vendorHash = "sha256-GEpBdCByMrCR7doDvp/eVKQzH8Z2kCqetwFivkkUDVU="; ldflags = [ "-s" diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 4e98a2f9c25c..d281302cb0b9 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -108,14 +108,14 @@ let libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: { pname = "libsession-util-nodejs"; - version = "0.5.5"; # find version in yarn.lock + version = "0.6.5"; # find version in yarn.lock src = fetchFromGitHub { owner = "session-foundation"; repo = "libsession-util-nodejs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; deepClone = true; # need git rev for all submodules - hash = "sha256-FmI9Xmml+sjXHJ+W6CfBC8QUrQR89H3HWEYlHE2Xsts="; + hash = "sha256-T6qjpXZPGkRfBcJCd/4XGNEBZILEG2Py2zN8W2c1Tlc="; # fetchgit is not reproducible with deepClone + fetchSubmodules: # https://github.com/NixOS/nixpkgs/issues/100498 postFetch = '' @@ -153,9 +153,6 @@ let # prevent downloading; see https://github.com/cmake-js/cmake-js/blob/v7.3.1/lib/dist.js mkdir -p "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}" ln -s ${electron.headers} "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}/v${electron.version}" - - # populate src/version.h - yarn update_version ''; # The install script is the build script. @@ -182,13 +179,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "session-desktop"; - version = "1.16.10"; + version = "1.17.5"; src = fetchFromGitHub { owner = "session-foundation"; repo = "session-desktop"; tag = "v${finalAttrs.version}"; leaveDotGit = true; - hash = "sha256-9l5AgG9YNz61lS/1Q/b46UgdyidHH7sQK7ZWz19XWr0="; + hash = "sha256-qx5e3HfmhB7Edr+KYK+SJfQhF19ct/40v6eIqExw+iU="; postFetch = '' pushd $out git rev-parse HEAD > .gitrev @@ -237,7 +234,7 @@ stdenv.mkDerivation (finalAttrs: { # copy the modified yarn.lock here, and use `./yarn.lock` instead of `"${finalAttrs.src}/yarn.lock"`, # and also add `cp ${./yarn.lock} yarn.lock` to postPatch. yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-A2AbKOXWx8+PN467DVpKVTorZDs/UFaxjc7VS0Xdo6k="; + hash = "sha256-5MqCwXe/BflIymZiggtAE6XgBa/S4Qoh7KzWokU+L5c="; }; preBuild = '' diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 98e3745f071a..8936b4ce7cdf 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.65.5"; + version = "2.67.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-uxRC5T9i4JbMqRT8pCnbqhuNl1GxrhgqsDLrMNy8fgM="; + hash = "sha256-IRgDCLAClF7Wwmhf1Ba6ulpyDZW3DSZSGj+oIptXImw="; }; - vendorHash = "sha256-rBlLfKcaWAYaC+3M9YgjHcne70ohNeOZ6JGt3Uwra4k="; + vendorHash = "sha256-CRUt2wjPCzIQ2/RDXvwJ5xW3KTJNYf/7Kzkhh4Z9NfI="; ldflags = [ "-s" diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 3b63db7e8d4c..7ffd9540356c 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.38.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-t8YG4RDuEfIlzvcG1/ozuLWyzX4T+JZfO4mvedKBsY4="; + hash = "sha256-T+oaNXudP+Rj4X2VuSzIjBGsWLrWCwEZMJUs90G87gQ="; # 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. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-k2LkkABh6Rp/DFhagRM62UdDLFsM5nrtiltZZX5p+yk="; + vendorHash = "sha256-2bOgqu4mAq8ig4M4fuTz4u/Jql9vJjILxBy3JsnPZsk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix index 9877861b2cd0..93d56e00d86a 100644 --- a/pkgs/by-name/tk/tk-safe/package.nix +++ b/pkgs/by-name/tk/tk-safe/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "tk-safe"; - version = "25.10.2"; - revision = "23"; + version = "25.12.0"; + revision = "24"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_${revision}.snap"; - hash = "sha512-Al2SOS2X7FO7uuqB1iyZapYP+AJHVqRnPxzupt5N0TwfSCP+N3FgiKN32tzsROoff8hkmQt5En3hFCCh3/UePA=="; + hash = "sha512-cAe982qjRgu3GJ1ttY+84ghAzorB1BREcEM+wY6pTW2kJvu5Czu881dPDUXpdSMil99lrtgZ7Mx3bPycDPXmMg=="; }; desktopItems = [ diff --git a/pkgs/by-name/tr/treefmt/tests.nix b/pkgs/by-name/tr/treefmt/tests.nix index fd84f398012b..c13b26b67b0f 100644 --- a/pkgs/by-name/tr/treefmt/tests.nix +++ b/pkgs/by-name/tr/treefmt/tests.nix @@ -45,6 +45,7 @@ in expected = '' on-unmatched = "info" tree-root-file = ".git/index" + [formatter.nixfmt] command = "nixfmt" includes = ["*.nix"] @@ -60,6 +61,7 @@ in expected = '' on-unmatched = "info" tree-root-file = "overridden" + [formatter.nixfmt] command = "nixfmt" includes = ["*.nix"] diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 89fc7f8ed08b..65f5c8a1a324 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.56.1"; + version = "2.56.2"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-Kj5tFt4WWWc7VOsncIPwRz/YHm1Sv4dIeC5LugqdJzo="; + hash = "sha256-xf7S3hpJ/+ZmmBdGWOsyshF+FI5X9M3yOvjrxpNgy+Y="; }; proxyVendor = true; - vendorHash = "sha256-qFfX7V3Zl9QQt6E7gURorW02dbE0a4gUQ4XwAL4Hg5s="; + vendorHash = "sha256-YNcff8KwSWfiILBuSVS7BFokMgsErQ1AhrXJGrhztDM="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 9f700fc28a79..70eb83ab4d32 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -54,25 +54,25 @@ let # Zoom versions are released at different times per platform and often with different versions. # We write them on three lines like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.6.11.70003"; - versions.x86_64-darwin = "6.6.11.70003"; + versions.aarch64-darwin = "6.7.0.71075"; + versions.x86_64-darwin = "6.7.0.71075"; # This is the fallback version so that evaluation can produce a meaningful result. - versions.x86_64-linux = "6.6.11.6052"; + versions.x86_64-linux = "6.7.0.6313"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-meWo9KusBHO76oZERli1JKOEQFMrfCVOHUR3dh5pvPg="; + hash = "sha256-Jj6Ikxk7W77sv6g6yYR9ttTRF3kooQgVJnExNaU5aAA="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-OWPlZl40TICl14wnHnySSJqPLDmvkDREz42/Hv1nJY8="; + hash = "sha256-OaF3cbJZcXKKPkvdfjMuL1Va944N/TOAlqCLdA1fl64="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-pFDxCVPVE4m7mhsyAWg62WOo7MX6cdVe/j8nNHKHpvs="; + hash = "sha256-Bm5LEGmGN0iUwzKdVzicxfx6K3g9FGevvR/gUIBaPj8="; }; }; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 56f87e0faef7..e6fe34cfe489 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -5,6 +5,7 @@ meson, ninja, nix-update-script, + pkgsBuildBuild, runCommand, }: @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "'test/suite-ev.janet'," "" ''; + depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 58f59efefcda..48a1c8bffb62 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,28 +15,28 @@ let allBass = { bass = { - h = "bass.h"; - version = "2.4.17"; + h = "c/bass.h"; + version = "2.4.18.3"; so = { i686_linux = "libs/x86/libbass.so"; x86_64-linux = "libs/x86_64/libbass.so"; armv7l-linux = "libs/armhf/libbass.so"; aarch64-linux = "libs/aarch64/libbass.so"; }; - url = "https://web.archive.org/web/20240501180538/http://www.un4seen.com/files/bass24-linux.zip"; - hash = "sha256-/JAlvtZtnzuzZjWy3n1WT8Q5ZVLO0BJJAJT7/dELS3o="; + url = "https://web.archive.org/web/20251222154947/https://www.un4seen.com/files/bass24-linux.zip"; + hash = "sha256-3iZk+9MaGn7vTbSNprjChICMXhk8Pu4hWHIR3peGkXI="; }; bass_fx = { h = "C/bass_fx.h"; - version = "2.4.12.1"; + version = "2.4.12.6"; so = { i686_linux = "libs/x86/libbass_fx.so"; x86_64-linux = "libs/x86_64/libbass_fx.so"; armv7l-linux = "libs/armhf/libbass_fx.so"; aarch64-linux = "libs/aarch64/libbass_fx.so"; }; - url = "https://web.archive.org/web/20240926184106/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip"; + url = "https://web.archive.org/web/20250627192213/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip"; hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs="; }; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index d31ebccea0b6..e58506152f55 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -130,7 +130,9 @@ in pname = "saxon"; version = "6.5.3"; src = fetchurl { - url = "mirror://sourceforge/saxon/saxon${dashify version}.zip"; + url = "mirror://sourceforge/saxon/OldFiles/${version}/saxon${ + builtins.replaceStrings [ "." ] [ "_" ] version + }.zip"; hash = "sha256-Q28wzqyUCPBJ2C3a8acdG2lmeee8GeEAgg9z8oUfvlA="; }; description = "XSLT 1.0 processor"; diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index f4bbbb7aba5d..473fb1805490 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.129.4"; + version = "1.130.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OGgMfbERVC3PJXLwqVQlNpXZpAAMv6Y87S0kpv6NxLA="; + hash = "sha256-Ue+iXpLpQwend/RAxJ0Xn9csXHrtCm0IaNexuFjT0s0="; }; build-system = [ diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 089c1c506927..78dfa0330163 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -7,12 +7,13 @@ }: buildPythonPackage rec { - pname = "colanderclchemy"; + pname = "colanderalchemy"; version = "0.3.4"; format = "setuptools"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "ColanderAlchemy"; sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl"; }; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 16a859c39373..5d8c4e7ee25a 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ecpy" ]; meta = { - description = "Pure Pyhton Elliptic Curve Library"; + description = "Pure Python Elliptic Curve Library"; homepage = "https://github.com/ubinity/ECPy"; changelog = "https://github.com/cslashm/ECPy/releases/tag/${version}"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/panzi-json-logic/default.nix b/pkgs/development/python-modules/panzi-json-logic/default.nix index 292c42f14a1d..28a8ee0a38fd 100644 --- a/pkgs/development/python-modules/panzi-json-logic/default.nix +++ b/pkgs/development/python-modules/panzi-json-logic/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, unittestCheckHook, setuptools, }: @@ -24,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "json_logic" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Pure Python 3 JsonLogic and CertLogic implementation."; homepage = "https://github.com/panzi/panzi-json-logic"; diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index c2baaced3afb..ecbed54a7c36 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, pytestCheckHook, setuptools, - pytest-cov, + pytest-cov-stub, attrs, }: buildPythonPackage rec { pname = "price-parser"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "scrapinghub"; @@ -20,15 +21,19 @@ buildPythonPackage rec { hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0="; }; + build-system = [ setuptools ]; + dependencies = [ attrs ]; nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "price_parser" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Extract price amount and currency symbol from a raw text string"; homepage = "https://github.com/scrapinghub/price-parser"; diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 152b603bb80f..f85e83f37d7a 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "canonica"; + owner = "canonical"; repo = "pylxd"; tag = version; hash = "sha256-Q4GMz7HFpJNPYlYgLhE0a7mVCwNpdbw4XVcUGQ2gUJ0="; diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix index 8894038470e9..b6e4e1165b84 100644 --- a/pkgs/development/python-modules/pyppeteer-ng/default.nix +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -4,6 +4,7 @@ aiohttp, appdirs, buildPythonPackage, + gitUpdater, certifi, diff-match-patch, fetchFromGitHub, @@ -21,7 +22,7 @@ pyee, pylint, pytest, - pytest-cov, + pytest-cov-stub, pytest-timeout, pytest-xdist, pytestCheckHook, @@ -43,8 +44,6 @@ buildPythonPackage rec { version = "2.0.0rc10"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "dgtlmoon"; repo = "pyppeteer-ng"; @@ -96,7 +95,7 @@ buildPythonPackage rec { pydocstyle pylint pytest - pytest-cov + pytest-cov-stub pytest-timeout pytest-xdist readme-renderer @@ -149,6 +148,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyppeteer" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; mainProgram = "pyppeteer-install"; diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index 99924823ff95..1d8ac5b71cf1 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "izar"; + owner = "OWASP"; repo = "pytm"; tag = "v${version}"; sha256 = "sha256-MseV1ucDCzSM36zx04g9v5euDX0t74KqUSB4+brHzt8="; diff --git a/pkgs/tools/package-management/nix/tests.nix b/pkgs/tools/package-management/nix/tests.nix index 5a7e9c245c86..34c9c7fca22b 100644 --- a/pkgs/tools/package-management/nix/tests.nix +++ b/pkgs/tools/package-management/nix/tests.nix @@ -36,9 +36,12 @@ fi '' else - # exact match + # Match base version, ignoring +suffix (which comes from patches) '' - if [ "$version" != "$srcVersion" ]; then + stripSuffix() { + echo "$1" | sed 's/+.*//' + } + if [ "$(stripSuffix "$version")" != "$(stripSuffix "$srcVersion")" ]; then echo "Version mismatch!" exit 1 fi