diff --git a/ci/OWNERS b/ci/OWNERS index 4e8cc28e50fe..8a52e846aafd 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -247,7 +247,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /pkgs/applications/networking/browsers/firefox/update.nix /pkgs/applications/networking/browsers/firefox/packages/firefox.nix @mweinelt /pkgs/applications/networking/browsers/firefox/packages/firefox-esr-*.nix @mweinelt -/pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz /pkgs/applications/networking/browsers/chromium @emilylange @networkException /nixos/tests/chromium.nix @emilylange @networkException diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0a51778b0ae9..9a3a0ead9e09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11780,6 +11780,12 @@ githubId = 1358764; name = "Jamie Magee"; }; + janhencic = { + name = "Jan Hencic"; + email = "jan@hencic.com"; + github = "janhencic"; + githubId = 61284133; + }; jankaifer = { name = "Jan Kaifer"; email = "jan@kaifer.cz"; diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix index 7d89659f5dd1..78d861604dad 100644 --- a/nixos/modules/services/security/crowdsec.nix +++ b/nixos/modules/services/security/crowdsec.nix @@ -602,7 +602,7 @@ in ++ lib.optionals (cfg.settings.console.tokenFile != null) [ '' if [ ! -e "${cfg.settings.console.tokenFile}" ]; then - ${lib.getExe cscli} console enroll "$(cat ${cfg.settings.console.tokenFile})" --name ${cfg.name} + ${lib.getExe cscli} console enroll "$(${lib.getExe' pkgs.coreutils "cat"} ${cfg.settings.console.tokenFile})" --name ${cfg.name} fi '' ]; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 65a25fb06dfa..ae3566402649 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.4.0"; + version = "7.4.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-IEfgpl/uuELQ+4dVqek7/iCHW+sooVZ5eiASNXnm5EA="; + hash = "sha256-8cWwsaF37tVfj3ATWVn9r2UMwQa4SZiXL3x8GW67EfE="; }; propagatedBuildInputs = [ diff --git a/pkgs/build-support/fetchfossil/nix-prefetch-fossil b/pkgs/build-support/fetchfossil/nix-prefetch-fossil new file mode 100755 index 000000000000..1f3c2636355e --- /dev/null +++ b/pkgs/build-support/fetchfossil/nix-prefetch-fossil @@ -0,0 +1,125 @@ +#!/bin/sh -e + +url= +rev= +expHash= +hashType="${NIX_HASH_ALGO:-sha256}" + +# Parse command line arguments +argi=0 +argfun="" +for arg; do + if test -z "$argfun"; then + case $arg in + --url) argfun=set_url;; + --rev) argfun=set_rev;; + --hash) argfun=set_expHash;; + --help|-h) + echo "Usage: nix-prefetch-fossil [options] [URL [REVISION [EXPECTED-HASH]]]" + echo "" + echo "Options:" + echo " --url URL Fossil repository URL" + echo " --rev REV Fossil revision/tag/branch (default: trunk)" + echo " --hash HASH Expected hash" + echo " --help Show this help message" + exit 0 + ;; + *) + argi=$((argi + 1)) + case $argi in + 1) url=$arg;; + 2) rev=$arg;; + 3) expHash=$arg;; + *) echo "Too many arguments" >&2; exit 1;; + esac + ;; + esac + else + case $argfun in + set_*) + var=${argfun#set_} + eval "$var='$arg'" + ;; + esac + argfun="" + fi +done + +if test -z "$url"; then + echo "error: URL is required" >&2 + echo "Usage: nix-prefetch-fossil [URL [REVISION [EXPECTED-HASH]]]" >&2 + exit 1 +fi + +# Default to trunk if no revision specified +if test -z "$rev"; then + rev="trunk" +fi + +# If the hash was given, check if we already have it in store +if test -n "$expHash"; then + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" fossil-archive) + if nix-store --check-validity "$finalPath" 2> /dev/null; then + echo "$expHash" + exit 0 + fi +fi + +# Create temporary directory for cloning +tmpPath="$(mktemp -d --tmpdir fossil-checkout-tmp-XXXXXXXX)" +cleanup() { rm -rf "$tmpPath"; } +trap cleanup EXIT + +# Fossil wants to write global configuration to $HOME/.fossil +# We'll let it write to the temp directory instead +export HOME="$tmpPath" + +echo "Fetching Fossil repository $url at revision $rev..." >&2 + +# Clone the repository +fossil clone -A nobody "$url" "$tmpPath/fossil-clone.fossil" >&2 + +# Create directory for checkout +checkoutDir="$tmpPath/checkout" +mkdir -p "$checkoutDir" + +# Open the repository at the specified revision +cd "$checkoutDir" +fossil open "$tmpPath/fossil-clone.fossil" "$rev" >&2 + +# Get the actual commit hash and date +checkoutLine=$(fossil info | grep ^checkout:) +# Remove 'checkout:' prefix and squeeze multiple spaces, then extract fields +actualRev=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f1) +# Extract date (format: checkout: HASH YYYY-MM-DD HH:MM:SS UTC) +actualDate=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f2) +cd - >/dev/null + +# Remove the fossil checkout file +rm -f "$checkoutDir/.fslckout" + +# Calculate the hash +hash=$(nix-hash --type "$hashType" --base32 "$checkoutDir") +echo "hash is $hash" >&2 + +# Add to store if we don't have an expected hash or if it matches +if test -z "$expHash" || test "$expHash" = "$hash"; then + finalPath=$(nix-store --add-fixed --recursive "$hashType" "$checkoutDir") + echo "path is $finalPath" >&2 +elif test -n "$expHash" && test "$expHash" != "$hash"; then + echo "error: hash mismatch for Fossil repository $url" >&2 + echo " expected: $expHash" >&2 + echo " actual: $hash" >&2 + exit 1 +fi + +# Output JSON result +cat </dev/null)/bin/nix-prefetch-fossil" + +echo "Fetching latest althttpd revision..." >&2 + +# Run nix-prefetch-fossil and capture output +output=$("$prefetch_fossil" https://sqlite.org/althttpd trunk 2>&1) + +# Extract JSON from output (it's at the end after the blank line) +json_output=$(echo "$output" | gawk '/^{/{p=1} p') + +# Extract revision, hash, and date +full_rev=$(echo "$json_output" | jq -r '.rev') +new_rev="${full_rev:0:16}" # Use 16-char prefix for consistency +new_hash=$(echo "$json_output" | jq -r '.hash') +commit_date=$(echo "$json_output" | jq -r '.date') + +# Fallback to current date if extraction fails +if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then + commit_date=$(date +%Y-%m-%d) +fi +new_version="unstable-$commit_date" + +echo "Updating althttpd to $new_version (rev $new_rev)" >&2 + +# Use update-source-version from the nixpkgs root +( + cd "$nixpkgs" + update-source-version althttpd "$new_version" "$new_hash" \ + --file="pkgs/by-name/al/althttpd/package.nix" \ + --rev="$new_rev" +) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index c9a671fb7242..31400b0860df 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.0.5"; + version = "1.1.4"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-7KDyTXqIM4hUnNVJt4xwsuUdP0eYSF+fSBRuSKs8VzQ="; + hash = "sha256-8nxz8Qmo1waHa3c6qbb5cy+mMT2kaWcHSl4uW3qrBsI="; # 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,11 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-vHTJCfXVlbBLQXC/tsXJsGoACcxAhJmFlU/tq10836Q="; + vendorHash = "sha256-vGtxVQSesrqWnYJT7B2KhWiYtUFsYVPdI/ZEbpFmkOc="; + + excludedPackages = [ + "internal/gen-jsonschema" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix index 4ed1a55251c2..05b85464a88e 100644 --- a/pkgs/by-name/co/coc-pyright/package.nix +++ b/pkgs/by-name/co/coc-pyright/package.nix @@ -7,17 +7,17 @@ buildNpmPackage { pname = "coc-pyright"; - version = "0-unstable-2026-01-04"; + version = "0-unstable-2026-02-01"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-pyright"; # No tagged releases, this commit corresponds to the latest release of the package. - rev = "767eebcb9f9b828412b9ec02e80558f3e748798a"; - hash = "sha256-PNCh6EiXQxIYgU6hOG1/ialhP0p2uGTQAgipiDpgI6s="; + rev = "8160b7e315c3b2480749b141f9a24d19323d4282"; + hash = "sha256-0pdbwZa7ikFVKP3OTDufOobIoWUlfWheIC5mSRAF198="; }; - npmDepsHash = "sha256-D5e17ubJ8leB5zoNO0DbZ1rUf/JpSJlezOldA3pvtFo="; + npmDepsHash = "sha256-01AvG8BPwFIqqYwqHbbEonA0jMIKhF5wnl/azjfmaPE="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 3f2b9a2f8a32..7175f27d524e 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.36.0"; + version = "0.39.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-xitCvejiVts9kkvtcVwh/zaeWIzDj0jx9xQMh2h+9Ns="; + hash = "sha256-2Y9hxrqFQmKR6BaKP0fHTW5h5P8bnlyCKL/vy1ZqsOE="; }; - vendorHash = "sha256-8Tw+O57E5aKFO2bKimiXRK9tGnAAQr3qsuP6P9LgBjw="; + vendorHash = "sha256-Y7QterJ5Mmjg/kMqFGbeSvd+3UwG8uGFTrdIBET5yRI="; ldflags = [ "-s" diff --git a/pkgs/by-name/cs/cspell/package.nix b/pkgs/by-name/cs/cspell/package.nix index 846e253afc33..eef3622ff733 100644 --- a/pkgs/by-name/cs/cspell/package.nix +++ b/pkgs/by-name/cs/cspell/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cspell"; - version = "9.6.2"; + version = "9.6.4"; src = fetchFromGitHub { owner = "streetsidesoftware"; repo = "cspell"; tag = "v${finalAttrs.version}"; - hash = "sha256-JEvvopeSqoVXrh9t4ORUlT0nPdE+3PofzD7h4VajnAs="; + hash = "sha256-OeS3wBOnvhxQtAAra40wb1FMYIb2mpKrqf72AFuU944="; }; pnpmWorkspaces = [ "cspell..." ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-CNsxfAsIQxmDvuGZtedKnHMOoB1usDlw45cKYxaD05U="; + hash = "sha256-ufHALS8FL2VjNnYHUBZh99IpivZDtaYaVjTmEoY6Sqc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 8031453475ca..8cedc500052b 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -59,13 +59,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; - version = "8.0.9"; + version = "8.1.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${finalAttrs.version}"; - hash = "sha256-cFMbeJeEIDP7uiNi+rRKErgHtjP/PbPKASo+M2qogZQ="; + hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M="; }; patches = [ ./qmlmodule-fix.patch ]; diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index 0bf83b5c809c..3ae084e7e72c 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "edmarketconnector"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "EDCD"; repo = "EDMarketConnector"; tag = "Release/${finalAttrs.version}"; - hash = "sha256-kWxen2CTmccI6FMoIZIvgI0Sk5TIL09onxTB3iY60I4="; + hash = "sha256-dnSzT1C4ElUkj34S3bYI+v0oKJQQ7zQBZ8OuhVB6ans="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/librewolf.nix rename to pkgs/by-name/li/librewolf-unwrapped/librewolf.nix diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix similarity index 95% rename from pkgs/applications/networking/browsers/librewolf/default.nix rename to pkgs/by-name/li/librewolf-unwrapped/package.nix index ccb39de0dc8d..e8ca16d5a5c1 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -29,7 +29,6 @@ in description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; maintainers = with lib.maintainers; [ - # Also update ci/OWNERS entry when changing maintainers squalus dwrege fpletz diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.json rename to pkgs/by-name/li/librewolf-unwrapped/src.json diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/by-name/li/librewolf-unwrapped/src.nix similarity index 100% rename from pkgs/applications/networking/browsers/librewolf/src.nix rename to pkgs/by-name/li/librewolf-unwrapped/src.nix diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/by-name/li/librewolf-unwrapped/update.nix similarity index 97% rename from pkgs/applications/networking/browsers/librewolf/update.nix rename to pkgs/by-name/li/librewolf-unwrapped/update.nix index 8833c2bcf1db..db09200e5520 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/update.nix @@ -36,7 +36,7 @@ writeScript "update-librewolf" '' latestTag=$(curl "https://codeberg.org/api/v1/repos/librewolf/source/tags?page=1&limit=1" | jq -r .[0].name) echo "latestTag=$latestTag" - srcJson=pkgs/applications/networking/browsers/librewolf/src.json + srcJson=pkgs/by-name/li/librewolf-unwrapped/src.json localRev=$(jq -r .source.rev < $srcJson) echo "localRev=$localRev" diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 3e9e5da10c18..b9e148da8261 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.184.0", + "version": "3.185.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_x86_64", - "hash": "sha256-/1LTDzulmiMzoobMUyADv+MWthoL/slQldgImUFikC4=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_x86_64", + "hash": "sha256-zDhN3KtvyFdGeZYZRnjKFCDiGSnIezXrBISOq1hR3Yg=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_linux_aarch64", - "hash": "sha256-zlpLCuJO+gouYYCBZ2Oo711QIvSfDXX/81JyyL3vdKE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_linux_aarch64", + "hash": "sha256-8Cylh5Pq0uxPLCu1H/JsfxvRgipF3bTOpsbkLL50OXY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal", - "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal", + "hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.184.0/mirrord_mac_universal", - "hash": "sha256-iHTWgj18BDrvW0PCriWZdkMKA0V0D828xoaD3mSHTac=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.185.1/mirrord_mac_universal", + "hash": "sha256-EUScHFfJpqB9v1qjrMzF+Itfs4rTQzj5XPUDod2xiJU=" } } } diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index b926379be6d0..558f352bd6f8 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -33,13 +33,13 @@ let finalAttrs = { pname = "ncps"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-1VWEN1HYV52H/LCfAvFv3R9DxQbHNRnyay3p2BY8dCg="; + hash = "sha256-zMMeY2dDF+SKv1mMFPZgeQycqZC1VZLXNiyKkBe/+wc="; }; vendorHash = "sha256-AcgC+zTS3eVsbcs0jim4zDBGc3lIjwPbdVT7/KQ9Lkc="; diff --git a/pkgs/by-name/pi/pikchr/package.nix b/pkgs/by-name/pi/pikchr/package.nix index 97a0185323a2..02ae12243c53 100644 --- a/pkgs/by-name/pi/pikchr/package.nix +++ b/pkgs/by-name/pi/pikchr/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "0-unstable-2025-02-28"; + version = "0-unstable-2025-05-12"; src = fetchfossil { url = "https://pikchr.org/home"; - rev = "b7fbd56c4eb82ab9"; - hash = "sha256-7oW1IYYk3YKPjOUPP6qYIdR0oGo9pRDDlyu30J4B3bI="; + rev = "2972d1d24849d4c3"; + hash = "sha256-IZ9m1xa2bO9Sd6XYROkNz6PloLEbR3d3JpSSYyDJR8I="; }; # can't open generated html files @@ -48,6 +48,8 @@ stdenv.mkDerivation { doCheck = true; + passthru.updateScript = ./update.sh; + meta = { description = "PIC-like markup language for diagrams in technical documentation"; homepage = "https://pikchr.org"; diff --git a/pkgs/by-name/pi/pikchr/update.sh b/pkgs/by-name/pi/pikchr/update.sh new file mode 100755 index 000000000000..c565ab5cce6b --- /dev/null +++ b/pkgs/by-name/pi/pikchr/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts jq gawk + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +cd "$(dirname "${BASH_SOURCE[0]}")" + +# Build and run nix-prefetch-fossil from the local nixpkgs +prefetch_fossil="$(nix-build "$nixpkgs" -A nix-prefetch-scripts --no-out-link 2>/dev/null)/bin/nix-prefetch-fossil" + +echo "Fetching latest pikchr revision..." >&2 + +# Run nix-prefetch-fossil and capture output +output=$("$prefetch_fossil" https://pikchr.org/home trunk 2>&1) + +# Extract JSON from output (it's at the end after the blank line) +json_output=$(echo "$output" | gawk '/^{/{p=1} p') + +# Extract revision, hash, and date +full_rev=$(echo "$json_output" | jq -r '.rev') +new_rev="${full_rev:0:16}" # Use 16-char prefix for consistency +new_hash=$(echo "$json_output" | jq -r '.hash') +commit_date=$(echo "$json_output" | jq -r '.date') + +# Fallback to current date if extraction fails +if [ -z "$commit_date" ] || [ "$commit_date" = "null" ]; then + commit_date=$(date +%Y-%m-%d) +fi +new_version="0-unstable-$commit_date" + +echo "Updating pikchr to $new_version (rev $new_rev)" >&2 + +# Use update-source-version from the nixpkgs root +( + cd "$nixpkgs" + update-source-version pikchr "$new_version" "$new_hash" \ + --file="pkgs/by-name/pi/pikchr/package.nix" \ + --rev="$new_rev" +) diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix index 225ee762b0d7..59ade259277c 100644 --- a/pkgs/by-name/pq/pq-cli/package.nix +++ b/pkgs/by-name/pq/pq-cli/package.nix @@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "urwid" "urwid-readline" ]; diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix new file mode 100644 index 000000000000..77595ef28e4a --- /dev/null +++ b/pkgs/by-name/re/remark42/package.nix @@ -0,0 +1,106 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + nodejs_22, + pnpm_8, + fetchPnpmDeps, + pnpmConfigHook, + testers, +}: + +let + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "umputun"; + repo = "remark42"; + tag = "v${version}"; + hash = "sha256-yd/qTRSZj0nZpgK77xP+XHyHcVXlNpyMzdfj6EbVcXQ="; + }; + + remark42-web = stdenv.mkDerivation (finalAttrs: { + pname = "remark42-web"; + inherit version src; + + strictDeps = true; + + pnpmRoot = "frontend"; + + nativeBuildInputs = [ + nodejs_22 + pnpm_8 + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + pnpm = pnpm_8; + fetcherVersion = 3; + hash = "sha256-E2tUZXhcufuztXS+Z//uZk9omvaPrevNbGqVd41Lwhw="; + }; + + buildPhase = '' + runHook preBuild + pushd "$pnpmRoot" + pnpm --filter ./apps/remark42 --fail-if-no-match run build + popd + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/web + cp -r "$pnpmRoot/apps/remark42/public/." $out/web/ + runHook postInstall + ''; + }); +in +buildGoModule (finalAttrs: { + pname = "remark42"; + inherit version src; + + strictDeps = true; + + modRoot = "backend"; + + # build the main package in ./backend/app + subPackages = [ "app" ]; + + preBuild = '' + rm -rf app/cmd/web + mkdir -p app/cmd/web + cp -r ${remark42-web}/web/. app/cmd/web/ + ''; + + vendorHash = null; + + # set the version string in the built binary. + ldflags = [ + "-s" + "-w" + "-X" + "main.revision=v${version}" + ]; + + postInstall = '' + mv "$out/bin/app" "$out/bin/remark42" + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "remark42 --help"; + version = "v${finalAttrs.version}"; + }; + + meta = with lib; { + description = "Self-hosted comment engine that embeds a statically built frontend"; + homepage = "https://remark42.com/"; + license = licenses.mit; + mainProgram = "remark42"; + platforms = platforms.unix; + maintainers = with maintainers; [ janhencic ]; + }; +}) diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index 1836ab96b8af..8cca1d00f1c2 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.15.4"; + version = "3.16.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb"; - hash = "sha256-O8rR4gLToJgUe8EsTvsk1AShGAAsgU4cy1+UITXiVm8="; + hash = "sha256-C21G9bbm6z/JSPb9zqJRnpqlJB+W3Y33tbEGFZIIlTc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index 96487d748c01..c00e351a7dcb 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "27.3.4.6"; - hash = "sha256-QC8C7rOpRXFriZtmVc48Se7IQ61p4DSAXVobnDeEkAE="; + version = "27.3.4.7"; + hash = "sha256-3D+j36vNio0REx02bJ/dYey/nTojZuQSnzIWBIOch1U="; } diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix deleted file mode 100644 index c4e2c1ef09a8..000000000000 --- a/pkgs/development/libraries/mapbox-gl-native/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - mkDerivation, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - qtbase, - curl, - libuv, - glfw3, - rapidjson, -}: - -mkDerivation rec { - pname = "mapbox-gl-native"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "mapbox"; - repo = "mapbox-gl-native"; - rev = "maps-v${version}"; - sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c"; - fetchSubmodules = true; - }; - - patches = [ - # https://github.com/mapbox/mapbox-gl-native/pull/16591 - (fetchpatch { - name = "add-support-for-qmapboxgl-installation.patch"; - url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch"; - sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b"; - }) - (fetchpatch { - name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch"; - url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch"; - sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r"; - }) - (fetchpatch { - name = "skip-license-check.patch"; - url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; - sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; - }) - (fetchpatch { - name = "fix-compilation.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native"; - hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI="; - }) - (fetchpatch { - name = "fix-narrowing-conversion.patch"; - url = "https://github.com/mapbox/mapbox-gl-native/commit/2955d0e479f57a39a0af4a0fa7ca7683455cca58.patch"; - hash = "sha256-Jk7OLb9/mVtc2mm0AL1h9zcSiQ54jogNI+q6ojY0HEo="; - }) - ]; - - postPatch = '' - # don't use vendored rapidjson - rm -r vendor/mapbox-base/extras/rapidjson - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - curl - libuv - glfw3 - qtbase - rapidjson - ]; - - cmakeFlags = [ - "-DMBGL_WITH_QT=ON" - "-DMBGL_WITH_QT_LIB_ONLY=ON" - "-DMBGL_WITH_QT_HEADLESS=OFF" - ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=type-limits"; - - meta = { - # Does not build against gcc-13, the repository is archived upstream. - broken = true; - description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; - homepage = "https://mapbox.com/mobile"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ - Thra11 - dotlambda - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index eb179169f6f5..e53bc2239dc4 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -6,14 +6,14 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "apycula"; - version = "0.28"; + version = "0.29"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-AfNjHQkDrZ9oULuEmgXhqr063NWDZCpVW5pE6chnnFI="; + inherit (finalAttrs) pname version; + hash = "sha256-awhGSmGQDQ0Pi+4y9KoR1Yw6UZjM/CTxAV0jdfen6Qw="; }; build-system = [ setuptools-scm ]; @@ -28,8 +28,8 @@ buildPythonPackage rec { meta = { description = "Open Source tools for Gowin FPGAs"; homepage = "https://github.com/YosysHQ/apicula"; - changelog = "https://github.com/YosysHQ/apicula/releases/tag/${version}"; + changelog = "https://github.com/YosysHQ/apicula/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ newam ]; }; -} +}) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 0390dd429a3c..b84bd6581cdd 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "denonavr"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "ol-iver"; repo = "denonavr"; tag = finalAttrs.version; - hash = "sha256-GrcTNnGanyYwcRIqzh5gToe2Z0E5KM2V7Ph/eBFoljA="; + hash = "sha256-nuxTZA4kGSaRp6qqOG8XjqjYxiCwmAraetVD4LFd0Qc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 018ac6209de4..18986c0ad7c0 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "urwid" "zstandard" # requested by maintainer diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix index f714303f2099..05f9ba66f81a 100644 --- a/pkgs/development/python-modules/protobuf/5.nix +++ b/pkgs/development/python-modules/protobuf/5.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "protobuf"; version = "5.29.6"; pyproject = true; + # nixpkgs-update: no auto update src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index d8e6b4cb297f..06715a760afb 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "pyenphase"; - version = "2.4.3"; + version = "2.4.5"; pyproject = true; src = fetchFromGitHub { owner = "pyenphase"; repo = "pyenphase"; tag = "v${finalAttrs.version}"; - hash = "sha256-JJtkfN3udslcNYMXGGRXjyPqP3hjix9bg7GcGNOoMbM="; + hash = "sha256-BMzYo6KrgJII/30TJndYRGOjRS2ufWJirQd5X8D0bbo="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 443945c7d3d6..9a993a1a4ce6 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -9,20 +9,20 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypck"; - version = "0.9.9"; + version = "0.9.10"; pyproject = true; src = fetchFromGitHub { owner = "alengwenus"; repo = "pypck"; - tag = version; - hash = "sha256-EsPfPRYp75GML9JMoFPf5U8obh51LjIkg/FFRNkrEOY="; + tag = finalAttrs.version; + hash = "sha256-UTUYYnXY+Wak4cd0fH1V5rdkJ/Aet0DSCHfd+PL+SBo="; }; postPatch = '' - echo "${version}" > VERSION + echo "${finalAttrs.version}" > VERSION ''; build-system = [ setuptools ]; @@ -42,8 +42,8 @@ buildPythonPackage rec { meta = { description = "LCN-PCK library written in Python"; homepage = "https://github.com/alengwenus/pypck"; - changelog = "https://github.com/alengwenus/pypck/releases/tag/${src.tag}"; + changelog = "https://github.com/alengwenus/pypck/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.epl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 20821b5d597c..dedcdcbc8cac 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "python-roborock"; - version = "4.8.0"; + version = "4.12.0"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${finalAttrs.version}"; - hash = "sha256-eOvadiJ0zLwCJDK22qb/ZPsNi+d6lI5+lzn05EHWB7I="; + hash = "sha256-H47NKOGKUCJs9LolVcTg6R8W6Fuq+YWBgrwJUB08JVA="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 03a9dbaab902..81f6bf4b83b3 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "urwid"; - version = "3.0.3"; + version = "3.0.4"; pyproject = true; src = fetchFromGitHub { owner = "urwid"; repo = "urwid"; tag = version; - hash = "sha256-+bvtIjSKWhu1JzyIgM60YZtrzNEaAvVqJrhq8PnkXk0="; + hash = "sha256-mKBLAoEBiqr//1Gl8DAmpUJ9woq6Zf2HhbYEirAoi2M="; }; postPatch = '' diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix index 97a665c3b04a..352ec9b22685 100644 --- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix +++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -7,13 +7,13 @@ let fingers = crystal.buildCrystalPackage rec { format = "shards"; - version = "2.5.1"; + version = "2.6.1"; pname = "fingers"; src = fetchFromGitHub { owner = "Morantron"; repo = "tmux-fingers"; rev = "${version}"; - sha256 = "sha256-O5CfboFnl51OeOgqI2NB3MmELDeKykd5NO2d5FGXkII="; + sha256 = "sha256-f18y4Jq5Ab/5KZKv8woMTkFGEY2/f5KeRH0sf6R1l1U="; }; shardsFile = ./shards.nix; diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch index 34014441ebf9..2cad0ea1ed67 100644 --- a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch +++ b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch @@ -1,8 +1,8 @@ diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux -index f15b509..a14e312 100755 +index c62915a..eb065e7 100755 --- a/tmux-fingers.tmux +++ b/tmux-fingers.tmux -@@ -1,35 +1,4 @@ +@@ -1,36 +1,5 @@ #!/usr/bin/env bash -CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -36,6 +36,13 @@ index f15b509..a14e312 100755 - fi -fi - --tmux run "$FINGERS_BINARY load-config" -+tmux run "@tmuxFingersDir@/tmux-fingers load-config" + if [[ "$TERM" == "dumb" ]]; then + # force term value to get proper colors in systemd and tmux 3.6a + # https://github.com/Morantron/tmux-fingers/issues/143 +@@ -39,5 +8,5 @@ else + FINGERS_TERM="$TERM" + fi + +-tmux run "TERM=$FINGERS_TERM $FINGERS_BINARY load-config" ++tmux run "TERM=$FINGERS_TERM @tmuxFingersDir@/tmux-fingers load-config" exit $? diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index e9c692d57f8e..64a94eb494d3 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -10,6 +10,7 @@ cvs, darcs, findutils, + fossil, gawk, gitMinimal, git-lfs, @@ -65,6 +66,11 @@ rec { gawk jq ]; + nix-prefetch-fossil = + mkPrefetchScript "fossil" ../../../build-support/fetchfossil/nix-prefetch-fossil + [ + fossil + ]; nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ findutils gawk @@ -94,6 +100,7 @@ rec { nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-darcs + nix-prefetch-fossil nix-prefetch-git nix-prefetch-hg nix-prefetch-svn diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a94717248bc..38080489103e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9984,16 +9984,6 @@ with pkgs; pname = "firefox-bin"; }; - librewolf-unwrapped = import ../applications/networking/browsers/librewolf { - inherit - stdenv - lib - callPackage - buildMozillaMach - nixosTests - ; - }; - librewolf = wrapFirefox librewolf-unwrapped { inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; libName = "librewolf"; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c6e9bab6d11d..e7bc54d06c14 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -122,8 +122,6 @@ makeScopeWithSplicing' { libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; - mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; maplibre-gl-native = callPackage ../development/libraries/maplibre-gl-native { }; @@ -228,6 +226,7 @@ makeScopeWithSplicing' { 'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017. Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead. ''; # Added 2025-10-25 + mapbox-gl-native = throw "libsForQt5.mapbox-gl-native has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 } )) );